X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fpurchasing_data.php;h=8a1b4c0f2cef176859066345ddaa965f5a141791;hb=412b79dc32855f813d03a8a6dd9debd45bb308f5;hp=8e2cb59d0e9a94e166e640506089ef62868a2b16;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 8e2cb59d..8a1b4c0f 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -18,7 +18,7 @@ check_db_has_suppliers(_("There are no suppliers defined in the system."));
 if (isset($_GET['supplier_id']))
 {
 	$supplier_id = strtoupper($_GET['supplier_id']);
-} 
+}
 elseif (isset($_POST['supplier_id']))
 {
 	$supplier_id = strtoupper($_POST['supplier_id']);
@@ -39,16 +39,19 @@ if ((isset($_POST['AddRecord']) || isset($_POST['UpdateRecord'])) && isset($supp
    	{
       	$input_error = 1;
       	display_error( _("There is no item selected."));
+	set_focus('stock_id');
    	}
-   	elseif (!is_numeric($_POST['price']) || $_POST['price']==0)
+   	elseif (!check_num('price', 0))
    	{
       	$input_error = 1;
       	display_error( _("The price entered was not numeric."));
+	set_focus('price');
    	}
-   	elseif (!is_numeric($_POST['conversion_factor']))
+   	elseif (!check_num('conversion_factor'))
    	{
       	$input_error = 1;
       	display_error( _("The conversion factor entered was not numeric. The conversion factor is the number by which the price must be divided by to get the unit price in our unit of measure."));
+	set_focus('conversion_factor');
    	}
 
 	if ($input_error == 0)
@@ -58,8 +61,9 @@ if ((isset($_POST['AddRecord']) || isset($_POST['UpdateRecord'])) && isset($supp
 
     		$sql = "INSERT INTO ".TB_PREF."purch_data (supplier_id, stock_id, price, suppliers_uom,
     			conversion_factor, supplier_description) VALUES (";
-    		$sql .= "'$supplier_id', '" . $_POST['stock_id'] . "', " . $_POST['price'] . ", '" . $_POST['suppliers_uom'] . "', " .
-    			$_POST['conversion_factor'] . ", '" . $_POST['supplier_description'] . "')";
+    		$sql .= "'$supplier_id', '" . $_POST['stock_id'] . "', " .
+		    input_num('price') . ", '" . $_POST['suppliers_uom'] . "', " .
+    			input_num('conversion_factor') . ", '" . $_POST['supplier_description'] . "')";
 
     		db_query($sql,"The supplier purchasing details could not be added");
     		display_notification(_("This supplier purchasing data has been added."));
@@ -67,9 +71,9 @@ if ((isset($_POST['AddRecord']) || isset($_POST['UpdateRecord'])) && isset($supp
 
        	if (isset($_POST['UpdateRecord']))
        	{
-          	$sql = "UPDATE ".TB_PREF."purch_data SET price=" . $_POST['price'] . ",
+          	$sql = "UPDATE ".TB_PREF."purch_data SET price=" . input_num('price') . ",
 				suppliers_uom='" . $_POST['suppliers_uom'] . "',
-				conversion_factor=" . $_POST['conversion_factor'] . ",
+				conversion_factor=" . input_num('conversion_factor') . ",
 				supplier_description='" . $_POST['supplier_description'] . "'
 				WHERE stock_id='" . $_POST['stock_id'] . "' AND
 				supplier_id='$supplier_id'";
@@ -102,7 +106,8 @@ if (isset($_GET['Delete']))
 	display_note(_("The purchasing data item has been sucessfully deleted."));
 	unset ($supplier_id);
 }
-
+if (isset($_POST['_stock_id_update']))
+	$Ajax->activate('price_table');
 //--------------------------------------------------------------------------------------------------
 
 start_form(false, true);
@@ -113,17 +118,18 @@ if (!isset($_POST['stock_id']))
 echo "<center>" . _("Item:"). "&nbsp;";
 stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
 
-echo "<hr><center>";
+echo "<hr></center>";
 
 set_global_stock_item($_POST['stock_id']);
 
 $mb_flag = get_mb_flag($_POST['stock_id']);
 
-if ($mb_flag == -1) 
+if ($mb_flag == -1)
 {
 	display_error(_("Entered item is not defined. Please re-enter."));
-} 
-else 
+	set_focus('stock_id');
+}
+else
 {
 
     $sql = "SELECT ".TB_PREF."purch_data.*,".TB_PREF."suppliers.supp_name,".TB_PREF."suppliers.curr_code
@@ -132,12 +138,12 @@ else
 		WHERE stock_id = '" . $_POST['stock_id'] . "'";
 
     $result = db_query($sql, "The supplier purchasing details for the selected part could not be retrieved");
-
+  div_start('price_table');
     if (db_num_rows($result) == 0)
     {
     	display_note(_("There is no purchasing data set up for the part selected"));
-    } 
-    else 
+    }
+    else
     {
         start_table("$table_style width=60%");
 
@@ -171,6 +177,7 @@ else
 
         end_table();
     }
+ div_end();
 }
 
 //------------------------------------------------------------------------------------------------
@@ -188,33 +195,34 @@ if (isset($_GET['Edit']))
 	$myrow = db_fetch($result);
 
     $supp_name = $myrow["supp_name"];
-    $_POST['price'] = $myrow["price"];
+    $_POST['price'] = price_format($myrow["price"]);
     $_POST['suppliers_uom'] = $myrow["suppliers_uom"];
     $_POST['supplier_description'] = $myrow["supplier_description"];
-    $_POST['conversion_factor'] = $myrow["conversion_factor"];
+    $_POST['conversion_factor'] = exrate_format($myrow["conversion_factor"]);
 }
 
 echo "<br>";
 start_table($table_style2);
 
-if (isset($_GET['Edit'])) 
+if (isset($_GET['Edit']))
 {
 	hidden('supplier_id', $supplier_id);
 	label_row(_("Supplier:"), $supp_name);
-} 
+}
 else
 {
 	supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
 	$supplier_id = $_POST['supplier_id'];
-}	
-text_row(_("Price:"), 'price', null, 12, 12, "", get_supplier_currency($supplier_id));
+}
+amount_row(_("Price:"), 'price', null,'', get_supplier_currency($supplier_id));
 text_row(_("Suppliers Unit of Measure:"), 'suppliers_uom', null, 50, 51);
 
 if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "")
 {
-   	$_POST['conversion_factor'] = 1;
+   	$_POST['conversion_factor'] = exrate_format(1);
 }
-text_row(_("Conversion Factor (to our UOM):"), 'conversion_factor', $_POST['conversion_factor'], 12, 12);
+amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor',
+  exrate_format($_POST['conversion_factor']), null, null, user_exrate_dec() );
 text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 51);
 
 end_table(1);
@@ -222,8 +230,8 @@ end_table(1);
 if (isset($_GET['Edit']))
 {
 	submit_center('UpdateRecord', _("Update Purchasing Data"));
-} 
-else 
+}
+else
 {
 	submit_center('AddRecord', _("Add Purchasing Data"));
 }