5480 Commits

Author	SHA1	Message	Date
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
Norbert Penel	b4475e434f	Events are not linked to products ... when created from a product card, the events are not linked to the product	2018-12-05 15:18:45 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
Laurent Destailleur	cb9ada2119	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/class/html.formmail.class.php htdocs/core/modules/modSociete.class.php htdocs/product/price.php	2018-12-01 18:19:45 +01:00
BENKE Charlene	1dc2fc5060	fix #9475	2018-12-01 16:17:52 +01:00
Inovea Conseil	0ba5fda3da	Update price.php	2018-12-01 16:11:49 +01:00
Inovea Conseil	8964ec7ea1	Fix #9572 ... Fix #9572	2018-12-01 15:58:37 +01:00
ptibogxiv	310dc46113	Update list.php	2018-11-29 13:44:42 +01:00
ptibogxiv	31e3b82ca6	Fix duration display product/service in list.php	2018-11-29 13:44:10 +01:00
Philippe GRAND	05d617b759	fix typo error	2018-11-26 14:33:45 +01:00
JC Prieto	54418c168b	New: Update only the multiprices that have been changed ... When a multiprice was changed all level prices were updated at once and history of prices is getting very large.	2018-11-22 12:38:10 +01:00
Thibault Descamps	c2e5a29246	NEW redirect if only one result on global search on card	2018-11-22 11:36:30 +01:00
atm-quentin	7571760fdd	fix errors during cherry picking	2018-11-16 11:31:23 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email ... FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Frédéric FRANCE	20acf440a3	Update api_products.class.php	2018-11-10 07:55:01 +01:00
Frédéric FRANCE	b271e1a3b0	The variable $i seems to be never defined.	2018-11-10 07:27:20 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	f1193ad3dd	FIX: Missing date creation and modification of supplier price	2018-11-09 10:29:22 +01:00
Laurent BOUQUET	320e7adef7	Fix blank lines and whitespace at end of lines	2018-11-08 17:09:54 +01:00
Laurent BOUQUET	b03a91213f	Merge branch 'develop' into feature/product-search-barcode	2018-11-08 16:57:49 +01:00
Laurent Destailleur	5bbf7e8f1d	Fix look and feel v8	2018-11-08 10:21:43 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Bouquet	f05b67909b	NEW : Add product search from barcode via REST api	2018-11-06 12:13:16 +01:00
Laurent Bouquet	cb10da4d41	[Core] Add product search from barcode via REST api	2018-11-05 23:06:19 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Laurent Destailleur	68f6ebd0ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php	2018-10-30 14:47:39 +01:00
Maxime Kohlhaas	46d3bec104	Fix replenish wasn't caring about supplier price min quantity #9561	2018-10-28 10:25:56 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	6edaf3a422	Merge branch 'develop' into patch-9	2018-10-24 12:24:00 +02:00
Laurent Destailleur	24f37c7bd7	CSS	2018-10-24 12:12:06 +02:00
Laurent Destailleur	36323752ed	Project must be on a dedicated field	2018-10-24 12:00:54 +02:00
Laurent Destailleur	c2c4366c62	Removed duplicate translation	2018-10-24 11:38:16 +02:00
Laurent Destailleur	6d86727c0b	Lang not loaded	2018-10-24 11:34:00 +02:00
Laurent Destailleur	2e0de15f95	Add public	2018-10-24 11:26:50 +02:00
Laurent Destailleur	f0743c55bb	Fix phpcs	2018-10-24 11:24:10 +02:00
Laurent Destailleur	1a4bb7ed12	FIX hover on line of movement list	2018-10-24 11:23:21 +02:00
Frédéric FRANCE	2a6478a2c4	fix phpcs	2018-10-24 08:15:00 +02:00
Laurent Destailleur	eaab953ba2	Renamed mouvement.php into movement_list.php to follow dev rules	2018-10-24 03:50:18 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	c8aa884462	Fix search all	2018-10-23 17:16:46 +02:00
Juanjo Menent	e40ee879dc	New: works with variants: ... - If product is variant disable prices modify - Add function isVariant for knowing if product is a Variant	2018-10-23 13:07:09 +02:00
Laurent Destailleur	7bb5e7c31f	Fix responsive	2018-10-23 11:52:21 +02:00
atm-quentin	8442b405b2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception	2018-10-23 10:27:46 +02:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	36ae81c749	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-19 14:17:20 +02:00
Laurent Destailleur	de4ead2558	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/accountancy/class/accountancycategory.class.php htdocs/core/actions_massactions.inc.php htdocs/product/reassort.php	2018-10-19 14:16:53 +02:00
Laurent Destailleur	5a9f0cbff7	Merge pull request #9796 from frederic34/patch-21 ... do not trim int	2018-10-19 13:26:08 +02:00
Frédéric FRANCE	ebc5cb5a96	do not trim int	2018-10-17 20:24:43 +02:00
Frédéric FRANCE	393303fe31	do not trim int	2018-10-17 20:17:43 +02:00
Ferran Marcet	ffde353441	FIX When delete a product, llx_product_association rows are not deleted	2018-10-17 10:06:06 +02:00
Ferran Marcet	bdae4e1c4d	FIX When delete a product, llx_product_association rows are not deleted	2018-10-17 10:04:42 +02:00
Ferran Marcet	b462e7b217	FIX When delete a product, llx_product_association rows are not deleted	2018-10-17 10:01:02 +02:00
Laurent Destailleur	57bb8bcfcd	Disabled action are hidden with reason	2018-10-16 20:27:33 +02:00
Laurent Destailleur	d43e1fcef6	Merge pull request #9729 from simnandez/develop ... New: works with variants	2018-10-16 20:08:17 +02:00
Laurent Destailleur	97429aeb7a	Merge pull request #9721 from grandoc/new_branch_10_10_2018 ... Standardize and update code	2018-10-16 19:30:19 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Philippe GRAND	729ff0b9bb	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-16 14:20:11 +02:00
Juanjo Menent	194b3478f3	Merge remote-tracking branch 'upstream/develop' into develop ... # Conflicts: # htdocs/product/class/product.class.php	2018-10-15 13:40:42 +02:00
Laurent Destailleur	cca87f3d5a	Fix phpcs	2018-10-15 13:27:17 +02:00
Laurent Destailleur	6ab037c766	Fix code comment	2018-10-15 13:26:18 +02:00
Laurent Destailleur	f59dba66e7	Fix phpcs	2018-10-15 13:23:35 +02:00
Juanjo Menent	58cc9aa918	Fix: found 1 blank lines before brace	2018-10-15 12:45:40 +02:00
Juanjo Menent	c2814948fb	Fix: name of fields used into the search criteria must always start with "search_"	2018-10-15 11:48:55 +02:00
Juanjo Menent	e3643c7ab7	Merge remote-tracking branch 'upstream/develop' into develop	2018-10-15 11:44:50 +02:00
Maxime Kohlhaas	af813f8214	Fix missing status_batch var on product lists #9606	2018-10-14 19:55:25 +02:00
Laurent Destailleur	7e68d8df1b	Update product.class.php	2018-10-14 16:47:30 +02:00
Laurent Destailleur	5654492ba8	Update product.class.php	2018-10-14 16:45:45 +02:00
Laurent Destailleur	db2e1e09e7	Merge branch 'develop' into patch-112	2018-10-14 16:44:36 +02:00
Maxime Kohlhaas	d4d921b1cc	Add massaction generate on main lists	2018-10-14 16:27:59 +02:00
Laurent Destailleur	532e05c42e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: ChangeLog htdocs/filefunc.inc.php	2018-10-13 14:29:51 +02:00
atm-ph	7b17b453bf	Fix sort and switch page	2018-10-12 23:29:35 +02:00
atm-ph	23e4cd57f3	Fix warnings PHP7	2018-10-12 23:27:38 +02:00
Philippe GRAND	9e494e65e0	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-12 19:04:02 +02:00
Philippe GRAND	357173f0ef	Standardize and update code	2018-10-12 09:30:53 +02:00
Philippe GRAND	849a1a9400	Standardize and update code	2018-10-12 09:26:58 +02:00
atm-ph	79420593f4	Fix display 0 (as virtual stock) instead of empty string	2018-10-11 17:14:22 +02:00
Juanjo Menent	0976616401	Fix: Opening brace should be on a new line	2018-10-11 17:13:39 +02:00
Juanjo Menent	ab55ff2e2c	New: works with variants: ... - Make the checkbox working correctly	2018-10-11 15:44:23 +02:00
Laurent Destailleur	e6f179b6cb	Fix look	2018-10-11 13:33:44 +02:00
Juanjo Menent	58be4ac7a3	New: works with variants: ... - Hide child products into list if PRODUIT_ATTRIBUTES_HIDECHILD is activated	2018-10-11 12:36:10 +02:00
Juanjo Menent	2ef0e95586	New: works with variants: ... - If product is parent showing stock of childs and not itself - Add function hasVariants for know if product has variants	2018-10-11 12:08:50 +02:00
Fernando Octavio García López	c7eb935cb8	FIX Fixed translatable field name in stock movement table	2018-10-10 22:57:08 -06:00
atm-quentin	aaace60b0d	FIX stock movement on close reception and set status if too much receive$	2018-10-10 15:33:35 +02:00
Laurent Destailleur	df0ec95b22	Code comment and better error message	2018-10-09 21:21:10 +02:00
Philippe GRAND	596dba9ce1	Standardize code	2018-10-06 12:14:47 +02:00
Philippe GRAND	b3925dd2bd	Standardize code	2018-10-05 16:04:10 +02:00
Philippe GRAND	073ec85208	Standardize code	2018-10-05 15:51:08 +02:00
Philippe GRAND	da560289e3	Standardize code	2018-10-05 15:48:38 +02:00
Philippe GRAND	d2ec703b51	Standardize and update code	2018-10-04 09:24:57 +02:00
atm-quentin	52717dbb65	NEW debut rename stock conf	2018-10-03 18:05:22 +02:00
Laurent Destailleur	75b1cac33f	FIX Pagination stats	2018-10-01 01:15:19 +02:00
Laurent Destailleur	d2e4752427	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-01 01:14:03 +02:00
Laurent Destailleur	d51eb1977a	FIX Pagination stats	2018-10-01 01:10:42 +02:00
Philippe GRAND	574cfad48f	Standardize and update code	2018-09-28 14:49:34 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +02:00
Laurent Destailleur	575c63f87d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/CMailFile.class.php	2018-09-27 12:52:10 +02:00
Laurent Destailleur	ff3f1e933a	Update replenish.php	2018-09-27 09:22:38 +02:00
gauthier	fc7c0ce521	FIX : need to filter on current entity on replenish	2018-09-24 16:23:44 +02:00
Frédéric FRANCE	6c8cbf710b	reduce complexity of ProductStockEntrepot class	2018-09-16 13:59:15 +02:00
Laurent Destailleur	d6ee00f2e7	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
Laurent Destailleur	bed8674714	Merge pull request #9519 from frederic34/patch-14 ... reduce complexity of libstatut inventory.class.php	2018-09-16 08:54:22 +02:00
Frédéric FRANCE	d2bd16280e	reduce complexity of libstatut inventory.class.php	2018-09-15 22:20:47 +02:00
Frédéric FRANCE	5d87847b65	reduce complexity of libstatut product.class.php	2018-09-15 22:13:54 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	ce76a2e714	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 20:21:35 +02:00
Frédéric FRANCE	a36f41728f	deprecate formbarcode:form_barcode_type	2018-09-10 23:58:57 +02:00
Frédéric FRANCE	312a606345	deprecate formbarcode:select_barcode_type	2018-09-10 23:50:48 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Philippe GRAND	97c740f510	Merge branch 'develop' of github.com:grandoc/dolibarr into develop	2018-09-06 19:28:10 +02:00
Frédéric FRANCE	4cbfa2073a	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 21:02:16 +02:00
Laurent Destailleur	2a471df828	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-05 20:42:55 +02:00
Laurent Destailleur	ed31eec5ee	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-09-05 20:40:19 +02:00
Laurent Destailleur	dfea391c88	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/lib/pdf.lib.php	2018-09-05 20:39:38 +02:00
Laurent Destailleur	4ac67e6409	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-05 20:31:10 +02:00
Laurent Destailleur	19431a94ba	Code style	2018-09-05 14:37:44 +02:00
Laurent Destailleur	f7d5172a74	Merge pull request #9410 from frederic34/patch-10 ... Create index.html	2018-09-05 14:15:22 +02:00
Frédéric FRANCE	2015268b7e	Create index.html	2018-09-04 22:06:24 +02:00
Frédéric FRANCE	e4afd4af00	Create index.html	2018-09-04 22:05:06 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	47b6374abc	Standardize and update code	2018-09-04 13:45:20 +02:00
Philippe GRAND	42565e722e	Standardize and update code	2018-09-04 13:37:00 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Laurent Destailleur	bb5fae0e46	Fix eol	2018-09-02 15:30:56 +02:00
Frédéric FRANCE	2a5c994009	move phpcs:ignore	2018-09-02 14:01:37 +02:00
Frédéric FRANCE	04c1a7d4af	move phpcs:ignore	2018-09-02 13:38:11 +02:00
Frédéric FRANCE	4ea582ad4a	move phpcs:ignore	2018-09-02 11:12:07 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Frédéric FRANCE	3e723af018	start changing phpcs:ignore	2018-09-01 23:46:13 +02:00
Philippe GRAND	db32d8903e	Standardize and Update code	2018-09-01 23:20:20 +02:00
Philippe GRAND	7b0d3c32ab	Standardize and Update code	2018-09-01 22:55:10 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps ... mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	45cbc36a15	Standardize and update code	2018-09-01 15:27:55 +02:00
Philippe GRAND	c013f9cf3d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 15:13:04 +02:00
Laurent Destailleur	c2548b8b39	Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm ... NEW hook formConfirm always called if hooked	2018-09-01 14:50:08 +02:00
Philippe GRAND	17e349eba2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:27:53 +02:00
Laurent Destailleur	5b6a44434c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-01 14:17:15 +02:00
Laurent Destailleur	bcee0ef0ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/dispatch.php htdocs/societe/class/societe.class.php htdocs/stripe/config.php	2018-09-01 14:16:57 +02:00
Laurent Destailleur	26cff9e11f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/langs/en_US/blockedlog.lang htdocs/stripe/config.php	2018-09-01 14:13:01 +02:00
Laurent Destailleur	123a66dc2a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/product/class/product.class.php	2018-09-01 14:09:00 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Philippe GRAND	b59d49d3b3	Merge remote-tracking branch 'upstream/develop' into develop	2018-09-01 13:58:33 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Laurent Destailleur	b5ed4de6a6	Merge pull request #9367 from joseplluis/patch-4 ... FIX support of option PRODUCT_DISABLE_VOLUME	2018-09-01 13:37:38 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing ... function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Frédéric FRANCE	ebcf43ec73	function Comment Missing	2018-08-31 21:39:23 +02:00
Philippe GRAND	3a8bde227b	Standardize and update code	2018-08-31 19:26:08 +02:00
Philippe GRAND	bb05e80a87	Standardize and update code	2018-08-31 18:47:25 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Philippe GRAND	2f307aae21	Standardize and update code	2018-08-31 18:06:17 +02:00
Josep Lluís	a514b97837	FIX: add global PRODUCT_DISABLE_VOLUME on create ... On update and view the global PRODUCT_DISABLE_VOLUME is used. But on create it does not exists.	2018-08-31 10:57:01 +02:00
ksar-ksar	49d3bea192	Remove the test ... After discussion with Frederic, the best solution is to remove the test	2018-08-30 11:27:48 +02:00
Frédéric FRANCE	5100b8b7b0	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-30 10:42:47 +02:00
atm-greg	f8fef61075	remove useless db begin	2018-08-30 09:19:44 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	6ca9854a34	Fix to avoid fetch when no accounting account defined	2018-08-29 21:07:00 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Laurent Destailleur	d40e1a0d0b	FIX #9258	2018-08-29 20:12:38 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	9c6ce4b29d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-28 02:36:15 +02:00
Laurent Destailleur	2db84a679e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/modulebuilder/index.php	2018-08-28 02:35:45 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing ... Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 ... Update and standardize code	2018-08-28 02:13:28 +02:00
Laurent Destailleur	534eadb7a2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-28 01:35:43 +02:00
Norbert Penel	f9c1dd8edd	There is a begin transaction without rollback ... In this Select, there is no need of this Begin Transaction on my understanding. Don't know why this line code is here for.	2018-08-28 01:32:55 +02:00
Laurent Destailleur	e00d6eda7e	Update productlot_list.php	2018-08-28 01:29:33 +02:00
Frédéric FRANCE	27978ed9a0	Update productlot_list.php ... https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series	2018-08-26 07:47:33 +02:00
ksar-ksar	a844855ade	Update hook formConfirm ... The hook should be called when the $formconfirm is not empty	2018-08-24 16:40:26 +02:00
Philippe GRAND	87067b2bc9	Standardize and update code	2018-08-23 18:35:45 +02:00
Norbert Penel	92b0668e3e	There is a begin transaction without rollback ... In this Select, there is no need of this Begin Transaction on my understanding. Don't know why this line code is here for.	2018-08-23 17:40:40 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +02:00
Philippe GRAND	e0462b975b	Update and standardize code	2018-08-22 11:48:26 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	a36061079b	Update and standardize code	2018-08-22 11:11:59 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	c76a33fb4f	remove superfluous spaces	2018-08-21 20:12:27 +02:00
Frédéric FRANCE	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration ... function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	39f7d4a011	Merge pull request #8975 from atm-greg/Add_hook_on_replenish ... add hooks on stock replenish	2018-08-21 13:28:18 +02:00
Laurent Destailleur	0ee7befa19	Update replenish.php	2018-08-21 13:27:49 +02:00
Laurent Destailleur	b40e32b8c3	Merge pull request #9264 from grandoc/new_branch_17_08_2018 ... standardize code	2018-08-21 12:52:34 +02:00
Laurent Destailleur	c25a968c72	Update list.php	2018-08-21 12:15:47 +02:00
Laurent Destailleur	a10b4da6ac	Update list.php	2018-08-21 12:13:07 +02:00
Laurent Destailleur	a73d2447d9	Update list.php	2018-08-21 12:10:05 +02:00
ptibogxiv	d5aed3394d	fix duration display for service in list.php	2018-08-20 09:52:59 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Laurent Destailleur	3b245f1b30	Merge pull request #9247 from frederic34/missingReturn ... return comment	2018-08-16 00:35:39 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Philippe GRAND	57f51fda3e	Standardize	2018-08-15 12:48:13 +02:00
Frédéric FRANCE	5146ab9177	trim	2018-08-14 15:34:44 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Philippe GRAND	e35da2f84d	Standardize code	2018-08-14 09:55:58 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Frédéric FRANCE	62db9a4022	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 19:54:03 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Laurent Destailleur	1b20d6feab	Merge pull request #9214 from atm-greg/Add_supplier_product_description ... NEW Can record the supplier product description	2018-08-12 18:56:27 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
Frédéric FRANCE	b00164ca39	test phpcs v3	2018-08-09 11:03:50 +02:00
Frédéric FRANCE	5f4d54ede5	correct space	2018-08-07 17:17:58 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
atm-greg	294045daed	update description without multicurrency	2018-08-07 10:16:04 +02:00
atm-greg	ad5f59822e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description	2018-08-07 09:33:30 +02:00
atm-greg	fc705e8510	Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description	2018-08-07 09:31:41 +02:00
atm-greg	08273612d9	create field without migration	2018-08-06 17:21:20 +02:00
atm-greg	a8b33a1710	New fields desc_supplier on product_fourn_prices	2018-08-06 16:26:25 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include ... Include and co are statements	2018-08-02 11:03:44 +02:00
Frédéric FRANCE	7dada7ae8e	fix #8820	2018-07-29 09:15:42 +02:00
Frédéric FRANCE	6cb0fb10d6	trim trailing	2018-07-26 19:05:34 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Philippe GRAND	efa6ad0659	Clean and update code	2018-07-25 19:05:40 +02:00
Philippe GRAND	ff04cb64c0	Clean and update code	2018-07-25 15:36:50 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	d871b8964f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:40 +02:00
Laurent Destailleur	e9eb8da61b	Update replenish.php	2018-07-24 18:09:50 +02:00
Philippe GRAND	74704acbcb	clean and update code	2018-07-18 16:13:13 +02:00
Laurent Destailleur	19bb8a5091	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/accountancy.lang	2018-07-18 14:12:28 +02:00
Laurent Destailleur	33d67ea332	Fix ref on list	2018-07-18 14:09:44 +02:00
gauthier	33aa373362	FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing	2018-07-16 15:27:37 +02:00
Laurent Destailleur	3eac1f410d	Merge pull request #8983 from atm-greg/Add_hook_on_replenish ... Add hook on replenish	2018-07-16 10:02:26 +02:00
Laurent Destailleur	20e360e918	Start to introduce array fields for products	2018-07-15 18:22:26 +02:00
Laurent Destailleur	e4be3ab954	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-13 09:09:51 +02:00
Laurent Destailleur	52dee71b39	Responsive	2018-07-12 18:06:06 +02:00
Laurent Destailleur	6eb9f13ec2	Fix warning	2018-07-11 10:01:26 +02:00
Laurent Destailleur	5f52dfa873	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-10 14:02:40 +02:00
Laurent Destailleur	d5cb2fc4cd	Update productcustomerprice.class.php	2018-07-09 17:04:50 +02:00
Laurent Destailleur	551e2efe86	Update productcustomerprice.class.php	2018-07-09 17:03:55 +02:00
Regis Houssin	e8afd7e833	Fix: use "supplier" instead "reseller"	2018-07-07 08:48:26 +02:00
Regis Houssin	1522a5b22d	Fix: differentiate customer prices from supplier prices sharing	2018-07-07 08:43:59 +02:00
Philippe GRAND	1e565486d8	fix : typo and update code	2018-07-06 19:17:11 +02:00
Laurent Destailleur	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	4db7e04523	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.formactions.class.php htdocs/loan/index.php	2018-07-06 16:09:32 +02:00
Laurent Destailleur	2cdd9adc6e	Merge pull request #9023 from atm-maxime/fix_stocklist ... Fix filters not saved when ordering	2018-07-06 14:23:10 +02:00
Laurent Destailleur	fb84211714	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 12:45:44 +02:00
Laurent Destailleur	b369585e61	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/product/stats/commande.php htdocs/product/stats/commande_fournisseur.php htdocs/product/stats/contrat.php htdocs/product/stats/facture.php htdocs/product/stats/facture_fournisseur.php htdocs/product/stats/propal.php htdocs/product/stats/supplier_proposal.php	2018-07-05 15:57:27 +02:00
Laurent Destailleur	0587e73272	FIX Pagination on related item pages	2018-07-05 15:53:28 +02:00
Laurent Destailleur	d8c7c61951	Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into ... hregis-8.0_canvas # Conflicts: # htdocs/product/canvas/product/tpl/list.tpl.php	2018-06-30 18:29:08 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Regis Houssin	f3d213bab8	Fix: remove old code	2018-06-30 11:05:13 +02:00
Regis Houssin	debec3d175	Fix: remove old code of canvas ... Conflicts: htdocs/product/list.php	2018-06-30 11:03:02 +02:00
Regis Houssin	62a55e10b7	Fix: remove not used list template	2018-06-30 10:58:28 +02:00
Regis Houssin	718cbce8eb	Fix: use "visible" field name instead "checked"	2018-06-30 10:58:08 +02:00
Regis Houssin	96faf7cb0f	Fix: use the new title	2018-06-30 10:55:15 +02:00
Regis Houssin	5b491a4d57	Fix: remove duplicate code	2018-06-30 10:55:01 +02:00
Regis Houssin	ebfd1846a3	Fix: add new field "checked"	2018-06-30 10:54:46 +02:00
Regis Houssin	3a26443546	Fix: remove unused code ... Conflicts: htdocs/product/list.php	2018-06-30 10:53:40 +02:00
Regis Houssin	e392610f46	Fix: missing banner	2018-06-30 10:52:51 +02:00
Regis Houssin	f998f64db0	Works on use new list engine instead template for canvas ... Conflicts: htdocs/product/list.php	2018-06-30 10:52:26 +02:00
Laurent Destailleur	f9b46ee0fa	Merge pull request #8818 from wdammak/patch-6 ... NEW Add link to inventory code	2018-06-30 01:19:50 +02:00
Laurent Destailleur	a850e91bcb	Merge pull request #9017 from grandoc/new_branch_27_06_2018 ... clean and update code	2018-06-29 19:41:22 +02:00
Maxime Kohlhaas	3babdb9798	Fix filters not saved when ordering	2018-06-28 13:45:30 +02:00
Laurent Destailleur	da138db528	FIX combo into popup become crazy with IE10 ... Conflicts: htdocs/asset/card.php htdocs/modulebuilder/template/myobject_card.php	2018-06-28 12:16:12 +02:00
Laurent Destailleur	3ea2d81279	FIX combo into popup become crazy with IE10	2018-06-28 12:05:02 +02:00
Philippe GRAND	a952b46d8b	clean and update code	2018-06-27 12:37:31 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	36402c22ee	FIX SQL Injections reported by mu shcor (ADLab of Venustech)	2018-06-25 14:06:09 +02:00
Laurent Destailleur	e9b4141dd9	Fix syntax error	2018-06-23 17:11:19 +02:00
Laurent Destailleur	2db2ea3627	Fix colspan	2018-06-23 15:13:39 +02:00
Laurent Destailleur	dbb90e80a3	Fix syntax error	2018-06-23 12:57:41 +02:00
Laurent Destailleur	eb88f1e5c9	Fix look and feel v8	2018-06-23 12:41:03 +02:00
Laurent Destailleur	be2309c70f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-22 22:54:11 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Laurent Destailleur	02fbe4a84c	Merge pull request #8991 from hregis/develop_product ... Fix: avoid Warning: A non-numeric value encountered	2018-06-22 15:52:05 +02:00
Laurent Destailleur	6f1101a2d6	Update card.php	2018-06-22 15:51:26 +02:00
Laurent Destailleur	1bf0432a72	Merge pull request #8997 from ptibogxiv/patch-29 ... add minute to duration services	2018-06-22 15:12:57 +02:00
Laurent Destailleur	0f80508be1	Fix canvas on list is a feature going in the wall so i clean this.	2018-06-22 14:51:47 +02:00
ptibogxiv	a6151ee11e	add minute to duration services ... add minute for duration description (more compliant thant 0,166667h for billing services by minute	2018-06-20 12:10:25 +02:00
Regis Houssin	b9fe6f8624	Fix: avoid warning	2018-06-19 19:00:23 +02:00
Regis Houssin	2c927dba01	Fix: wrong var name "shownav"	2018-06-19 18:33:22 +02:00
Regis Houssin	b9893bde1d	Fix: avoid Warning: A non-numeric value encountered	2018-06-19 18:26:37 +02:00
atm-greg	df056980b5	fix bad result on fetch ProductStockEntrepot	2018-06-19 10:46:07 +02:00
Laurent Destailleur	edd7499375	Fix clone with new architecture	2018-06-19 09:21:23 +02:00
Laurent Destailleur	5b019eb985	Merge pull request #8982 from hregis/7.0_bug6 ... Fix: "libelle" is deprecated, use "label" instead	2018-06-18 14:32:35 +02:00
Regis Houssin	54a333c374	Fix: use label instead libelle	2018-06-18 13:54:14 +02:00
Regis Houssin	494d6dcfef	Fix: libelle is deprecated, use label instead	2018-06-18 13:50:58 +02:00
atm-greg	2cdae2ec98	remove globalcard context	2018-06-18 11:30:38 +02:00
Laurent Destailleur	7981bd08b7	Fix price+sql error when adding product when no supplier price defined	2018-06-16 14:47:33 +02:00
atm-greg	72449ddef4	add hooks on stock replenish	2018-06-15 16:55:23 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
fappels	a86c90fed1	Fix Wrong error for duplicate ref if barcode enabled but not set.	2018-06-12 16:38:42 +02:00
fappels	141d19571c	Add modify trigger to barcode modify.	2018-06-06 17:11:34 +02:00
Laurent Destailleur	eaee252a5d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-04 12:56:12 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
fappels	e0f9605483	Fix add missing properties for trigger	2018-06-03 11:05:02 +02:00
Laurent Destailleur	be2c49d490	Fix log	2018-06-01 17:39:07 +02:00
Laurent Destailleur	0503373e31	Avoid error on screen	2018-05-31 09:49:46 +02:00
Laurent Destailleur	51b5f63ce8	Merge pull request #8880 from wdammak/patch-14 ... Add movement generateDocument function (mode dev)	2018-05-29 11:15:00 +02:00
Laurent Destailleur	cf5f7bf06d	Update price.php	2018-05-29 10:52:55 +02:00
Laurent Destailleur	f473607249	Merge branch 'develop' into patch-15	2018-05-29 10:49:28 +02:00
wdammak	9ec6387a63	Add movement generateDocument function (mode dev)	2018-05-28 05:21:53 +01:00
Frédéric FRANCE	022d457284	loadlangs	2018-05-27 00:06:49 +02:00
Frédéric FRANCE	d986909109	loadlangs	2018-05-26 23:52:52 +02:00
Frédéric FRANCE	58e5715ac3	loadlangs	2018-05-26 17:57:30 +02:00
Frédéric FRANCE	a487cf6806	Update price.php	2018-05-26 15:15:38 +02:00
jean	fb96857b73	use dayhour instead of % format	2018-05-25 15:33:27 +02:00
jean	eb39e5746e	Merge remote-tracking branch 'origin/develop' into dev_datepricefour	2018-05-25 15:32:15 +02:00
Laurent Destailleur	823936ef87	Merge pull request #8847 from frederic34/multipriceqty ... NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-25 12:55:02 +02:00
Laurent Destailleur	9d407cdc03	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 11:27:04 +02:00
Laurent Destailleur	0e6aa3def3	Fix duplicate deprecated file	2018-05-25 11:26:50 +02:00
Laurent Destailleur	cbe54e596b	Merge pull request #8817 from wdammak/patch-5 ... Add generateDocument function to entrepot class	2018-05-25 11:08:43 +02:00
Laurent Destailleur	f416f9629e	Merge pull request #8840 from all3kcis/patch-9 ... Add oldcopy on productlot::update()	2018-05-25 10:22:18 +02:00
Laurent Destailleur	b9fbf13eba	Fix look and feel v8	2018-05-25 09:36:49 +02:00
Laurent Destailleur	23e2bb20d9	Look and feel v8	2018-05-24 12:32:04 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
Frédéric FRANCE	0623ff7667	fix logic	2018-05-24 11:56:19 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
All3kcis	4bfd8b5539	Add oldcopy on productlot::update()	2018-05-23 10:38:24 +02:00
jean	1ab5eece6b	Adding code to show update date of supplier price shown	2018-05-22 09:40:49 +02:00
Laurent Destailleur	de84f0e687	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/actions_massactions.inc.php htdocs/filefunc.inc.php	2018-05-21 23:35:09 +02:00
wdammak	90881fe488	Add link to inventory code	2018-05-18 16:32:46 +01:00
wdammak	5fef8c2dc1	Add generateDocument function to entrepot class	2018-05-18 14:59:42 +01:00
Laurent Destailleur	429efcc979	Merge pull request #8772 from wdammak/patch-2 ... Documents generes movement warehouse	2018-05-18 12:20:58 +02:00
Laurent Destailleur	b5f37b2876	Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling ... Fix product vat update error handling	2018-05-18 12:00:03 +02:00
fappels	90d2ccc79c	Fix product vat update error handling ... Product vat update does not show update error if update result negative.	2018-05-17 21:29:15 +02:00
wdammak	c0e5132108	Documents generes movement warehouse	2018-05-09 15:07:11 +01:00
wdammak	e62426546d	Add Documents generes	2018-05-09 15:02:46 +01:00
BENKE Charlene	8ed3b3e49c	Update product.class.php	2018-05-06 22:12:43 +02:00
BENKE Charlene	70c9ed960d	let's play with hook	2018-05-06 22:11:24 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
Laurent Destailleur	44cb60e61d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-05 13:25:00 +02:00
Laurent Destailleur	f6ca1eb624	Fix permission name	2018-05-05 13:24:46 +02:00
Laurent Destailleur	634e58b7c9	Look and feel v8	2018-05-04 18:24:00 +02:00
fappels	db76fd7895	Fix delete all product variants of a parent product ... User object missing	2018-05-02 22:33:23 +02:00
BENKE Charlene	5ac0f77d0e	Add trigger for virtual stock ... Allow to add/sustract some qty for GPAO OF running	2018-05-02 17:29:31 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Laurent Destailleur	aafab12f4b	Debug API for ticket module	2018-04-29 18:06:31 +02:00
Laurent Destailleur	19d15c79dd	Merge pull request #8673 from frederic34/variantonservice ... NEW Module variant supported on services	2018-04-27 10:01:28 +02:00
Laurent Destailleur	90723357c4	Look and feel v8	2018-04-24 13:50:05 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not ... visible.	2018-04-24 11:37:57 +02:00
Frédéric FRANCE	5f4e2dc565	variant on services	2018-04-24 11:01:17 +02:00
Frédéric FRANCE	657fa48c3f	Update api_products.class.php	2018-04-23 15:31:55 +02:00
Laurent Destailleur	ac89951acd	Merge pull request #8647 from fmarcet/develop ... New: Add same parameters on 'printFieldListTitle' hooks	2018-04-22 19:35:09 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	fec9303d18	Remove useless $var	2018-04-22 18:51:03 +02:00
Laurent Destailleur	411949a6bb	Optimize constructors	2018-04-21 15:08:46 +02:00
Laurent Destailleur	394b988a4e	FIX key in getEntity for supplier proposals	2018-04-21 14:41:31 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	c30b0da07d	Clean code	2018-04-21 12:12:46 +02:00
Laurent Destailleur	cef9782179	Clean defined constant at begin of pages	2018-04-21 12:00:55 +02:00
Ferran Marcet	6ced1a3264	New: Add same parameters on 'printFieldListTitle' hooks	2018-04-20 10:38:16 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	2959dc4a3a	Fix regression	2018-04-15 18:20:04 +02:00
Laurent Destailleur	e2838aa074	NEW Show also size in bytes in tooltip if visible unit is not bytes	2018-04-15 17:58:13 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	fbae4429b7	Clean code for better extrafields management	2018-04-13 12:52:23 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 ... NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Laurent Destailleur	341d1efb11	Fix clear filter must not lose type	2018-04-12 23:42:06 +02:00
Laurent Destailleur	3cecfd02c7	NEW Mutualize code for action="update_extras" ... NEW Can use setValueFrom without user modification field FIX Exclude separators from mandatory extrafields test More code to use the new framework array for extrafields Can use text condition in extrafield visibility	2018-04-12 23:16:23 +02:00
All-3kcis	c35b454455	Fix bug productlot created without entity	2018-04-12 17:13:42 +02:00
All-3kcis	f1d1fdf951	Fix bug when entity=null on DB	2018-04-12 17:11:02 +02:00
All-3kcis	21df700325	Add option to save file with product batch ref ... + use batch number like ref instead of id + debug access to shared link	2018-04-12 15:55:08 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
All-3kcis	f7e58f3c73	Add files management on products lot	2018-04-12 15:10:37 +02:00
Laurent Destailleur	68b4b74d80	Merge pull request #8531 from all3kcis/patch-7 ... Add insertExtraFields into create/update	2018-04-11 16:34:21 +02:00
Laurent Destailleur	701aa53bdd	Update productlot.class.php	2018-04-11 16:33:12 +02:00
All3kcis	00c8593567	remove hook	2018-04-11 14:09:30 +02:00
Laurent Destailleur	7d7c0624d2	Update traduction.php	2018-04-11 12:59:24 +02:00
Laurent Destailleur	eeb2580f32	Fix foreign key error	2018-04-10 22:23:21 +02:00
atm-quentin	809b2a91ed	FIX issue #8037	2018-04-10 16:27:18 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for ... action on CRUD events.	2018-04-10 12:03:01 +02:00
All3kcis	3cc3816391	Add $action before insertExtrafields hook	2018-04-10 10:17:06 +02:00
All3kcis	691e3df1c0	Add insertExtraFields in create	2018-04-10 09:59:07 +02:00
Laurent Destailleur	ff411ed2e5	NEW Add accounting account number on product tooltip	2018-04-08 23:54:04 +02:00
Laurent Destailleur	58bc3e5e74	FIX Ref of supplier invoice in stats page	2018-04-08 23:38:54 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	723ac6fba0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-06 00:02:06 +02:00
Laurent Destailleur	6c409b2670	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-05 18:08:19 +02:00
Laurent Destailleur	9d9f3ddf85	Merge pull request #8502 from ATM-Marc/NEW_create_from_list ... NEW: generalize use of button to create new element from list	2018-04-05 16:40:15 +02:00
Laurent Destailleur	55719cd166	Update card.php	2018-04-05 16:20:50 +02:00
Laurent Destailleur	7c70f9ed03	Fix option STOCK_SUPPORTS_SERVICES	2018-04-03 20:23:47 +02:00
Maxime Kohlhaas	0c3b92f09a	Better fix	2018-04-03 14:53:57 +02:00
Maxime Kohlhaas	39eab6d88d	Fix service creation, right is tested regarding the product type	2018-04-03 14:38:20 +02:00
Regis Houssin	9f7fcdc8bf	Fix: multiple avoid Warning and errors	2018-04-02 10:18:51 +02:00
Laurent Destailleur	a9ac7e1f29	Debug inventory module	2018-03-31 19:20:38 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Laurent Destailleur	f5079276fb	Fix use new extrafield array definition. ... Fix exclude separator from list of fields in lists	2018-03-31 17:52:31 +02:00
Marc de Lima Lucio	0366e645d5	NEW: generalize button to create object from list, for most of the lists	2018-03-30 16:54:38 +02:00
Marc de Lima Lucio	3646374976	NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders	2018-03-28 11:54:21 +02:00
Laurent Destailleur	72cedcf9f3	Removed method fetch_prods() and get_each_prod() not used, keep only ... get_arbo_each_prod() that is better.	2018-03-22 18:01:06 +01:00
Laurent Destailleur	9980a5fbd0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog	2018-03-22 14:08:43 +01:00
Laurent Destailleur	700c69e127	NEW Can set position of images in module tickets ... Mutualize code of method show_photo	2018-03-22 11:46:35 +01:00
fappels	3765bc4775	Fix html escape for edit label	2018-03-22 10:48:03 +01:00
fappels	9e4a66b1a9	Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION	2018-03-22 10:46:54 +01:00
All3kcis	a7e33150ce	add status batch for getNomUrl	2018-03-16 14:09:38 +01:00
All3kcis	c574a74a2e	Add status batch for getNomUrl	2018-03-16 13:59:04 +01:00
All3kcis	1c0fdcda7a	Add status batch for getNomUrl	2018-03-16 13:57:02 +01:00
All3kcis	fd275a636c	Add batch status ... Add batch status, for correct display with getNomUrl	2018-03-16 11:45:46 +01:00
Laurent Destailleur	c962b89495	NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull	2018-03-15 20:46:55 +01:00
Laurent Destailleur	302fed8646	More fa image to replace png picto	2018-03-14 20:08:44 +01:00
Laurent Destailleur	78b0585798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/taxes.php	2018-03-12 19:09:57 +01:00
Laurent Destailleur	55d3e72463	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/contact/class/contact.class.php htdocs/societe/card.php	2018-03-12 19:02:30 +01:00
Laurent Destailleur	d5d6939fd9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/core/class/commonobject.class.php	2018-03-11 19:28:39 +01:00
Laurent Destailleur	43e297b142	Merge pull request #8138 from frederic34/patch-2 ... Update price.php	2018-03-11 18:33:16 +01:00
Laurent Destailleur	64f21b8a3c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2018-03-11 00:10:13 +01:00
Laurent Destailleur	6c9e0e1752	Merge branch '7.0' into 7.0	2018-03-10 21:52:57 +01:00
Laurent Destailleur	905cf112e9	Merge pull request #8327 from tiaris/fix7.0 ... FIX #8289	2018-03-10 18:58:22 +01:00
Laurent Destailleur	6fcc271790	Update product.class.php	2018-03-10 18:57:55 +01:00
Laurent Destailleur	aea3c164ba	Merge pull request #8178 from hregis/7.0_bug2 ... Fix: avoid Warning: A non-numeric value encountered	2018-03-10 18:47:11 +01:00
BadPixxel	44d18027f2	BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709	2018-03-10 15:48:40 +01:00
jean	6793bfae3a	FIX #8289 add a cofoiguration for correct stopck calculation	2018-03-10 14:17:52 +01:00
Laurent Destailleur	212536a3fd	Update list.php	2018-03-10 12:54:20 +01:00
Laurent Destailleur	64f2f324de	Update card.php	2018-03-10 12:52:09 +01:00
Laurent Destailleur	a7f82af352	Update card.php	2018-03-10 12:49:25 +01:00
Maxime Kohlhaas	fd36ade61a	Fix unit in replenish #7225	2018-03-10 11:20:32 +01:00
florian HENRY	1c966d4769	on going	2018-03-09 12:57:58 +01:00
Laurent Destailleur	62a339e582	Minor fix in multicurrency for supplier prices	2018-03-07 14:13:46 +01:00
Laurent Destailleur	cf45f78d7e	Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency ... NEW Add multicurrency support for product buy price for supplier propales, orders and invoices	2018-03-07 13:12:23 +01:00
Laurent Destailleur	14d7ffa53b	Fix cancel and template to record stock movement/correction	2018-03-06 09:07:39 +01:00
Laurent Destailleur	d569adea2f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-05 21:46:40 +01:00
Laurent Destailleur	1537363e59	Fix cancel and template to record stock movement/correction	2018-03-05 21:16:01 +01:00
Laurent Destailleur	c921fde3e5	Update mouvement.php	2018-03-05 20:58:30 +01:00
Alexis ALGOUD	35002cf93d	Merge branch 'develop' into NEW_price_on_stock_mvt	2018-03-05 17:45:27 +01:00
Alexis Algoud	a84990ab78	NEW price in burger menu on mouvement list	2018-03-05 17:43:06 +01:00
Laurent Destailleur	ea5cd4db76	Merge pull request #8250 from ruistrecht-alt/Fix_bad_naming_resotre ... FIX misspelled restore_lastsearch_values	2018-03-02 17:53:33 +01:00
Laurent Destailleur	a3350d12d8	css	2018-03-01 23:51:06 +01:00
Laurent Destailleur	0e7a250060	Fix colspan	2018-03-01 11:53:18 +01:00
Laurent Destailleur	3c903675f2	Fix colspan	2018-02-28 15:29:52 +01:00
Laurent Destailleur	5ef7bee030	Use combo for selection of categories into virtual product edition	2018-02-28 15:27:21 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Laurent Destailleur	6bec121c9f	Use name of var	2018-02-27 13:26:57 +01:00
Rui Strecht	5b925a5912	Fix misspelled restore_lastsearch_values	2018-02-27 11:08:23 +00:00
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
Laurent Destailleur	19ae24f693	Code comment	2018-02-26 21:03:52 +01:00
kkhelifa-opendsi	90f4c985f6	Merge branch 'develop' into product_supplier_buyprice_multicurrency	2018-02-26 09:54:09 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	2cd5ed65a6	Clean deprecated (field unit_charge in supplier price)	2018-02-25 14:13:09 +01:00
Regis Houssin	b216249214	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
Laurent Destailleur	0a79550f43	Fix oldcopy must be saved before update_extras	2018-02-23 16:11:00 +01:00
KHELIFA	54dba24ab5	Add multicurrency support for product buy price for supplier propales, orders and invoices	2018-02-23 11:06:07 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	809ef1bd00	FIX Trigger *_MODIFY must be called when editing a property event extra. ... Clean duplicate trigggers "*_CLONE"	2018-02-20 18:09:38 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	f0855da0fb	Fix responsive	2018-02-15 12:57:04 +01:00
Laurent Destailleur	f1a9f81fb4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang	2018-02-14 22:19:59 +01:00
Laurent Destailleur	7f8cbc0f62	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/adherents/type.php htdocs/contrat/services.php htdocs/contrat/tpl/linkedobjectblock.tpl.php htdocs/install/upgrade2.php	2018-02-14 22:08:18 +01:00
Laurent Destailleur	23ee6748f7	Update fournisseurs.php	2018-02-14 20:36:13 +01:00
Laurent Destailleur	4f369bd746	NEW Can force usage of shared link for photo of products	2018-02-13 16:34:43 +01:00
Laurent Destailleur	36ac380cac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 22:26:48 +01:00
Laurent Destailleur	00a8be22a2	Fix field too small	2018-02-12 22:11:43 +01:00
Regis Houssin	24cc687724	Fix: you can't check "fournisseur" with checkUserAccessToObject without ... object ID	2018-02-12 09:28:41 +01:00
Regis Houssin	40fe3849dc	Fix: avoid Warning: A non-numeric value encountered	2018-02-12 08:21:35 +01:00
Laurent Destailleur	6bdb82cf27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/societe/class/api_thirdparties.class.php	2018-02-12 04:15:47 +01:00
Laurent Destailleur	7f4adb7f97	Update card.php	2018-02-12 03:23:57 +01:00
Regis Houssin	3525306cc4	Fix: wrong var name	2018-02-11 13:29:37 +01:00
Regis Houssin	86df1ddd0a	Fix: uniformize user rights check	2018-02-11 13:27:02 +01:00
Regis Houssin	01b3b8e09e	Fix: check perms by type of product	2018-02-11 12:09:12 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Laurent Destailleur	03b10041db	Fix missing contextpage	2018-02-08 13:27:43 +01:00
Frédéric FRANCE	9f7496ce04	Update price.php	2018-02-05 17:47:29 +01:00
Laurent Destailleur	fe57cf697f	Fix init category selected	2018-02-04 14:35:38 +01:00
Laurent Destailleur	ec15048964	Fix init category selected	2018-02-04 14:34:31 +01:00
Laurent Destailleur	fae7616281	Fix update price when updating products	2018-02-01 21:20:54 +01:00
Laurent Destailleur	e79f6fda2b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-26 01:23:18 +01:00
Laurent Destailleur	2c0eeaf8de	FIX #8093	2018-01-25 20:57:51 +01:00
Laurent Destailleur	39c4df723a	Fix error management when setting product accounts	2018-01-22 21:07:10 +01:00
Laurent Destailleur	23494a9dd4	Update product.php	2018-01-20 12:53:30 +01:00
All-3kcis	a58a3f893d	Fix #8058	2018-01-19 10:21:48 +01:00
Laurent Destailleur	3c3402bc60	Debug API for prices of products	2018-01-14 15:58:04 +01:00
Laurent Destailleur	8b972313ae	Fix scrutinizer	2018-01-12 15:38:53 +01:00
Laurent Destailleur	f0a10cdcc1	Missing backlink	2018-01-12 10:32:48 +01:00
Laurent Destailleur	af6b84ba3a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/contact/document.php htdocs/product/list.php	2018-01-11 01:03:13 +01:00
Laurent Destailleur	9827358002	Merge pull request #8040 from atm-florian/dev_fixsecu ... fix #7963	2018-01-11 00:44:45 +01:00
Laurent Destailleur	4747e84b74	Update price.php	2018-01-11 00:40:33 +01:00
Laurent Destailleur	b5fe953a64	Merge pull request #8035 from pdermody/6.0 ... Fix #8034 - Surface and volume units are calculated incorrectly	2018-01-11 00:36:00 +01:00
HENRY Florian	5af39e80e0	Update price.php	2018-01-10 20:38:06 +01:00
Laurent Destailleur	43d560830c	Fix on old php	2018-01-10 13:20:43 +01:00
florian HENRY	fdedd6f75b	fix 7963	2018-01-08 20:54:40 +01:00
Paul Dermody	a1ac285a25	Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet.	2018-01-07 12:42:14 -06:00
Laurent Destailleur	301f509611	Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update ... FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false	2018-01-04 21:03:20 +01:00
Laurent Destailleur	e4d37c3e23	Merge pull request #8012 from ATM-Nicolas/fix_product_best_price ... Fix product best price	2018-01-04 20:58:59 +01:00
gauthier	58470e0913	FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false	2018-01-04 12:01:21 +01:00
Laurent Destailleur	c7798d11ce	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-01-03 20:13:17 +01:00
ATM-Nicolas	2e6c036ad8	Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price	2018-01-02 17:22:53 +01:00
ATM-Nicolas	61efda4cbd	FIX : product best price on product list	2018-01-02 17:21:04 +01:00
Laurent Destailleur	644e8b5a05	Fix navigation on stock	2017-12-24 15:02:15 +01:00
Laurent Destailleur	e6c7f9e69b	Debug module inventory	2017-12-22 21:29:09 +01:00
Laurent Destailleur	f0c8b548f3	Fix bugs reported by scrutinizer	2017-12-22 14:24:31 +01:00
Laurent Destailleur	493669e986	Fix look and feel v7	2017-12-22 14:19:12 +01:00
Laurent Destailleur	2b056b0177	BUG Fix of old hidden feature price per quantity	2017-12-22 12:53:46 +01:00
Laurent Destailleur	27a9a81f99	Fix link to contracts	2017-12-21 23:48:33 +01:00
Laurent Destailleur	eab44f62b1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2017-12-21 14:35:33 +01:00
Laurent Destailleur	6a62e13960	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
Frédéric FRANCE	ab558ee5fa	Update product.php	2017-12-14 09:49:55 +01:00
Laurent Destailleur	247c380d18	Several fixes	2017-12-12 16:11:40 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	f85e79e250	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/filefunc.inc.php htdocs/holiday/class/holiday.class.php	2017-12-08 13:13:53 +01:00
Laurent Destailleur	8dc3d7323d	Merge pull request #7923 from fmarcet/6.0 ... FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable	2017-12-08 13:02:07 +01:00
Laurent Destailleur	9b9b5adf66	Fix must be compatible with old and new storage location	2017-12-08 13:01:45 +01:00
Laurent Destailleur	08abb1490a	Remove code using not defined var	2017-12-08 12:54:08 +01:00
Ferran Marcet	bfc476a118	FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable	2017-12-07 18:44:33 +01:00
Ion	669e080670	More informative error message in dynamics price	2017-12-06 14:51:29 +01:00
Laurent Destailleur	2458244ee3	Fix css	2017-12-02 16:24:38 +01:00
Laurent Destailleur	0a6633da6e	Fix error message	2017-12-02 15:56:56 +01:00
Laurent Destailleur	fa8b913d24	Change order or field	2017-12-02 11:24:33 +01:00
Laurent Destailleur	e8327fd9a1	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
Laurent Destailleur	64d29709d5	FIX #7881 error not reported/blocking when subprodut need lot	2017-12-01 18:12:29 +01:00
Laurent Destailleur	4969ae2abb	Fix missing the badge on virtual product tab	2017-12-01 17:48:51 +01:00
Laurent Destailleur	a832bbb348	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/facture/stats/index.php	2017-12-01 16:18:03 +01:00
Laurent Destailleur	471f99c24c	Fix look and feel v7	2017-12-01 15:58:35 +01:00
Laurent Destailleur	46b015d205	Fix usage of option STOCK_SUPPORTS_SERVICES	2017-12-01 13:40:24 +01:00
Laurent Destailleur	a0231b5c60	Fix responsive	2017-12-01 12:55:28 +01:00
root	b7f26ea788	FIX add line bad price and ref	2017-11-30 11:10:01 +01:00
Laurent Destailleur	c1e6d35ca5	Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search ... factorization of extrafields into list	2017-11-28 12:14:47 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Scrutinizer Auto-Fixer	aab2799981	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-11-27 13:48:36 +00:00
Laurent Destailleur	ffe2be377c	Fix navigation	2017-11-26 20:43:37 +01:00
Laurent Destailleur	a0406bc741	Standardize view of events for products	2017-11-26 20:24:20 +01:00
Laurent Destailleur	ae906270f3	Debug module variant	2017-11-26 18:43:43 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Laurent Destailleur	aaf08ade2f	Fix bug reported by scrutinizer	2017-11-25 11:21:31 +01:00
Laurent Destailleur	831099fef8	Debug modulebuilder	2017-11-24 16:24:42 +01:00
Laurent Destailleur	5ee85821fc	Debug modulebuilder	2017-11-24 15:47:38 +01:00
Laurent Destailleur	9f235e1ff6	Standardize database: field ref of warehouse was renamed label -> ref	2017-11-24 15:27:00 +01:00
Laurent Destailleur	9c22b5f335	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = ... Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	405275693f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/replenishorders.php htdocs/projet/activity/perday.php	2017-11-17 14:20:08 +01:00
Laurent Destailleur	a6e4e4ddb0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/product/stock/replenishorders.php	2017-11-17 14:17:49 +01:00
Laurent Destailleur	fde33594a2	FIX #7824	2017-11-17 14:06:08 +01:00
Laurent Destailleur	7f28c9fff6	FIX #7824 ... Conflicts: htdocs/product/stock/replenishorders.php	2017-11-17 14:01:21 +01:00
Laurent Destailleur	57a6ada2a3	FIX #7824	2017-11-17 13:57:40 +01:00
Laurent Destailleur	25a2e6f577	FIX #7824	2017-11-17 13:56:41 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
florian HENRY	e195cf0b95	fix : return vat code for supplier price	2017-11-14 09:53:06 +01:00
Laurent Destailleur	b5196b7164	FIX A lot of several fix on local taxes and NPR tax	2017-11-13 14:24:40 +01:00
Laurent Destailleur	955ed7dbbf	NEW Show the supplier ref into supplier cards	2017-11-12 15:30:21 +01:00
Laurent Destailleur	186c8cdbf0	Fix selection of contact into creation of event	2017-11-12 13:40:05 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	7e1e710d28	Merge pull request #7796 from IonAgorria/fix-price-dynamic ... Fix: price dynamic bugs	2017-11-11 17:49:00 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Ion	cb463d186a	Error when fetching empty expression	2017-11-10 12:32:54 +01:00
Ion	fdf260a1da	Use __METHOD__ on dynamic prices syslog	2017-11-10 12:32:54 +01:00
Ion	f642289160	Add missing arg in supplier min price	2017-11-10 12:32:49 +01:00
Ion Agorria	aa0b811f73	Undefined variable detection in price parser	2017-11-09 17:12:55 +01:00
Ion	e528a82051	Remove price dynamic internal var	2017-11-09 17:12:55 +01:00
Laurent Destailleur	e7abc92f97	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/transfer.php htdocs/core/lib/functions.lib.php	2017-11-06 21:37:19 +01:00
Laurent Destailleur	6eb2204c2b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: ChangeLog htdocs/filefunc.inc.php htdocs/product/list.php	2017-11-06 21:20:06 +01:00
Laurent Destailleur	34bd785785	Prepre 7.0 (not stable code hidden)	2017-11-06 09:30:30 +01:00
Laurent Destailleur	fa999dfa65	Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant ... NEW Accountancy Add variant on sell account for intracommunity sales & export sales	2017-11-06 09:25:14 +01:00
Laurent Destailleur	141bef0b8a	Fix translation and css	2017-11-04 15:21:35 +01:00
Maxime Kohlhaas	e992e4bea5	Fix : type was forced to 0 so service are not in the list	2017-11-03 09:09:07 +01:00
Maxime Kohlhaas	13667e4850	Fix display of product/service list	2017-11-03 08:56:23 +01:00
Alexandre SPANGARO	2d17e4094c	Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant ... # Conflicts: # htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-11-03 06:18:27 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
Alexandre SPANGARO	8d3beef161	Add fields in product card	2017-11-01 07:19:36 +01:00
fappels	3f5112ff48	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update	2017-10-31 16:49:54 +01:00
fappels	f7df9e1d1f	Fix travis	2017-10-31 16:49:39 +01:00
fappels	a9ceb46f97	Add parameter to load all lot from lines of object in cache ... If you want use the lot stock selector in mutiple lines you can add lines array. If you don't give a product id or a lines array, no lot numbers will be loaded.	2017-10-29 20:40:56 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. ... Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Laurent Destailleur	8058712d47	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/contrat/class/contrat.class.php htdocs/product/list.php	2017-10-26 17:06:11 +02:00
Laurent Destailleur	67208b111d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/facture.php htdocs/expedition/card.php htdocs/product/list.php	2017-10-26 17:02:40 +02:00
Laurent Destailleur	6163a3d54d	Code comment	2017-10-26 16:57:17 +02:00
Laurent Destailleur	0efd118d43	Fix hook on product list	2017-10-26 16:50:38 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Laurent Destailleur	d2f723045c	Work on website and modulebuilder	2017-10-24 17:30:05 +02:00
fappels	7f7e621ea9	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update	2017-10-24 10:53:34 +02:00
fappels	fe2acb2cb6	Add form select for lot numbers	2017-10-23 22:17:24 +02:00
Laurent Destailleur	285203ed0e	Reduce diplicate code	2017-10-22 17:00:35 +02:00
Laurent Destailleur	36ad17cc95	Work on module builder	2017-10-22 16:45:18 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	4a1834ee29	#7411	2017-10-22 04:23:17 +02:00
Laurent Destailleur	c9fceaad3c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/index.php htdocs/fourn/facture/card.php	2017-10-22 04:04:26 +02:00
Laurent Destailleur	030cea6a0f	Merge pull request #7664 from frederic34/patch-1 ... keep vat input with multiprices product creation	2017-10-22 02:42:44 +02:00
Laurent Destailleur	19a5780f7f	Clean code	2017-10-20 23:49:20 +02:00
Laurent Destailleur	abd5251330	Better responsive	2017-10-19 19:53:29 +02:00
Frédéric FRANCE	5afd2695fb	keep vat input with multiprices product creation	2017-10-19 18:33:15 +02:00
florian HENRY	b0c68ddc61	fix displaying accountancy code	2017-10-19 12:35:59 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Laurent Destailleur	347883b7be	Code comment	2017-10-18 10:39:36 +02:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	33624e1001	NEW Attaching doc automatically in email is now a parameter of template.	2017-10-08 16:34:42 +02:00
Laurent Destailleur	df2f73bdc3	Fix quick search on product/services	2017-10-07 20:36:32 +02:00
Laurent Destailleur	e40bffb0d5	Fix bug reported by scrutinizer	2017-10-07 20:21:47 +02:00
Laurent Destailleur	8e0da9bfeb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/document.php	2017-10-04 13:32:53 +02:00
Regis Houssin	45de1ca21e	Fix: check security	2017-10-03 19:09:46 +02:00
Regis Houssin	4537e5472b	Fix: refactorization of "getListForItem" function	2017-10-03 19:01:54 +02:00
Regis Houssin	ed5dca652d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi	2017-10-03 17:32:40 +02:00
Laurent Destailleur	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
Regis Houssin	f8f4ff6d21	Fix: missing include api_categories class	2017-10-03 13:07:07 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
arnaud	8866683a72	Merge branch '6.0' of github.com:Dolibarr/dolibarr into FIX_replenish_stock_line_0	2017-09-27 10:55:49 +02:00
arnaud	7f807986d7	FIX replenish if line test GETPOST on line 0	2017-09-27 10:53:29 +02:00
Laurent Destailleur	f1a563625b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-09-26 22:11:00 +02:00
Laurent Destailleur	d7dd6ed334	Fix undefined var	2017-09-26 16:15:22 +02:00
Laurent Destailleur	1002923dea	Fix css	2017-09-26 10:58:24 +02:00
Laurent Destailleur	7f420f3246	Complete vat rates for india	2017-09-26 10:54:07 +02:00
Laurent Destailleur	4f76545b62	Add missing fields to manage localtax on supplier products	2017-09-26 10:47:08 +02:00
Laurent Destailleur	5482f80c0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-26 10:30:47 +02:00
Laurent Destailleur	59571b1ce1	FIX #7473 Mass update of vat rates and other bugs on localtax	2017-09-26 10:29:44 +02:00
Laurent Destailleur	051ca6fdc4	Merge pull request #7162 from hguibourgdev/patch-5 ... NEW Can show stock in alert even if alter is set to 0	2017-09-25 18:17:18 +02:00
Regis Houssin	16941f1d9d	Fix: uniformize code	2017-09-25 16:46:13 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Laurent Destailleur	934edd9f5a	Merge branch 'develop' into 6.0-api	2017-09-24 22:01:07 +02:00
Laurent Destailleur	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Laurent Destailleur	fc5c9ad2f2	Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling ... Fix batch required for lot product error message.	2017-09-20 17:33:05 +02:00
Regis Houssin	77fea1983c	Fix: wrong supplier product price id	2017-09-20 16:57:38 +02:00
Laurent Destailleur	1e33495f42	Fix remove warnings	2017-09-19 00:31:51 +02:00
Regis Houssin	cdd1473cfa	Fix: avoid Warning: A non-numeric value encountered	2017-09-18 16:30:01 +02:00
Laurent Destailleur	291a0d46e6	Fix edit of categories	2017-09-18 01:39:39 +02:00
Laurent Destailleur	dece156a99	NEW Add supplier proposals into stats of product page.	2017-09-17 18:08:43 +02:00
Laurent Destailleur	a3c555049d	NEW Add supplier proposals into stats of product page.	2017-09-17 18:08:23 +02:00
Laurent Destailleur	ad40d27324	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php	2017-09-16 12:22:18 +02:00
Laurent Destailleur	8773a6860f	Fix HTML5 use of <br> is preferred to <br />	2017-09-15 23:49:04 +02:00
Laurent Destailleur	48ae76e295	Fix picto on service	2017-09-15 19:13:40 +02:00
Laurent Destailleur	55e31796d2	Code comment	2017-09-15 19:08:39 +02:00
Josep Lluís	c43515f484	Fix: Custom info view in services ... In services view, custom info should be hide. Also, Nature field is moved and grouped with product fields	2017-09-15 17:11:03 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	f5d2283093	USe second parameter in GETPOST	2017-09-15 10:52:53 +02:00
Laurent Destailleur	0873260b8a	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
Laurent Destailleur	8f5206accf	NEW The lot of a product uses the link and picto when shown into list.	2017-09-15 10:45:41 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	149ab80b3a	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
Laurent Destailleur	724817139d	Start remove $GLOBALS	2017-09-12 19:49:07 +02:00
Laurent Destailleur	939d33cce7	Fix bug reported by scrutinizer	2017-09-12 19:12:39 +02:00
Laurent Destailleur	47d2350ad4	Fix bugs reported by scrutinizer	2017-09-12 19:03:12 +02:00
Laurent Destailleur	d572e1ddad	Fix duration output	2017-09-12 17:30:18 +02:00
fappels	681c2a67bd	Fix batch required for lot product error message.	2017-09-11 23:22:44 +02:00
Laurent Destailleur	cb0c7d6594	Standardize search field name	2017-09-11 00:10:23 +02:00
Laurent Destailleur	cb7456239b	Remove deprecated file	2017-09-11 00:03:05 +02:00
Laurent Destailleur	cf56da8102	NEW Default filter and sort order can use partial list of query ... parameters to set the qualified URLs.	2017-09-11 00:02:52 +02:00
Laurent Destailleur	4f52871c67	Merge pull request #7345 from AXeL-dev/develop ... fix hidepriceinlabel when using ajax autocompleter	2017-09-08 21:22:38 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	03fe9d4e97	Escape all status	2017-09-08 13:23:12 +02:00
AXeL-dev	a615a46a5a	fix hidepricelabel when using ajax autocompleter	2017-09-08 11:06:55 +01:00
Laurent Destailleur	bde293af22	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
fappels	533881e620	Fix supplier prices not shown when best buy hidden ... only show value if item has supplier	2017-08-25 11:58:34 +02:00
Laurent Destailleur	4337001418	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/societe/list.php	2017-08-24 14:26:45 +02:00
Laurent Destailleur	bf1f60b31e	Merge	2017-08-23 17:14:29 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	6b5b10fc94	FIX #7224	2017-08-23 16:28:34 +02:00
Laurent Destailleur	f3ef6448d7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/admin/supplier_payment.php htdocs/core/lib/ajax.lib.php htdocs/don/admin/donation.php htdocs/product/admin/product.php	2017-08-23 16:11:51 +02:00
Regis Houssin	2492b9968a	Fix: missing scandir	2017-08-23 10:21:10 +02:00
Regis Houssin	6dda2f3670	Fix: "scandir" in url is blocked in some providers	2017-08-23 10:07:00 +02:00
Laurent Destailleur	681623c3ab	Merge branch 'develop' into patch-1	2017-08-22 11:43:25 +02:00
Laurent Destailleur	7d57cd6913	Update productcustomerprice.class.php	2017-08-22 11:38:32 +02:00
Laurent Destailleur	097b660c41	Mutualize code	2017-08-18 16:25:00 +02:00
Laurent Destailleur	e9eefb170f	Merge pull request #7212 from ATM-Marc/NEW_price_formObjectOptions_hook ... NEW hook formObjectOptions in the form setting product selling price	2017-08-17 18:25:30 +02:00
Laurent Destailleur	40b3c7c4d5	Merge pull request #7253 from altatof/fix_restrictedarea_parms ... FIX : same logic for setting fieldvalue and fieldtype	2017-08-17 17:22:36 +02:00
altatof	650e4eaa50	FIX : same logic for setting fieldvalue and fieldtype	2017-08-10 16:41:09 +02:00
Laurent Destailleur	402e6bf650	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/index.php htdocs/compta/paiement/list.php htdocs/core/modules/modCron.class.php	2017-08-04 15:39:00 +02:00
Laurent Destailleur	7c840b8348	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-04 15:32:30 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	c8b79214cd	Fix translation	2017-08-02 14:53:42 +02:00
Laurent Destailleur	025ecd4ecc	Fix default value for inventory code during a stock correction	2017-08-02 14:21:20 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
florian HENRY	53add04a2e	fix :add missing hook into product price card	2017-07-31 10:28:24 +02:00
Marc de Lima Lucio	2cb89b2d8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_price_formObjectOptions_hook	2017-07-27 17:16:58 +02:00
Marc de Lima Lucio	677d50df5b	NEW: add 'formObjectOptions' hook to the form setting the product selling price	2017-07-27 17:11:15 +02:00
Laurent Destailleur	5bf10737d9	Merge branch 'develop' into patch-14	2017-07-25 18:32:36 +02:00
Laurent Destailleur	4ef36746bd	Merge pull request #7199 from hguibourgdev/patch-13 ... NEW : Add toolkit for StockLimit and DesiredStock	2017-07-25 18:31:12 +02:00
Laurent Destailleur	f6ab691c08	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-25 01:22:29 +02:00
Laurent Destailleur	aff61fad7d	Fix new generic classes system	2017-07-25 01:21:20 +02:00
hguibourgdev	6b9d25708b	NEW : Add toolkit for StockLimit	2017-07-24 21:05:21 +02:00
hguibourgdev	e1f8cfd474	NEW : Add toolkit for StockLimit and DesiredStock	2017-07-24 20:59:46 +02:00
Laurent Destailleur	929d14c816	Merge pull request #7078 from atm-florian/dev_prodlist ... NEW : filter on extrafield on product list (as in company list)	2017-07-21 15:15:11 +02:00
hguibourgdev	4b0638dd40	Update list.php ... FIX copy-paste error (sell versus buy)	2017-07-18 14:43:03 +02:00
hguibourgdev	4633d1ae7e	Update list.php ... FIX copy-paste error (sell versus buy)	2017-07-15 19:04:10 +02:00
hguibourgdev	3825e7fd52	Update replenish.php ... FIX ">=" instead of ">" for alert test in order to work when negatif stock are allowed	2017-07-15 18:55:52 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
florian HENRY	8e3c2af7ee	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_prodlist Conflicts: htdocs/accountancy/class/accountancycategory.class.php	2017-07-10 16:16:11 +02:00
fappels	13d6664ab4	Fix delete product from product card	2017-07-09 12:47:51 +02:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
Laurent Destailleur	a9468ad84a	Look and feel v6	2017-07-08 00:42:55 +02:00
Laurent Destailleur	608e9e1c82	Look and feel v6 (no amount symbol into list)	2017-07-07 19:48:35 +02:00
Laurent Destailleur	de24e93cca	Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list ... NEW: Add column with nbr suppliers prices and WAP to product list.	2017-07-07 19:42:25 +02:00
Laurent Destailleur	b7af0cca63	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/list.php htdocs/holiday/card.php	2017-07-07 19:39:57 +02:00
Laurent Destailleur	aa4ff464d6	Merge pull request #7096 from fappels/6.0_fix_virtual_stock_read_rights_third_parties ... FIX: Ignore third party read rights filter for virtual stock calculation.	2017-07-07 19:34:12 +02:00
Laurent Destailleur	4c0fcb2b9a	Fix total with tax does not include local taxes. To solve, i show both ... totals.	2017-07-07 14:58:57 +02:00
Laurent Destailleur	8abec461a6	Fix total with tax does not include local taxes. To solve, i show both ... totals.	2017-07-07 12:31:00 +02:00
fappels	857e45baf3	Fix comment	2017-07-06 15:34:10 +02:00
Laurent Destailleur	95cf36c43b	Fix use the getUrl function instead of hard coded curl	2017-07-04 10:55:53 +02:00
fappels	78283b6a0b	Ignore rights filter for virtual stock calculation.	2017-06-30 17:02:50 +02:00
fappels	989084e4de	WAP always 2 decimals	2017-06-30 10:56:05 +02:00
arnaud	ca6ce2ba8b	FIX status were wrong on product referent list	2017-06-30 10:38:54 +02:00
florian HENRY	53510ac660	NEW : filter on extrafield on product list (as in company list)	2017-06-29 10:14:48 +02:00
Laurent Destailleur	adf281c4f3	Look and feel v6	2017-06-27 17:42:07 +02:00
Laurent Destailleur	6f82837b0f	Fix GETPOST of lang_id	2017-06-27 17:27:01 +02:00
Laurent Destailleur	c213624c14	Fix migration into product_lot	2017-06-27 16:42:37 +02:00
Laurent Destailleur	77ba5a8c24	Fix reception of product interface	2017-06-27 14:02:01 +02:00
fappels	e3f7402e07	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list	2017-06-26 22:45:18 +02:00
fappels	13e5c8ff7a	Create patch ... Add Number of supplier prices and wap columns	2017-06-26 22:44:56 +02:00
Laurent Destailleur	59bd4749a8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php htdocs/product/class/product.class.php	2017-06-24 10:27:10 +02:00
Laurent Destailleur	1211e0d7ab	FIX vat code not saved during product creation.	2017-06-23 12:09:21 +02:00
Laurent Destailleur	4102403482	Look and feel v6	2017-06-21 11:37:34 +02:00
Laurent Destailleur	bb2d27280b	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Laurent Destailleur	abe736c6a6	Escape hml tags	2017-06-18 19:42:59 +02:00
BENKE Charlene	e98bc90489	introduce OZ : once weight	2017-06-17 10:18:59 +02:00
Laurent Destailleur	b889db997a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php	2017-06-14 10:48:34 +02:00
Laurent Destailleur	e4c7f584e3	Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should)	2017-06-13 11:45:21 +02:00
Laurent Destailleur	5def2d2600	Add div to help debug of html content	2017-06-13 11:14:52 +02:00
phf	b67a14c7d6	Fix ajax search product is broken	2017-06-13 10:20:26 +02:00
Laurent Destailleur	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +02:00
Laurent Destailleur	64a6ff9687	Fix test for navigation disabling for external users	2017-06-12 16:26:25 +02:00
Laurent Destailleur	cd08690646	Fix ajax search product that return bad json response	2017-06-12 12:42:06 +02:00
Laurent Destailleur	8f7371cdf0	Product has 2 status. Add span to differentiate for css	2017-06-12 12:24:42 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
Laurent Destailleur	1af74b4c42	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-06-09 12:50:56 +02:00
Laurent Destailleur	1935de03c7	Fix bad consistency of labels	2017-06-09 12:01:55 +02:00
Laurent Destailleur	02781b41ca	Fix several problem with hook printFieldListWhere	2017-06-09 11:02:34 +02:00
Laurent Destailleur	b92980c6ff	Fix statistics on products	2017-06-09 10:38:06 +02:00
Laurent Destailleur	bec6ad9fb3	Fix bad position of hook	2017-06-09 10:22:07 +02:00
Laurent Destailleur	d6ba16d357	Fix missing printFieldListWhere hook	2017-06-09 09:45:22 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
Laurent Destailleur	543630e487	Fix missing count of nb of columns into lists	2017-06-08 14:14:06 +02:00
Laurent Destailleur	7587a3d592	Merge branch 'develop' into develop_transverse	2017-06-08 10:25:04 +02:00
Laurent Destailleur	cfe9d02bc3	Merge pull request #6952 from atm-ph/fix_search_extrafield_on_list ... Fix can't use search on all extrafields on list	2017-06-08 10:18:55 +02:00
Regis Houssin	b183c6e7ac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_transverse	2017-06-07 20:23:24 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	bfd6116e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
phf	707a9e40c0	Fix can't use search on all extrafields on list	2017-06-06 12:01:49 +02:00
Regis Houssin	03df365eea	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 11:01:42 +02:00
Laurent Destailleur	02b5d9e6f7	FIX #6945	2017-06-06 10:53:53 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	77df19009d	Removed duplicated code	2017-06-01 12:11:45 +02:00
Laurent Destailleur	48a6e9e038	Removed not used files	2017-05-30 22:31:57 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	425192ef84	Merge branch 'develop' into 6.0-multijournal	2017-05-29 10:23:46 +02:00
Alexandre SPANGARO	e89c4e9f41	Merge remote-tracking branch 'uptream/develop' into 6.0-pcard	2017-05-25 07:15:03 +02:00
Alexandre SPANGARO	1f079fac9d	Move html.formventilation.class.php to html.formaccounting.class.php	2017-05-25 06:57:28 +02:00
Laurent Destailleur	1a8884bbbe	NEW Can filter on year and product tags on the product statistic page	2017-05-22 15:20:52 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Alexandre SPANGARO	d834cbf7ba	Use getNomUrl for accounting account in product card	2017-05-21 15:24:16 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	e4ec5aa9a9	Merge pull request #6818 from atm-alexis/NEW_poc_list_product_with_listview ... NEW poc list product with listview	2017-05-19 18:21:49 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal ... Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
Laurent Destailleur	f3838ee8f2	Fix limit into message	2017-05-17 18:52:01 +02:00
Laurent Destailleur	c224e2b4f6	Remove table that does not exists	2017-05-17 16:05:26 +02:00
Laurent Destailleur	1d6b4cb28a	Look and feel v6	2017-05-17 15:25:09 +02:00
Laurent Destailleur	a8afa547f0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php	2017-05-17 15:20:17 +02:00
Laurent Destailleur	e2a7b0943f	Clean dead code	2017-05-17 14:52:27 +02:00
Laurent Destailleur	d86b42b024	Missing title, bad css	2017-05-17 14:45:08 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Alexandre SPANGARO	4dc7d5cd8d	Fix : tooltip on bank in customer invoice card	2017-05-14 21:20:35 +02:00
Alexandre SPANGARO	93554b7e30	Typo searchpicto	2017-05-14 21:06:33 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	0d11fce834	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
Laurent Destailleur	5581e5da72	FIX New vat code not correctly implemented if "1 price per customer".	2017-05-12 13:12:17 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	5e54567558	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/skeleton_list.php	2017-05-10 13:30:35 +02:00
Laurent Destailleur	3e0fcf5ec2	Fix label "total for this page" on last page.	2017-05-10 11:57:59 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	6d01bd712d	FIX Better sanitizing of search all parameter.	2017-05-09 19:36:10 +02:00
alexis portable	8272408b6e	fix travis case statement	2017-05-09 14:43:54 +02:00
alexis portable	651ea92657	NEW fix listview class and add a demo for product list	2017-05-09 14:26:47 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Laurent Destailleur	d948447600	Add button to disable all personalized default values in one click.	2017-05-06 17:08:38 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	768df56c07	Uniformize name of standard PDF template	2017-05-04 20:16:55 +02:00
Laurent Destailleur	c196e79bf4	Merge branch 'develop' into FIX_inventory	2017-05-04 13:50:53 +02:00
Laurent Destailleur	1a6c118a5d	Fix travis warning	2017-05-04 12:41:29 +02:00
Laurent Destailleur	8009370f04	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/contact/document.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/repair.sql	2017-05-04 10:01:11 +02:00
alexis Algoud	6138d197e4	FIX major issues for inventory ... - Move all needed declaration from coreobject to commonobject for updateCommon, fetchCommon, deleteCommon, createCommon - Just leave method for child object into coreobject, check later if is useless - debug inventory card, PHP 7.0 compatibility - activate rights for inventory into stock module - add inventory options into stock admin module	2017-05-02 15:19:55 +02:00
Laurent Destailleur	1e3384a842	Fix travis	2017-04-30 14:16:58 +02:00
Laurent Destailleur	072eb740c7	Fix php compatibility	2017-04-30 13:57:13 +02:00
Laurent Destailleur	865c8140d1	Clean code	2017-04-30 03:23:06 +02:00
Laurent Destailleur	b57bf6460b	Start debug inventory	2017-04-30 02:34:00 +02:00
Laurent Destailleur	4993a43025	Move new feature inventory into module stock.	2017-04-30 02:25:05 +02:00
Laurent Destailleur	92b5f8d85e	Move new feature inventory into module stock.	2017-04-29 21:53:01 +02:00
Laurent Destailleur	50d65e3a9f	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/install/mysql/migration/repair.sql	2017-04-29 17:40:47 +02:00
Laurent Destailleur	cd099bf3b1	Fix bad update of prices	2017-04-24 12:42:54 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	846204bdb4	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	3e9ccc186a	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
Laurent Destailleur	a6b05bb4da	Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0	2017-04-12 14:08:58 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	b054ca8267	NEW Introduce mass action on product list ('delete' for the moment)	2017-04-09 15:02:55 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
Laurent Destailleur	ea44e14b60	Start debug the variant module	2017-04-07 11:01:12 +02:00
Laurent Destailleur	f598bf8bef	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:59:11 +02:00
Laurent Destailleur	18fc5bec9b	Better log	2017-04-06 10:56:37 +02:00
Laurent Destailleur	d99b0461c7	Extrafields multilanguage support.	2017-04-03 10:56:28 +02:00
Laurent Destailleur	979bcd3a9b	NEW Can add a background image on login page	2017-03-31 11:40:31 +02:00
Laurent Destailleur	8e70c4a0b7	Work on 6.0 new look and feel	2017-03-30 15:39:50 +02:00
Laurent Destailleur	54b03a3552	Work on 6.0 new look and feel	2017-03-29 11:03:13 +02:00
Laurent Destailleur	219bcb0d54	Work on 6.0 features.	2017-03-27 22:44:50 +02:00
BENKE Charlie	d8018f7937	add trigger on product price add/update	2017-03-26 19:16:19 +02:00
BENKE Charlie	ec3402a04b	Update note.php	2017-03-25 10:52:03 +01:00
BENKE Charlie	656875acb5	Update info.php	2017-03-25 10:49:57 +01:00
BENKE Charlie	a1db02cc08	Update fournisseurs.php	2017-03-25 10:48:50 +01:00
BENKE Charlie	cf68039c36	Update document.php	2017-03-25 10:47:42 +01:00
BENKE Charlie	2e6ab393df	add next_prev_filter for pagination	2017-03-25 10:45:01 +01:00
Laurent Destailleur	2f4a4f493e	Missin translation	2017-03-25 01:47:52 +01:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	ee8112dde7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/projet/class/project.class.php	2017-03-21 19:20:14 +01:00
Laurent Destailleur	43e70830ed	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-03-21 17:18:41 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php ... to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Laurent Destailleur	dfc1ed7d72	FIX #6535	2017-03-16 22:49:02 +01:00
Laurent Destailleur	9827887643	Merge pull request #6519 from marcosgdf/bug-multiprices ... FIX Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error	2017-03-14 10:45:47 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Marcos García de La Fuente	15d0e6abc5	Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error	2017-03-13 20:33:21 +01:00
Laurent Destailleur	7103d7921e	Uniformize look	2017-03-11 13:42:16 +01:00
Laurent Destailleur	696100b9e7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-11 12:45:57 +01:00
Laurent Destailleur	f06126c463	Fix style	2017-03-11 12:45:18 +01:00
Laurent Destailleur	d1fe6a408c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-11 12:41:47 +01:00
Laurent Destailleur	910859145f	Fix filter on lot was lost	2017-03-11 12:40:47 +01:00
Laurent Destailleur	4e6ee4d12c	Fix dol_banner on card for lot	2017-03-11 12:37:18 +01:00
Laurent Destailleur	53238c2b0d	Fix sort order and number of lines	2017-03-11 12:27:42 +01:00
Laurent Destailleur	4ca634b41c	Better look and feel	2017-03-11 12:04:28 +01:00
Laurent Destailleur	c72e7c1057	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/files.lib.php	2017-03-10 14:54:35 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
Laurent Destailleur	4b63834868	Merge pull request #6488 from atm-quentin/develop ... NEW filter checkbox to add draft order in replenish	2017-03-10 11:54:44 +01:00
Laurent Destailleur	184d52525a	PHP code to manage pair/impair is replaced by native CSS.	2017-03-07 22:45:22 +01:00
Quentin Vial-Gouteyron	bf8d510541	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2017-03-06 15:52:59 +01:00
Quentin Vial-Gouteyron	b378279440	New_filter_to_add_draft_order_to_validated_one	2017-03-06 15:50:17 +01:00
Laurent Destailleur	c260325863	Lang not loaded	2017-03-06 12:32:07 +01:00
Laurent Destailleur	f291e1c470	Fix test on qty for stock move	2017-03-06 12:30:59 +01:00
Laurent Destailleur	4e4045d18a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:12:08 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if ... there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	832c91417a	Fix the default_vat_code was not correctly saved and shown on the ... product price.	2017-03-04 19:16:09 +01:00
Laurent Destailleur	a5019e1619	Fix position of field	2017-03-04 18:17:04 +01:00
Laurent Destailleur	bbd32b9294	Fix bad count	2017-03-04 14:34:43 +01:00
fmarcet	e1f459d67a	Fix: Error when references are numeric	2017-03-03 12:57:52 +01:00
BENKE Charlie	29cb5dd545	FIX input stock value not display ... the good array is "value" (like in the card tabs who give the right value)	2017-03-03 11:48:04 +01:00
Laurent Destailleur	0f11a42fe4	Fight against useless colspan	2017-02-28 19:03:39 +01:00
Laurent Destailleur	58229907d4	Removed not used class "Service". Reduce nb of request on dashboard.	2017-02-28 12:35:55 +01:00
Laurent Destailleur	170ad1a265	Depreciate a class not really used	2017-02-27 00:56:44 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	fc6fb61476	Minor fix in typo	2017-02-22 02:19:05 +01:00
Laurent Destailleur	19e60f03b9	Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms	2017-02-21 14:17:44 +01:00
Laurent Destailleur	d72e5a3646	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-10 17:34:23 +01:00
Laurent Destailleur	ad308e33cc	Fix scrutinizer warning	2017-02-09 18:29:04 +01:00
Laurent Destailleur	e0850b29cd	Merge pull request #6399 from fappels/5.0 ... Qual reputation for price supplier	2017-02-08 16:42:20 +01:00
fappels	b1fe8e3f2b	fix merge	2017-02-08 13:45:42 +01:00
fappels	a84c6f9b45	Qual reputation for price supplier ... Move available reputation constants from view-controller to class	2017-02-08 13:35:34 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr ... Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	31c3398b7f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/modules.php	2017-02-08 10:59:05 +01:00
Laurent Destailleur	c6e0a4cc87	Fix column label	2017-02-07 12:39:45 +01:00
Laurent Destailleur	fcbc12ce31	Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project ... New link movement stock to project	2017-02-06 20:45:04 +01:00
Laurent Destailleur	aa1c14e508	Remove change of PMP when we should not	2017-02-06 20:43:44 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	64da0e77d5	Merge pull request #6358 from defrance/patch-71 ... FIX : fill fourn remise percent with select product mode	2017-02-02 02:27:35 +01:00
Laurent Destailleur	13f37b2cb9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-02 02:25:49 +01:00
Laurent Destailleur	6b1e81fa1d	Fix missing space	2017-02-02 02:22:01 +01:00
Laurent Destailleur	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	924a08a078	Fix code should use 5.0 framework	2017-02-01 16:24:40 +01:00
Laurent Destailleur	9a9b31c9c0	Fix cancel button + logic to close project when setting opp to WON/LOST.	2017-02-01 13:25:16 +01:00
BENKE Charlie	772d862766	Update product.class.php	2017-01-31 23:13:58 +01:00
atm-ph	8e9a9637a0	Fix travis	2017-01-30 21:52:52 +01:00
atm-ph	ccad6d6dde	New show on project "overview" tab the informations about movements stock	2017-01-29 13:36:33 +01:00
atm-ph	56d75c552d	New movement stock can be linked to project	2017-01-29 13:04:06 +01:00
BENKE Charlie	e73a132ed9	PHP7 warning error on $page not affected	2017-01-25 16:24:12 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Gustavo Novaro	22a815a1b4	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-17 01:21:44 -03:00
Laurent Destailleur	fafe71ec52	Fix autocalculation of surface and volume.	2017-01-16 10:55:33 +01:00
Laurent Destailleur	1b1bab94ca	More complete commit for #6114	2017-01-16 10:43:22 +01:00
Laurent Destailleur	81d76f8600	Merge pull request #6114 from defrance/patch-52 ... NEW Allow to change heigth and width on product	2017-01-16 10:19:47 +01:00
Laurent Destailleur	846e827e09	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:49:11 +01:00
Laurent Destailleur	f5458b4337	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/admin/modules.php htdocs/core/class/html.formfile.class.php htdocs/product/stats/card.php	2017-01-16 00:48:37 +01:00
Laurent Destailleur	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Regis Houssin	c3997194b2	Fix: avoid foreach error	2017-01-15 15:17:32 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	6aa26e0f62	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/paiement.php htdocs/product/stock/massstockmove.php htdocs/projet/info.php htdocs/projet/tasks/time.php htdocs/societe/class/societe.class.php	2017-01-13 16:49:18 +01:00
Laurent Destailleur	380b61a0e9	FIX Can make a stock transfert on product not on sale/purchase.	2017-01-12 21:56:50 +01:00
Gustavo Novaro	751aa2a2aa	Improve code style	2017-01-12 12:11:45 -03:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
florian HENRY	2c2bb366bd	fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of ... "NULL")	2017-01-11 09:19:07 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Laurent Destailleur	febd23fe41	Clean dead code	2017-01-03 11:22:03 +01:00
Laurent Destailleur	1f2f03c287	Merge pull request #6222 from gnovaro/patch-4 ... var to public	2016-12-31 17:27:07 +01:00
Laurent Destailleur	2c4e8926f8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-31 17:24:14 +01:00
Laurent Destailleur	f46ce68d08	NEW Can sort thumbs visible on product card	2016-12-31 16:16:20 +01:00
Marcos García de La Fuente	154425e2bc	Fixed PHP fatal error	2016-12-27 16:13:39 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Gustavo Novaro	191f69ec79	var to public ... Improve code style	2016-12-23 14:06:11 -03:00
florian HENRY	30b4d9e2e5	fix : avoid bug when batch number is not trimmed	2016-12-23 12:10:55 +01:00
Laurent Destailleur	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Laurent Destailleur	ba7ca3da6e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop6 Conflicts: htdocs/core/photos_resize.php htdocs/install/mysql/data/llx_c_action_trigger.sql	2016-12-22 17:57:42 +01:00
Laurent Destailleur	ed0ffd6f5a	NEW Uploaded files are indexed into database	2016-12-20 19:42:25 +01:00
Laurent Destailleur	0eded9a8b7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-19 02:36:10 +01:00
Laurent Destailleur	3f5d67d4d6	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-12-19 02:35:16 +01:00
Laurent Destailleur	876722733a	Better fix to get localtax	2016-12-19 02:33:54 +01:00
Laurent Destailleur	ac44aa6d81	FIX security bugs	2016-12-18 13:24:06 +01:00
Laurent Destailleur	a736f3782c	FIX security bugs	2016-12-18 13:21:09 +01:00
gauthier	1f1c75adfb	FIX : HT and TTC price should always be displayed together	2016-12-14 15:50:50 +01:00
Laurent Destailleur	ecab7cb70e	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/class/product.class.php	2016-12-14 12:29:41 +01:00
Laurent Destailleur	d2e4888bdd	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-12-14 12:21:33 +01:00
Laurent Destailleur	43d18cd70c	FIX if a supplier price reference is changed after creating an order, we ... can't clone order.	2016-12-13 13:22:24 +01:00
Juanjo Menent	5c4ab99a9a	Merge pull request #6132 from simnandez/3.9 ... Fix #5646 Error editing Sell Price on products/services	2016-12-11 14:32:00 +01:00
Juanjo Menent	3abbb2a3e5	Fix Uniformize status alignment	2016-12-11 14:19:23 +01:00
BENKE Charlie	37d734387b	print_barre_liste only on top of list	2016-12-11 14:03:48 +01:00
Laurent Destailleur	190f432c23	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-11 11:07:22 +01:00
Laurent Destailleur	4969af8c74	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: ChangeLog htdocs/product/card.php	2016-12-11 11:04:15 +01:00
Laurent Destailleur	95d8faef04	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/product/class/product.class.php	2016-12-11 10:51:15 +01:00