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

FIX Societe Merge : "unknow column fk_soc" + "Delivery" label

Browse Source
This commit is contained in:
atm-lena 2021-01-15 09:58:04 +01:00
parent bcfe03216a
commit e2696d7718
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,3 +555,6 @@ 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;
ALTER TABLE llx_mrp_production ADD COLUMN fk_soc integer NOT NULL;

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

@ -16,7 +16,8 @@
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,
fk_soc 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/societe/card.php
View File

@ -249,7 +249,7 @@ if (empty($reshook))
'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php', 'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php', 'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php', 'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
'Livraison' => '/delivery/class/delivery.class.php', 'Delivery' => '/delivery/class/delivery.class.php',
'Product' => '/product/class/product.class.php', 'Product' => '/product/class/product.class.php',
'Project' => '/projet/class/project.class.php', 'Project' => '/projet/class/project.class.php',
'Ticket' => '/ticket/class/ticket.class.php', 'Ticket' => '/ticket/class/ticket.class.php',