Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

This commit is contained in:
Regis Houssin 2012-07-02 19:31:00 +02:00
commit 9c2f1a7544
2 changed files with 8 additions and 3 deletions

View File

@ -35,4 +35,9 @@ ALTER TABLE llx_commande_fournisseur CHANGE COLUMN date_cloture date_approve dat
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_user_cloture fk_user_approve integer;
ALTER TABLE llx_mailing MODIFY COLUMN body mediumtext;
ALTER TABLE llx_mailing ADD COLUMN extraparams varchar(255);
ALTER TABLE llx_mailing ADD COLUMN extraparams varchar(255);
ALTER TABLE llx_product MODIFY ref varchar(128) NOT NULL;
ALTER TABLE llx_product MODIFY ref_ext varchar(128);

View File

@ -22,10 +22,10 @@
create table llx_product
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
ref varchar(32) NOT NULL,
ref varchar(128) NOT NULL,
entity integer DEFAULT 1 NOT NULL, -- Multi company id
ref_ext varchar(32), -- reference into an external system (not used by dolibarr)
ref_ext varchar(128), -- reference into an external system (not used by dolibarr)
datec datetime,
tms timestamp,