Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/bom/bom_card.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/19.0.0-20.0.0.sql
This commit is contained in:
Laurent Destailleur 2024-04-19 16:02:02 +02:00
commit a7d07fe75d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/bom/bom_card.php
View File

@ -170,6 +170,7 @@ if (empty($reshook)) {
$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
$disable_stock_change = GETPOSTINT('disable_stock_change');
$fk_workstation = GETPOSTINT('idworkstations');
$efficiency = price2num(GETPOST('efficiency', 'alpha'));
$fk_unit = GETPOST('fk_unit', 'alphanohtml');
@ -178,7 +179,11 @@ if (empty($reshook)) {
$product = new Product($db);
$res = $product->fetch($idprod);
if ($res > 0 && $product->type == Product::TYPE_SERVICE) {
$fk_default_workstation = $product->fk_default_workstation;
if ($fk_workstation > 0) {
$fk_default_workstation = $fk_workstation;
} else {
$fk_default_workstation = $product->fk_default_workstation;
}
}
if (empty($fk_unit)) {
$fk_unit = $product->fk_unit;

2
htdocs/install/mysql/migration/18.0.0-19.0.0.sql
View File

@ -216,3 +216,5 @@ ALTER TABLE llx_prelevement_lignes ADD COLUMN tms timestamp DEFAULT CURRENT_TIME
ALTER TABLE llx_bom_bomline ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
UPDATE llx_c_type_contact SET element = 'stocktransfer' WHERE element = 'StockTransfer';
UPDATE llx_c_units SET scale = 1 WHERE code = 'S';