1278 Commits

Author	SHA1	Message	Date
stickler-ci	102595f6b1	Fixing style errors.	2020-02-06 09:02:15 +00:00
atm-greg	f8ffdea5ae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging	2020-02-06 09:59:42 +01:00
Scrutinizer Auto-Fixer	5fda829023	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-30 00:48:28 +00: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
Cédric	7b295bf738	addPurchasePrice Update the price if already exist	2019-12-01 14:56:39 +01:00
Norbert Penel	89f57d7d3b	add label to combobox ... useful for BOM, etc	2019-11-30 23:45:24 +01:00
stickler-ci	1bad6f5c9c	Fixing style errors.	2019-11-30 22:38:05 +00:00
Cédric	565a17dc47	API New add purchase prices	2019-11-30 23:36:23 +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
stickler-ci	76c5a08242	Fixing style errors.	2019-11-28 12:13:36 +00:00
Cédric	45bf3e4df9	Merge branch 'develop' into patch-3	2019-11-28 13:11:52 +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
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
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
Cédric	d6ba06e271	API New get attribute by ref + security update	2019-11-21 15:50:06 +01:00
stickler-ci	c33506b4cc	Fixing style errors.	2019-11-19 13:41:30 +00:00
Cédric	8fbf853b94	Display attributes infos when get product variants	2019-11-19 14:40:50 +01:00
stickler-ci	a17e183da9	Fixing style errors.	2019-11-17 00:18:43 +00:00
Cédric	8c057f1975	API New Product variants	2019-11-17 01:20:15 +01:00
Cédric	256e256f62	Paths and vars: subproducts instead of childs	2019-11-16 12:30:47 +01:00
Cédric	33d4c4b73c	Doc for $child_id	2019-11-16 11:23:50 +01:00
Cédric	04f58f5d32	$includesubproducts and path consistency	2019-11-16 11:17:56 +01:00
stickler-ci	aa7353d3cf	Fixing style errors.	2019-11-15 21:18:40 +00:00
Cédric	f620b165d3	API New get / add / remove product childs	2019-11-15 22:17:53 +01:00
Laurent Destailleur	da3a907075	Merge branch 'develop' into fix-product-virtual-stock-stats-sending	2019-11-14 12:16:28 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
VESSILLER	851cf4f3f3	FIX add product qty in shipment already sent only if reel stock was decremented	2019-11-14 09:52:13 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	614faa07c1	Merge pull request #12427 from Dolibarr/scrutinizer-patch-3 ... Scrutinizer Auto-Fixes	2019-11-14 08:49:53 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	f4aaa8d9bb	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:34:37 +00:00
Philippe GRAND	69e1d0480a	add some comment	2019-11-10 12:10:13 +01:00
Laurent Destailleur	274ddaa1be	Fix mandatory field	2019-11-09 19:01:03 +01:00
Cédric	4dbf151b15	Inject $user in ProductCombination::updateProperties	2019-11-09 13:29:12 +01:00
Laurent Destailleur	e60fff39d9	Fix phpcs	2019-11-04 20:36:55 +01:00
Laurent Destailleur	8485747713	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-02 13:37:43 +01:00
Laurent Destailleur	9e69b12847	FIX #12281	2019-11-02 13:37:30 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid ... replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Laurent Destailleur	d232b7a387	Merge pull request #12286 from grandoc/new_branch_01_11_2019 ... add some comment	2019-11-02 13:00:23 +01:00
Laurent Destailleur	58ffb73627	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-02 12:59:49 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	c12e66e2a2	Merge branch 'develop' into new_branch_01_11_2019	2019-11-02 12:00:04 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
stickler-ci	0e260c859b	Fixing style errors.	2019-11-01 19:28:39 +00:00
ptibogxiv	6f77885686	Update api_products.class.php	2019-11-01 20:26:39 +01:00
stickler-ci	bc5e6c867f	Fixing style errors.	2019-11-01 14:37:21 +00:00
ptibogxiv	0f80ba5353	FIX prices by customer API	2019-11-01 15:36:48 +01:00
Laurent Destailleur	e3b5be7475	All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed ... into 'labelStatus'. All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.	2019-11-01 12:52:03 +01:00
Philippe GRAND	07cd656a1c	add some comment	2019-11-01 10:56:46 +01:00
Laurent Destailleur	68a4ddceed	Look and feel v11	2019-10-31 23:29:17 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Laurent Destailleur	19f97fb23b	Merge pull request #12211 from frederic34/patch-2 ... doxygen product.class.php	2019-10-30 03:16:22 +01:00
Laurent Destailleur	8d21144521	Beautify select of products in vendor record	2019-10-24 20:33:16 +02:00
Laurent Destailleur	443ca85f43	NEW Beautify the select of warehouses	2019-10-24 19:48:25 +02:00
Laurent Destailleur	31452dad42	NEW Beautify the select of warehouses	2019-10-24 19:34:28 +02:00
Frédéric FRANCE	5999d8a05a	Update product.class.php	2019-10-24 16:11:05 +02:00
Frédéric FRANCE	93a8b1d2a3	Update product.class.php	2019-10-24 16:09:35 +02:00
Laurent Destailleur	2e573fd794	Fix save of units ... Conflicts: htdocs/expedition/card.php htdocs/product/card.php htdocs/product/class/product.class.php	2019-10-23 03:03:55 +02:00
Laurent Destailleur	f0355b3057	Debug option PRODUCT_ADD_NET_MEASURE	2019-10-23 02:58:39 +02:00
Laurent Destailleur	c4be61c55c	FIX Better compatible fix for the trouble of weight / size units ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/card.php	2019-10-22 18:42:59 +02:00
Laurent Destailleur	e7e9898e0d	FIX Better compatible fix for the trouble of weight / size units	2019-10-22 18:36:36 +02:00
Laurent Destailleur	e261d63295	NEW Can add a button "Create" after combo of object with modulebuilder.	2019-10-21 14:44:39 +02:00
Frédéric FRANCE	86f22c4563	do not ignore lines with mix od tabs and spaces	2019-10-20 17:17:22 +02:00
Laurent Destailleur	05fed5358a	Merge pull request #12179 from c3do/develop ... NEW Add API to get objects by ref, ref_ext, ...	2019-10-20 13:42:18 +02:00
Laurent Destailleur	24dc7fb667	Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices ... NEW add clone customers prices in clone product or service	2019-10-20 13:27:50 +02:00
Frédéric FRANCE	7581275316	wip	2019-10-20 11:59:21 +02:00
c3do	ae3ce37a57	copyright mentions	2019-10-19 16:45:30 +02:00
c3do	6742700c04	Can get product by ref, ref_ext, barcode through API Rest	2019-10-19 16:36:11 +02:00
VESSILLER	801092d848	NEW add clone customers prices in clone product or service	2019-10-18 15:10:22 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	4ca9fddfcc	Update product.class.php	2019-10-16 14:26:49 +02:00
Cédric	3429cb7c1d	New: Update product type with update method	2019-10-14 22:42:38 +02:00
Cédric	2257706a30	New: Update product type with update method	2019-10-14 22:22:20 +02:00
Laurent Destailleur	29384d9a71	Merge branch 'develop' into patch-187	2019-10-09 13:02:47 +02:00
ptibogxiv	10c29887d6	Update product.class.php	2019-10-08 16:15:12 +02:00
ptibogxiv	e2d76f6f24	Update product.class.php	2019-10-08 16:13:59 +02:00
Laurent Destailleur	653958b1a2	Merge pull request #11094 from altatof/prodstats ... NEW Extend option ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC for all virtual product stats (renamed into PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)	2019-10-08 15:12:52 +02:00
Frédéric FRANCE	41cdf0d5a0	remove stock data from getsupplierprice ... stock data can be retrieved with get	2019-10-08 08:19:27 +02:00
Frédéric FRANCE	b895f8a78f	api supplier get purchase prices	2019-10-05 21:19:55 +02:00
Frédéric FRANCE	10671e3266	api supplier price delete	2019-10-05 21:15:13 +02:00
Laurent Destailleur	b883a8092a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php htdocs/core/lib/product.lib.php htdocs/core/tpl/extrafields_list_search_input.tpl.php htdocs/fourn/facture/card.php htdocs/product/class/html.formproduct.class.php	2019-10-05 19:35:40 +02:00
altairis	85bbf1decb	Merge branch 'develop' into prodstats	2019-10-04 11:05:36 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Laurent Destailleur	d0d884742f	FIX #11861 Not consistent code to manage measuring units	2019-09-27 19:45:33 +02:00
Laurent Destailleur	ea62ea8c70	Merge pull request #11901 from ptibogxiv/patch-263 ... NEW: delete purchase price API	2019-09-27 15:37:21 +02:00
VESSILLER	5f08a649eb	FIX empty cache when we want to load specific warehouses in select ... Conflicts: htdocs/product/class/html.formproduct.class.php	2019-09-27 15:10:05 +02:00
Laurent Destailleur	8ef227f24a	Merge pull request #11902 from OPEN-DSI/fix-formproduct-select-warehouses-cache ... FIX empty cache when we want to load specific warehouses in select	2019-09-27 14:59:14 +02:00
Laurent Destailleur	6858dce344	Rename table for categorie of warehouses	2019-09-27 13:28:28 +02:00
Laurent Destailleur	961f2b5165	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/viewcat.php htdocs/fourn/class/fournisseur.product.class.php htdocs/takepos/invoice.php	2019-09-24 14:25:02 +02:00
Laurent Destailleur	6431e8e16d	FIX SQL injection on qty	2019-09-24 12:43:44 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
VESSILLER	6e806a5aed	FIX empty cache when we want to load specific warehouses in select	2019-09-16 10:37:55 +02:00
ptibogxiv	ea1baefe9a	NEW: delete purchase price API	2019-09-15 20:50:18 +02:00
Laurent Destailleur	12d67c5f85	Rename api to get all purchase prices	2019-09-15 17:18:10 +02:00
Laurent Destailleur	68a3c5b41c	Merge pull request #11853 from ptibogxiv/patch-259 ... NEW add supplier's product list	2019-09-15 17:04:17 +02:00
Laurent Destailleur	5d0ba10f34	Update api_products.class.php	2019-09-15 17:04:08 +02:00
Laurent Destailleur	4a815da993	Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order ... NEW add minimum stock filter in load warehoues for product form	2019-09-14 17:09:27 +02:00
stickler-ci	1e8663b1c8	Fixing style errors.	2019-09-10 18:48:55 +00:00
ptibogxiv	651fbde64d	Merge branch 'develop' into patch-187	2019-09-10 20:46:54 +02:00
Laurent Destailleur	61cf47aa16	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-10 00:14:07 +02:00
VESSILLER	6a734ea828	NEW add minimum stock filter in load warehoues for product form	2019-09-09 16:58:20 +02:00
stickler-ci	be66e1bd20	Fixing style errors.	2019-09-09 14:36:02 +00:00
ptibogxiv	f4a565544f	Update api_products.class.php	2019-09-09 16:33:12 +02:00
Laurent Destailleur	a5f7211730	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/install/repair.php	2019-09-06 16:10:55 +02:00
Laurent Destailleur	348ab4765c	Fix sql injection	2019-09-06 15:20:04 +02:00
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Frédéric FRANCE	a5aedacb7e	Update productbatch.class.php	2019-09-03 16:49:41 +02:00
Laurent Destailleur	ffcea3dfd8	Fix phpcs	2019-09-03 14:48:06 +02:00
ptibogxiv	d7cc76b94a	NEW purchase_prices API	2019-08-26 20:10:00 +02:00
ptibogxiv	1b4788c6d0	Update product.class.php	2019-08-24 14:21:41 +02:00
ptibogxiv	0ce22d68ef	Update product.class.php	2019-08-10 09:43:26 +02:00
ptibogxiv	4f69be2c2c	Update product.class.php	2019-08-10 09:12:40 +02:00