X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fpurchasing_data.php;h=1969cf93f2c0aeb9aeb5ee1cbca8afbadc602724;hb=5a96d27422f2eb4b45738ad54894a032e0495cb4;hp=67b670ffd6a89c742da8a5c37a352aa45992be57;hpb=d56ff2a16e67d39ce89c718502f47e3e5d3b5bf3;p=fa-stable.git
diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 67b670ff..1969cf93 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -1,9 +1,19 @@
.
+***********************************************************************/
+$page_security = 'SA_PURCHASEPRICING';
+$path_to_root = "..";
include_once($path_to_root . "/includes/session.inc");
-page(_("Supplier Purchasing Data"));
+page(_($help_context = "Supplier Purchasing Data"));
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
@@ -13,7 +23,9 @@ 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."));
+//----------------------------------------------------------------------------------------
simple_page_mode(true);
+
//--------------------------------------------------------------------------------------------------
if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
@@ -43,25 +55,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
{
if ($Mode == 'ADD_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'] . "')";
-
- db_query($sql,"The supplier purchasing details could not be added");
+ add_item_purchasing_data($_POST['supplier_id'], $_POST['stock_id'], input_num('price',0),
+ $_POST['suppliers_uom'], input_num('conversion_factor'), $_POST['supplier_description']);
display_notification(_("This supplier purchasing data has been added."));
- } else
+ }
+ else
{
- $sql = "UPDATE ".TB_PREF."purch_data SET price=" . input_num('price') . ",
- suppliers_uom='" . $_POST['suppliers_uom'] . "',
- conversion_factor=" . input_num('conversion_factor') . ",
- supplier_description='" . $_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");
-
+ update_item_purchasing_data($selected_id, $_POST['stock_id'], input_num('price',0),
+ $_POST['suppliers_uom'], input_num('conversion_factor'), $_POST['supplier_description']);
display_notification(_("Supplier purchasing data has been updated."));
}
$Mode = 'RESET';
@@ -72,11 +73,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
if ($Mode == 'Delete')
{
-
- $sql = "DELETE FROM ".TB_PREF."purch_data WHERE supplier_id='$selected_id'
- AND stock_id='" . $_POST['stock_id'] . "'";
- db_query($sql,"could not delete purchasing data");
-
+ delete_item_purchasing_data($selected_id, $_POST['stock_id']);
display_notification(_("The purchasing data item has been sucessfully deleted."));
$Mode = 'RESET';
}
@@ -92,17 +89,17 @@ 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');
//--------------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
echo "
" . _("Item:"). " ";
-stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
+echo stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
echo "
";
@@ -117,24 +114,18 @@ if ($mb_flag == -1)
}
else
{
-
- $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
- 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');
+ $result = get_items_purchasing_data($_POST['stock_id']);
+ div_start('price_table');
if (db_num_rows($result) == 0)
{
display_note(_("There is no purchasing data set up for the part selected"));
}
else
{
- start_table("$table_style width=60%");
+ start_table(TABLESTYLE, "width=65%");
$th = array(_("Supplier"), _("Price"), _("Currency"),
- _("Supplier's Unit"), _("Supplier's Description"), "", "");
+ _("Supplier's Unit"), _("Conversion Factor"), _("Supplier's Description"), "", "");
table_header($th);
@@ -145,12 +136,13 @@ else
alt_table_row_color($k);
label_cell($myrow["supp_name"]);
- amount_cell($myrow["price"]);
+ amount_decimal_cell($myrow["price"]);
label_cell($myrow["curr_code"]);
label_cell($myrow["suppliers_uom"]);
+ qty_cell($myrow['conversion_factor'], false, 'max');
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++;
@@ -168,28 +160,21 @@ else
//-----------------------------------------------------------------------------------------------
+$dec2 = 6;
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='$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");
-
- $myrow = db_fetch($result);
+ $myrow = get_item_purchasing_data($selected_id, $_POST['stock_id']);
$supp_name = $myrow["supp_name"];
- $_POST['price'] = price_format($myrow["price"]);
+ $_POST['price'] = price_decimal_format($myrow["price"], $dec2);
$_POST['suppliers_uom'] = $myrow["suppliers_uom"];
$_POST['supplier_description'] = $myrow["supplier_description"];
- $_POST['conversion_factor'] = exrate_format($myrow["conversion_factor"]);
+ $_POST['conversion_factor'] = maxprec_format($myrow["conversion_factor"]);
}
-echo "
";
+br();
hidden('selected_id', $selected_id);
-start_table($table_style2);
+start_table(TABLESTYLE2);
if ($Mode == 'Edit')
{
@@ -199,21 +184,22 @@ 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));
+amount_row(_("Price:"), 'price', null,'', get_supplier_currency($selected_id), $dec2);
text_row(_("Suppliers Unit of Measure:"), 'suppliers_uom', null, 50, 51);
if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "")
{
- $_POST['conversion_factor'] = exrate_format(1);
+ $_POST['conversion_factor'] = maxprec_format(1);
}
amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor',
- exrate_format($_POST['conversion_factor']), null, null, user_exrate_dec() );
+ maxprec_format($_POST['conversion_factor']), null, null, 'max');
text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 51);
end_table(1);
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
end_form();
end_page();