Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 18:01:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add import key on third party table

Browse Source
This commit is contained in:
Laurent Destailleur
2009-05-05 01:09:31 +00:00
parent aa967dc3e0
commit 93444309dd
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/lib/functions2.lib.php
View File

@@ -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>';

5
mysql/migration/2.6.0-2.7.0.sql
View File

@@ -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;

2
mysql/tables/llx_product.sql
View File

@@ -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;
-- --

3
mysql/tables/llx_societe.sql
View File

@@ -72,7 +72,8 @@ create table llx_societe
cond_reglement tinyint, -- condition de r<>glement cond_reglement tinyint, -- condition de r<>glement
tva_assuj tinyint DEFAULT 1, -- assujeti ou non <20> la TVA tva_assuj tinyint DEFAULT 1, -- assujeti ou non <20> 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;
-- --