Skip to content
Snippets Groups Projects
Commit 93444309 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Add import key on third party table

parent aa967dc3
Branches
Tags
No related merge requests found
...@@ -83,6 +83,9 @@ function dol_print_object_info($object) ...@@ -83,6 +83,9 @@ function dol_print_object_info($object)
global $langs; global $langs;
$langs->load("other"); $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) if (isset($object->user_creation) && $object->user_creation->fullname)
print $langs->trans("CreatedBy")." : " . $object->user_creation->fullname . '<br>'; print $langs->trans("CreatedBy")." : " . $object->user_creation->fullname . '<br>';
......
...@@ -7,10 +7,13 @@ ...@@ -7,10 +7,13 @@
-- --
-- Usage of llx_menu_const and llx_menu_constraint is too complicated -- 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_menu_const drop foreign key fk_menu_const_fk_menu;
alter table llx_societe add column import_key varchar(14);
-- Multi company -- Multi company
ALTER TABLE llx_rights_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER module; 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; ALTER TABLE llx_events ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER type;
......
...@@ -53,7 +53,7 @@ create table llx_product ...@@ -53,7 +53,7 @@ create table llx_product
pmp double(24,8) default 0 NOT NULL, pmp double(24,8) default 0 NOT NULL,
canvas varchar(15) DEFAULT '', canvas varchar(15) DEFAULT '',
finished tinyint DEFAULT NULL, finished tinyint DEFAULT NULL,
import_key varchar(14) import_key varchar(14) -- import key
)type=innodb; )type=innodb;
-- --
......
...@@ -72,7 +72,8 @@ create table llx_societe ...@@ -72,7 +72,8 @@ create table llx_societe
cond_reglement tinyint, -- condition de rglement cond_reglement tinyint, -- condition de rglement
tva_assuj tinyint DEFAULT 1, -- assujeti ou non la TVA tva_assuj tinyint DEFAULT 1, -- assujeti ou non la TVA
gencod varchar(255), -- barcode 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; )type=innodb;
-- --
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment