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 |
|
|
|
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 |
|
|
|
3b98f74a56
|
Fix typo and switch to old join style.
|
2022-04-28 22:56:44 +04:00 |
|
|
|
b35b40649f
|
CLOSE #20736 Allow extrafields SQL filters on REST API product lookup
|
2022-04-28 15:48:07 +04:00 |
|
Christophe Battarel
|
75f540c30c
|
fix for reshook when several module use the hook but only on is concerned
|
2022-04-28 11:49:15 +02:00 |
|
Christophe Battarel
|
25078b292d
|
fix hookmanager
|
2022-04-27 09:40:09 +02:00 |
|
Christophe Battarel
|
543e6f186c
|
add hook to getSellPrice function
|
2022-04-27 09:03:51 +02:00 |
|
Laurent Destailleur
|
4e34649fc2
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
|
2022-04-14 16:10:23 +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
|
26c3e235cf
|
Merge pull request #19459 from frederic34/productmerge
can merge products
|
2022-04-07 15:02:03 +02:00 |
|
Laurent Destailleur
|
5b91ae062f
|
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
|
2022-04-02 10:31:58 +02:00 |
|
ATM john
|
c1d9ea95dc
|
fix function name
|
2022-03-30 12:16:17 +02:00 |
|
Regis Houssin
|
4479ba8015
|
FIX missing translation keys
|
2022-03-26 08:32:20 +01:00 |
|
Regis Houssin
|
e8dae7a8db
|
FIX Multiccompany sharings compatibility
|
2022-03-24 16:40:51 +01:00 |
|
Laurent Destailleur
|
4a80f35aaa
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2022-03-23 17:26:25 +01: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 |
|
Regis Houssin
|
b95bb58ba0
|
FIX remove unused global
|
2022-03-22 16:49:29 +01:00 |
|
Regis Houssin
|
4ca3d45eca
|
NEW add hook printFieldWhere in load_state_board function
|
2022-03-22 15:51:30 +01:00 |
|
Laurent Destailleur
|
8603d493ad
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contrat/list.php
htdocs/install/mysql/tables/llx_partnership.key.sql
|
2022-03-19 17:34:26 +01:00 |
|
Laurent Destailleur
|
ed631b2b06
|
Fix doxygen, missing error message
|
2022-03-18 16:14:20 +01:00 |
|
Laurent Destailleur
|
43e7547611
|
Fix sql errors
|
2022-03-17 11:49:14 +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
|
84b951c2f9
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-03-07 15:27:07 +01:00 |
|
Laurent Destailleur
|
54ecf1f98c
|
# WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-03-07 15:24:08 +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 |
|
