|
|
1c8263f5b4
|
Virtual stock calculation: do not take into account credit bills
|
2022-12-05 13:54:29 +04:00 |
|
|
|
6c1ba8e2c3
|
Merge branch '15.0.2_oine' into 15.0.3_oine
|
2022-10-02 12:08:59 +04:00 |
|
Laurent Destailleur
|
40f0bb1b94
|
Update api_products.class.php
|
2022-07-10 17:39:06 +04:00 |
|
|
|
906eb02076
|
Product REST API: Always JOIN extrafields table.
|
2022-06-24 12:59:05 +04:00 |
|
|
|
fb4a178266
|
Fix typo and switch to old join style.
|
2022-06-24 12:59:04 +04:00 |
|
|
|
fdddd512d7
|
CLOSE #20736 Allow extrafields SQL filters on REST API product lookup
|
2022-06-24 12:59:04 +04:00 |
|
|
|
313838c7ab
|
Merge branch stock_decrease_on_credit_invoice
|
2022-06-24 12:59:04 +04: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
|
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
|
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
|
c620757dbc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/product/price.php
htdocs/reception/class/reception.class.php
|
2022-03-23 17:23:21 +01:00 |
|
Laurent Destailleur
|
32f2499c36
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/langs/en_US/propal.lang
htdocs/product/price.php
htdocs/projet/card.php
htdocs/reception/class/reception.class.php
|
2022-03-23 17:04:31 +01:00 |
|
Laurent Destailleur
|
6167d8a02c
|
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management
FIX: better error management at product selling price update
|
2022-03-23 16:48:15 +01:00 |
|
Laurent Destailleur
|
ed631b2b06
|
Fix doxygen, missing error message
|
2022-03-18 16:14:20 +01:00 |
|
Laurent Destailleur
|
32a68995d6
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/product/class/product.class.php
|
2022-03-10 14:08:19 +01:00 |
|
Laurent Destailleur
|
cc57d3dbc1
|
Fix phpcs
|
2022-03-09 22:25:29 +01:00 |
|
Marc de Lima Lucio
|
e989371651
|
FIX: better error management at product selling price update
|
2022-03-08 14:49:26 +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 |
|
