diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql
index dc16f1877..db7e15e05 100644
--- a/install-dev/sql/db.sql
+++ b/install-dev/sql/db.sql
@@ -1772,7 +1772,6 @@ CREATE TABLE `PREFIX_stock` (
   PRIMARY KEY (`id_stock`),
   KEY `id_product` (`id_product`),
   KEY `id_product_attribute` (`id_product_attribute`),
-  KEY `id_group_shop` (`id_group_shop`),
   KEY `id_shop` (`id_shop`),
   UNIQUE KEY `product_stock` (`id_product` ,`id_product_attribute` ,`id_shop`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
diff --git a/install-dev/sql/db_settings_extends.sql b/install-dev/sql/db_settings_extends.sql
index bf2639579..5df5a0c98 100644
--- a/install-dev/sql/db_settings_extends.sql
+++ b/install-dev/sql/db_settings_extends.sql
@@ -1128,33 +1128,37 @@ INSERT INTO `PREFIX_store` (`id_store`, `id_country`, `id_state`, `name`, `addre
 INSERT INTO `PREFIX_store_shop` (`id_store`, `id_shop`) (SELECT `id_store`, 1 FROM `PREFIX_store`);
 
 INSERT INTO `PREFIX_stock` (`id_stock`, `id_product`, `id_product_attribute`, `id_shop`, `quantity`) VALUES
-(1, 1, 25, 1, 150),
-(2, 1, 26, 1, 120),
-(3, 1, 27, 1, 230),
-(4, 1, 28, 1, 150),
-(5, 1, 29, 1, 120),
-(6, 1, 30, 1, 230),
-(7, 1, 31, 1, 150),
-(8, 1, 31, 1, 120),
-(9, 1, 33, 1, 230),
-(10, 1, 34, 1, 150),
-(11, 1, 35, 1, 120),
-(12, 1, 36, 1, 230),
-(13, 1, 39, 1, 150),
-(14, 1, 40, 1, 120),
-(15, 1, 41, 1, 230),
-(16, 1, 42, 1, 150),
-(17, 2, 7, 1, 120),
-(18, 2, 8, 1, 230),
-(19, 2, 9, 1, 150),
-(20, 2, 10, 1, 120),
-(21, 5, 12, 1, 230),
-(22, 5, 13, 1, 150),
-(23, 5, 14, 1, 120),
-(24, 5, 15, 1, 230),
-(25, 6, 0, 1, 230),
-(26, 7, 19, 1, 150),
-(27, 7, 22, 1, 120),
-(28, 7, 23, 1, 230),
-(29, 8, 0, 1, 230),
-(30, 9, 0, 1, 150);
\ No newline at end of file
+(1, 2, 7, 1, 10),
+(2, 2, 8, 1, 20),
+(3, 2, 9, 1, 30),
+(4, 2, 10, 1, 40),
+(5, 5, 12, 1, 100),
+(6, 5, 13, 1, 99),
+(7, 5, 14, 1, 50),
+(8, 5, 15, 1, 25),
+(9, 7, 19, 1, 50),
+(10, 7, 22, 1, 60),
+(11, 7, 23, 1, 70),
+(12, 1, 25, 1, 50),
+(13, 1, 26, 1, 50),
+(14, 1, 27, 1, 50),
+(15, 1, 28, 1, 50),
+(16, 1, 29, 1, 50),
+(17, 1, 30, 1, 50),
+(18, 1, 31, 1, 50),
+(19, 1, 32, 1, 50),
+(20, 1, 33, 1, 50),
+(21, 1, 34, 1, 50),
+(22, 1, 35, 1, 50),
+(23, 1, 36, 1, 50),
+(24, 1, 39, 1, 50),
+(25, 1, 40, 1, 50),
+(26, 1, 41, 1, 50),
+(27, 1, 42, 1, 50),
+(32, 1, 0, 1, 800),
+(33, 2, 0, 1, 100),
+(34, 5, 0, 1, 274),
+(35, 6, 0, 1, 250),
+(36, 7, 0, 1, 180),
+(37, 8, 0, 1, 1),
+(38, 9, 0, 1, 1);
\ No newline at end of file
diff --git a/install-dev/sql/upgrade/1.5.0.0.sql b/install-dev/sql/upgrade/1.5.0.0.sql
index b8934fdad..18a015e30 100755
--- a/install-dev/sql/upgrade/1.5.0.0.sql
+++ b/install-dev/sql/upgrade/1.5.0.0.sql
@@ -70,13 +70,16 @@ CREATE TABLE `PREFIX_stock` (
   PRIMARY KEY (`id_stock`),
   KEY `id_product` (`id_product`),
   KEY `id_product_attribute` (`id_product_attribute`),
-  KEY `id_group_shop` (`id_group_shop`),
   KEY `id_shop` (`id_shop`),
   UNIQUE KEY `product_stock` (`id_product` ,`id_product_attribute` ,`id_shop`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
-INSERT INTO `PREFIX_stock` (id_product, id_shop) (SELECT p.id_product, 1 FROM PREFIX_product p LEFT JOIN PREFIX_product_attribute pa ON (p.id_product = pa.id_product) WHERE pa.id_product_attribute IS NULL);
-INSERT INTO `PREFIX_stock` (id_product, id_product_attribute, id_shop) (SELECT id_product, id_product_attribute, 1 FROM PREFIX_product_attribute);
+INSERT INTO `PREFIX_stock` (id_product, id_product_attribute, id_shop, quantity) (SELECT id_product, id_product_attribute, 1, quantity FROM PREFIX_product_attribute);
+INSERT INTO `PREFIX_stock` (id_product, id_product_attribute, id_shop, quantity) (SELECT id_product, 0, 1, IF(
+	(SELECT COUNT(*) FROM PREFIX_product_attribute pa WHERE p.id_product = pa.id_product) > 0,
+	(SELECT SUM(pa2.quantity) FROM PREFIX_product_attribute pa2 WHERE p.id_product = pa2.id_product),
+	quantity
+) FROM PREFIX_product p);
 
 CREATE TABLE `PREFIX_country_shop` (
 `id_country` INT( 11 ) UNSIGNED NOT NULL,