lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-18 21:55:11 +02:00
commit 62f51c4d35
7 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/bom/class/bom.class.php
View File

@ -1732,6 +1732,12 @@ class BOMLine extends CommonObjectLine
*/ */
public $childBom = array(); public $childBom = array();
/*
* Service Workstation
*/
public $fk_default_workstation;
/** /**
* Constructor * Constructor

3
htdocs/install/mysql/migration/17.0.0-18.0.0.sql
View File

@ -394,3 +394,6 @@ ALTER TABLE llx_c_email_templates add COLUMN defaultfortype smallint DEFAULT 0;
ALTER TABLE llx_mailing ADD COLUMN fk_user_modif integer AFTER fk_user_creat; ALTER TABLE llx_mailing ADD COLUMN fk_user_modif integer AFTER fk_user_creat;
ALTER TABLE llx_mailing ADD COLUMN evenunsubscribe smallint DEFAULT 0; ALTER TABLE llx_mailing ADD COLUMN evenunsubscribe smallint DEFAULT 0;
ALTER TABLE llx_mailing ADD COLUMN name_from varchar(128) AFTER email_from; ALTER TABLE llx_mailing ADD COLUMN name_from varchar(128) AFTER email_from;
ALTER TABLE llx_bom_bomline ADD COLUMN fk_default_workstation integer DEFAULT NULL;
ALTER TABLE llx_mrp_production ADD COLUMN fk_default_workstation integer DEFAULT NULL;

3
htdocs/install/mysql/tables/llx_bom_bomline.sql
View File

@ -26,6 +26,7 @@ CREATE TABLE llx_bom_bomline(
disable_stock_change smallint DEFAULT 0, disable_stock_change smallint DEFAULT 0,
efficiency double(24,8) NOT NULL DEFAULT 1, efficiency double(24,8) NOT NULL DEFAULT 1,
fk_unit integer NULL, fk_unit integer NULL,
position integer NOT NULL DEFAULT 0 position integer NOT NULL DEFAULT 0,
fk_default_workstation integer DEFAULT NULL
-- END MODULEBUILDER FIELDS -- END MODULEBUILDER FIELDS
) ENGINE=innodb; ) ENGINE=innodb;

3
htdocs/install/mysql/tables/llx_mrp_production.sql
View File

@ -33,6 +33,7 @@ CREATE TABLE llx_mrp_production(
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
import_key varchar(14) import_key varchar(14),
fk_default_workstation integer DEFAULT NULL
) ENGINE=innodb; ) ENGINE=innodb;

4
htdocs/mrp/class/api_mos.class.php
View File

@ -345,10 +345,10 @@ class Mos extends DolibarrApi
} }
if (empty($labelmovement)) { if (empty($labelmovement)) {
throw new RestException(500, "Field inventorylabel not prodivded"); throw new RestException(500, "Field inventorylabel not provided");
} }
if (empty($codemovement)) { if (empty($codemovement)) {
throw new RestException(500, "Field inventorycode not prodivded"); throw new RestException(500, "Field inventorycode not provided");
} }
// Code for consume and produce... // Code for consume and produce...

5
htdocs/mrp/class/mo.class.php
View File

@ -1744,6 +1744,11 @@ class MoLine extends CommonObjectLine
public $import_key; public $import_key;
public $fk_parent_line; public $fk_parent_line;
/*
* Service Workstation
*/
public $fk_default_workstation;
/** /**
* Constructor * Constructor
* *

6
htdocs/product/class/productcustomerprice.class.php
View File

@ -875,7 +875,7 @@ class Productcustomerprice extends CommonObject
$prodsocpriceupd->recuperableonly = $this->recuperableonly; $prodsocpriceupd->recuperableonly = $this->recuperableonly;
$resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate); $resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate);
if ($result < 0) { if ($resultupd < 0) {
$error++; $error++;
$this->error = $prodsocpriceupd->error; $this->error = $prodsocpriceupd->error;
} }
@ -893,7 +893,7 @@ class Productcustomerprice extends CommonObject
$prodsocpricenew->recuperableonly = $this->recuperableonly; $prodsocpricenew->recuperableonly = $this->recuperableonly;
$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate); $resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
if ($result < 0) { if ($resultupd < 0) {
$error++; $error++;
$this->error = $prodsocpricenew->error; $this->error = $prodsocpricenew->error;
} }
@ -927,7 +927,7 @@ class Productcustomerprice extends CommonObject
$this->db->begin(); $this->db->begin();
if (!$error && !$notrigger) { if (!$notrigger) {
$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user); $result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user);
if ($result < 0) { if ($result < 0) {
$error++; $error++;