From 4b7a3e07b322609487158f79a35fb4bde2c1d076 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sun, 17 May 2009 22:05:43 +0000 Subject: [PATCH] Changed service items to use cogs account instead of inventory account. --- CHANGELOG.txt | 4 ++++ inventory/manage/items.php | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index dd2cca42..d5a63682 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +17-May-2009 Joe Hunt +! Changed service items to use cogs account instead of inventory account. +$ /inventory/manage/items.php + 16-May-2009 Joe Hunt # [0000133] Removed buggy & obsolete hotkey support in pager_link() $ /includes/ui/db_pager_view.inc diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 8a465010..112e1b2c 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -39,6 +39,9 @@ if (list_updated('stock_id')) { $Ajax->activate('details'); $Ajax->activate('controls'); } +if (list_updated('category_id') || list_updated('mb_flag')) { + $Ajax->activate('details'); +} $upload_file = ""; if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '') { @@ -297,7 +300,7 @@ if ($new_item) $company_record = get_company_prefs(); if (!isset($_POST['inventory_account']) || $_POST['inventory_account'] == "") - $_POST['inventory_account'] = $company_record["default_inventory_act"]; + $_POST['inventory_account'] = $company_record["default_inventory_act"]; if (!isset($_POST['cogs_account']) || $_POST['cogs_account'] == "") $_POST['cogs_account'] = $company_record["default_cogs_act"]; @@ -311,6 +314,8 @@ if ($new_item) if (!isset($_POST['assembly_account']) || $_POST['assembly_account'] == "") $_POST['assembly_account'] = $company_record["default_assembly_act"]; + if (list_updated('mb_flag') && is_service($_POST['mb_flag'])) + $_POST['inventory_account'] = $company_record["default_cogs_act"]; } else { // Must be modifying an existing item @@ -372,15 +377,15 @@ table_section_title(_("GL Accounts")); gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', $_POST['sales_account']); -gl_all_accounts_list_row(_("Inventory Account:"), 'inventory_account', $_POST['inventory_account']); - if (!is_service($_POST['mb_flag'])) { + gl_all_accounts_list_row(_("Inventory Account:"), 'inventory_account', $_POST['inventory_account']); gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'adjustment_account', $_POST['adjustment_account']); } else { + gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'inventory_account', $_POST['inventory_account']); hidden('cogs_account', $_POST['cogs_account']); hidden('adjustment_account', $_POST['adjustment_account']); } -- 2.30.2