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

Merge remote-tracking branch 'origin/3.6' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2014-07-09 00:30:23 +02:00
commit e659b9e693
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
View File

@ -155,7 +155,7 @@ CREATE TABLE llx_product_batch (
sellby datetime DEFAULT NULL, sellby datetime DEFAULT NULL,
batch varchar(30) DEFAULT NULL, batch varchar(30) DEFAULT NULL,
qty double NOT NULL DEFAULT 0, qty double NOT NULL DEFAULT 0,
import_key varchar(14) DEFAULT NULL, import_key varchar(14) DEFAULT NULL
) ENGINE=InnoDB; ) ENGINE=InnoDB;
CREATE TABLE llx_expeditiondet_batch ( CREATE TABLE llx_expeditiondet_batch (
@ -165,7 +165,7 @@ CREATE TABLE llx_expeditiondet_batch (
sellby date DEFAULT NULL, sellby date DEFAULT NULL,
batch varchar(30) DEFAULT NULL, batch varchar(30) DEFAULT NULL,
qty double NOT NULL DEFAULT 0, qty double NOT NULL DEFAULT 0,
fk_origin_stock integer NOT NULL, fk_origin_stock integer NOT NULL
) ENGINE=InnoDB; ) ENGINE=InnoDB;
-- Salary payment in tax module -- Salary payment in tax module