Commit Graph

72832 Commits

Author SHA1 Message Date
Laurent Destailleur
31f4513a7e Fix bad function 2019-01-28 02:46:31 +01:00
Laurent Destailleur
4398649af6 Add hooks to add column in list of payment modes 2019-01-28 01:46:59 +01:00
Laurent Destailleur
46bc078481 Fix phpcs 2019-01-27 23:10:10 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
97545af1fd Translation 2019-01-27 18:26:18 +01:00
Laurent Destailleur
c291450a07 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 18:13:28 +01:00
Laurent Destailleur
7a7fd657ed Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 18:13:20 +01:00
Laurent Destailleur
a78db45178 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-27 18:12:36 +01:00
Laurent Destailleur
56838bc659 Fix missing field into migration 2019-01-27 18:11:18 +01:00
Laurent Destailleur
c33860cfab
Merge pull request #10368 from ptibogxiv/patch-91
NEW thirdparty in donation if option ON
2019-01-27 18:07:46 +01:00
Laurent Destailleur
12e75cb8c9
Merge pull request #10401 from aspangaro/10.0_accountancy2
NEW: Automatically binding for intra/export accountancy code in customer list
2019-01-27 18:06:08 +01:00
Laurent Destailleur
c467625781
Merge pull request #10429 from frederic34/patch-17
do not trim int, use cast
2019-01-27 18:00:52 +01:00
Laurent Destailleur
d1befcb1ba
Merge pull request #10427 from EuskalMoneta/develop
NEW Get the list of groups of a user with the REST API.
2019-01-27 17:58:09 +01:00
Laurent Destailleur
3e78807cbc
Merge pull request #10424 from EuskalMoneta/7.0
FIX 'statut' is ignored when updating a user with the REST API.
2019-01-27 17:56:14 +01:00
Laurent Destailleur
05ba397156
Merge pull request #10421 from frederic34/patch-2
correct menu
2019-01-27 17:55:23 +01:00
Laurent Destailleur
a268a13c89
Merge pull request #10423 from grandoc/new_branch_27_01_2019
fix translations
2019-01-27 17:55:05 +01:00
Laurent Destailleur
da1b12a0d0
Merge pull request #10422 from frederic34/elseif
PSR2 usage of else if is discouraged
2019-01-27 17:54:21 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Laurent Destailleur
0738e0e7cc
Merge pull request #10420 from andreubisquerra/master
Remove absolute divs and add Dolistore POS category link to TakePOS
2019-01-27 17:52:34 +01:00
Laurent Destailleur
d4daa6cebd
Merge pull request #10430 from frederic34/patch-18
typo in fournisseur.product.class.php
2019-01-27 17:51:49 +01:00
Laurent Destailleur
b07513befe
Merge pull request #10431 from frederic34/argspacing
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 17:51:24 +01:00
Laurent Destailleur
3c88816bf8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 17:44:13 +01:00
Laurent Destailleur
d59097f65c Fix upload of module file 2019-01-27 17:40:56 +01:00
Philippe GRAND
b8ec33d29b fix translations 2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
0e3efadf59
typo in fournisseur.product.class.php 2019-01-27 14:37:37 +01:00
Frédéric FRANCE
ac63a7b6b5
do not trim int, use cast 2019-01-27 14:30:23 +01:00
Xebax
0aa98297f5 NEW Get the list of groups of a user with the REST API. 2019-01-27 13:52:08 +01:00
Xebax
94d3f038eb FIX 'statut' is ignored when updating a user with the REST API. 2019-01-27 13:20:33 +01:00
Philippe GRAND
95bbb46fdf fix translations 2019-01-27 12:20:24 +01:00
Philippe GRAND
a6c40dc867 fix translations 2019-01-27 11:37:57 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Frédéric FRANCE
46b6d16210
correct menu 2019-01-27 09:17:01 +01:00
andreubisquerra
bec25fb45c Remove absolut divs and add Dolistore POS category link to TakePOS 2019-01-27 01:28:32 +01:00
Laurent Destailleur
a9da6a2d51
Merge pull request #10410 from ptibogxiv/patch-107
NEW manage statut member type
2019-01-26 15:44:40 +01:00
Laurent Destailleur
462c1f9c1a
Merge pull request #10413 from mapiolca/patch-8
Add date_livraison substitution
2019-01-26 15:38:00 +01:00
Laurent Destailleur
cc574852d2 Fix phpcs 2019-01-26 15:20:36 +01:00
Pierre Ardoin
6fdbded588
Update functions.lib.php 2019-01-26 14:40:00 +01:00
Laurent Destailleur
3118e92d2b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-26 14:30:59 +01:00
Laurent Destailleur
ba87284a90 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-26 14:30:44 +01:00
Laurent Destailleur
e46fb303d0
Merge pull request #10386 from atm-florian/dev_newhiglightinvoice_onpayment
NEW show in blod invoice amount where we came from when making payment
2019-01-26 14:29:20 +01:00
Laurent Destailleur
fd192f10c4
Merge pull request #10341 from hregis/8.0_bug
FIX security broken with Multicompany
2019-01-26 14:28:13 +01:00
Laurent Destailleur
7785f3e3e2
Merge pull request #10397 from atm-gauthier/8.0_fix_discount_on_excess_with_creditnote_or_deposit
FIX : when we add a payment on an invoice which already has payments …
2019-01-26 14:24:06 +01:00
Laurent Destailleur
b4400b95db
Merge pull request #10411 from BitKFu/develop
Added new calculation fields for the doc generator
2019-01-26 14:17:43 +01:00
Laurent Destailleur
c989b8d102
Update commondocgenerator.class.php 2019-01-26 14:17:01 +01:00
Laurent Destailleur
ab262237b2
Merge pull request #10393 from fappels/10_add_product_dimensions
NEW Show product dimensions in product list tooltip.
2019-01-26 14:14:03 +01:00
Laurent Destailleur
c6fe94c455
Merge pull request #10388 from hregis/9.0_bug
FIX JSON.parse not needeed and missing simple quote escaping
2019-01-26 14:13:26 +01:00
Laurent Destailleur
f96d730943
Merge pull request #10391 from grandoc/new_branch_22_01_2019
update with html5 compliant code
2019-01-26 14:09:15 +01:00
Laurent Destailleur
60c9eccbc4
Merge pull request #10395 from fappels/10_work_on_supplier_price_history
Work on #10394 supplier price history
2019-01-26 14:08:15 +01:00
Laurent Destailleur
4a5d260db5
Update fournisseur.product.class.php 2019-01-26 14:07:37 +01:00