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

Dolibarr · Jul 8, 2014 · e659b9e · e659b9e
2 parents 682d765 + 32c1513
commit e659b9e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -155,7 +155,7 @@ CREATE TABLE llx_product_batch (
   sellby datetime DEFAULT NULL,
   batch varchar(30) DEFAULT NULL,
   qty double NOT NULL DEFAULT 0,
-  import_key varchar(14) DEFAULT NULL,
+  import_key varchar(14) DEFAULT NULL
 ) ENGINE=InnoDB;
 
 CREATE TABLE llx_expeditiondet_batch (
@@ -165,7 +165,7 @@ CREATE TABLE llx_expeditiondet_batch (
   sellby date DEFAULT NULL,
   batch varchar(30) DEFAULT NULL,
   qty double NOT NULL DEFAULT 0,
-  fk_origin_stock integer NOT NULL,
+  fk_origin_stock integer NOT NULL
 ) ENGINE=InnoDB;
 
 -- Salary payment in tax module