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

Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe

Browse Source 
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
This commit is contained in:
Laurent Destailleur 2021-01-30 13:22:00 +01:00 committed by GitHub
commit 2b59a20ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@ -554,4 +554,3 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64); ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
ALTER TABLE llx_projet ADD COLUMN fk_opp_status_end integer DEFAULT NULL; ALTER TABLE llx_projet ADD COLUMN fk_opp_status_end integer DEFAULT NULL;

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

@ -16,7 +16,7 @@
CREATE TABLE llx_mrp_production( CREATE TABLE llx_mrp_production(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
fk_mo integer NOT NULL, fk_mo integer NOT NULL,
position integer NOT NULL DEFAULT 0, position integer NOT NULL DEFAULT 0,
fk_product integer NOT NULL, fk_product integer NOT NULL,
fk_warehouse integer, fk_warehouse integer,

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

@ -1352,7 +1352,7 @@ class Mo extends CommonObject
*/ */
public static function replaceThirdparty($db, $origin_id, $dest_id) public static function replaceThirdparty($db, $origin_id, $dest_id)
{ {
$tables = array('mrp_production'); $tables = array('mrp_mo');
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables); return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
} }