2
0
forked from Wavyzz/dolibarr
Commit Graph

53123 Commits

Author SHA1 Message Date
Laurent Destailleur
3beee569a6 Enhance support of default value in extrafields 2017-09-02 15:18:41 +02: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
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
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
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
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
61cf69f2bb NEW Include a color syntaxed HTML editor for emailing edition. 2017-09-01 13:09:13 +02:00
Laurent Destailleur
9a0576ff79 Enhance website module 2017-09-01 12:19:55 +02:00
Laurent Destailleur
1da71d48cd Work on export site 2017-09-01 11:10:03 +02:00
Alexandre SPANGARO
c4d2ca661f Merge remote-tracking branch 'uptream/develop' into 7.0-f2
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-01 07:24:55 +02:00
Alexandre SPANGARO
84fcbb724e Add project on various_payment 2017-09-01 07:21:27 +02:00
Laurent Destailleur
2ab12f54ff Fix install error due to too large column with index 2017-08-31 22:42:14 +02:00
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64 Uniformize code of accounting report 2017-08-31 15:44:36 +02:00
Laurent Destailleur
6a3d110d3a Enhance repair for utf8 mix collation 2017-08-31 14:44:32 +02:00
Quentin Sutkowski
c761eb592e Fix barcode reader on POS
Solve the keyboard emulation issue with a barcode reader on cashdesk module research area.
2017-08-31 11:15:55 +02:00
Laurent Destailleur
c31febc4e0 Fix bad var 2017-08-31 03:41:04 +02:00
Laurent Destailleur
9146bb336e Work on merging all payment modes in one page 2017-08-31 03:34:57 +02:00
Laurent Destailleur
e71409b7c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-30 17:15:28 +02:00
Laurent Destailleur
0a67ca53d4 Fix menu auguria 2017-08-30 17:14:54 +02:00
Laurent Destailleur
b65db49868 Merge pull request #7309 from simnandez/6.0
NEW Add detail of all tax rates into pdf column tax sale.
2017-08-30 16:47:42 +02:00