248 Commits

Author	SHA1	Message	Date
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
Laurent Destailleur	7b3a7c9921	Add token on all url with action=delete	2020-10-01 10:50:54 +02:00
Laurent Destailleur	f442dac2c9	Add token on most GET url for admin action	2020-09-30 15:13:28 +02:00
Laurent Destailleur	0e4d3c19dd	Fix escaping	2020-09-20 02:57:15 +02:00
Laurent Destailleur	216b3c885d	Fix escaping	2020-09-20 01:30:36 +02:00
Laurent Destailleur	0bf0312d50	FIX #yogosha4448	2020-09-17 12:30:14 +02:00
Laurent Destailleur	bfbb217607	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
Laurent Destailleur	5ea47f3ade	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/resultat/index.php htdocs/product/admin/product.php htdocs/projet/tasks/list.php	2020-07-08 18:11:58 +02:00
Laurent Destailleur	7d7ef1e72a	FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY ... Fix setup of product	2020-07-06 15:34:26 +02:00
Anthony Berton	bda4753e41	Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE	2020-06-11 18:44:38 +02:00
Laurent Destailleur	a59961dae6	Fix td alignment	2020-06-05 23:06:59 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Frédéric FRANCE	a25ed0e041	add new rule	2020-05-21 01:56:06 +02:00
Anthony Berton	06c08ad045	Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE	2020-05-14 15:26:58 +02:00
Laurent Destailleur	3dbe9a4af1	Fix label	2020-05-06 13:59:15 +02:00
stickler-ci	56a5e8ca3c	Fixing style errors.	2020-05-03 17:50:10 +00:00
Anthony Berton	485ef522d2	Add option HT TTC créate product	2020-05-03 19:47:10 +02:00
Laurent Destailleur	a88ab40384	Clean phpcs	2020-05-02 15:18:59 +02:00
Laurent Destailleur	1c70e49695	Merge branch 'develop' into 12.0_a23	2020-04-27 14:14:13 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Alexandre SPANGARO	5528e9ef38	Work on split module fournisseur	2020-03-24 22:02:58 +01:00
Scrutinizer Auto-Fixer	e8083e2a65	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-03-23 14:54:02 +00:00
Scrutinizer Auto-Fixer	e44865d8b5	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-21 16:53:37 +00:00
Scrutinizer Auto-Fixer	fd48877dc6	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-18 22:47:25 +00:00
Laurent Destailleur	f4f3efec62	Fight against $_POST	2020-02-16 19:33:58 +01:00
atm-greg	f8ffdea5ae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging	2020-02-06 09:59:42 +01:00
Laurent Destailleur	38de69f5a9	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php	2020-01-04 14:20:25 +01:00
Regis Houssin	71a2998118	FIX wrong var name and avoid warning	2019-12-30 15:36:09 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
stickler-ci	5d051cc901	Fixing style errors.	2019-11-25 07:08:22 +00:00
atm-greg	ce15af0980	manage packaging on supplier prices	2019-11-23 15:52:34 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	496f93911f	Merge pull request #11821 from Tim-Otte/develop ... NEW Extrafields support in product supplier prices	2019-11-02 16:19:13 +01:00
Laurent Destailleur	d79114c1f8	Clean code	2019-10-20 15:16:40 +02:00
Frédéric FRANCE	7581275316	wip	2019-10-20 11:59:21 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Tim Otte	54d0b94b6d	Added extrafield support to the product supplier price lines	2019-09-04 15:13:42 +02:00
Laurent Destailleur	fa53641221	Merge pull request #11551 from atm-quentin/NEW_global_search_product ... NEW Add hidden option to set fields for the quick search on products	2019-08-15 20:26:05 +02:00
Laurent Destailleur	8647a20c18	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/langs/en_US/admin.lang htdocs/product/dynamic_price/class/price_parser.class.php htdocs/product/stats/facture.php	2019-08-10 01:57:43 +02:00
Regis Houssin	0b831ccdf7	FIX better help message with multicompany	2019-08-09 09:33:14 +02:00
atm-quentin	bd2f5ba037	FIX Replace conf by hidden conf editable by user	2019-07-26 14:16:54 +02:00
Laurent Destailleur	0c6499f193	Update product.php	2019-07-25 18:01:47 +02:00
Laurent Destailleur	9a0e0fbdd2	Update product.php	2019-07-25 18:01:16 +02:00
atm-quentin	03ed4eb141	modif rowspan	2019-07-24 09:42:39 +02:00
atm-quentin	5a385bf1cc	ADD extrafields on global search	2019-07-24 09:41:02 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	8e3620fce1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/compta/facture/invoicetemplate_list.php	2019-07-04 12:26:17 +02:00
atm-quentin	8cdb251ca5	FIX product_use_units was set to 0 each time a conf in block other was set	2019-07-02 10:18:03 +02:00
Laurent Destailleur	a7bd734ece	Rename ->produit into ->product. Still permissions to rename.	2019-06-24 21:18:49 +02:00