Commit Graph

322 Commits

Author SHA1 Message Date
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
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
VESSILLER
6e9bb5d7da FIX sql bad request in product buying price extrafields 2020-01-03 20:49:54 +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
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
atm-quentin
4b3824a1a9 FIX buyprice barcode default val 2019-06-25 14:17:31 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
fd5048ef73 Fix reported by phpstan 2019-05-15 19:16:48 +02:00
Laurent Destailleur
49d65710ba Fix date missing 2019-05-14 10:31:11 +02:00
Laurent Destailleur
04f7261bfc Fix field date was not visible 2019-05-13 21:34:30 +02:00
Regis Houssin
8a29d9f2d1 FIX possibility to override permissions (multicompany) 2019-05-10 11:23:19 +02:00
ATM-Nicolas
6cfdfe8408 NEW : Can update product supplier price ref 2019-04-19 10:58:18 +02:00
Laurent Destailleur
7c59629e66 Fix phpcs 2019-03-15 02:32:21 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
2713c430df Merge branch 'develop' into dev_datepricefour 2019-03-14 18:43:09 +01:00
Laurent Destailleur
5aee322b30 Update fournisseurs.php 2019-03-14 18:36:05 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Frédéric FRANCE
a1d2d3bddc replace html code by html5 2019-02-24 11:18:55 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00