1178 Commits

Author	SHA1	Message	Date
Laurent Destailleur	3860f24908	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/product/class/product.class.php	2020-03-30 19:56:31 +02:00
Laurent Destailleur	d0c179e1e9	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-03-30 19:54:32 +02:00
Laurent Destailleur	fbce8fcfe3	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/product/class/product.class.php	2020-03-30 19:53:31 +02:00
Laurent Destailleur	125e964352	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/product/class/product.class.php	2020-03-30 19:50:47 +02:00
Laurent Destailleur	b081cf5cba	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/product/class/product.class.php	2020-03-30 19:48:41 +02:00
Laurent Destailleur	3ea9c297ea	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2020-03-30 19:46:23 +02:00
Cédric	eead9a93d3	Fix can set desiredstock to (int) 0 from API Rest ... When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.	2020-03-30 13:03:13 +02:00
ptibogxiv	cb7342d4c8	FIX product purchase prices ... Fix get datas but don't fix cleandata :( @eldy	2020-03-27 20:07:18 +01:00
Laurent Destailleur	504a67daee	FIX duplicate class name into some log lines	2020-02-17 12:34:00 +01:00
Laurent Destailleur	549bf076d7	Fix prefix of log	2020-02-17 12:22:52 +01:00
Laurent Destailleur	78d4978d31	FIX #13100	2020-02-13 11:26:11 +01:00
Laurent Destailleur	17f28189f9	Virtual stock must include Manufacturing Orders	2020-01-24 14:51:45 +01:00
Laurent Destailleur	540713510e	Fix load of segment prices not required for virtual stock change ... virtual stock must include production (WIP)	2020-01-23 21:03:15 +01:00
Laurent Destailleur	4686be34d2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/stripe/charge.php	2020-01-22 14:10:46 +01:00
VESSILLER	c91ab621b8	FIX length, width and height coherence in product table	2020-01-21 17:49:27 +01:00
Laurent Destailleur	18f2b09fb1	Debug v11	2020-01-20 12:25:25 +01:00
Laurent Destailleur	df26bab65b	FIX #12881	2020-01-18 19:52:59 +01:00
Laurent Destailleur	dd930fe791	Can disable a not expected behaviour on price propagation	2020-01-10 01:07:58 +01:00
Laurent Destailleur	38de69f5a9	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php	2020-01-04 14:20:25 +01:00
Laurent Destailleur	0dafbd194f	Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending ... FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)	2020-01-03 20:56:59 +01:00
Laurent Destailleur	37f9307732	Update product.class.php	2020-01-03 20:53:49 +01:00
Laurent Destailleur	2e8fd25299	FIX Local taxes was not correctly supported in TakePOS.	2020-01-01 21:54:47 +01:00
Regis Houssin	71a2998118	FIX wrong var name and avoid warning	2019-12-30 15:36:09 +01:00
Regis Houssin	c76edb20d7	FIX avoid php warning	2019-12-27 12:20:38 +01:00
VESSILLER	b0edd46494	FIX add product qty in shipment already sent	2019-12-23 15:07:26 +01:00
Laurent Destailleur	03649ea2c8	Fix pb with svg images	2019-12-19 19:10:23 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Frédéric FRANCE	9357bfd98e	doxygen	2019-12-12 08:17:14 +01:00
Frédéric FRANCE	650c9c2e57	Update product.class.php	2019-12-03 16:46:50 +01:00
Laurent Destailleur	a00d011f10	Merge pull request #12609 from frederic34/patch-20 ... Update product.class.php	2019-12-03 13:18:29 +01:00
Laurent Destailleur	37cee5840a	Merge pull request #12608 from frederic34/patch-19 ... $id parameter was removed long time ago	2019-12-03 13:17:01 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
Frédéric FRANCE	ac674aae6a	Update product.class.php	2019-12-02 20:45:28 +01:00
Frédéric FRANCE	579f570abf	$id parameter was removed long time ago	2019-12-02 20:42:48 +01:00
Norbert Penel	89f57d7d3b	add label to combobox ... useful for BOM, etc	2019-11-30 23:45:24 +01:00
Laurent Destailleur	3b9d2abcb2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/class/html.formfile.class.php htdocs/core/lib/product.lib.php htdocs/filefunc.inc.php htdocs/product/class/product.class.php htdocs/product/list.php	2019-11-29 11:42:08 +01:00
Laurent Destailleur	a4a805f618	Doxygen	2019-11-29 11:32:22 +01:00
Scrutinizer Auto-Fixer	5f99e25c45	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-28 11:36:20 +00:00
Laurent Destailleur	30ea48a715	Fix api for deletion of attributes	2019-11-26 12:58:41 +01:00
Laurent Destailleur	f0e7eaf0cd	Merge pull request #12453 from c3do/patch-3 ... API New get / add / remove subproducts, attributes and variants	2019-11-22 14:34:54 +01:00
Cédric	e76a112099	Remove unecessary dol_clone in ::putVariant	2019-11-21 23:09:18 +01:00
stickler-ci	821ca724a5	Fixing style errors.	2019-11-21 21:54:51 +00:00
Cédric	1bc8c57d6d	Fix $weight_impact $price_impact	2019-11-21 22:54:13 +01:00
Cédric	5a3f78088e	Fix double deleteAttributeValueByRef	2019-11-21 18:18:11 +01:00
Cédric	351ba58bbe	Fix Superfluous parameter comment	2019-11-21 17:43:40 +01:00
stickler-ci	cfa0860d24	Fixing style errors.	2019-11-21 16:41:45 +00:00
Cédric	416a2f7f1c	FIX putAttributes, ADD putAttributeValue	2019-11-21 17:41:09 +01:00
stickler-ci	0074589b6f	Fixing style errors.	2019-11-21 16:24:25 +00:00
Cédric	1068d9a623	FIX deleteAttributeValueByRef / ADD getAttributeValueById, getAttributeValueByRef	2019-11-21 17:23:46 +01:00
stickler-ci	4f747e2eb8	Fixing style errors.	2019-11-21 14:50:47 +00:00