X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fprices.php;h=280595150545e89901ae47333cb6a3267fe9b5cb;hb=da0f29ef8eb73e7a3cf6484af8fd04726e0e5ef1;hp=4da07b47f900a3c31808592b761536f4c541671d;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git
diff --git a/inventory/prices.php b/inventory/prices.php
index 4da07b47..28059515 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");
@@ -39,13 +48,13 @@ if (!isset($_POST['curr_abrev']))
//---------------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
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']);
@@ -110,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_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']);
@@ -136,14 +145,14 @@ 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();
}
end_table();
if (db_num_rows($prices_list) == 0)
{
- display_note(_("There are no prices set up for this part."));
+ display_note(_("There are no prices set up for this part."), 1);
}
div_end();
//------------------------------------------------------------------------------------------------
@@ -165,12 +174,17 @@ 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);
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
div_end();
end_form();