181073b00f
Product REST API: Always JOIN extrafields table.
2022-04-30 13:33:28 +04:00
d34c99bcd8
Fix typo and switch to old join style.
2022-04-30 12:40:53 +04:00
028817b275
CLOSE #20736 Allow extrafields SQL filters on REST API product lookup
2022-04-28 15:56:56 +04:00
188b775d76
Merge branch stock_decrease_on_credit_invoice
2022-04-26 20:24:58 +04:00
Laurent Destailleur
ed631b2b06
Fix doxygen, missing error message
2022-03-18 16:14:20 +01:00
Laurent Destailleur
c4a20685a4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-03-07 15:21:38 +01:00
Laurent Destailleur
c0088191f1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/product/admin/product.php
htdocs/product/class/product.class.php
2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
htdocs/product/admin/product.php
htdocs/product/class/product.class.php
2022-03-07 15:13:25 +01:00
Laurent Destailleur
e13038dc30
Update product.class.php
2022-03-07 14:06:54 +01:00
Eric Seigne
744b84cb09
fix #20270 : use product_id in sql only if product_id is defined
2022-03-04 15:20:50 +01:00
Laurent Destailleur
b98f547c4a
Fix autoselect
2022-02-12 12:12:50 +01:00
ptibogxiv
b18b049dca
FIX api product with subproduct
2022-02-06 22:55:37 +01:00
Laurent Destailleur
836ffc2b02
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 19:06:32 +01:00
Laurent Destailleur
63d35ecffd
Fix phpcs
2022-02-04 19:05:11 +01:00
Laurent Destailleur
f99e19e729
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-04 13:19:55 +01:00
Laurent Destailleur
e57bc01466
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/product/class/product.class.php
2022-02-04 13:02:45 +01:00
Laurent Destailleur
3f87db08d4
Update product.class.php
2022-02-04 12:55:31 +01:00
El-dge
d09303d27c
Issue on stock virtuel : fix Dolibarr/dolibarr#18634
2022-02-04 12:31:40 +01:00
Laurent Destailleur
5b8d6e60e4
Debug v15
2022-01-05 10:43:05 +01:00
Laurent Destailleur
108df3726a
Fix php syntax
2021-12-30 18:46:26 +01:00
Laurent Destailleur
0387b9922e
FIX error message on sqlfilter in API
2021-12-20 20:49:32 +01:00
50d422cdf6
CLOSE #19531 Product REST API: allow list / search method to retrieve stock data.
...
See feature request #19531
2021-12-01 16:33:47 +04:00
Laurent Destailleur
0dcbd458b8
FIX default_vat_code was not returned in some Ajax services of products
2021-11-23 13:08:00 +01:00
Scrutinizer Auto-Fixer
5567310e44
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Laurent Destailleur
fc29aa7d3b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-10-23 23:58:00 +02:00
Maxime Kohlhaas
604052d1a1
Fix #19070 : Api subproducts was returning false
2021-10-23 02:28:53 +02:00
Laurent Destailleur
c81bf68578
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/compta/cashcontrol/cashcontrol_list.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
Laurent Destailleur
b5929fb7c4
Fix phpcs
2021-10-22 15:42:18 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
...
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Florian HENRY
d4690ddbdd
fix scrutinizer
2021-10-21 18:20:07 +02:00
Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
53244c5f45
FIX missing permission check reported by me@lainwir3d.net on product api
2021-10-20 12:38:19 +02:00
Laurent Destailleur
79177b0a11
Rename method into selectLotDataList
2021-10-17 14:38:12 +02:00
Laurent Destailleur
1c07385aba
Update product.class.php
2021-10-16 21:22:53 +02:00
Laurent Destailleur
dd0809b528
Fix trans labels status
2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Benjamin Chantalat
3438a4a9f6
Add the module reception to the calcul of virtual stock
2021-10-14 09:33:26 +02:00
Laurent Destailleur
6bd1bc767b
doc
2021-10-12 15:17:34 +02:00
Benjamin Chantalat
91164951de
Remove not complete order from virtual stock
2021-10-11 15:24:56 +02:00
Laurent Destailleur
d5d892b263
Merge pull request #18831 from SteiniGreenwork/develop
...
NEW Can select existing batch numbers for a combo list (in mrp consumtion)
2021-10-06 15:20:52 +02:00
Laurent Destailleur
a984eb5c98
Merge branch 'develop' into 14_fix_api_priduct_warning
2021-10-06 13:43:18 +02:00
Laurent Destailleur
7b1b7c0ad6
Update api_products.class.php
2021-10-06 13:42:49 +02:00
Laurent Destailleur
5d9c87a9ea
Update api_products.class.php
2021-10-06 13:42:13 +02:00
Florian HENRY
9d1915f9c2
fix php warning
2021-10-06 09:56:10 +02:00
Laurent Destailleur
e85a0c54cc
Update product.class.php
2021-10-05 18:43:35 +02:00
xgerhard
e44c3a46e1
Fix #18895 Fix negative stock correction
...
If people use a negative number as input, I think we can assume they want to delete units. It will now set the movement to 1 if the number is negative and 'add' was selected.
For each negative number we now multiply this number by -1, to make it a positive number again.
2021-10-05 00:25:52 +02:00
Stephan Steininger
3bb941f3b8
Merge branch 'Dolibarr:develop' into develop
2021-10-04 08:12:19 +02:00
Laurent Destailleur
7863642daa
FIX #18852
2021-10-02 19:16:42 +02:00
Laurent Destailleur
3d4bb66853
Clean code
2021-09-30 15:59:47 +02:00
Stephan Steininger
5bb717b887
Merge branch 'develop' of https://github.com/SteiniGreenwork/dolibarr into develop
2021-09-30 15:07:37 +02:00