Commit Graph

84523 Commits

Author SHA1 Message Date
Laurent Destailleur
2f3614df8a Fix lang loaded 2019-11-25 12:53:56 +01:00
VESSILLER
35f02c5165 NEW add width and height measures in product list 2019-11-25 10:25:09 +01:00
Laurent Destailleur
cf67f650eb Better decoding of email topics 2019-11-25 10:12:26 +01:00
Regis Houssin
1a43b58f8a FIX compatibility with Multicompany 2019-11-25 10:03:35 +01:00
stickler-ci
5d051cc901 Fixing style errors. 2019-11-25 07:08:22 +00:00
atm-greg
5af9784dc9 fix update line 2019-11-25 07:40:29 +01:00
Laurent Destailleur
d34f487c65 Decode subject by emailcollector 2019-11-24 21:30:00 +01:00
Laurent Destailleur
1bace80a9b Fix the home page is not set on first page created 2019-11-24 20:59:17 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Laurent Destailleur
19fb6bfd17 FIX Use PROV as temporary ID for leaves 2019-11-24 18:25:55 +01:00
Laurent Destailleur
bc5270ce76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:15:25 +01:00
Laurent Destailleur
c7aaed1264 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-24 18:14:18 +01:00
Laurent Destailleur
8656143050 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:13:02 +01:00
Laurent Destailleur
98a7a5559f Fix bad fix 2019-11-24 18:12:40 +01:00
Laurent Destailleur
f2e01834a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:11:46 +01:00
Laurent Destailleur
27e4c66dd5 Fix empty 2019-11-24 18:11:11 +01:00
Laurent Destailleur
712ae48e4e Fix default setup 2019-11-24 18:07:38 +01:00
atm-greg
89dd04aa07 implement on supplier_order 2019-11-23 19:05:49 +01:00
Cédric
950a32a433
Checkbox label delete child product FR 2019-11-23 18:11:20 +01:00
Cédric
b959e59554
Checkbox label delete child product EN 2019-11-23 18:09:17 +01:00
Cédric
83de0fa7c1
Add the choice to delete the product linked 2019-11-23 18:03:46 +01:00
Cédric
d647479794
Do not delete product automaticaly (unlink only) 2019-11-23 17:17:25 +01:00
Cédric
31cfc9cd35
Add field reference in form 2019-11-23 17:04:14 +01:00
stickler-ci
7a3f6c362d Fixing style errors. 2019-11-23 15:23:31 +00:00
Cédric
6086ecef86
Can add already existing product as variant
ONLY if the reference is forced
2019-11-23 16:14:21 +01:00
Cédric
6484ba10c5
remove unecessary code
already done by ::createProductCombination
2019-11-23 16:08:35 +01:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
Cédric
76fd794559
API New can customize reference when addvariant 2019-11-23 14:04:00 +01:00
Cédric
3aef39c64d
New can customize the reference of a combination 2019-11-23 13:45:58 +01:00
andreubisquerra
ddaf830de2
Merge pull request #1 from Dolibarr/develop
Update
2019-11-23 12:33:26 +01:00
Laurent Destailleur
cf0311dd6a FIX Hook getAccessForbiddenMessage was missing parameters 2019-11-22 16:13:22 +01:00
ptibogxiv
4d9894e58e
Update card.php 2019-11-22 15:49:06 +01:00
Laurent Destailleur
24bb345ee1 Fix bad name of function 2019-11-22 15:35:19 +01:00
Laurent Destailleur
886c763573 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-22 15:21:32 +01:00
Laurent Destailleur
14450d8b79 psr 2019-11-22 15:21:21 +01:00
stickler-ci
7f24d1fe40 Fixing style errors. 2019-11-22 14:18:09 +00:00
Laurent Destailleur
97c727e21c
Merge pull request #12498 from Dolibarr/scrutinizer-patch-14
Scrutinizer Auto-Fixes
2019-11-22 15:15:48 +01:00
altairis
bdb2b730af allow time consumed to be linked to another task 2019-11-22 15:14:55 +01:00
altairis
f15087a97d remove conf 2019-11-22 15:14:32 +01:00
altairis
142ba77266 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2019-11-22 15:13:40 +01:00
Scrutinizer Auto-Fixer
1eab97080c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-22 14:13:30 +00:00
Laurent Destailleur
31956d8912 Standard of REST API URL 2019-11-22 15:11:28 +01:00
Laurent Destailleur
e4d9f99484 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/remx.php
	htdocs/expedition/card.php
	htdocs/fourn/facture/card.php
2019-11-22 15:04:40 +01:00
Laurent Destailleur
186a13f101 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/fourn/facture/card.php
2019-11-22 14:51:13 +01:00
Laurent Destailleur
ece35538f0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-22 14:49:29 +01:00
Laurent Destailleur
1cb1473948 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-22 14:48:23 +01:00
Laurent Destailleur
7cf71f7283
Merge pull request #12477 from code-chicken/develop
Use virtual stock when it has been configured
2019-11-22 14:47:32 +01:00
Laurent Destailleur
3242835111
Update replenish.php 2019-11-22 14:47:15 +01:00
Laurent Destailleur
5ef54e3eb8 Doc 2019-11-22 14:45:44 +01:00
Laurent Destailleur
32f590f274
Merge pull request #12485 from aspangaro/12.0_a2
NEW Add shipment widget
2019-11-22 14:39:56 +01:00