X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fprices.php;h=15a70ae7a670ac92d3fd4d1c76b4f666e6ad7b72;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=5a3238ff3ef5d34af064a4993db25dcd9d09c1db;hpb=6cf44b7a78d331f6bfbf9e0e080abda65f7e6155;p=fa-stable.git
diff --git a/inventory/prices.php b/inventory/prices.php
index 5a3238ff..15a70ae7 100644
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 2;
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
@@ -45,7 +54,7 @@ if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
echo "
" . _("Item:"). " ";
-stock_items_list('stock_id', $_POST['stock_id'], false, true);
+sales_items_list('stock_id', $_POST['stock_id'], false, true);
echo "
";
set_global_stock_item($_POST['stock_id']);
@@ -102,19 +111,18 @@ if ($Mode == 'RESET')
$selected_id = -1;
}
-if (isset($_POST['_stock_id_update'])) {
+if (list_updated('stock_id')) {
$Ajax->activate('price_table');
$Ajax->activate('price_details');
}
-if (isset($_POST['_stock_id_update']) || isset($_POST['_sales_type_id_update'])
- || isset($_POST['_curr_abrev_update']) ) {
+if (list_updated('stock_id') || isset($_POST['_curr_abrev_update']) ) {
// after change of stock, currency or salestype selector
// display default calculated price for new settings.
// If we have this price already in db it is overwritten later.
- $_POST['price'] = price_format(get_price(get_post('stock_id'),
- get_post('curr_abrev'), get_post('sales_type_id')));
+ unset($_POST['price']);
$Ajax->activate('price_details');
}
+
//---------------------------------------------------------------------------------------------------
$mb_flag = get_mb_flag($_POST['stock_id']);
@@ -137,7 +145,7 @@ while ($myrow = db_fetch($prices_list))
label_cell($myrow["sales_type"]);
amount_cell($myrow["price"]);
edit_button_cell("Edit".$myrow['id'], _("Edit"));
- edit_button_cell("Delete".$myrow['id'], _("Delete"));
+ delete_button_cell("Delete".$myrow['id'], _("Delete"));
end_row();
}
@@ -166,8 +174,13 @@ start_table($table_style2);
currencies_list_row(_("Currency:"), 'curr_abrev', null, true);
sales_types_list_row(_("Sales Type:"), 'sales_type_id', null, true);
+if (!isset($_POST['price'])) {
+ $_POST['price'] = price_format(get_kit_price(get_post('stock_id'),
+ get_post('curr_abrev'), get_post('sales_type_id')));
+}
-small_amount_row(_("Price:"), 'price', null);
+$kit = get_item_code_dflts($_POST['stock_id']);
+small_amount_row(_("Price:"), 'price', null, '', _('per') .' '.$kit["units"]);
end_table(1);