lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
108,698 Commits 43 Branches 150 Tags 886 MiB
1b82340e1b
Commit Graph

6914 Commits

Author SHA1 Message Date
Laurent Destailleur
f14e614430
Merge pull request #20779 from atm-GregM/develop_new_massaction_extrafield_product 
NEW : Add massaction "Edit Extrafield" for Product
 2022-05-08 19:15:25 +02:00
Laurent Destailleur
b04ef20708
Merge pull request #20782 from atm-adrien/FIX_move_inventory_column-develop 
Fix move inventory column develop
 2022-05-08 19:13:26 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +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
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
23ae3af247 Fixing style errors. 2022-05-05 07:38:40 +00:00
GregM
885324629f commit resolve conflict 2022-05-04 17:10:39 +02:00
GregM
d2bf2fdb98 update massaction langs & script 2022-05-04 16:53:57 +02:00
Adrien Raze
82ac8b4c0a FIX : move "Real Qty" column 2022-05-02 10:44:31 +02:00
Adrien Raze
2d033ef8a5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_move_inventory_column-develop 2022-05-02 10:33:24 +02:00
Adrien Raze
0e75b4e9c7 FIX : GetnomURL sur les numéro de lot/série 2022-05-02 10:14:06 +02:00
Laurent Destailleur
d7398f573c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-01 20:49:43 +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
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
lainwir3d
f187f4214a Product REST API: Always JOIN extrafields table. 2022-04-30 13:24:44 +04:00
Laurent Destailleur
fdfde165a9 FIX #20702 #20699 #20700 2022-04-29 17:48:40 +02:00
Laurent Destailleur
bc03658f18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-29 16:42:43 +02:00
Laurent Destailleur
67048cd2c6
Merge pull request #20721 from altairisfr/getsellprice 
NEW : add hook to getSellPrice function
 2022-04-29 16:39:30 +02:00
Laurent Destailleur
4a8864ed63
Merge pull request #20739 from lainwir3d/inventories_fix_movement_display 
FIX #20738 Inventory: Add missing <td....> for movement number / card.
 2022-04-29 16:06:07 +02:00
Laurent Destailleur
5817c1f1b7
Update inventory.php 2022-04-29 16:05:52 +02:00
John BOTELLA
02cf3fa361 end factoring 2022-04-29 15:38:12 +02:00
GregM
3e4cd251ea add edit extrafields Massaction products 2022-04-29 11:45:50 +02:00
lainwir3d
3b98f74a56 Fix typo and switch to old join style. 2022-04-28 22:56:44 +04:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
 2022-04-28 19:23:13 +02:00
Adrien Raze
5fe448e86c FIX : [inventory] Update PMP when qty stay the same 2022-04-28 15:49:31 +02:00
lainwir3d
88bd28323c FIX #20738 Inventory: Add missing <td....> for movement number / card. 2022-04-28 16:46:42 +04:00
lainwir3d
b35b40649f CLOSE #20736 Allow extrafields SQL filters on REST API product lookup 2022-04-28 15:48:07 +04:00
stickler-ci
6ab88d0169 Fixing style errors. 2022-04-28 10:09:02 +00:00
lainwir3d
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
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
Adrien Raze
ed4610b36b FIX : Move column "Real Qty" just before "Real PMP" column 2022-04-28 11:45:55 +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
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
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf 
New hidden conf to manage pmp on inventory
 2022-04-14 22:42:35 +02:00
Laurent Destailleur
6075b627a3
Merge pull request #20633 from Easya-Solutions/fix-stockcorrection-include-tpl-path 
FIX include tpl path in product stock
 2022-04-14 21:03:15 +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
lvessiller
5f7f9a7515 FIX include tpl path in product stock 2022-04-14 09:48:06 +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
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +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
stickler-ci
ddb50264ae Fixing style errors. 2022-04-11 13:58:59 +00:00
Quentin VIAL-GOUTEYRON
67e7c91c3e pmp inventory conf MAIN_PRODUCT_PERENTITY_SHARED 2022-04-11 15:47:38 +02:00