Changed foreign column name add added category_id in item_codes.

diff --git a/sql/alter2.1.php b/sql/alter2.1.php
index 17fda983e27fe4774b8660c058b6d2f58146cc11..6eae749ff58bbaaa3d4fe8e6d516c70103b77f0c 100644 (file)
--- a/sql/alter2.1.php
+++ b/sql/alter2.1.php
@@ -32,7 +32,7 @@ class fa2_1 {
                        }
                }
                // copy all item codes from stock_master into item_codes
-               $sql = "SELECT `stock_id`,`description` FROM `".$pref."stock_master`";
+               $sql = "SELECT `stock_id`,`description`,`category_id` FROM ".$pref."stock_master";
                $result = db_query($sql);
                if (!$result) {
                        display_error(_("Cannot select stock identificators")
@@ -41,9 +41,9 @@ class fa2_1 {
                } else {
                        while ($row = db_fetch_assoc($result)) {
                                $sql = "INSERT IGNORE "
-                                       .$pref."item_codes (`item_code`,`stock_id`,`description`)
+                                       .$pref."item_codes (`item_code`,`stock_id`,`description`,`category_id`)
                                        VALUES('".$row['stock_id']."','".$row['stock_id']."','"
-                                       .$row['description']."')";
+                                       .$row['description']."','".$row['category_id']."')";
                                $res2 = db_query($sql);
                                if (!$res2) {
                                        display_error(_("Cannot insert stock id into item_codes")

diff --git a/sql/alter2.1.sql b/sql/alter2.1.sql
index f656d7bd5963462fb1ed1bebef177fd838e5688b..51b5e88ae4d59bbae019246b90b772ab746387f4 100644 (file)
--- a/sql/alter2.1.sql
+++ b/sql/alter2.1.sql
@@ -177,8 +177,9 @@ CREATE TABLE `0_item_codes` (
   `item_code` varchar(20) NOT NULL,
   `stock_id` varchar(20) NOT NULL,
   `description` varchar(200) NOT NULL default '',
+  `category_id` int(11) NOT NULL,
   `quantity` double NOT NULL default '1',
-  `foreign` tinyint(1) NOT NULL default 0,
+  `is_foreign` tinyint(1) NOT NULL default 0,
   PRIMARY KEY  (`id`),
   UNIQUE KEY(`stock_id`, `item_code`)
 ) TYPE=MyISAM AUTO_INCREMENT=1;