diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
index 6a5ab3c27..4ecc2a6e8 100644
--- a/install-dev/data/db_structure.sql
+++ b/install-dev/data/db_structure.sql
@@ -110,7 +110,7 @@ CREATE TABLE `PREFIX_attribute_impact` (
   `id_attribute_impact` int(10) unsigned NOT NULL auto_increment,
   `id_product` int(11) unsigned NOT NULL,
   `id_attribute` int(11) unsigned NOT NULL,
-  `weight` float NOT NULL,
+  `weight` DECIMAL(20,6) NOT NULL,
   `price` decimal(17,2) NOT NULL,
   PRIMARY KEY (`id_attribute_impact`),
   UNIQUE KEY `id_product` (`id_product`,`id_attribute`)
@@ -1148,7 +1148,7 @@ CREATE TABLE `PREFIX_order_detail` (
   `product_upc` varchar(12) default NULL,
   `product_reference` varchar(32) default NULL,
   `product_supplier_reference` varchar(32) default NULL,
-  `product_weight` float NOT NULL,
+  `product_weight` DECIMAL(20,6) NOT NULL,
   `tax_computation_method` tinyint(1) unsigned NOT NULL default '0',
   `tax_name` varchar(16) NOT NULL,
   `tax_rate` DECIMAL(10,3) NOT NULL DEFAULT '0.000',
@@ -1367,10 +1367,10 @@ CREATE TABLE `PREFIX_product` (
   `reference` varchar(32) default NULL,
   `supplier_reference` varchar(32) default NULL,
   `location` varchar(64) default NULL,
-  `width` float NOT NULL default '0',
-  `height` float NOT NULL default '0',
-  `depth` float NOT NULL default '0',
-  `weight` float NOT NULL default '0',
+  `width` DECIMAL(20, 6) NOT NULL default '0',
+  `height` DECIMAL(20, 6) NOT NULL default '0',
+  `depth` DECIMAL(20, 6) NOT NULL default '0',
+  `weight` DECIMAL(20, 6) NOT NULL default '0',
   `out_of_stock` int(10) unsigned NOT NULL default '2',
   `quantity_discount` tinyint(1) default '0',
   `customizable` tinyint(2) NOT NULL default '0',
@@ -1443,7 +1443,7 @@ CREATE TABLE `PREFIX_product_attribute` (
   `price` decimal(20,6) NOT NULL default '0.000000',
   `ecotax` decimal(17,6) NOT NULL default '0.00',
   `quantity` int(10) NOT NULL default '0',
-  `weight` float NOT NULL default '0',
+  `weight` DECIMAL(20,6) NOT NULL default '0',
   `unit_price_impact` decimal(17,2) NOT NULL default '0.00',
   `default_on` tinyint(1) unsigned NOT NULL default '0',
   `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1',
@@ -1462,7 +1462,7 @@ CREATE TABLE `PREFIX_product_attribute_shop` (
   `wholesale_price` decimal(20,6) NOT NULL default '0.000000',
   `price` decimal(20,6) NOT NULL default '0.000000',
   `ecotax` decimal(17,6) NOT NULL default '0.00',
-  `weight` float NOT NULL default '0',
+  `weight` DECIMAL(20,6) NOT NULL default '0',
   `unit_price_impact` decimal(17,2) NOT NULL default '0.00',
   `default_on` tinyint(1) unsigned NOT NULL default '0',
   `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1',
@@ -2352,7 +2352,7 @@ CREATE TABLE `PREFIX_order_carrier` (
   `id_order` int(11) unsigned NOT NULL,
   `id_carrier` int(11) unsigned NOT NULL,
   `id_order_invoice` int(11) unsigned DEFAULT NULL,
-  `weight` float DEFAULT NULL,
+  `weight` DECIMAL(20,6) DEFAULT NULL,
   `shipping_cost_tax_excl` decimal(20,6) DEFAULT NULL,
   `shipping_cost_tax_incl` decimal(20,6) DEFAULT NULL,
   `tracking_number` varchar(64) DEFAULT NULL,
diff --git a/install-dev/upgrade/sql/1.5.0.18.sql b/install-dev/upgrade/sql/1.5.0.18.sql
index da8c2de77..ed87802bf 100644
--- a/install-dev/upgrade/sql/1.5.0.18.sql
+++ b/install-dev/upgrade/sql/1.5.0.18.sql
@@ -8,3 +8,10 @@ UPDATE `PREFIX_image_shop` image_shop SET image_shop.`cover`=1 WHERE `id_image`
 INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_ONE_PHONE_AT_LEAST', '1', NOW(), NOW());
 
 /* PHP:p15018_change_image_types(); */;
+
+ALTER TABLE `PREFIX_product` CHANGE `width` `width` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `height` `height` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `depth` `depth` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
+ALTER TABLE `PREFIX_product_attribute` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
+ALTER TABLE `PREFIX_product_attribute_shop` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
+ALTER TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
+ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
+ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';