Commit Graph

5124 Commits

Author SHA1 Message Date
Laurent Destailleur
5a366767fb Fix phpcs 2020-04-10 01:47:50 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
273443550e Fix list in warehouse 2020-04-10 01:21:59 +02:00
Laurent Destailleur
f7d1ce1e09 FIX Can use decimal value in virtual products 2020-04-10 00:26:09 +02:00
Laurent Destailleur
1ed8639653 Merge pull request #13532 from atm-quentin/11_fix_buyprice_extrafield_langfile_and_tooltip
FIX buyprice extrafield langfile and tooltip
2020-04-09 19:49:32 +02:00
Francis Appels
caecb0152f Fix set default warehouse list columns 2020-04-09 14:46:20 +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
ATM john
88297d5682 fix key 2020-04-06 13:20:42 +02:00
ATM john
721371a08c Fix warehouse list 2020-04-06 13:08:03 +02:00
Laurent Destailleur
50790a7f36 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/filefunc.inc.php
2020-04-05 03:44:06 +02:00
Laurent Destailleur
8a14652eae Merge pull request #13449 from atm-quentin/FIX_missing_default_accountancy_product_buy_code
FIX missing default accountancy product buy code
2020-04-05 03:41:46 +02:00
Laurent Destailleur
d204cfe6c6 FIX Protection when database has a corrupted product id 2020-04-02 15:54:33 +02:00
Laurent Destailleur
3860f24908 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Laurent Destailleur
1c7ce31207 Merge pull request #13435 from ptibogxiv/patch-316
FIX product get purchase prices
2020-03-30 19:20:32 +02:00
Laurent Destailleur
81b41c932f Merge pull request #13432 from atm-quentin/FIX_reapro_11
FIX replenish stock to buy
2020-03-30 19:11:34 +02:00
atm-quentin
9a92545d8d FIX missing default accountancy product buy code 2020-03-30 14:28:22 +02:00
Cédric
eead9a93d3 Fix can set desiredstock to (int) 0 from API Rest
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
2020-03-30 13:03:13 +02:00
ptibogxiv
cb7342d4c8 FIX product purchase prices
Fix get datas but don't fix cleandata :( @eldy
2020-03-27 20:07:18 +01:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column
Conflicts:
	htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
f512e0d161 Fix popup 2020-03-27 12:06:58 +01:00
Laurent Destailleur
3a9cc532d7 FIX Use getNomURL instead of hard coded link. Fix limit. 2020-03-27 11:56:59 +01:00
atm-quentin
96481c3d52 FIX ordered stock already in $stock 2020-03-27 09:43:59 +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
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Regis Houssin
45579b0986 FIX remove unused var, $usercancreate can be change by Multicompany 2020-03-23 07:01:23 +01:00
Laurent Destailleur
ef86311639 Merge pull request #13224 from mapiolca/patch-38
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
c71da5d013 FIX mass action on stock movements 2020-03-19 15:43:06 +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
Laurent Destailleur
dfe947885c FIX params of setEventMessage($langs->trans('ErrorProductClone')... 2020-03-12 12:40:28 +01:00
Laurent Destailleur
87fe2e691b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Alexandre SPANGARO
da99c89c26 FIX: typo on ckeck method 2020-03-01 05:21:51 +01:00
VESSILLER
8eff3162a9 FIX undefined function measuringUnitString in product list 2020-02-29 12:47:48 +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
Laurent Destailleur
ef9fe73d96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/index.php
2020-02-26 17:02:23 +01:00
atm-josselin
b2a488ef9f FIX : Bad translation for productlot EatBy and SellBy 2020-02-24 11:00:55 +01:00
Laurent Destailleur
fa16063875 Fix bad accounting code set 2020-02-18 22:39:01 +01:00
Laurent Destailleur
31ae0bc06e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/product/card.php
2020-02-18 22:38:30 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
549bf076d7 Fix prefix of log 2020-02-17 12:22:52 +01:00
gauthier
523d09536c FIX : must be == and not = 2020-02-17 12:20:19 +01:00
Laurent Destailleur
78d4978d31 FIX #13100 2020-02-13 11:26:11 +01:00
Laurent Destailleur
6be746e219 Fix replenishment for virtual stock check if module is on or off 2020-02-12 21:42:48 +01:00
Laurent Destailleur
83b5fe3c71 FIX #13077 Replace left join with inner join (left join was useless) 2020-02-12 20:24:58 +01:00