5186: The field lengths of item name and description don't match. Temporary fix and...

[fa-stable.git] / inventory / includes / db / items_purchases_db.inc

diff --git a/inventory/includes/db/items_purchases_db.inc b/inventory/includes/db/items_purchases_db.inc
index adbead6eb2244e7924cef96d79443399e5a19b30..2cebd696e17f6635938a174f6b9e30d65cf67cba 100644 (file)
--- a/inventory/includes/db/items_purchases_db.inc
+++ b/inventory/includes/db/items_purchases_db.inc
@@ -13,12 +13,15 @@
 function add_item_purchasing_data($supplier_id, $stock_id, $price,
        $suppliers_uom, $conversion_factor, $supplier_description)
 {
+       $supp_desc = db_escape($supplier_description);
+       if (strlen($supp_desc) > 50) // to be fixed and removed in 2.5
+               $supp_desc = substr($supp_desc, 0, 50)."'";
        $sql = "INSERT INTO ".TB_PREF."purch_data (supplier_id, stock_id, price, suppliers_uom,
                conversion_factor, supplier_description) VALUES (";
        $sql .= db_escape($supplier_id).", ".db_escape($stock_id). ", "
                .$price . ", ".db_escape($suppliers_uom ). ", "
                .$conversion_factor . ", "
-               .db_escape($supplier_description) . ")";
+               .$supp_desc . ")";
 
        db_query($sql,"The supplier purchasing details could not be added");
 }
@@ -26,10 +29,13 @@ function add_item_purchasing_data($supplier_id, $stock_id, $price,
 function update_item_purchasing_data($selected_id, $stock_id, $price,
        $suppliers_uom, $conversion_factor, $supplier_description)
 {
+       $supp_desc = db_escape($supplier_description);
+       if (strlen($supp_desc) > 50) // to be fixed and removed in 2.5
+               $supp_desc = substr($supp_desc, 0, 50) ."'";
        $sql = "UPDATE ".TB_PREF."purch_data SET price=" . $price . ",
                suppliers_uom=".db_escape($suppliers_uom) . ",
                conversion_factor=" . $conversion_factor . ",
-               supplier_description=" . db_escape($supplier_description) . "
+               supplier_description=" . $supp_desc . "
                WHERE stock_id=".db_escape($stock_id) . " AND
                supplier_id=".db_escape($selected_id);
        db_query($sql,"The supplier purchasing details could not be updated");
@@ -44,10 +50,9 @@ function delete_item_purchasing_data($selected_id, $stock_id)
 
 function get_items_purchasing_data($stock_id)
 {
-    $sql = "SELECT ".TB_PREF."purch_data.*,".TB_PREF."suppliers.supp_name,"
-       .TB_PREF."suppliers.curr_code
-               FROM ".TB_PREF."purch_data INNER JOIN ".TB_PREF."suppliers
-               ON ".TB_PREF."purch_data.supplier_id=".TB_PREF."suppliers.supplier_id
+    $sql = "SELECT pdata.*, supplier.supp_name,        supplier.curr_code
+               FROM ".TB_PREF."purch_data pdata
+                       INNER JOIN ".TB_PREF."suppliers supplier ON pdata.supplier_id=supplier.supplier_id
                WHERE stock_id = ".db_escape($stock_id);
 
     return db_query($sql, "The supplier purchasing details for the selected part could not be retrieved");
@@ -55,14 +60,13 @@ function get_items_purchasing_data($stock_id)
 
 function get_item_purchasing_data($selected_id, $stock_id)
 {
-       $sql = "SELECT ".TB_PREF."purch_data.*,".TB_PREF."suppliers.supp_name FROM ".TB_PREF."purch_data
-               INNER JOIN ".TB_PREF."suppliers ON ".TB_PREF."purch_data.supplier_id=".TB_PREF."suppliers.supplier_id
-               WHERE ".TB_PREF."purch_data.supplier_id=".db_escape($selected_id)."
-               AND ".TB_PREF."purch_data.stock_id=".db_escape($stock_id);
+       $sql = "SELECT pdata.*, supplier.supp_name
+               FROM ".TB_PREF."purch_data pdata
+                       INNER JOIN ".TB_PREF."suppliers supplier ON pdata.supplier_id=supplier.supplier_id
+               WHERE pdata.supplier_id=".db_escape($selected_id)."
+                       AND pdata.stock_id=".db_escape($stock_id);
 
        $result = db_query($sql, "The supplier purchasing details for the selected supplier and item could not be retrieved");
 
        return db_fetch($result);
 }
-
-