Commit Graph

71686 Commits

Author SHA1 Message Date
Laurent Destailleur
bcf2e751b5
Merge pull request #9743 from atm-maxime/new_mass_generate
New mass generate
2018-12-14 15:45:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
a37c07f625
Merge pull request #9893 from frederic34/fieldlabel
remove fieldlabel and add fieldeditkey
2018-12-14 15:43:23 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
59e38d4a81
Merge pull request #9897 from Vaadasch/develop
NEW Update working chkbxlst filter for lists
2018-12-14 15:33:50 +01:00
Laurent Destailleur
233e160489
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2
NEW Extend import option to Order's card and Propal's card
2018-12-14 15:29:27 +01:00
Laurent Destailleur
2024003b53
Merge pull request #9958 from OPEN-DSI/email-contact-card
[New] Email Contact card
2018-12-14 15:26:39 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card 2018-12-14 15:26:15 +01:00
Laurent Destailleur
67b6ed05b6
Merge pull request #9927 from grandoc/new_branch_31_10_2018
Typo
2018-12-14 14:27:57 +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
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
0d6863ebb0
Merge pull request #10217 from torvista/langs_en_US
various en_US changes
2018-12-14 11:09:35 +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
54fa0e9502
Merge pull request #9864 from atm-greg/New_manage_loan_schedule
NEW manage loan schedule
2018-12-14 10:54:33 +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
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
82f008bd0e
Merge pull request #10164 from atm-maxime/qual_rename_facnumber
QUAL rename facnumber by ref
2018-12-13 20:24:38 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
b86b9ffece
Merge pull request #10185 from frederic34/patch-2
upgrade 9 to 10 in travis
2018-12-13 20:21:34 +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
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
5fb1cfa720
Merge pull request #10216 from com4WEB/develop
Create /doc/install/README-DE
2018-12-13 19:57:59 +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
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
911f343c97 Removed deprecated files 2018-12-12 13:01:34 +01:00
Laurent Destailleur
95660f0671 Update Dolibarr schema 2018-12-12 13:01:15 +01:00
Laurent Destailleur
ea041693b6 Code comment 2018-12-12 12:54:10 +01:00