*** empty log message ***

[fa-stable.git] / inventory / purchasing_data.php

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 85e8adedc254d2ffeb71bcadf6b303e12ef3314d..ce1c9b7853c5226ad78e02f4e328d968ad34723b 100644 (file)
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -67,17 +67,17 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                $sql = "INSERT INTO ".TB_PREF."purch_data (supplier_id, stock_id, price, suppliers_uom,
                        conversion_factor, supplier_description) VALUES (";
                $sql .= "'".$_POST['supplier_id']."', '" . $_POST['stock_id'] . "', " .
-                   input_num('price') . ", '" . $_POST['suppliers_uom'] . "', " .
-                       input_num('conversion_factor') . ", '" . $_POST['supplier_description'] . "')";
+                   input_num('price',0) . ", '" . $_POST['suppliers_uom'] . "', " .
+                       input_num('conversion_factor') . ", " . db_escape($_POST['supplier_description']) . ")";
 
                db_query($sql,"The supplier purchasing details could not be added");
                display_notification(_("This supplier purchasing data has been added."));
                } else
                {
-               $sql = "UPDATE ".TB_PREF."purch_data SET price=" . input_num('price') . ",
+               $sql = "UPDATE ".TB_PREF."purch_data SET price=" . input_num('price',0) . ",
                                suppliers_uom='" . $_POST['suppliers_uom'] . "',
                                conversion_factor=" . input_num('conversion_factor') . ",
-                               supplier_description='" . $_POST['supplier_description'] . "'
+                               supplier_description=" . db_escape($_POST['supplier_description']) . "
                                WHERE stock_id='" . $_POST['stock_id'] . "' AND
                                supplier_id='$selected_id'";
                db_query($sql,"The supplier purchasing details could not be updated");
@@ -151,10 +151,10 @@ else
     }
     else
     {
-        start_table("$table_style width=60%");
+        start_table("$table_style width=65%");
 
                $th = array(_("Supplier"), _("Price"), _("Currency"),
-                       _("Supplier's Unit"), _("Supplier's Description"), "", "");
+                       _("Supplier's Unit"), _("Conversion Factor"), _("Supplier's Description"), "", "");
 
         table_header($th);
 
@@ -168,6 +168,7 @@ else
             amount_cell($myrow["price"]);
             label_cell($myrow["curr_code"]);
             label_cell($myrow["suppliers_uom"]);
+            qty_cell($myrow['conversion_factor'], false, user_exrate_dec());
             label_cell($myrow["supplier_description"]);
                        edit_button_cell("Edit".$myrow['supplier_id'], _("Edit"));
                        delete_button_cell("Delete".$myrow['supplier_id'], _("Delete"));
@@ -207,7 +208,7 @@ if ($Mode =='Edit')
     $_POST['conversion_factor'] = exrate_format($myrow["conversion_factor"]);
 }
 
-echo "<br>";
+br();
 hidden('selected_id', $selected_id);
 start_table($table_style2);
 
@@ -219,6 +220,7 @@ if ($Mode == 'Edit')
 else
 {
        supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
+       $_POST['price'] = $_POST['suppliers_uom'] = $_POST['conversion_factor'] = $_POST['supplier_description'] = "";
 }
 amount_row(_("Price:"), 'price', null,'', get_supplier_currency($selected_id));
 text_row(_("Suppliers Unit of Measure:"), 'suppliers_uom', null, 50, 51);