Commit Graph

6803 Commits

Author SHA1 Message Date
Laurent Destailleur
3b1058ed72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-15 19:44:55 +01:00
Laurent Destailleur
b766e6de66 FIX #22786 2022-11-14 21:08:54 +01:00
Laurent Destailleur
e2e91c6e67
Update fournisseurs.php 2022-09-24 18:47:35 +02:00
Jean
a919618bf4 FIX #22382 Error on length of supplier reference 2022-09-24 09:47:56 +02:00
Laurent Destailleur
017a2258ce FIX bad sort order field on DMD in product lot page 2022-08-31 01:03:30 +02:00
Laurent Destailleur
4e678c5065 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-22 13:02:51 +02:00
Laurent Destailleur
c0e187d39c
Merge pull request #21184 from Quatadah/fix21094
FIX #21094
2022-08-17 10:51:06 +02:00
Laurent Destailleur
643f4c8bdc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-10 13:08:03 +02:00
Frédéric FRANCE
5ef9d2d40d
keep url 2022-08-08 11:11:17 +02:00
Frédéric FRANCE
96c17b485c
do not loose decription
when changing country, reload cause description lost
2022-08-08 11:07:38 +02:00
Quatadah Nasdami
2d60fe26f9 done as it should 2022-07-27 11:07:28 +02:00
Quatadah Nasdami
586d496d5a done as it should 2022-07-27 11:03:29 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
lvessiller
b57c40ef78 FIX load product stock in inventory lines 2022-07-12 11:32:12 +02:00
Quatadah Nasdami
66ed4aa524 refixing the bug 2022-07-11 14:04:31 +02:00
Laurent Destailleur
61f1595f8c Fix look and feel v15 2022-07-08 11:21:54 +02:00
Laurent Destailleur
f9d13290d5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/facture/list.php
2022-07-07 19:15:58 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Florian HENRY
739d24e1ae fix: replannish view lost filter and sort on pagination and sorting 2022-06-28 11:22:01 +02:00
stickler-ci
23d948cec4 Fixing style errors. 2022-06-27 10:56:08 +00:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
d6aa53168c
Merge pull request #21379 from cfoellmann/PR/fix-disable-product-accounting
fix PRODUCT_DISABLE_ACCOUNTING
2022-06-27 11:33:42 +02:00
Laurent Destailleur
149fc6ed83
Update list.php 2022-06-27 11:26:57 +02:00
Christian Foellmann
082c7091fc fix PRODUCT_DISABLE_ACCOUNTING + STOCK_SUPPORT_SERVICES on products/services list page 2022-06-26 15:47:24 +02:00
Christian Foellmann
b65c9f4ead fix PRODUCT_DISABLE_ACCOUNTING - hide fields on product/card view 2022-06-25 15:04:28 +02:00
Laurent Destailleur
c0240ae996 Merge 2022-06-23 12:24:34 +02:00
atm-lena
a94e39f0f4 Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into 14.0_FIX_productfournprice_saveextrafieldsvalues 2022-06-21 16:38:09 +02:00
atm-lena
d99adae850 Product Fourn Price : fix error save extrafields values 2022-06-21 16:34:23 +02:00
NASDAMI Quatadah
53bf6db23f commenting a line => resolves the bug 2022-06-09 13:46:04 +02:00
Francis Appels
c9049a9c85 Fix non numeric warning 2022-06-08 12:38:50 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:35:58 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
6f83c8c6f3
Update productbatch.class.php 2022-05-24 21:22:14 +02:00
atm-greg
8213756c37 fix sql to avoid getting product_stock of another product with same batch 2022-05-24 16:49:55 +02:00
Laurent Destailleur
7a361a3bde More info to help debug 2022-05-12 14:28:17 +02:00
Laurent Destailleur
0426be5059 FIX Update of sale price (log not correctly updated)
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/price.php
2022-05-06 12:42:45 +02:00
Laurent Destailleur
f222328ff8 FIX Update of sale price (log not correctly updated) 2022-05-06 12:37:18 +02:00
Laurent Destailleur
203c4e8082 Fix bad test 2022-05-06 11:48:15 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
stickler-ci
6ab88d0169 Fixing style errors. 2022-04-28 10:09:02 +00:00
f0e65e8bdd FIX #20733 Inventory: Do not use batch qty even if present if batch module is disabled. 2022-04-28 14:00:24 +04:00
Laurent Destailleur
8bc4e9082c
Merge pull request #20647 from FHenry/15.0_fix_html_PRODUCT_LOT_ENABLE_QUALITY_CONTROL
fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL
2022-04-15 13:22:31 +02:00
Florian HENRY
b4fb6cf527 fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL 2022-04-15 09:13:41 +02:00
Laurent Destailleur
29242a23c3
Update product.class.php 2022-04-13 12:11:35 +02:00
Norbert Penel
e9e10e84b2
ensure priority in this usage
ensure priority in this usage
2022-04-13 10:47:33 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 21:14:51 +02:00
lvessiller
18488cf1dd FIX replenish and manage product stock by warhouse 2022-04-11 13:53:35 +02:00
Laurent Destailleur
afdefad55b FIX bad link to add a customer price (token duplicated) 2022-04-06 21:01:04 +02:00