lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2012-12-09 18:45:03 +01:00
commit f4def0cd89
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -813,7 +813,7 @@ CREATE TABLE llx_product_price_by_qty
qty_min real DEFAULT 0 qty_min real DEFAULT 0
)ENGINE=innodb; )ENGINE=innodb;
ALTER TABLE llx_product_price ADD price_by_qty INT NOT NULL DEFAULT 0; ALTER TABLE llx_product_price ADD COLUMN price_by_qty INT NOT NULL DEFAULT 0;
ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, qty_min); ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, qty_min);
@ -880,3 +880,8 @@ create table llx_user_extrafields
)ENGINE=innodb; )ENGINE=innodb;
ALTER TABLE llx_user_extrafields ADD INDEX idx_user_extrafields (fk_object); ALTER TABLE llx_user_extrafields ADD INDEX idx_user_extrafields (fk_object);
ALTER TABLE llx_element_lock ADD COLUMN sessionid varchar(255) AFTER datem;
ALTER TABLE llx_element_lock MODIFY COLUMN elementtype varchar(32) NOT NULL;
ALTER TABLE llx_element_lock DROP COLUMN fk_user_modif;
ALTER TABLE llx_element_lock DROP COLUMN status;

6
htdocs/install/mysql/tables/llx_element_lock.sql
View File

@ -20,10 +20,8 @@ create table llx_element_lock
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_element integer NOT NULL, fk_element integer NOT NULL,
elementtype varchar(16) NOT NULL, elementtype varchar(32) NOT NULL,
datel datetime, -- date of lock datel datetime, -- date of lock
datem datetime, -- date of unlock/modif datem datetime, -- date of unlock/modif
fk_user_modif integer, sessionid varchar(255)
status tinyint DEFAULT 0 -- 0 unlock, 1 lock
)ENGINE=innodb; )ENGINE=innodb;