Commit Graph

1734 Commits

Author SHA1 Message Date
Laurent Destailleur
2fe9e24961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-06-16 00:56:43 +02:00
Laurent Destailleur
0d46edd121 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-06-16 00:45:37 +02:00
Laurent Destailleur
39f8932b80 Fix phpcs 2023-06-16 00:35:55 +02:00
Maxime Kohlhaas
87ead82db0 Fix #23822 virtualstock calculation with credit note 2023-06-10 22:55:56 +02:00
Laurent Destailleur
2378f8067b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:13 +01:00
Florian HENRY
797b9c9054 dfelete cem data on product deletion 2023-01-03 11:42:39 +01:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
Maxime Kohlhaas
2fa0e34b09 Fix api product : rang is now position 2022-10-22 15:32:54 +02:00
Regis Houssin
a5a260b317 FIX wrong typo, remove quote 2022-10-13 08:13:58 +02:00
ptibogxiv
49163de473
Fix better fix for php 8 2022-10-03 22:01:04 +02:00
stickler-ci
982a574205 Fixing style errors. 2022-09-15 13:15:44 +00:00
ptibogxiv
1a76b26731
Fix php 8 error 2022-09-15 15:14:36 +02:00
Laurent Destailleur
1be8746a78 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-22 13:03:39 +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
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
66c27139e1 Fix php8 2022-07-25 19:21:14 +02:00
Laurent Destailleur
274b0ff6b8 Remove useless test 2022-07-24 00:01:03 +02:00
Quatadah Nasdami
66ed4aa524 refixing the bug 2022-07-11 14:04:31 +02:00
Laurent Destailleur
834d129634
Update product.class.php 2022-06-27 11:11:43 +02:00
BB2A Anthony Berton
f3b3e97d49 Recursive call if there is childs to child 2022-06-27 08:51:12 +02:00
Laurent Destailleur
b2bc6059df Fix test 2022-06-12 18:55:16 +02:00
Laurent Destailleur
f0d0bf6442
Update api_products.class.php 2022-06-12 18:52:43 +02:00
ptibogxiv
727fb63833
Fix php 8 compatibility 2022-06-12 14:21:14 +02:00
Laurent Destailleur
04d625cccf
Merge pull request #21213 from rycks/15_add_invoice_template_in_product_used_list
#21212 : add template invoices stats on products card
2022-06-12 11:46:17 +02:00
Eric Seigne
c23b5947b3 #21212 : add template invoices stats on products card 2022-06-12 11:05:12 +02:00
NASDAMI Quatadah
53bf6db23f commenting a line => resolves the bug 2022-06-09 13:46:04 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Francis Appels
c9049a9c85 Fix non numeric warning 2022-06-08 12:38:50 +02:00
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +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
7ddf4ef315 Fix look and feel v16 2022-05-28 12:50:44 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +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
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
c020325587 Debug v16 2022-05-16 19:54:49 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +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
c26c6b58ca
Merge pull request #20737 from lainwir3d/allow_product_api_sqlfilters_extrafield
CLOSE #20736 Allow extrafields SQL filters on REST API product lookup
2022-05-01 12:23:26 +02:00
Laurent Destailleur
a2ff15164f
Update api_products.class.php 2022-05-01 12:23:02 +02:00
lainwir3d
f187f4214a Product REST API: Always JOIN extrafields table. 2022-04-30 13:24:44 +04:00
Laurent Destailleur
bc03658f18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-29 16:42:43 +02:00