From e43afae15592be88fe3fda57db92068d5d85b8ab Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 29 Jan 2009 08:33:44 +0000 Subject: [PATCH] Small fixes --- includes/ui/ui_view.inc | 2 +- inventory/prices.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index b7271786..47e32672 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -444,7 +444,7 @@ function display_supp_trans_tax_details($tax_items, $columns) $tax = number_format2(abs($tax_item['amount']),user_price_dec()); if ($tax_item['included_in_price']) label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " . - _("Amount:") . ": $tax", "colspan=$columns align=right", "align=right"); + _("Amount") . ": $tax", "colspan=$columns align=right", "align=right"); else label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)", $tax, "colspan=$columns align=right", "align=right"); diff --git a/inventory/prices.php b/inventory/prices.php index 628dea21..a8c641bd 100644 --- a/inventory/prices.php +++ b/inventory/prices.php @@ -119,10 +119,10 @@ 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_kit_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']); @@ -174,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); -- 2.30.2