5721 Commits

Author	SHA1	Message	Date
Laurent Destailleur	f48c7d2ecf	Fix modulebuilder	2020-01-09 22:31:23 +01:00
Laurent Destailleur	0e58edd896	Fix modulebuilder	2020-01-09 22:27:24 +01:00
Laurent Destailleur	124f41f863	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-09 09:10:11 +01:00
Laurent Destailleur	0802df78b5	Debug MRP	2020-01-08 17:56:02 +01:00
Laurent Destailleur	97f62c68f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-08 13:38:03 +01:00
Laurent Destailleur	5da952cf8a	Comment	2020-01-08 13:37:52 +01:00
Laurent Destailleur	622dc7e8d7	Debug v11	2020-01-07 22:01:55 +01:00
Laurent Destailleur	7ef3ee56bd	Fix MRP	2020-01-07 20:28:21 +01:00
Dev2a	2d67c2365f	Fix Check right for service for arrayofmassaction ... if product module disable, threre is no action for service	2020-01-07 18:59:58 +01:00
Laurent Destailleur	0e496d2191	MRP	2020-01-06 02:55:09 +01:00
Laurent Destailleur	eca91af2ca	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-01-04 14:21:56 +01:00
Laurent Destailleur	7853427bb1	FIX product with empty stock were not visible	2020-01-04 14:21:38 +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
VESSILLER	6e9bb5d7da	FIX sql bad request in product buying price extrafields	2020-01-03 20:49:54 +01:00
Pierre Ardoin	79458ac139	FIX an issue that shows all entities stock ... Before : If products are shared between several entities, the stock of each entity are to add in this page (reassort.php) Now : Each entity see only her stock and not other's stock.	2020-01-03 18:05:49 +01:00
Laurent Destailleur	2e8fd25299	FIX Local taxes was not correctly supported in TakePOS.	2020-01-01 21:54:47 +01:00
Laurent Destailleur	7d07c198bc	FIX Price of purchase order and vendor invoice with multicurrency ... FIX entering predefined product with a forced unit price	2020-01-01 17:15:26 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +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	9f86cd8824	Debug v11	2019-12-20 11:14:16 +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
Scrutinizer Auto-Fixer	455178ff73	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-18 14:20:36 +00:00
Laurent Destailleur	f4b7e038f8	Merge pull request #12714 from frederic34/patch-6 ... doxygen	2019-12-16 19:03:47 +01:00
Laurent Destailleur	1af67a4336	Merge pull request #12713 from frederic34/doxygen_warning ... doxygen	2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer	c8baaa2995	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-16 12:06:25 +00:00
Frédéric FRANCE	e1386faa59	doxygen	2019-12-15 10:53:03 +01:00
Frédéric FRANCE	9e4fb8d4fe	doxygen	2019-12-15 10:02:20 +01:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Laurent Destailleur	dea5396029	Merge pull request #12705 from frederic34/patch-21 ... doxygen	2019-12-14 13:42:46 +01:00
Laurent Destailleur	65bf2fa285	Merge pull request #12689 from code-chicken/develop ... Fix: calculation of virtual stock	2019-12-14 13:40:02 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
Frédéric FRANCE	c269229aab	doxygen	2019-12-13 08:12:55 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Frédéric FRANCE	9357bfd98e	doxygen	2019-12-12 08:17:14 +01:00
Laurent Destailleur	63b9656468	Fix use of currency accuracy	2019-12-11 17:05:42 +01:00
Rüdiger Hahn	cc96ad03c1	Update replenish.php	2019-12-11 14:00:27 +01:00
Laurent Destailleur	24e9d3fdf0	Merge pull request #12631 from atm-florianm/FIX_10.0_backporting_duration_fix_from_develop ... FIX 10.0: do not display single-letter duration values in product list	2019-12-09 17:43:32 +01:00
Scrutinizer Auto-Fixer	4debd71281	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-06 08:26:49 +00:00
Frédéric FRANCE	d9bfa62367	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-05 21:47:42 +01:00
Florian Mortgat	3f6715a377	FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list	2019-12-05 15:34:41 +01:00
Florian Mortgat	139419c3e8	FIX 10.0: do not display single-letter values (indicating duration unit without value) in product list ... (this fix exists in develop)	2019-12-05 10:38:03 +01:00
Laurent Destailleur	b78f310508	Reponsive	2019-12-04 15:49:22 +01:00
Laurent Destailleur	bde917d7fc	Fix responsive	2019-12-04 15:09:20 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Frédéric FRANCE	650c9c2e57	Update product.class.php	2019-12-03 16:46:50 +01:00
Frédéric FRANCE	85d8d2ff58	select_product_fourn_price returns void	2019-12-03 15:19:58 +01:00
Laurent Destailleur	41a176ce72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/remx.php htdocs/core/modules/modStripe.class.php htdocs/product/stock/replenish.php htdocs/stripe/payout.php	2019-12-03 13:58:15 +01:00
Laurent Destailleur	eb5a2bd1a5	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/expensereport/card.php htdocs/user/card.php	2019-12-03 13:52:42 +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
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
Cédric	7b295bf738	addPurchasePrice Update the price if already exist	2019-12-01 14:56:39 +01:00
Maxime Kohlhaas	270f4c2500	Fix #12044 : with replenish function, use product supplier desc in order	2019-12-01 09:26:54 +01:00
Laurent Destailleur	f549c4fc9c	Merge pull request #12544 from frederic34/select_produits ... Form select_produits returns void	2019-12-01 00:47:02 +01:00
Laurent Destailleur	d338a054eb	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-12-01 00:41:23 +01:00
Laurent Destailleur	a2a96f8796	# WARNING: head commit changed in the meantime ... Restore file for travis	2019-12-01 00:41:11 +01:00
Laurent Destailleur	3c328153bb	Merge pull request #12581 from homer8173/patch-12 ... add location on combobox	2019-12-01 00:32:23 +01:00
Norbert Penel	89f57d7d3b	add label to combobox ... useful for BOM, etc	2019-11-30 23:45:24 +01:00
Norbert Penel	755417e9a9	add location on combobox ... usefull for BOM, etc	2019-11-30 23:43:22 +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
Norbert Penel	e3fb27e3fc	Default type missing for add links from module builder ... BOM links to add product don't precise the type (from common object)	2019-11-30 19:34:22 +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
Laurent Destailleur	3acd0bc2ff	FIX Reduce number of request for list of products	2019-11-29 11:32:09 +01:00
Frédéric FRANCE	c214dd0675	Form select_produits returns void	2019-11-28 21:23:53 +01:00
Laurent Destailleur	d58bb5f66b	Fix link to user	2019-11-28 16:16:55 +01:00
Laurent Destailleur	6ee6c5d514	Fix edit of product images	2019-11-28 14:09:41 +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
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Frédéric FRANCE	6ea204bd73	Update entrepot.class.php	2019-11-26 20:20:46 +01:00
Frédéric FRANCE	28b70a5399	remove deprecated	2019-11-26 20:14:46 +01:00
Laurent Destailleur	30ea48a715	Fix api for deletion of attributes	2019-11-26 12:58:41 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
VESSILLER	35f02c5165	NEW add width and height measures in product list	2019-11-25 10:25:09 +01:00
stickler-ci	5d051cc901	Fixing style errors.	2019-11-25 07:08:22 +00: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
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	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	2fc00437d8	Merge pull request #12493 from Dolibarr/scrutinizer-patch-12 ... Scrutinizer Auto-Fixes	2019-11-22 14:35:49 +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
Scrutinizer Auto-Fixer	b388c6b7a8	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-22 13:14:59 +00: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
Laurent Destailleur	0fffdd891e	Sanitize data	2019-11-21 15:37:59 +01:00
VESSILLER	b7517377a7	FIX goup by unit label in product list	2019-11-20 15:00:34 +01:00
VESSILLER	38b083b766	FIX unit translate in product list if null	2019-11-20 14:43:29 +01:00
VESSILLER	0a125f73b5	NEW add units in product list	2019-11-20 14:21:35 +01:00
Rüdiger Hahn	9018ec7eb2	Merge branch 'develop' into develop	2019-11-20 13:09:51 +01:00
Rüdiger Hahn	db0d352af3	Use virtual stock when this has been configured ... When "Use virtual stock by default, instead of physical stock, for replenishment feature" has been set in configuration, this should really be used. Otherwise only physically missing items will be shown in replenishment.	2019-11-20 12:53:23 +01:00
ptibogxiv	f1a9daf77e	NEW add total of value in product stat	2019-11-20 12:42:56 +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
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Laurent Destailleur	3300446cbf	Fix td colspan	2019-11-18 14:13:51 +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
Laurent Destailleur	e15963688a	Merge pull request #12435 from OPEN-DSI/fix-product-virtual-stock-stats-sending ... FIX add product qty in shipment already sent only if reel stock was d…	2019-11-16 23:34:44 +01:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. ... Fix remove empty id	2019-11-16 14:38:05 +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
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +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	1f5bea01f5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php htdocs/user/card.php	2019-11-14 21:30:16 +01:00
Laurent Destailleur	7e52c70321	FIX Advisory ID: usd20190067	2019-11-14 21:16:18 +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
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +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
Frédéric FRANCE	446c66da62	use class CONST	2019-11-14 08:15:39 +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
Scrutinizer Auto-Fixer	87585c0f2a	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer	c85e54b08c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer	df664e790b	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 23:15:34 +00:00
Laurent Destailleur	8976bd7c9b	Fix setup of accounting account	2019-11-11 19:05:42 +01:00
stickler-ci	3df87a419c	Fixing style errors.	2019-11-10 11:12:42 +00:00
Philippe GRAND	098ffd4827	add some comment	2019-11-10 12:12:14 +01: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
Scrutinizer Auto-Fixer	2ecfe41810	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 09:53:31 +00:00
Laurent Destailleur	f11943126a	Fix scrutinizer	2019-11-08 09:42:39 +01:00
Laurent Destailleur	3fcc72f504	Merge pull request #12353 from frederic34/patch-17 ... can't have static and $this at same time	2019-11-07 11:32:55 +01:00
Laurent Destailleur	9dc309d59d	Merge pull request #12351 from frederic34/patch-15 ... Update fournisseurs.php	2019-11-07 11:31:43 +01:00
Laurent Destailleur	1ea8fed9c4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-07 11:16:20 +01:00
Laurent Destailleur	feef992d39	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-07 11:16:09 +01:00
Frédéric FRANCE	90f80d137f	can't have static and $this at same time	2019-11-05 23:19:11 +01:00
Frédéric FRANCE	d1131e6b5a	Update fournisseurs.php	2019-11-05 22:27:30 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	d972fa8bcb	Fix pb with model_pdf	2019-11-05 20:20:57 +01:00
Laurent Destailleur	94bd0f71d9	Fix pb with permission	2019-11-05 19:41:30 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Laurent Destailleur	0347d82660	Merge pull request #12303 from frederic34/patch-2 ... css	2019-11-04 20:31:02 +01:00
Laurent Destailleur	5d41268d1e	CSS	2019-11-04 19:28:04 +01:00
Laurent Destailleur	11500fb8d9	FIX confusion between permto... and permisstionto...	2019-11-04 15:33:49 +01:00
Frédéric FRANCE	534f8712a3	Update fournisseurs.php	2019-11-02 18:11:18 +01:00
Frédéric FRANCE	4a564cc05d	Update product.class.php	2019-11-02 18:10:01 +01:00
Laurent Destailleur	6f82c212a0	Finished migration to the new architecture of extrafields	2019-11-02 17:38:19 +01:00
Laurent Destailleur	496f93911f	Merge pull request #11821 from Tim-Otte/develop ... NEW Extrafields support in product supplier prices	2019-11-02 16:19:13 +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	80fd5af32b	Merge pull request #12271 from frederic34/patch-3 ... css	2019-11-02 13:30:38 +01:00
Laurent Destailleur	7fae6d60a7	Merge pull request #12270 from frederic34/patch-2 ... css	2019-11-02 13:09:38 +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
Laurent Destailleur	68691ddd8a	Merge pull request #12265 from grandoc/new_branch_30_10_2019 ... add comment	2019-11-02 11:49:28 +01:00
Laurent Destailleur	41a3861465	Merge pull request #12290 from ptibogxiv/patch-273 ... FIX prices by customer API	2019-11-02 11:47:32 +01:00
Frédéric FRANCE	77d4ca81dc	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-02 09:14:15 +01:00
Laurent Destailleur	cea2c3a9f4	Look and feel v11	2019-11-01 23:58:14 +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
atm-josselin	5550a62afa	Fix misspelling on field of productlot	2019-10-31 11:05:45 +01:00
Frédéric FRANCE	3738fb87ed	css	2019-10-30 18:42:33 +01:00
Frédéric FRANCE	bfe683d031	css	2019-10-30 18:40:07 +01:00
Philippe GRAND	b029febff1	add some comment	2019-10-30 10:07:54 +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	4eedf4a113	Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop	2019-10-29 11:48:36 +01:00
Laurent Destailleur	9483e367ca	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 ... Conflicts: htdocs/expensereport/class/expensereport.class.php htdocs/product/stock/replenishorders.php	2019-10-29 11:48:11 +01:00
Laurent Destailleur	149d63757f	Space	2019-10-29 11:43:56 +01:00
Laurent Destailleur	e58ecaaa64	Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 ... Conflicts: htdocs/product/stock/replenishorders.php	2019-10-29 11:43:35 +01:00
Laurent Destailleur	2814a5c07b	Fix phpcs	2019-10-24 21:47:31 +02: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
Laurent Destailleur	6855f588b5	Use dolGetStatus	2019-10-24 16:38:06 +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	1ea3865f0d	Look and feel v11	2019-10-24 13:01:03 +02:00
Juanjo Menent	7e9d6dc153	Fix With pagination it is possible that the searched product does not appear if there are many open supplier orders	2019-10-24 10:58:29 +02:00
Laurent Destailleur	da00591bba	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/product.lib.php htdocs/expedition/card.php htdocs/product/list.php	2019-10-23 04:04:32 +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	2f0b791cfe	Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service ... FIX : if we search something with global search, and after with form …	2019-10-22 20:06:10 +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	b88968520b	Move code of extrafields to the new architecture	2019-10-22 17:08:37 +02:00
gauthier	44ced0cbeb	FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list	2019-10-22 16:11:59 +02:00
Laurent Destailleur	6079a4d159	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/langs/en_US/main.lang	2019-10-22 15:25:31 +02:00
Laurent Destailleur	5ad7ca5620	Code more generic around setting projet on a card	2019-10-22 13:43:24 +02:00
Tim Otte	ceb3482204	Requested changes implemented	2019-10-22 11:36:28 +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
Laurent Destailleur	48f5970c7a	Debug net measure	2019-10-21 14:43: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	49c101bb77	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-10-20 15:16:51 +02:00
Laurent Destailleur	d79114c1f8	Clean code	2019-10-20 15:16:40 +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
Laurent Destailleur	ce1b443212	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-10-18 14:26:09 +02:00
Laurent Destailleur	4d9c285126	Merge pull request #12163 from sadlig/fix-stock-movement-right ... Fix Stock movement user's right (Fixes #11967)	2019-10-17 17:53:17 +02:00
Gildas	132ea56a59	Fix Stock movement user's right (Fixes #11967)	2019-10-17 17:06:38 +02:00
Marc de Lima Lucio	d79340a632	FIX: stock replenish: fetching and freeing non existing SQL result set	2019-10-17 09:55:02 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	c69e934f9c	Merge pull request #12135 from c3do/patch-1 ... NEW Can update product type with update method	2019-10-16 14:28:21 +02:00
Laurent Destailleur	4ca9fddfcc	Update product.class.php	2019-10-16 14:26:49 +02:00
Laurent Destailleur	b60ddc255c	Removed useless html tags	2019-10-16 14:17:53 +02:00
Laurent Destailleur	e07e01580d	Replace deprecated code with new one	2019-10-16 03:34:32 +02:00
Laurent Destailleur	fc90916de9	Look and feel v11	2019-10-16 03:17:53 +02:00
Laurent Destailleur	fb3d20107c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/exports/export.php htdocs/filefunc.inc.php	2019-10-15 03:51:57 +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	0d21e61673	Merge pull request #12116 from frederic34/patch-18 ... fix travis	2019-10-14 20:53:42 +02:00
atm-josselin	4f10009113	Add fields definition in product batch class for extrafields compatibility	2019-10-14 15:39:38 +02:00
Laurent Destailleur	0cd451ef1a	Fix show duration in list of services	2019-10-14 15:06:21 +02:00
Laurent Destailleur	9922ff39ca	Fix show duration in list of services	2019-10-14 15:01:37 +02:00
Frédéric FRANCE	4e52276d1f	fix travis	2019-10-14 13:14:02 +02:00
Laurent Destailleur	67d76787eb	Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT	2019-10-12 15:29:06 +02:00
Laurent Destailleur	9871dd8770	Debug variants	2019-10-12 15:27:06 +02:00
Laurent Destailleur	9ba992b8b6	Work on inventory module	2019-10-12 12:31:35 +02:00
Laurent Destailleur	dccfdad9dd	Work on inventory feature	2019-10-12 11:32:47 +02:00
ptibogxiv	2b9be13a7c	Update card.php	2019-10-09 15:26:55 +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
Laurent Destailleur	71c18b7d65	Merge pull request #12062 from frederic34/patch-13 ... remove stock data from getsupplierprice	2019-10-08 14:50:41 +02:00
Laurent Destailleur	43a70e5548	Clean code to use the new $extrafields->attributes array	2019-10-08 09:28:50 +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
Laurent Destailleur	80cbc09f21	Merge pull request #12046 from frederic34/apisupplierproduct ... api supplier price delete	2019-10-07 10:22:48 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +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
Laurent Destailleur	1a66e0b05e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/product/card.php	2019-10-03 17:53:59 +02:00
Laurent Destailleur	75be637b0b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-10-03 17:50:57 +02:00
Frédéric FRANCE	c5f729b945	Update list.php	2019-10-02 22:59:13 +02:00
Laurent Destailleur	d8a8c4fbe6	Look and feel v11. Picto are fontawesome.	2019-10-02 18:36:36 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
Laurent Destailleur	4928a999a0	Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype ... FIX : change product type must be allowed if we activate hidden conf	2019-10-01 14:41:52 +02:00
Laurent Destailleur	d448998762	Update card.php	2019-10-01 14:41:25 +02:00
gauthier	2167e7ed98	FIX : hidden conf to prevent from changing product_type	2019-10-01 09:12:51 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Laurent Destailleur	d9e9364ddf	Close #11689 Close #11696	2019-09-30 19:00:19 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon ... NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Alexandre SPANGARO	aec50d3ac9	NEW Add fa_icon on load_fiche_titre	2019-09-30 10:14:55 +02:00
Laurent Destailleur	6966651d51	Standardize code to use dolSqlDateFilter	2019-09-28 13:22:05 +02:00
Alexandre SPANGARO	288aea190b	Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon	2019-09-28 06:09:40 +02:00
Alexandre SPANGARO	7f93f046e9	NEW Add fa_icon on load_fiche_titre	2019-09-28 06:02:25 +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	acfceecda5	Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units ... NEW add units fields in buying price tab of product card	2019-09-27 14:17:52 +02:00
Laurent Destailleur	6858dce344	Rename table for categorie of warehouses	2019-09-27 13:28:28 +02:00
Laurent Destailleur	a79c4608d6	Merge pull request #11934 from atm-quentin/NEW_stock_categories ... NEW Categories/Tags are also available on warehouses	2019-09-27 12:41:28 +02:00
Laurent Destailleur	41101d3dbe	Merge pull request #11955 from bafbes/abb100078 ... fix:forgotten test condition	2019-09-27 11:30:03 +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
Abbes Bahfir	1ca531239e	fix:forgotten test condition	2019-09-24 09:40:19 +01:00
Frédéric FRANCE	26cd418320	Update price_parser.class.php	2019-09-24 10:28:27 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
atm-quentin	a46ed62e81	Merge branch 'NEW_stock_categories' of github.com:atm-quentin/dolibarr into NEW_stock_categories	2019-09-19 16:43:49 +02:00
atm-quentin	769ef78d8e	FIX missing comment	2019-09-19 16:43:21 +02:00
stickler-ci	774ec5a274	Fixing style errors.	2019-09-19 14:30:23 +00:00
atm-quentin	c09f2d8c4e	NEW stock categories	2019-09-19 16:21:03 +02:00
gauthier	d40534e8fa	FIX : change product type must be allowed if we activate hidden conf	2019-09-19 15:21:52 +02:00
VESSILLER	ca18448b48	NEW add units fields in buying price tab of product card	2019-09-18 10:36:13 +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	0194f48041	Merge pull request #10795 from altatof/clonecat ... NEW : copy linked categories on product clone process	2019-09-15 16:34:42 +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
VESSILLER	44fa2e4cd1	NEW multiselect with checkbox in categories/tags search for product list	2019-09-13 12:23:34 +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
Laurent Destailleur	80daf29d79	Fix conflict between new module reception and old process ... Fix inventory record does not need status at creation Conflicts: htdocs/fourn/commande/card.php	2019-09-06 01:55:22 +02:00
Laurent Destailleur	04adbd8c80	Fix conflict between new module reception and old process ... Fix inventory record does not need status at creation	2019-09-06 01:52:51 +02:00
Christophe Battarel	1cfd5615d3	resolv conflict	2019-09-05 16:10:23 +02:00
Laurent Destailleur	f893854986	Fix remove warnings	2019-09-05 14:24:13 +02:00
Tim Otte	0f9b01cd5b	Added support for extrafield styling options: ... - visibility now implemented - fieldrequired now implemented	2019-09-05 09:47:40 +02:00
Tim Otte	be000b96ee	Fixed error that occurred in the travis CI build	2019-09-04 16:42:13 +02:00
Tim Otte	fbafbc3e19	Added myself to the author list	2019-09-04 15:16:29 +02:00
Tim Otte	54d0b94b6d	Added extrafield support to the product supplier price lines	2019-09-04 15:13:42 +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
Laurent Destailleur	71dadc9bd4	Merge pull request #11757 from ptibogxiv/patch-246 ... NEW purchase_prices API	2019-09-03 13:03:31 +02:00
Laurent Destailleur	d4fb1d134d	Merge pull request #11801 from jtraulle/fix-11682-10.0 ... Fix #11683 Correct links to create a new product or service from search results	2019-09-03 13:02:17 +02:00
Abbes Bahfir	f945ec5771	fix: convert posted price formatted values to numeric	2019-09-02 21:24:53 +01:00
Jean Traullé	c84f1baf17	Fix #11683 Correct links to create a new product or service from search results	2019-08-31 00:18:53 +02:00
Laurent Destailleur	321e41ceed	Fix graph	2019-08-30 04:17:07 +02:00
Laurent Destailleur	6009601254	Use graph for stats on products/services	2019-08-30 04:15:24 +02:00
Laurent Destailleur	55505604c1	Merge pull request #11397 from atm-josselin/FIX_product_document_and_special_characters ... FIX : filepath of generated documents doesn't handle products with sp…	2019-08-27 14:12:48 +02:00
Laurent Destailleur	e8bb84e803	NEW Add status of warehouse in tooltip of a warehouse.	2019-08-26 23:54:15 +02:00
Laurent Destailleur	db6b1b6ffb	NEW Add status of warehouse in tooltip of a warehouse.	2019-08-26 23:44:20 +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
Laurent Destailleur	3339f89fc5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/api/class/api_login.class.php htdocs/dav/fileserver.php	2019-08-22 12:45:23 +02:00
Laurent Destailleur	27cd6cd308	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/compta/paiement.php htdocs/product/fournisseurs.php htdocs/stripe/payment.php	2019-08-22 12:39:07 +02:00
Laurent Destailleur	a35f010e55	FIX name and position of hook FIX #11710	2019-08-22 12:30:14 +02:00
Laurent Destailleur	db220d25c2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-16 21:48:53 +02:00
Laurent Destailleur	467ad3ed22	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/files.lib.php htdocs/product/stock/card.php	2019-08-16 21:48:46 +02:00
Laurent Destailleur	9799153171	Merge pull request #11695 from jtraulle/fix-11683 ... Fix #11683 Correct links to create a new product or service from search results	2019-08-16 17:49:55 +02:00
Laurent Destailleur	ee50c41e74	Fix phpcs	2019-08-16 17:34:23 +02:00
Laurent Destailleur	48125fd957	Fix phpcs	2019-08-16 17:32:58 +02:00
Jean Traullé	4bed1b9a3d	Fix #11683 Correct links to create a new product or service from search results	2019-08-15 22:21:31 +02:00
Laurent Destailleur	fa53641221	Merge pull request #11551 from atm-quentin/NEW_global_search_product ... NEW Add hidden option to set fields for the quick search on products	2019-08-15 20:26:05 +02:00
Laurent Destailleur	8a126800e7	Merge pull request #11650 from ptibogxiv/patch-217 ... FIX count negative in stats with credit note	2019-08-15 19:36:21 +02:00
Laurent Destailleur	b36df2303b	Update movement_list.php	2019-08-15 19:26:46 +02:00
atm-greg	f8ad8d72c0	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement	2019-08-12 15:16:43 +02:00
atm-greg	acdf13d769	add fk_projet on stock movements	2019-08-12 15:08:15 +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
ptibogxiv	33cf4d8417	Update product.class.php	2019-08-10 09:12:15 +02:00
Laurent Destailleur	3351a1687c	Fix phpcs	2019-08-10 02:17:07 +02:00
Laurent Destailleur	8647a20c18	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/langs/en_US/admin.lang htdocs/product/dynamic_price/class/price_parser.class.php htdocs/product/stats/facture.php	2019-08-10 01:57:43 +02:00
Laurent Destailleur	2824dee11a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/langs/en_US/admin.lang htdocs/product/dynamic_price/class/price_parser.class.php	2019-08-10 01:20:17 +02:00
Laurent Destailleur	6a8910f109	Merge pull request #11649 from ptibogxiv/patch-216 ... FIX qty in invoice list on product's stats	2019-08-10 00:37:35 +02:00
Je2fb	2dee289fc6	Update price_parser.class.php ... Calculation with supplier_min_price work Conflicts: htdocs/product/dynamic_price/class/price_parser.class.php	2019-08-10 00:21:13 +02:00
Laurent Destailleur	88c66d24fe	Merge pull request #11662 from ptibogxiv/patch-219 ... FIX duration when creating service	2019-08-09 23:53:55 +02:00
Laurent Destailleur	6d4ba6b36b	Merge branch 'develop' into develop	2019-08-09 23:49:31 +02:00
Regis Houssin	0b831ccdf7	FIX better help message with multicompany	2019-08-09 09:33:14 +02:00
Je2fb	1a592f8f69	Update price_parser.class.php	2019-08-08 09:34:59 +02:00
Je2fb	4008ddc567	Update price_parser.class.php	2019-08-08 09:33:03 +02:00
ptibogxiv	322ec32ff5	FIX duration when creating service	2019-08-07 20:16:53 +02:00
Je2fb	ef285a87a8	Update price_parser.class.php ... Calculation with supplier_min_price work	2019-08-07 17:16:34 +02:00
ptibogxiv	3e94b3dc59	FIX count negative in stats whithcredit note	2019-08-06 16:54:44 +02:00
ptibogxiv	0fc92b92a2	Update facture.php	2019-08-06 16:47:54 +02:00
ptibogxiv	ee8d99351d	Update facture.php	2019-08-06 16:28:18 +02:00
Frédéric FRANCE	69985339d8	Update price_parser.class.php	2019-08-06 11:47:34 +02:00
ptibogxiv	d22c2960b7	Update product.class.php	2019-08-06 00:14:19 +02:00
ptibogxiv	2d77bfd873	Update product.class.php	2019-08-04 14:50:25 +02:00
ptibogxiv	c9e481d6f7	Update product.class.php	2019-08-04 14:09:59 +02:00
ptibogxiv	f5f6882583	Update product.class.php	2019-08-04 13:42:50 +02:00
atm-quentin	bd2f5ba037	FIX Replace conf by hidden conf editable by user	2019-07-26 14:16:54 +02:00
Laurent Destailleur	0c6499f193	Update product.php	2019-07-25 18:01:47 +02:00
Laurent Destailleur	9a0e0fbdd2	Update product.php	2019-07-25 18:01:16 +02:00
Laurent Destailleur	a46bfc7a29	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/project.lib.php	2019-07-25 17:54:14 +02:00
Alexandre SPANGARO	323d2df210	Presentation nowrap on amount	2019-07-24 10:42:00 +02:00
atm-quentin	0ff121e7f1	add some new field on global search	2019-07-24 09:42:52 +02:00
atm-quentin	03ed4eb141	modif rowspan	2019-07-24 09:42:39 +02:00
atm-quentin	5a385bf1cc	ADD extrafields on global search	2019-07-24 09:41:02 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	fb5af65f4d	FIX #11466	2019-07-15 23:56:05 +02:00
Laurent Destailleur	adfbd62f8b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-14 00:44:35 +02:00
Laurent Destailleur	694be619b2	Fix doxygen	2019-07-11 22:16:32 +02:00
Laurent Destailleur	f5cc29417d	Translation lignes -> lines	2019-07-05 21:50:35 +02:00
Laurent Destailleur	0a7d70829f	Translation of some comments	2019-07-05 21:37:25 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	8e3620fce1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/compta/facture/invoicetemplate_list.php	2019-07-04 12:26:17 +02:00
Laurent Destailleur	80bbc2577e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:09:26 +02:00
Laurent Destailleur	b065cbc6f8	FIX #11446	2019-07-04 12:09:04 +02:00
Laurent Destailleur	3d0a5d9f00	Merge pull request #11442 from atm-john/9.0_Fix_column_price_display ... Fix column price display	2019-07-04 10:50:35 +02:00
John Botella	0288338364	Fix column price display	2019-07-02 14:38:09 +02:00
atm-quentin	8cdb251ca5	FIX product_use_units was set to 0 each time a conf in block other was set	2019-07-02 10:18:03 +02:00
atm-josselin	c24a95b7ad	Sanitize at creation of the product instead of the creation of the filepath	2019-07-01 09:31:01 +02:00
Laurent Destailleur	b177787f0a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php htdocs/product/class/product.class.php	2019-06-29 18:28:51 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
Laurent Destailleur	93b0e45246	Fix duplicate class in some cases	2019-06-29 02:27:58 +02:00
Laurent Destailleur	d71330c00b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-29 02:04:16 +02:00
Laurent Destailleur	36e240a16d	NEW Add statistics on product into contracts	2019-06-29 02:03:57 +02:00
Laurent Destailleur	8aebcc45b2	Fix message to not show sometimes	2019-06-29 01:54:38 +02:00
Laurent Destailleur	97827f5172	Fix print	2019-06-29 01:44:49 +02:00
Laurent Destailleur	1b33952028	Update facture.php	2019-06-28 12:37:22 +02:00
ptibogxiv	55bd67058b	Update facture.php	2019-06-26 14:10:52 +02:00
atm-quentin	7f62fdbfe4	FIX buyprice barcode default val	2019-06-25 14:27:44 +02:00
atm-quentin	4b3824a1a9	FIX buyprice barcode default val	2019-06-25 14:17:31 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	3ca258c93d	Remove dead code	2019-06-24 22:58:21 +02:00
Laurent Destailleur	a7bd734ece	Rename ->produit into ->product. Still permissions to rename.	2019-06-24 21:18:49 +02:00
Laurent Destailleur	efa09301b1	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 20:19:14 +02:00
Laurent Destailleur	b202c7eaa0	Fix confusion between ->childs and ->childsoncascade	2019-06-22 20:17:40 +02:00
Laurent Destailleur	5675e7c50e	Clean code of deprecated method	2019-06-22 18:19:40 +02:00
Laurent Destailleur	b0c76f48e1	error management	2019-06-21 09:38:26 +02:00
Laurent Destailleur	8da5794777	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/accounting.lib.php htdocs/product/stock/class/entrepot.class.php	2019-06-20 18:24:43 +02:00
Laurent Destailleur	e28bf71964	Fix error management of warehouse->delete	2019-06-20 18:15:14 +02:00
Laurent Destailleur	6975e18233	Fix phpcs	2019-06-20 13:59:04 +02:00
Laurent Destailleur	e9da44e023	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 12:33:02 +02:00
Laurent Destailleur	1a6dc83d4c	Fix: default accounting account for eec and export sales were not used.	2019-06-20 12:25:58 +02:00
Laurent Destailleur	d152354022	Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield ... NEW add extrafields in warehouses	2019-06-20 03:16:49 +02:00
Laurent Destailleur	4308f48cad	Merge branch 'develop' into MissingHook	2019-06-20 03:04:32 +02:00
Alexandre SPANGARO	47c2f6fac4	NEW Add column VAT rate in product list	2019-06-19 21:35:35 +02:00
Nicolas ZABOURI	2e4db8c83c	Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook	2019-06-19 08:39:05 +02:00
Laurent Destailleur	663998bab1	Fix scrutinizer errors	2019-06-18 20:15:04 +02:00
ICstage	820c420ae5	FIX Missing hooks	2019-06-18 14:07:52 +02:00
Laurent Destailleur	08d5ca4ddb	Debug page to export accounting documents	2019-06-17 17:53:43 +02:00
Francis Appels	a26c868783	Fix scrutinizer bugs	2019-06-12 22:05:10 +02:00
Francis Appels	2ecde139f0	Fix stock mouvement does not need virtual stock.	2019-06-07 18:09:03 +02:00
Josep Lluís	bb0313a1a4	Fix Hide disabled fields ... Hide disabled fields in product list	2019-06-07 15:23:20 +02:00
Lionel VESSILLER	9a974814fa	NEW add extrafields in warehouses ... - fix load lang stocks	2019-06-03 15:53:21 +02:00
Lionel VESSILLER	439eafb637	NEW add extrafields in warehouses ... - create table - admin extrafields - object fecth, insert, update and delete extrafields - card and list	2019-06-03 15:44:17 +02:00
Laurent Destailleur	2218994958	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
Laurent Destailleur	815a467eb7	Debug clone of products	2019-05-22 19:54:03 +02:00
Laurent Destailleur	18f1952e2d	Fix set of properties	2019-05-22 14:49:18 +02:00
Laurent Destailleur	e60131e3ee	Fix look and feel v10	2019-05-22 13:42:27 +02:00
Laurent Destailleur	c1a0e9385f	Merge pull request #11219 from frederic34/patch-2 ... dol_print_object_info return void	2019-05-21 22:38:39 +02:00
Laurent Destailleur	22e897b1a1	Clean and prepare code to fix a SQL injection	2019-05-21 17:22:38 +02:00
Laurent Destailleur	e463b17c15	Fix look and feel v10	2019-05-21 15:31:56 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Frédéric FRANCE	53a09a0dd4	Update agenda.php	2019-05-19 09:15:51 +02:00
Laurent Destailleur	94f5f6c655	Merge pull request #11207 from atm-john/FIX_scrutyniser ... FIX: scrutinizer feedback	2019-05-18 16:05:24 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button ... NEW : look and feel title button	2019-05-18 16:04:47 +02:00
ATM John BOTELLA	f714b45efb	FIX scrutinizer feedback	2019-05-18 15:53:07 +02:00
Laurent Destailleur	fd5048ef73	Fix reported by phpstan	2019-05-15 19:16:48 +02:00
Laurent Destailleur	49d65710ba	Fix date missing	2019-05-14 10:31:11 +02:00
Laurent Destailleur	04f7261bfc	Fix field date was not visible	2019-05-13 21:34:30 +02:00
Laurent Destailleur	75646e365d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/contrat/services_list.php htdocs/expensereport/list.php htdocs/product/list.php htdocs/product/reassort.php htdocs/product/reassortlot.php htdocs/projet/list.php	2019-05-13 12:28:16 +02:00
Laurent Destailleur	9242c1a630	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: ChangeLog htdocs/contrat/services_list.php htdocs/core/lib/files.lib.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-13 12:22:14 +02:00
Juanjo Menent	f4ca6916cd	Merge remote-tracking branch 'upstream/7.0' into 8.0 ... # Conflicts: # htdocs/contrat/services_list.php # htdocs/expensereport/list.php # htdocs/projet/list.php	2019-05-11 17:31:23 +02:00
Juanjo Menent	6206519456	Fix: missing GETPOST params	2019-05-11 16:54:56 +02:00
Juanjo Menent	2e6cb2afaa	Fix: missing GETPOST params	2019-05-11 16:53:16 +02:00
Juanjo Menent	dc9f8a349f	Fix: missing GETPOST params	2019-05-11 16:50:31 +02:00
Laurent Destailleur	3def11d5c9	Standardize translation	2019-05-10 19:32:46 +02:00
Laurent Destailleur	aaeb7dc9d6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/holiday.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-10 17:45:33 +02:00
Laurent Destailleur	95326c3d63	Update list.php	2019-05-10 16:27:38 +02:00
John BOTELLA	f296093f8d	fix travis	2019-05-10 15:52:46 +02:00
Regis Houssin	8a29d9f2d1	FIX possibility to override permissions (multicompany)	2019-05-10 11:23:19 +02:00
Juanjo Menent	2df026b903	FIX: #11032	2019-05-09 20:59:22 +02:00
Laurent Destailleur	a94c291b76	Dolibarization	2019-05-09 16:59:06 +02:00
Laurent Destailleur	6e69db8a1a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/product/doc/pdf_standard.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php htdocs/filefunc.inc.php	2019-05-09 12:27:14 +02:00
Laurent Destailleur	c2abedeb24	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0	2019-05-08 21:43:57 +02:00
Laurent Destailleur	b62b09df66	Merge pull request #11147 from frederic34/patch-2 ... fix reassort with not using product units	2019-05-08 18:33:10 +02:00
Laurent Destailleur	590b1d1e90	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php	2019-05-08 18:24:50 +02:00
Laurent Destailleur	b5d8bc732d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-05-08 18:22:11 +02:00
Frédéric FRANCE	5fd3109e7f	fix reassort with no product units	2019-05-08 16:28:18 +02:00
Laurent Destailleur	d86f0b7407	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-05-08 13:27:36 +02:00
Laurent Destailleur	a67d6e7208	css	2019-05-08 13:27:26 +02:00
Laurent Destailleur	af2c158821	Update reassort.php	2019-05-08 02:11:50 +02:00
Laurent Destailleur	953c9148ff	Update reassort.php	2019-05-08 02:11:12 +02:00
Rüdiger Hahn	475290a4b9	Show unit values if configured ... Fix: Fetch unit values from db and display them if this has been configured	2019-05-07 09:02:48 +02:00
Laurent Destailleur	c4798c34b0	Fix autocompletion of product on stock correction	2019-05-07 00:26:31 +02:00
Laurent Destailleur	15dc5f9d23	Fix css	2019-05-04 16:46:09 +02:00
atm-greg	e0c3cf8360	fix project link for stock correction	2019-05-03 10:24:49 +02:00
Christophe Battarel	face07ece1	new constant PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC	2019-05-01 15:15:20 +02:00
ptibogxiv	61f2b84f5f	FIX : error with call IsInEEC	2019-04-28 00:49:21 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All ... methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Laurent Destailleur	e5c2027dbb	NEW Add accounting code for eec sales and export sales on products	2019-04-25 01:16:29 +02:00
Laurent Destailleur	aa9184905a	FIX Duration is lost when editing	2019-04-25 00:11:08 +02:00
Laurent Destailleur	fe1b884966	Add missing methods	2019-04-23 12:20:59 +02:00
Laurent Destailleur	c0c723a207	Work on inventory feature	2019-04-23 11:00:28 +02:00
ATM-Nicolas	6cfdfe8408	NEW : Can update product supplier price ref	2019-04-19 10:58:18 +02:00
ATM john	684879d73c	apply appli btn to more elements	2019-04-16 21:49:26 +02:00
John BOTELLA	7372e8c610	Appli function to links	2019-04-15 15:47:36 +02:00
Laurent Destailleur	cf058e7d3b	NEW Ask date of invoice when using the Clone feature.	2019-04-12 12:12:08 +02:00
Laurent Destailleur	cb08bf6021	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/class/product.class.php	2019-04-11 16:25:33 +02:00
Laurent Destailleur	54b3acc997	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/product/class/product.class.php	2019-04-11 16:23:56 +02:00
Laurent Destailleur	8fa8d7fa08	FIX Combo list was limited to 20 in stock correction	2019-04-11 16:13:44 +02:00
Laurent Destailleur	be004c16c6	FIX Combo list was limited to 20 in stock correction	2019-04-11 16:13:23 +02:00
gauthier	9a24007c0a	FIX : better test	2019-04-11 15:32:50 +02:00
gauthier	524b186959	FIX : Product accountancey sell intra code must be visible if main feature level 1	2019-04-11 15:19:40 +02:00
Laurent Destailleur	3cfeba0113	Standardize code	2019-04-09 01:23:27 +02:00
Laurent Destailleur	d7f980fda0	NEW Add picto of deletion on mass action combo lists	2019-04-09 01:22:59 +02:00
Laurent Destailleur	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Ion	06d3b5792c	Fix dynamic prices bug caused by arg displacement	2019-04-07 21:41:31 +02:00
Christophe Battarel	8e2ef8e56c	remove old dev	2019-04-05 11:42:12 +02:00
Christophe Battarel	45b3a0588f	remove old dev	2019-04-05 11:40:57 +02:00
Christophe Battarel	f167ad910e	camelCase and generic cloneCategories function	2019-04-05 11:30:51 +02:00
Laurent Destailleur	fff9b7db9d	Fix doxygen	2019-04-04 18:33:12 +02:00
Laurent Destailleur	5891d0a056	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/list.php htdocs/projet/list.php	2019-04-04 17:45:02 +02:00
Laurent Destailleur	9c7464d157	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/list.php htdocs/societe/card.php	2019-04-04 17:42:12 +02:00
Laurent Destailleur	fa95f5575c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/product/list.php	2019-04-04 17:41:22 +02:00
Laurent Destailleur	eaf9a2402a	Fix length of label	2019-04-04 17:39:51 +02:00
Laurent Destailleur	e79204e81a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/product/list.php	2019-04-04 17:13:52 +02:00
Laurent Destailleur	4489db2a70	Fix field surface/weight not loaded	2019-04-04 17:06:26 +02:00
Laurent Destailleur	993920628b	Fix phpcs	2019-04-03 12:33:24 +02:00
Laurent Destailleur	379f9f2d53	Fix phpcs	2019-04-02 20:36:00 +02:00
Laurent Destailleur	42fda54edf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/fichinter/list.php htdocs/product/stock/replenish.php	2019-04-02 19:41:58 +02:00
Laurent Destailleur	c5348be337	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-02 19:35:42 +02:00
Laurent Destailleur	17a61b3232	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-02 19:34:49 +02:00
Laurent Destailleur	8fe1be1a67	Removed deprecated use of string in dol_print_date(). Only date allowed.	2019-04-01 19:27:34 +02:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Laurent Destailleur	50395b7dd7	New: Input field to search product always visible with focus so you can ... use a barcode flasher at any time	2019-03-28 18:51:04 +01:00
atm-greg	957fae1081	missing params	2019-03-28 11:07:27 +01:00
atm-greg	11343e986c	add all missing hooks on replenish	2019-03-28 10:47:32 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Laurent Destailleur	1b558d70c1	Fix menu translation	2019-03-22 12:42:23 +01:00
Laurent Destailleur	1075ef8cf2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-03-21 18:25:43 +01:00
Laurent Destailleur	f7f20df323	Merge pull request #10891 from atm-greg/Add_hook_on_replenish ... Add hook on replenish	2019-03-21 18:23:06 +01:00
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Laurent Destailleur	9a3c66b057	Merge pull request #10846 from grandoc/new_branch_15_03_2019 ... New branch 15 03 2019	2019-03-19 12:13:02 +01:00
Laurent Destailleur	1a8902f23e	Fix migration for compatibility	2019-03-19 12:03:02 +01:00
Laurent Destailleur	1a05cdfaa1	Fix regressions in selecting duration of service	2019-03-19 11:42:50 +01:00
ATM-Nicolas	1cf42726ff	FIX : Duplicate executeHook function	2019-03-18 15:19:39 +01:00
Christophe Battarel	7bc0260661	begin factorization of categories cloning	2019-03-18 14:15:55 +01:00
ptibogxiv	8657ff034b	Update card.php	2019-03-18 13:48:16 +01:00
Frédéric FRANCE	5e6d9691e4	phpcs fix	2019-03-16 19:12:45 +01:00
Laurent Destailleur	e7543a26b1	Merge branch 'develop' into patch-1	2019-03-16 14:22:36 +01:00
Philippe GRAND	bcfaf4bb1b	update with html5 compliant code	2019-03-15 09:55:06 +01:00
Philippe GRAND	c958bf49d0	update with html5 compliant code	2019-03-15 09:54:10 +01:00
Philippe GRAND	14abf357e7	update with html5 compliant code	2019-03-15 09:53:06 +01:00
Philippe GRAND	6bdac445c5	update with html5 compliant code	2019-03-15 09:50:53 +01:00
Philippe GRAND	89da4fbdc1	update with html5 compliant code	2019-03-15 09:49:07 +01:00
Philippe GRAND	7c916666a6	update with html5 compliant code	2019-03-15 09:48:32 +01:00
Laurent Destailleur	7c59629e66	Fix phpcs	2019-03-15 02:32:21 +01:00
Laurent Destailleur	86c5dc20e3	NEW Can choose the root category to show for TakePOS module	2019-03-15 02:12:40 +01:00
Laurent Destailleur	2713c430df	Merge branch 'develop' into dev_datepricefour	2019-03-14 18:43:09 +01:00
Laurent Destailleur	5aee322b30	Update fournisseurs.php	2019-03-14 18:36:05 +01:00
Laurent Destailleur	8f65ee2296	Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode	2019-03-14 17:48:44 +01:00
Laurent Destailleur	3c40d5d30c	Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units ... Fix measure unit id in select options	2019-03-14 14:10:13 +01:00
Laurent Destailleur	993183aec6	Merge pull request #10817 from wdammak/patch-35 ... Fix Warning: Invalid argument - dynamic_price	2019-03-14 14:09:21 +01:00
Frédéric FRANCE	ba749ffc8c	Update product.class.php	2019-03-14 09:14:29 +01:00
Lionel VESSILLER	17dd88d397	Fix measure unit id in select options	2019-03-13 14:05:32 +01:00
wdammak	b651b7ec07	Fix Warning: Invalid argument - dynamic_price	2019-03-13 01:03:12 +01:00
Laurent Destailleur	98ca9bf17a	Reduce quantity of string to translates	2019-03-12 19:44:59 +01:00
Laurent Destailleur	3559d600e2	Merge pull request #10770 from atm-john/theme_badge_status ... Add badge status css part1	2019-03-11 20:49:31 +01:00
John BOTELLA	57c6c60118	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-11 14:44:35 +01:00
Christophe Battarel	3215e066e4	copy linked categories when cloning a product	2019-03-11 10:00:44 +01:00
Frédéric FRANCE	86c1694195	update doc in product class	2019-03-09 10:36:39 +01:00
Laurent Destailleur	d99f4c1726	Fix var not used	2019-03-09 01:08:50 +01:00
Scrutinizer Auto-Fixer	68188ffda1	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-03-09 00:02:05 +00:00
Frédéric FRANCE	e845b96f2b	Update product.class.php	2019-03-07 22:40:16 +01:00
Laurent Destailleur	4c75e6644d	Fix css	2019-03-07 21:57:03 +01:00
John BOTELLA	ca10b1e403	add new dolGetStatus to LibStatut in product class	2019-03-07 11:37:54 +01:00
Laurent Destailleur	a426c8e9bf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/compta/facture/class/facture.class.php htdocs/filefunc.inc.php htdocs/install/upgrade2.php htdocs/product/class/product.class.php	2019-03-07 11:16:24 +01:00
Laurent Destailleur	b15e00cae7	FIX Autodetect buy price for invoices autogenerated with templates.	2019-03-06 21:39:09 +01:00
Laurent Destailleur	ec15f9251d	Merge pull request #10738 from frederic34/patch-2 ... phpcs fix	2019-03-05 18:42:22 +01:00
Laurent Destailleur	db5dd7f9aa	Fix phpunit	2019-03-05 18:19:37 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	1d6028dfb0	FIX PHPUnit	2019-03-04 19:38:52 +01:00
Laurent Destailleur	06a40726bb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-03-04 16:29:23 +01:00
Laurent Destailleur	27402f432a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/don/class/don.class.php htdocs/product/stock/card.php htdocs/theme/eldy/style.css.php	2019-03-04 16:29:16 +01:00
Laurent Destailleur	3b48808916	Update list.php	2019-03-04 16:13:38 +01:00
Laurent Destailleur	16d13b223a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-03 20:43:35 +01:00
Laurent Destailleur	526bd1d02e	Fix number format	2019-03-03 17:36:43 +01:00
futurehousestore	b710a41707	Update list.php ... Display full product name	2019-03-03 16:23:10 +00:00
Frédéric FRANCE	014f69850e	add visibility	2019-03-01 23:08:57 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Frédéric FRANCE	796ea6f4ea	add visibility	2019-02-28 23:19:58 +01:00
Frédéric FRANCE	4f9e35f350	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-28 20:48:23 +01:00
Laurent Destailleur	9967adaf09	Merge pull request #10436 from wdammak/patch-23 ... Add links and related documents for a stock movement	2019-02-27 15:50:06 +01:00
atm-quentin	f51b89def3	NEW supplier buyprice barcode	2019-02-27 09:22:34 +01:00
Frédéric FRANCE	6ee186096c	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-24 23:48:51 +01:00
Frédéric FRANCE	27218b7087	wip	2019-02-24 23:32:09 +01:00
Laurent Destailleur	6b46a927f1	Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket	2019-02-24 20:53:54 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
Frédéric FRANCE	167a857f4c	replace html code by html5 in contact	2019-02-24 14:47:47 +01:00
Frédéric FRANCE	a1d2d3bddc	replace html code by html5	2019-02-24 11:18:55 +01:00
Frédéric FRANCE	390766babf	replace html code by html5	2019-02-23 23:36:21 +01:00
Frédéric FRANCE	6ee29559f9	doc comment entrepot.class.php	2019-02-23 09:44:45 +01:00
Laurent Destailleur	ec5461a4d1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/multicurrency/class/multicurrency.class.php	2019-02-21 22:31:27 +01:00
Laurent Destailleur	6cdf5c5673	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-21 22:28:25 +01:00
Regis Houssin	1c3541295b	FIX wrong class name "CUnits instead CMeasuringUnits"	2019-02-19 09:24:30 +01:00
Regis Houssin	45d05da6ed	FIX missing $ismultientitymanaged for previous/next ref	2019-02-14 16:14:19 +01:00
Laurent Destailleur	e6e18ff616	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/product/stock/card.php htdocs/product/stock/info.php htdocs/product/stock/movement_list.php	2019-02-14 15:33:17 +01:00
Laurent Destailleur	89050da856	Merge	2019-02-14 15:27:31 +01:00
Laurent Destailleur	2c2052d113	Update card.php ... Avoid regression on restrictArea	2019-02-14 15:23:34 +01:00
Laurent Destailleur	4ac086ab70	Update info.php	2019-02-14 15:23:07 +01:00
Laurent Destailleur	173d28cf5a	Update mouvement.php ... Avoid regression on restrictArea	2019-02-14 15:22:22 +01:00
Regis Houssin	aa4c5ae839	FIX missing access security checking with multicompany	2019-02-14 10:12:15 +01:00
Laurent Destailleur	2311912d8a	Merge branch 'develop' into dev_importproduct_measuringunit	2019-02-13 16:35:46 +01:00
florian HENRY	020fa52507	travis	2019-02-13 15:30:20 +01:00
Frédéric FRANCE	fa6bc309d6	Merge branch 'develop' into fixphpcs	2019-02-13 15:24:37 +01:00
florian HENRY	5bb260d3d1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_importproduct_measuringunit Conflicts: htdocs/product/stock/movement_card.php	2019-02-13 13:52:35 +01:00
florian HENRY	9caefc9483	fix travis	2019-02-13 13:50:57 +01:00
florian HENRY	dd9896516b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_importproduct_measuringunit Conflicts: htdocs/margin/agentMargins.php htdocs/product/stock/movement_card.php htdocs/projet/tasks/time.php htdocs/resource/class/html.formresource.class.php	2019-02-13 12:52:07 +01:00
Laurent Destailleur	44fd36b15c	Fix phpcs	2019-02-13 12:39:26 +01:00
florian HENRY	37c66c2ece	travis	2019-02-13 12:32:06 +01:00
Laurent Destailleur	ced386fdca	Fix phpcs	2019-02-13 11:32:00 +01:00
florian HENRY	de87321c15	fix travcis	2019-02-13 10:28:08 +01:00
florian HENRY	5c059c897d	fix travis (mosty for dev no conerne by my changes)	2019-02-13 09:21:14 +01:00
florian HENRY	d88475c61a	Merge branch 'develop' of local repository into dev_importproduct_measuringunit	2019-02-13 08:59:18 +01:00
Frédéric FRANCE	484acc2e00	fix phpcs	2019-02-12 20:55:55 +01:00
florian HENRY	5b5f96bafb	NEW : measuring unit dictionnary and product size/unit import	2019-02-12 16:58:11 +01:00
Laurent Destailleur	41863bb127	Merge	2019-02-12 16:42:51 +01:00
Frédéric FRANCE	b041eeae22	first parameter of print_liste_field_titre was translated	2019-02-10 18:11:34 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	38d4284638	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/db/pgsql.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/filefunc.inc.php htdocs/imports/import.php htdocs/supplier_proposal/card.php	2019-02-08 11:26:08 +01:00
Laurent Destailleur	fe1188c4ea	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/filefunc.inc.php	2019-02-08 10:44:45 +01:00
atm-quentin	730a2a90ff	FIX supplier invoice product stats total ht is line total not invoice total	2019-02-05 09:43:14 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	4d41b1b33c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 19:45:45 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop ... psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Laurent Destailleur	e309261140	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 18:19:58 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Maxime Kohlhaas	bb3225809b	Fix warehouse fetch was not checking parameters. Fixes #10414	2019-02-02 18:43:25 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Laurent Destailleur	ebe30f7a0e	FIX error report not returned	2019-02-01 19:19:23 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Laurent Destailleur	6de732d7f8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php	2019-02-01 16:07:18 +01:00
Laurent Destailleur	35f65a571c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/facture/mod_facture_mars.php htdocs/core/modules/facture/mod_facture_terre.php htdocs/fourn/commande/list.php	2019-02-01 16:05:43 +01:00
Pierre Ardoin	2d6f5ca8ab	#Fix : Error in Total Products/Services ... Its correct an error in the total of stat Products/Services total.	2019-01-31 20:22:56 +01:00
Frédéric FRANCE	b766204690	wip	2019-01-30 22:53:47 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	408609e0ec	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/core/tpl/objectline_edit.tpl.php	2019-01-30 16:54:38 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 ... Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	d0b20178e0	Merge pull request #10442 from aspangaro/10.0_accountancy_default ... NEW: When you create product or service, sell accountancy account by default are proposed	2019-01-30 16:30:13 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines ... PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Pierre Ardoin	99892c13b0	FIX : Erreur dans le Total ... Corrige l'erreur de calcul dans le total des produits et services	2019-01-29 23:26:08 +01:00
Alexandre SPANGARO	64975b3b9e	NEW: When you create product or service, sell accountancy account by default are proposed	2019-01-28 22:27:55 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
wdammak	7812baf8aa	Cleaning after using the movement card	2019-01-28 16:12:18 +01:00
wdammak	8546c801a5	to make it work with movement_card.php	2019-01-28 05:17:09 +01:00
wdammak	837821ebb6	Create movement_card.php	2019-01-28 05:12:20 +01:00
wdammak	49ccdb9602	Update movement_list.php ... For it to work you have to create this script htdocs\core\modules\stock\doc\pdf_stdmouvement.modules.php instead htdocs\core\modules\stock\doc\pdf_stdmovement.modules.php this mixture of fr/en confused me and I'm sure you better control the structure to make it work properly it tested & works but with htdocs\core\modules\stock\doc\pdf_stdmouvement.modules.php thx	2019-01-28 05:06:02 +01:00
wdammak	aa08e32761	Add links and related documents for a stock movement ... @eldy you can clone in movement_card.php if you prefer this structure	2019-01-28 04:48:59 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +01:00
Laurent Destailleur	12e75cb8c9	Merge pull request #10401 from aspangaro/10.0_accountancy2 ... NEW: Automatically binding for intra/export accountancy code in customer list	2019-01-27 18:06:08 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	496fa9b0fb	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	cc574852d2	Fix phpcs	2019-01-26 15:20:36 +01:00
Laurent Destailleur	ab262237b2	Merge pull request #10393 from fappels/10_add_product_dimensions ... NEW Show product dimensions in product list tooltip.	2019-01-26 14:14:03 +01:00
Laurent Destailleur	60c9eccbc4	Merge pull request #10395 from fappels/10_work_on_supplier_price_history ... Work on #10394 supplier price history	2019-01-26 14:08:15 +01:00
Laurent Destailleur	a5daa25707	Move common code to get sell price into a method	2019-01-24 19:45:17 +01:00
Alexandre SPANGARO	9ff848210f	NEW: Automatically binding for intra/export accountancy code	2019-01-23 22:14:13 +01:00
jfefe	b3dfbaf38c	FIX: wrong permission test for inventory creation	2019-01-23 02:45:46 +01:00
Francis Appels	7ad48064be	Add code to show in fourn price tooltip.	2019-01-22 16:18:25 +01:00
Francis Appels	9227d9fe9b	Show product dimensions in product list tooltip.	2019-01-22 12:42:02 +01:00
Philippe GRAND	621b42e8e3	update with html5 compliant code	2019-01-21 10:02:11 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime ... Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
Laurent Destailleur	126e02798a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/cashdesk.lang htdocs/langs/fr_FR/cashdesk.lang	2019-01-07 19:49:15 +01:00
Laurent Destailleur	1306918eb0	FIX #10299	2019-01-07 16:03:55 +01:00
JC Prieto	99e2f893fd	Fix: loadBatchInfo()	2019-01-02 19:38:44 +01:00
Laurent Destailleur	f965e9ec7a	Merge pull request #10270 from prietojc/patch-3 ... FIX: loadBatchInfo()	2019-01-02 19:38:25 +01:00
Laurent Destailleur	422e18ee8e	Merge pull request #10268 from hregis/develop_upgrade ... FIX remove old unused and deprecated function "getStaticMember"	2019-01-02 19:37:49 +01:00
JC Prieto	d43adbce71	Fix: loadBatchInfo()	2018-12-26 20:42:26 +01:00
Laurent Destailleur	5c516fdae2	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2018-12-26 19:43:01 +01:00
Regis Houssin	1a15698f96	FIX replace deprecated "print_titre" with "load_fiche_titre" ... Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2018-12-25 08:36:42 +01:00
Laurent Destailleur	85375495e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php	2018-12-22 19:06:58 +01:00
Laurent Destailleur	8d39edf430	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/price.php	2018-12-22 18:59:49 +01:00
Laurent Destailleur	850b939ffd	FIX CVE-2018-19994	2018-12-22 17:03:50 +01:00
Laurent Destailleur	44a6644969	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-18 21:55:53 +01:00
Laurent Destailleur	89068ffef1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/errors.lang htdocs/product/stock/product.php htdocs/user/card.php	2018-12-18 21:55:14 +01:00
ATM-Nicolas	96144e18f1	FIX : Function updatePrice with wrong parameters	2018-12-18 15:27:32 +01:00
Laurent Destailleur	af4405c669	FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE	2018-12-16 20:29:08 +01:00
Laurent Destailleur	d8b5cd4bdf	Remove white lines	2018-12-16 19:31:59 +01:00
Laurent Destailleur	efb88292dd	Clean code	2018-12-16 19:30:54 +01:00
Laurent Destailleur	003c463ee4	FIX Can't delete a line of minimal stock per warehouse	2018-12-16 19:23:53 +01:00
Laurent Destailleur	e14b426985	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/exports/export.php	2018-12-16 13:39:16 +01:00
Laurent Destailleur	54a4a54afe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/langs/en_US/banks.lang	2018-12-15 20:00:31 +01:00
Norbert Penel	0f3a063c91	Events are not linked to products ... when created from a product card, the events are not linked to the product	2018-12-15 15:57:15 +01:00
Laurent Destailleur	2d4403c3bf	Merge pull request #10184 from homer8173/patch-5 ... Events are not linked to products	2018-12-15 15:46:22 +01:00
Laurent Destailleur	1bce3f6c6b	Fix phpcs	2018-12-15 14:54:10 +01:00
Laurent Destailleur	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	2d2481cc5f	Merge pull request #10068 from prietojc/patch-2 ... New: Update just the multiprices that have been changed	2018-12-14 19:22:26 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	83efdee7d3	Merge branch 'develop' into new_mass_generate	2018-12-14 15:44:46 +01:00
Laurent Destailleur	78cdade1a7	Merge pull request #10211 from atm-john/fix_error_message_details ... Add détails to error message	2018-12-14 14:26:38 +01:00
Laurent Destailleur	177675b73d	Merge pull request #10225 from madx666/contrib ... Change type_mouvement on movement_list	2018-12-14 10:40:00 +01:00
Laurent Destailleur	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
madx666	3159c3f8d1	Change type_mouvement on movement_list	2018-12-13 11:28:49 +01:00
BENKE Charlene	946d55a7bb	fk_default_warehouse not defined	2018-12-12 00:41:11 +01:00
ATM John BOTELLA	6a4df05fd0	fix error message details	2018-12-08 17:29:07 +01:00