Fix duration must be double(24,8) to store seconds

Dolibarr · Dec 1, 2019 · 83928b4 · 83928b4
1 parent b1a8e39
commit 83928b4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
@@ -1051,7 +1051,7 @@ class BOMLine extends CommonObjectLine
 		'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'notnull'=>1, 'isameasure'=>'1',),
 		'qty_frozen' => array('type'=>'smallint', 'label'=>'QuantityFrozen', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>105, 'css'=>'maxwidth50imp', 'help'=>'QuantityConsumedInvariable'),
 	    'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
-	    //'efficiency' => array('type'=>'double(8,4)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
+	    //'efficiency' => array('type'=>'double(24,8)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
 		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>200, 'notnull'=>1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 	);

diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -78,7 +78,7 @@ ALTER TABLE llx_rights_def ADD COLUMN family_position INTEGER NOT NULL DEFAULT 0
 
 UPDATE llx_rights_def SET subperms = 'write' WHERE perms = 'fiscalyear' AND module = 'accounting' AND subperms IS NULL;
 
-ALTER TABLE llx_bom_bom ADD COLUMN duration double(8,4) DEFAULT NULL;
+ALTER TABLE llx_bom_bom ADD COLUMN duration double(24,8) DEFAULT NULL;
 ALTER TABLE llx_bom_bom ADD COLUMN fk_warehouse integer;
 ALTER TABLE llx_bom_bomline ADD COLUMN position integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_bom_bomline ADD COLUMN qty_frozen smallint DEFAULT 0;

diff --git a/htdocs/install/mysql/tables/llx_bom_bom.sql b/htdocs/install/mysql/tables/llx_bom_bom.sql
@@ -26,8 +26,8 @@ CREATE TABLE llx_bom_bom(
 	note_private text, 
 	fk_warehouse integer,
 	qty double(24,8),
-	efficiency double(8,4) DEFAULT 1,
-	duration double(8,4) DEFAULT NULL,
+	efficiency double(24,8) DEFAULT 1,
+	duration double(24,8) DEFAULT NULL,
 	date_creation datetime NOT NULL,
 	date_valid datetime,
 	tms timestamp, 

diff --git a/htdocs/install/mysql/tables/llx_bom_bomline.sql b/htdocs/install/mysql/tables/llx_bom_bomline.sql
@@ -24,7 +24,7 @@ CREATE TABLE llx_bom_bomline(
 	qty double(24,8) NOT NULL, 
     qty_frozen smallint DEFAULT 0,
     disable_stock_change smallint DEFAULT 0, 
-	efficiency double(8,4) NOT NULL DEFAULT 1,
+	efficiency double(24,8) NOT NULL DEFAULT 1,
 	position integer NOT NULL DEFAULT 0
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;