X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fpurchasing_data.php;h=ce1c9b7853c5226ad78e02f4e328d968ad34723b;hb=61c780745e4743d3bf4c8ef8d23ad2f34ddc121b;hp=67b670ffd6a89c742da8a5c37a352aa45992be57;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 67b670ff..ce1c9b78 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 4;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -13,6 +23,16 @@ include_once($path_to_root . "/includes/data_checks.inc");
 check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system."));
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
+//----------------------------------------------------------------------------------------
+if ($ret = context_restore()) {
+	if(isset($ret['supplier_id']))
+		$_POST['supplier_id'] = $ret['supplier_id'];
+}
+if (isset($_POST['_supplier_id_editor'])) {
+	context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 
+		array( 'supplier_id', 'stock_id','_stock_id_edit', 'price', 
+			'suppliers_uom', 'supplier_description','conversion_factor'));
+}
 simple_page_mode(true);
 //--------------------------------------------------------------------------------------------------
 
@@ -47,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");
@@ -92,7 +112,7 @@ if (isset($_POST['_selected_id_update']) )
 	$Ajax->activate('_page_body');
 }
 
-if (isset($_POST['_stock_id_update']))
+if (list_updated('stock_id')) 
 	$Ajax->activate('price_table');
 //--------------------------------------------------------------------------------------------------
 
@@ -131,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);
 
@@ -148,9 +168,10 @@ 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"));
-		 	edit_button_cell("Delete".$myrow['supplier_id'], _("Delete"));
+		 	delete_button_cell("Delete".$myrow['supplier_id'], _("Delete"));
             end_row();
 
             $j++;
@@ -187,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);
 
@@ -199,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);