diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php index 85561c1c5721bc563c05779924cfe33b2b4cb1ea..d0c2310a0e45c1786b63976f9096512e0048847d 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 237916d3e5578829d847f499f91702f8ad265fbc..34226a3c6f23003c298f19668e538f10d357ffd1 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 0ad03e2095c363b559efa4466a09d6efc592f6a3..526ab4263e75c74855b40370d99c448e20f51455 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 3236ee3870ba13f43f9b56bb1619a5f83edc1c04..043949b5eaea80c307fc3893cac0fd2fbc8b0942 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; --