Commit Graph

63009 Commits

Author SHA1 Message Date
altatof
d5bf9691ee allow product ajax search on description 2018-12-14 15:10:32 +01:00
Laurent Destailleur
9e83699193 Merge branch 'develop' into new_branch_31_10_2018 2018-12-14 14:27:35 +01:00
Laurent Destailleur
78cdade1a7 Merge pull request #10211 from atm-john/fix_error_message_details
Add détails to error message
2018-12-14 14:26:38 +01:00
Laurent Destailleur
7be2097e87 Fix phpcs 2018-12-14 12:00:14 +01:00
Alexandre SPANGARO
60f56fcf8d Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
8b0919d7e4 Fix phpcs 2018-12-14 11:26:37 +01:00
Laurent Destailleur
63aa7ac1ec Fix name of key 2018-12-14 11:16:05 +01:00
Laurent Destailleur
0113281cc9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-14 11:13:59 +01:00
Laurent Destailleur
2f075147a3 Migrate to 10 2018-12-14 11:13:48 +01:00
Laurent Destailleur
55487da03e Merge branch 'develop' into langs_en_US 2018-12-14 11:09:25 +01:00
Laurent Destailleur
dc4a122697 Merge pull request #10224 from fmarcet/develop
Qual: Better management of select type of lines
2018-12-14 11:06:33 +01:00
Laurent Destailleur
8c9f81807f Merge pull request #9702 from bafbes/abb80027
New : Link to create new element on linked fields
2018-12-14 11:01:39 +01:00
Laurent Destailleur
42de7da334 Update commonobject.class.php 2018-12-14 11:01:27 +01:00
Laurent Destailleur
3765db422a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/tables/llx_loan.sql
2018-12-14 10:57:11 +01:00
Laurent Destailleur
6eaa6a1d28 Add missing column 2018-12-14 10:56:13 +01:00
Laurent Destailleur
fec64a78ab Merge branch 'develop' into New_manage_loan_schedule 2018-12-14 10:54:09 +01:00
Laurent Destailleur
fab6dde593 Close #9825 2018-12-14 10:51:32 +01:00
Laurent Destailleur
177675b73d Merge pull request #10225 from madx666/contrib
Change type_mouvement on movement_list
2018-12-14 10:40:00 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91 FIX #9629 #9625 2018-12-14 10:31:09 +01:00
Laurent Destailleur
9bb3382002 Merge pull request #9534 from wdammak/patch-16
Add the ability to sort products by category
2018-12-14 10:02:08 +01:00
Laurent Destailleur
e1baf3ab2b Update html.form.class.php 2018-12-14 10:01:12 +01:00
Laurent Destailleur
5d5add641b Fix scrutinizer 2018-12-14 09:58:23 +01:00
torvista
1c7189ed40 supplier->vendor
suppliers->vendors
2018-12-13 22:24:45 +01:00
Laurent Destailleur
4fc2cefce3 Merge pull request #10181 from aljawaid/aljawaid-override_vat_expense_report
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'
2018-12-13 20:53:32 +01:00
Laurent Destailleur
3484b50511 Update html.form.class.php 2018-12-13 20:51:45 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
dcb43214d6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-13 20:46:05 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
f97b561af0 Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
eefcf4b708 Merge pull request #9822 from bafbes/abb80034
NEW Grant right to child classes to use Category methods
2018-12-13 20:21:05 +01:00
Laurent Destailleur
1ee1b7a321 Merge pull request #10212 from atm-john/new_pdf_improve_desc_item_visibility
NEW Hidden conf to improve pdf desc item visibitity
2018-12-13 20:06:50 +01:00
Laurent Destailleur
210c937725 Merge pull request #10213 from inoveaconseil/patch-5
NEW: Add note in tooltips
2018-12-13 20:06:13 +01:00
Laurent Destailleur
860492a19f Merge pull request #10201 from joseplluis/patch-3
Fix: add ID property to select objects
2018-12-13 20:03:46 +01:00
Laurent Destailleur
603656c7de Merge pull request #10219 from simnandez/8.0
FIX: #10218 Bad redirection after deleting a user or group
2018-12-13 20:02:53 +01:00
Laurent Destailleur
1fd283fe6f Merge pull request #10220 from defrance/patch-139
fk_default_warehouse not defined on product class
2018-12-13 20:02:31 +01:00
Laurent Destailleur
b6df9f88da Merge pull request #10223 from OPEN-DSI/develop
NEW Add contact status in category export
2018-12-13 20:02:19 +01:00
Laurent Destailleur
f6775b8af5 Merge pull request #10222 from grandoc/new_branch_12_12_2018
to avoid html issue
2018-12-13 19:57:34 +01:00
Laurent Destailleur
4413b2e886 Merge pull request #10215 from atm-quentin/8.0_FIX_if_qty_is_0
FIX if qty is 0
2018-12-13 19:56:38 +01:00
Laurent Destailleur
6ad106d14a Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
florian HENRY
2e57a8be51 better fix 2018-12-13 12:37:40 +01:00
florian HENRY
56923caeec Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-13 12:34:39 +01:00
Laurent Destailleur
b0941967f0 Fix sort of email templates 2018-12-13 12:13:28 +01:00
madx666
3159c3f8d1 Change type_mouvement on movement_list 2018-12-13 11:28:49 +01:00
Ferran Marcet
555698a3af Qual: Better management of select type of lines 2018-12-13 10:36:30 +01:00
Lionel VESSILLER
1512ba9242 Add contact status in category export 2018-12-12 14:20:04 +01:00
Laurent Destailleur
0ecdb0f3bb Code comment 2018-12-12 13:02:18 +01:00
Laurent Destailleur
61503bdaa9 Fix picto for status of cron task 2018-12-12 13:02:11 +01:00
Laurent Destailleur
ad3c679d28 Fix status in cron task list 2018-12-12 13:02:03 +01:00
Laurent Destailleur
ea041693b6 Code comment 2018-12-12 12:54:10 +01:00