X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fpurchasing_data.php;h=3e2f77b6733feb1fccc7aa9d7a7e642f1e68abd5;hb=348062667e6a96e9849bf25de0f2a426b4f0b9c6;hp=8e2cb59d0e9a94e166e640506089ef62868a2b16;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 8e2cb59d..3e2f77b6 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -1,6 +1,4 @@
activate('_page_body');
+}
+
+if (list_updated('stock_id'))
+ $Ajax->activate('price_table');
//--------------------------------------------------------------------------------------------------
start_form(false, true);
@@ -113,17 +114,18 @@ if (!isset($_POST['stock_id']))
echo "
" . _("Item:"). " ";
stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
-echo "
";
+echo "
";
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 +134,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%");
@@ -157,8 +159,8 @@ else
label_cell($myrow["curr_code"]);
label_cell($myrow["suppliers_uom"]);
label_cell($myrow["supplier_description"]);
- edit_link_cell("stock_id=" . $_POST['stock_id']. "&supplier_id=" . $myrow["supplier_id"] . "&Edit=1");
- delete_link_cell("stock_id=" . $_POST['stock_id']. "&supplier_id=" . $myrow["supplier_id"] . "&Delete=1");
+ edit_button_cell("Edit".$myrow['supplier_id'], _("Edit"));
+ edit_button_cell("Delete".$myrow['supplier_id'], _("Delete"));
end_row();
$j++;
@@ -171,16 +173,17 @@ else
end_table();
}
+ div_end();
}
-//------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------------------------
-if (isset($_GET['Edit']))
+if ($Mode =='Edit')
{
$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='$supplier_id'
+ WHERE ".TB_PREF."purch_data.supplier_id='$selected_id'
AND ".TB_PREF."purch_data.stock_id='" . $_POST['stock_id'] . "'";
$result = db_query($sql, "The supplier purchasing details for the selected supplier and item could not be retrieved");
@@ -188,45 +191,39 @@ 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 "
";
+hidden('selected_id', $selected_id);
start_table($table_style2);
-if (isset($_GET['Edit']))
+if ($Mode == 'Edit')
{
- hidden('supplier_id', $supplier_id);
+ hidden('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($selected_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);
-if (isset($_GET['Edit']))
-{
- submit_center('UpdateRecord', _("Update Purchasing Data"));
-}
-else
-{
- submit_center('AddRecord', _("Add Purchasing Data"));
-}
+submit_add_or_update_center($selected_id == -1, '', true);
end_form();
end_page();