lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,731 Commits 43 Branches 150 Tags 886 MiB
6e69db8a1a
Commit Graph

75731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
f1fd4108ae Debug/Clean code 2019-05-09 12:17:20 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +02:00
Laurent Destailleur
725de78d29 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-09 10:16:01 +02:00
Laurent Destailleur
ed98817f0d Fix template for situation 2019-05-09 10:15:38 +02:00
Laurent Destailleur
e5b613562a
Merge pull request #11148 from andreubisquerra/master 
TakePOS Terminals
 2019-05-09 09:18:41 +02:00
Laurent Destailleur
50563ab126 Prepare 9.0.3 2019-05-08 22:03:16 +02:00
Laurent Destailleur
7883ac4a8d Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-08 22:01:46 +02:00
Laurent Destailleur
08fcfded76 Prepare 9.0.3 2019-05-08 22:00:13 +02:00
Laurent Destailleur
541da011a4 Prepare 9.0.2 2019-05-08 21:59:55 +02:00
Laurent Destailleur
c2abedeb24 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-08 21:43:57 +02:00
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-05-08 19:14:31 +02:00
Laurent Destailleur
96c021773e
Update takepos.lib.php 2019-05-08 19:11:17 +02:00
Laurent Destailleur
c3693cb007 Fix phpcs 2019-05-08 19:10:12 +02:00
Laurent Destailleur
429ffd6c53 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-08 19:08:51 +02:00
Laurent Destailleur
bb4cda6719 Fix phpcs 2019-05-08 19:08:40 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
Laurent Destailleur
b62b09df66
Merge pull request #11147 from frederic34/patch-2 
fix reassort with not using product units
 2019-05-08 18:33:10 +02:00
Laurent Destailleur
5317d0432d Fix bad link 2019-05-08 18:32:26 +02:00
andreubisquerra
84cfa00bf1 Terminals 2019-05-08 18:29:00 +02:00
Laurent Destailleur
590b1d1e90 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2019-05-08 18:24:50 +02:00
Laurent Destailleur
b5d8bc732d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-08 18:22:11 +02:00
Laurent Destailleur
af436b6559 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-08 18:21:17 +02:00
Laurent Destailleur
f2e24ed96e Fix bad contact used 2019-05-08 18:20:28 +02:00
Laurent Destailleur
3a3b04f31b Fix showdocument for external modules 2019-05-08 17:31:50 +02:00
Frédéric FRANCE
5fd3109e7f
fix reassort with no product units 2019-05-08 16:28:18 +02:00
Laurent Destailleur
d86f0b7407 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-08 13:27:36 +02:00
Laurent Destailleur
a67d6e7208 css 2019-05-08 13:27:26 +02:00
Laurent Destailleur
018cd3d034
Merge pull request #11143 from code-chicken/patch-5 
FIX Show unit values if configured
 2019-05-08 02:12:04 +02:00
Laurent Destailleur
af2c158821
Update reassort.php 2019-05-08 02:11:50 +02:00
Laurent Destailleur
953c9148ff
Update reassort.php 2019-05-08 02:11:12 +02:00
Laurent Destailleur
8812b95ce0
Merge pull request #11144 from aspangaro/develop 
Fix Eldy menu
 2019-05-08 02:09:35 +02:00
Laurent Destailleur
4ebc281960
Merge pull request #11140 from code-chicken/patch-3 
FIX Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc
 2019-05-08 02:07:14 +02:00
Laurent Destailleur
eb9b9e44d8
Merge pull request #11137 from OPEN-DSI/fix-card-presend-shipment 
Fix contact address substitution before sending by mail in shipment card
 2019-05-08 02:06:36 +02:00
Laurent Destailleur
b58a73cfaf
Merge pull request #11139 from code-chicken/patch-1 
FIX Add support for units
 2019-05-08 02:02:22 +02:00
Laurent Destailleur
2ee72e2fdf
Update html.form.class.php 2019-05-08 02:02:07 +02:00
Laurent Destailleur
21c355dd9d
Merge pull request #11133 from aspangaro/9.0_lettering 
FIX sortfield on lettering function
 2019-05-08 01:59:27 +02:00
Laurent Destailleur
cea05b0d7d
Merge pull request #11131 from ptibogxiv/patch-173 
FIX url lettre max & colissimo
 2019-05-08 01:54:12 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder 
Fix link of ref in cash fence list
 2019-05-08 01:09:38 +02:00
Laurent Destailleur
3606bab973
Merge pull request #11130 from ptibogxiv/patch-172 
FIX : facnumber to ref report takepos
 2019-05-08 00:35:03 +02:00
Laurent Destailleur
dc1ee29fef Fix default permission of new users 2019-05-07 23:03:45 +02:00
Laurent Destailleur
12409e944c Fix duplicate error message 2019-05-07 22:57:27 +02:00
Laurent Destailleur
e37519ed89 Fix label 2019-05-07 22:43:59 +02:00
Alexandre SPANGARO
a386f0e9ea Fix Eldy menu 2019-05-07 09:18:27 +02:00
Rüdiger Hahn
475290a4b9
Show unit values if configured 
Fix: Fetch unit values from db and display them if this has been configured
 2019-05-07 09:02:48 +02:00
Laurent Destailleur
c4798c34b0 Fix autocompletion of product on stock correction 2019-05-07 00:26:31 +02:00
Rüdiger Hahn
acb2f59f56
Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc 
cond_reglement and cond_reglement_doc got the same value cond_reglement_libelle. It looks like that the db field libelle_facture was intended to be used for cond_reglement_libelle_doc.
 2019-05-06 19:22:49 +02:00
Rüdiger Hahn
4008e26328
Add support for units 
Fetch units from db when they've been enabled in configuration
 2019-05-06 13:12:41 +02:00
Lionel VESSILLER
8bb4b3f339 Fix contact address substitution before sending by mail in shipment card 2019-05-06 11:12:56 +02:00
Alexandre SPANGARO
c86318ea66 fix 2019-05-05 21:49:04 +02:00