Commit Graph

28 Commits

Author SHA1 Message Date
Frédéric FRANCE
27218b7087 wip 2019-02-24 23:32:09 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
e39e57c5b9 Update expeditionbatch.class.php 2018-10-24 02:24:47 +02:00
fappels
beb906b5f1 Deprecate class property before removing it. 2018-10-21 22:52:53 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
ced4038443 FIX qty not visible for a lot when making shipment on a dedicated stock 2018-10-11 11:56:52 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
1182f29864 trimtrailing 2018-08-28 08:33:02 +02:00
Philippe GRAND
e0462b975b Update and standardize code 2018-08-22 11:48:26 +02:00
Laurent Destailleur
45418769b1 Update expeditionbatch.class.php 2018-03-02 18:11:03 +01:00
All3kcis
733ca8af7d Use correct values of eatby and sellby on batchs expeditions
Use new table "product_lot" to getting eatby and sellby date
2018-03-01 14:23:19 +01:00
Laurent Destailleur
e8327fd9a1 Fix the eatby/sellby date was not visible. 2017-12-02 10:43:01 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
fappels
68aac4476c FIX: #3605 deleting a shipping
Get lots to move back to stock.
Move lots back to stock.
Do not log object because it will be deleted
Improve error reporting
2015-10-14 12:16:54 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Laurent Destailleur
0b74ddf5c3 Doxygen 2015-03-10 14:23:40 +01:00
Scrutinizer Auto-Fixer
27e99793a3 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-06 02:10:01 +00:00
Laurent Destailleur
213c818204 Debug serial/lot management 2015-02-16 20:14:16 +01:00
Laurent Destailleur
9a9a1f3983 Fix bad id 2015-02-16 19:14:34 +01:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Raphaël Doursenaud
20842a5c45 Qual: Missing variable declaration 2014-04-23 18:24:11 +02:00
KreizIT
fcb588f424 -Fix error when shipping a batch enabled product without stock
-Fix typo
2014-03-26 17:18:02 +01:00
KreizIT
18e4703438 Travis fix 2014-03-07 12:21:35 +01:00
KreizIT
a0f1a60780 Change on shipment for batch product 2014-03-07 11:35:16 +01:00