From 93444309ddcde4920090cb51e4097de480047d0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 May 2009 01:09:31 +0000
Subject: [PATCH] Add import key on third party table
---
htdocs/lib/functions2.lib.php | 3 +++
mysql/migration/2.6.0-2.7.0.sql | 5 ++++-
mysql/tables/llx_product.sql | 2 +-
mysql/tables/llx_societe.sql | 5 +++--
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php
index 85561c1c572..d0c2310a0e4 100644
--- a/htdocs/lib/functions2.lib.php
+++ b/htdocs/lib/functions2.lib.php
@@ -83,6 +83,9 @@ function dol_print_object_info($object)
global $langs;
$langs->load("other");
+ if (isset($object->import_key))
+ print $langs->trans("ImportedWithSet")." : " . $object->import_key . '<br>';
+
if (isset($object->user_creation) && $object->user_creation->fullname)
print $langs->trans("CreatedBy")." : " . $object->user_creation->fullname . '<br>';
diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql
index 237916d3e55..34226a3c6f2 100644
--- a/mysql/migration/2.6.0-2.7.0.sql
+++ b/mysql/migration/2.6.0-2.7.0.sql
@@ -7,10 +7,13 @@
--
-- Usage of llx_menu_const and llx_menu_constraint is too complicated
--- We remove it
+-- so we made first change to remove it
alter table llx_menu_const drop foreign key fk_menu_const_fk_menu;
+alter table llx_societe add column import_key varchar(14);
+
+
-- Multi company
ALTER TABLE llx_rights_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER module;
ALTER TABLE llx_events ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER type;
diff --git a/mysql/tables/llx_product.sql b/mysql/tables/llx_product.sql
index 0ad03e2095c..526ab4263e7 100644
--- a/mysql/tables/llx_product.sql
+++ b/mysql/tables/llx_product.sql
@@ -53,7 +53,7 @@ create table llx_product
pmp double(24,8) default 0 NOT NULL,
canvas varchar(15) DEFAULT '',
finished tinyint DEFAULT NULL,
- import_key varchar(14)
+ import_key varchar(14) -- import key
)type=innodb;
--
diff --git a/mysql/tables/llx_societe.sql b/mysql/tables/llx_societe.sql
index 3236ee3870b..043949b5eae 100644
--- a/mysql/tables/llx_societe.sql
+++ b/mysql/tables/llx_societe.sql
@@ -70,9 +70,10 @@ create table llx_societe
remise_client real DEFAULT 0, -- remise syst�matique pour le client
mode_reglement tinyint, -- mode de r�glement
cond_reglement tinyint, -- condition de r�glement
- tva_assuj tinyint DEFAULT 1, -- assujeti ou non � la TVA
+ tva_assuj tinyint DEFAULT 1, -- assujeti ou non � la TVA
gencod varchar(255), -- barcode
- price_level tinyint(4) NULL -- level of price for multiprices
+ price_level tinyint(4) NULL, -- level of price for multiprices
+ import_key varchar(14) -- import key
)type=innodb;
--
--
GitLab