Commit Graph

89109 Commits

Author SHA1 Message Date
Frédéric FRANCE
3edac06fae
Form selectAvailabilityDelay returns void 2019-11-26 00:06:57 +01:00
Frédéric FRANCE
18e08420f4
Update combinations.php 2019-11-26 00:01:06 +01:00
Frédéric FRANCE
2dbe3260a1
Update document.php 2019-11-25 23:59:32 +01:00
Frédéric FRANCE
aa12ec1f67
Update agenda.php 2019-11-25 23:58:53 +01:00
Frédéric FRANCE
84e1e6ccf1
Update document.php 2019-11-25 23:58:14 +01:00
Frédéric FRANCE
5d9d542cd7
Update photos.php 2019-11-25 23:57:10 +01:00
andreubisquerra
6baa1c8d4a
Fix travis 2019-11-25 23:32:40 +01:00
stickler-ci
9ee0dc75f3 Fixing style errors. 2019-11-25 22:19:50 +00:00
Bastien Vidé
fb069d248a Added SumUp payment to TakePOS 2019-11-25 23:15:39 +01:00
Daniel Seichter
7a4beb824f Merge remote-tracking branch 'upstream/develop' into develop 2019-11-25 23:14:19 +01:00
Daniel Seichter
9eafc8f550 fix small css issues 2019-11-25 23:13:31 +01:00
Laurent Destailleur
1f8361ea9e Tooltip 2019-11-25 21:02:26 +01:00
Laurent Destailleur
a8c2aa094d More examples 2019-11-25 20:30:05 +01:00
Frédéric FRANCE
d280eef1e0
Update expensereport_rules.php 2019-11-25 20:12:51 +01:00
Frédéric FRANCE
4056848483
do not evaluate count at each iteration 2019-11-25 20:07:29 +01:00
andreubisquerra
b2e995279e Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php 2019-11-25 19:29:07 +01:00
andreubisquerra
53ec106365
Merge pull request #2 from Dolibarr/develop
Update
2019-11-25 16:08:33 +01:00
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