336 Commits

Author	SHA1	Message	Date
Laurent Destailleur	4ecd15b7ab	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/main.lang	2020-08-27 21:57:42 +02:00
Alexandre SPANGARO	142ce7c03f	Fix Missing language key	2020-08-21 04:58:21 +02:00
Laurent Destailleur	96c583b84e	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-07-10 02:28:34 +02:00
Laurent Destailleur	6b5f46624c	Fix label of AWP	2020-07-09 16:19:40 +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
Scrutinizer Auto-Fixer	1bf5745286	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-25 11:52:07 +00: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
Laurent Destailleur	83af4ebea4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/class/entrepot.class.php htdocs/product/stock/list.php	2020-04-10 01:22:22 +02:00
stickler-ci	50b789456d	Fixing style errors.	2020-04-08 14:03:16 +00:00
atm-quentin	64f6542f96	FIX buyprice extrafield langfile and tooltip	2020-04-08 15:59:10 +02:00
Laurent Destailleur	20fad86520	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/cashcontrol/cashcontrol_card.php	2020-03-26 00:14:06 +01:00
Laurent Destailleur	51f8c5ca87	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/class/commoninvoice.class.php htdocs/expensereport/list.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php	2020-03-25 19:01:56 +01:00
Regis Houssin	45579b0986	FIX remove unused var, $usercancreate can be change by Multicompany	2020-03-23 07:01:23 +01:00
Pierre Ardoin	26f6f04486	forgot ";"	2020-03-17 10:08:18 +01:00
Pierre Ardoin	564f412957	correction due to comments @hregis and @eldy	2020-03-17 10:04:43 +01:00
Pierre Ardoin	8476477137	add const NOTMODIFYOTHERENTITYFOURNPRICE ... if const NOTMODIFYOTHERENTITYFOURNPRICE, can't modify other shared fourn prices.	2020-02-27 09:19:39 +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
VESSILLER	6e9bb5d7da	FIX sql bad request in product buying price extrafields	2020-01-03 20:49:54 +01:00
VESSILLER	9c4d7044a3	FIX sql bad request in product buying price extrafields	2019-12-26 16:18:26 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +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
Laurent Destailleur	1f5bea01f5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php htdocs/user/card.php	2019-11-14 21:30:16 +01:00
Laurent Destailleur	7e52c70321	FIX Advisory ID: usd20190067	2019-11-14 21:16:18 +01:00
Scrutinizer Auto-Fixer	2ecfe41810	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 09:53:31 +00:00
Laurent Destailleur	9dc309d59d	Merge pull request #12351 from frederic34/patch-15 ... Update fournisseurs.php	2019-11-07 11:31:43 +01:00
Frédéric FRANCE	d1131e6b5a	Update fournisseurs.php	2019-11-05 22:27:30 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Frédéric FRANCE	534f8712a3	Update fournisseurs.php	2019-11-02 18:11:18 +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
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Tim Otte	ceb3482204	Requested changes implemented	2019-10-22 11:36:28 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Laurent Destailleur	acfceecda5	Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units ... NEW add units fields in buying price tab of product card	2019-09-27 14:17:52 +02:00
Laurent Destailleur	961f2b5165	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/viewcat.php htdocs/fourn/class/fournisseur.product.class.php htdocs/takepos/invoice.php	2019-09-24 14:25:02 +02:00
Laurent Destailleur	6431e8e16d	FIX SQL injection on qty	2019-09-24 12:43:44 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
VESSILLER	ca18448b48	NEW add units fields in buying price tab of product card	2019-09-18 10:36:13 +02:00
Tim Otte	0f9b01cd5b	Added support for extrafield styling options: ... - visibility now implemented - fieldrequired now implemented	2019-09-05 09:47:40 +02:00
Tim Otte	be000b96ee	Fixed error that occurred in the travis CI build	2019-09-04 16:42:13 +02:00
Tim Otte	fbafbc3e19	Added myself to the author list	2019-09-04 15:16:29 +02:00
Tim Otte	54d0b94b6d	Added extrafield support to the product supplier price lines	2019-09-04 15:13:42 +02:00
Abbes Bahfir	f945ec5771	fix: convert posted price formatted values to numeric	2019-09-02 21:24:53 +01:00
Laurent Destailleur	3339f89fc5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/api/class/api_login.class.php htdocs/dav/fileserver.php	2019-08-22 12:45:23 +02:00
Laurent Destailleur	27cd6cd308	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/compta/paiement.php htdocs/product/fournisseurs.php htdocs/stripe/payment.php	2019-08-22 12:39:07 +02:00
Laurent Destailleur	a35f010e55	FIX name and position of hook FIX #11710	2019-08-22 12:30:14 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
atm-quentin	7f62fdbfe4	FIX buyprice barcode default val	2019-06-25 14:27:44 +02:00