Commit Graph

61371 Commits

Author SHA1 Message Date
Laurent Destailleur
e6f0e76988 Add option MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH 2017-09-02 15:30:00 +02:00
Laurent Destailleur
75e639db6c Fix error management 2017-09-02 15:23:53 +02:00
Laurent Destailleur
3beee569a6 Enhance support of default value in extrafields 2017-09-02 15:18:41 +02:00
Rui Strecht
ceafef56b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-02 13:35:19 +01:00
Laurent Destailleur
9923c87fd8 Fix translation of extrafields 2017-09-02 13:03:14 +02:00
Laurent Destailleur
36eb21c135 Fix translation of extrafields 2017-09-02 13:02:01 +02:00
Laurent Destailleur
e5400a4a36 Fix translation of extrafields 2017-09-02 13:01:41 +02:00
Laurent Destailleur
7f7b4cddb4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-02 12:37:02 +02:00
Laurent Destailleur
a6a5602572 NEW Can set email of thirdparty as unique and/or mandatory 2017-09-02 12:36:53 +02:00
Laurent Destailleur
015bc51c43 Fix regression adding a false error message 2017-09-02 12:17:29 +02:00
Laurent Destailleur
09e9254f35 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-02 01:29:12 +02:00
Laurent Destailleur
7c722def0f FIX #7312 2017-09-02 01:28:19 +02:00
Laurent Destailleur
c1e54b7e23 Merge pull request #7315 from aspangaro/7.0-f2
NEW Add project on a various payment
2017-09-02 00:45:36 +02:00
Laurent Destailleur
91e75b5812 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-02 00:34:16 +02:00
Laurent Destailleur
9fe5eb3c87 Fix double translation 2017-09-02 00:33:18 +02:00
Laurent Destailleur
4644a39be5 Merge pull request #7322 from ruistrecht-alt/NEW_Add_Region_to_third_party_societe_list
NEW Added regions to third party/societe lists, can be filtered
2017-09-02 00:13:20 +02:00
Laurent Destailleur
32c6acefd2 Merge pull request #7321 from ruistrecht-alt/NEW_Add_region_to_state/province_form_field
NEW Added Region name to state/province form field
2017-09-02 00:10:25 +02:00
Laurent Destailleur
227c8a96c8 Merge pull request #7320 from hregis/6.0_bug3
Fix: avoid warning "non-numeric value encountered"
2017-09-02 00:09:24 +02:00
Laurent Destailleur
9fe1d8462a Merge pull request #7318 from atm-maxime/fix_extrafieldsline_insert
Fix extrafieldsline insert
2017-09-02 00:07:00 +02:00
Laurent Destailleur
5ba13a9500 Merge pull request #7317 from hregis/6.0_bug2
Fix: missing $dolibarrdataroot value
2017-09-02 00:05:42 +02:00
Laurent Destailleur
d018bd4892 Merge pull request #7316 from aspangaro/6.0-rc_p4
FIX Missing language key "Events" everywhere
2017-09-02 00:00:10 +02:00
Laurent Destailleur
58b08c7de8 Clean code 2017-09-01 23:56:59 +02:00
Laurent Destailleur
08ea82ae95 Merge pull request #7314 from QuentinSu/cashdeskResearchArea
Fix barcode reader on POS
2017-09-01 23:25:33 +02:00
Laurent Destailleur
407febc141 Fix travis 2017-09-01 22:49:33 +02:00
Laurent Destailleur
bc446999dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-01 19:37:45 +02:00
Laurent Destailleur
55691bfbc2 Work on generic payment module 2017-09-01 19:37:34 +02:00
Laurent Destailleur
1a5f96123a Work on generic payment module 2017-09-01 19:30:56 +02:00
Laurent Destailleur
796684713f Work on generic payment module 2017-09-01 18:49:55 +02:00
Laurent Destailleur
30eefb34aa Fix payment suffix 2017-09-01 18:03:26 +02:00
Laurent Destailleur
d71359b634 Update data 2017-09-01 17:42:04 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
9b51810653 Clean code 2017-09-01 17:30:09 +02:00
Rui Strecht
9b65578ff7 Merge branch 'NEW_Add_region_to_state/province_form_field' into develop 2017-09-01 16:25:48 +01:00
Rui Strecht
7107fba8c5 Merge branch 'NEW_Add_Region_to_third_party_societe_list' into develop 2017-09-01 16:25:39 +01:00
Laurent Destailleur
0d0b7f8af2 Fix email 2017-09-01 17:18:07 +02:00
Rui Strecht
1ee0077e4e Fix: Added name to contributors 2017-09-01 16:10:19 +01:00
Laurent Destailleur
4660bc58fc Fix nostop option 2017-09-01 17:08:47 +02:00
Laurent Destailleur
bda507d191 Fix nostop option 2017-09-01 17:07:26 +02:00
Rui Strecht
cd8362498f NEW Added regions to third party/societe lists, can be filtered 2017-09-01 16:07:07 +01:00
Laurent Destailleur
223e1b1cd4 Fix missing the nostop tag 2017-09-01 16:55:09 +02:00
Regis Houssin
0fc8a0f840 Fix: avoid warning "non-numeric value encountered" 2017-09-01 16:54:06 +02:00
Laurent Destailleur
920d6270c3 Fix missing the nostop tag 2017-09-01 16:54:06 +02:00
Rui Strecht
9443cb0c1b NEW Added Region name to state/province form field 2017-09-01 15:53:06 +01:00
Laurent Destailleur
2768878618 FIX Bad condition on sms log debug 2017-09-01 16:39:49 +02:00
Laurent Destailleur
e663314cb1 Clean code 2017-09-01 16:38:56 +02:00
Laurent Destailleur
c02355c8c3 FIX Bad condition on sms log debug 2017-09-01 16:37:45 +02:00
Laurent Destailleur
e13792a555 Fix data for account categories 2017-09-01 15:31:35 +02:00
Laurent Destailleur
ffb408f440 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-01 15:20:48 +02:00
Laurent Destailleur
ac08dec2c3 Avoid warnings 2017-09-01 15:20:29 +02:00
Laurent Destailleur
d88a75b666 Fix typo 2017-09-01 13:47:12 +02:00