From ce5156cda28617e8fe6387c2a2be4fa7b7e703d0 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 19 Jul 2010 22:43:55 +0000 Subject: [PATCH] Changed Std. Cost to show all decimals, and added UOM --- CHANGELOG.txt | 7 +++++- applications/inventory.php | 12 +++++----- reporting/rep301.php | 28 ++++++++++++---------- reporting/rep303.php | 48 +++++++++++++++++--------------------- 4 files changed, 50 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 74cba867..7d7b51a8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -25,7 +25,12 @@ $ /applications/generalledger.php /gl/accruals.php (new file) /gl/view/accrual_trans.php (new file) /includes/access_levels.inc - +! Changed Std. Cost to show all decimals, and added UOM +$ /reporting/rep301.php + /reporting/rep303.php +# Wrong link to Inventory Reports +$ /applications/inventory.php + 18-Jul-2010 Janusz Dobrowolski ! Improved key_in_foreign_table to check multiply tables $ /admin/db/company_db.inc diff --git a/applications/inventory.php b/applications/inventory.php index c92e5d1b..b5b32f53 100644 --- a/applications/inventory.php +++ b/applications/inventory.php @@ -1,17 +1,17 @@ . ***********************************************************************/ -class inventory_app extends application +class inventory_app extends application { - function inventory_app() + function inventory_app() { $this->application("stock", _($this->help_context = "&Items and Inventory")); @@ -27,7 +27,7 @@ class inventory_app extends application $this->add_lapp_function(1, _("Inventory Item &Status"), "inventory/inquiry/stock_status.php?", 'SA_ITEMSSTATVIEW'); $this->add_rapp_function(1, _("Inventory &Reports"), - "reporting/reports_main.php?Class="._("Inventory"), 'SA_ITEMSTRANSVIEW'); + "reporting/reports_main.php?Class=2", 'SA_ITEMSTRANSVIEW'); $this->add_module(_("Maintenance")); $this->add_lapp_function(2, _("&Items"), diff --git a/reporting/rep301.php b/reporting/rep301.php index fbf5f3f2..56398b71 100644 --- a/reporting/rep301.php +++ b/reporting/rep301.php @@ -1,12 +1,12 @@ . ***********************************************************************/ $page_security = 'SA_ITEMSVALREP'; @@ -33,6 +33,7 @@ function getTransactions($category, $location) $sql = "SELECT ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_category.description AS cat_description, ".TB_PREF."stock_master.stock_id, + ".TB_PREF."stock_master.units, ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive, ".TB_PREF."stock_moves.loc_code, SUM(".TB_PREF."stock_moves.qty) AS QtyOnHand, @@ -93,11 +94,11 @@ function print_inventory_valuation_report() else $loc = get_location_name($location); - $cols = array(0, 100, 250, 350, 450, 515); + $cols = array(0, 75, 225, 250, 350, 450, 515); - $headers = array(_('Category'), '', _('Quantity'), _('Unit Cost'), _('Value')); + $headers = array(_('Category'), '', _('UOM'), _('Quantity'), _('Unit Cost'), _('Value')); - $aligns = array('left', 'left', 'right', 'right', 'right'); + $aligns = array('left', 'left', 'left', 'right', 'right', 'right'); $params = array( 0 => $comments, 1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''), @@ -123,7 +124,7 @@ function print_inventory_valuation_report() $rep->NewLine(2, 3); $rep->TextCol(0, 4, _('Total')); } - $rep->AmountCol(4, 5, $total, $dec); + $rep->AmountCol(5, 6, $total, $dec); if ($detail) { $rep->Line($rep->row - 2); @@ -144,9 +145,12 @@ function print_inventory_valuation_report() $rep->fontSize -= 2; $rep->TextCol(0, 1, $trans['stock_id']); $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); - $rep->AmountCol(2, 3, $trans['QtyOnHand'], get_qty_dec($trans['stock_id'])); - $rep->AmountCol(3, 4, $trans['UnitCost'], $dec); - $rep->AmountCol(4, 5, $trans['ItemTotal'], $dec); + $rep->TextCol(2, 3, $trans['units']); + $rep->AmountCol(3, 4, $trans['QtyOnHand'], get_qty_dec($trans['stock_id'])); + $dec2 = 0; + price_decimal_format($trans['UnitCost'], $dec2); + $rep->AmountCol(4, 5, $trans['UnitCost'], $dec2); + $rep->AmountCol(5, 6, $trans['ItemTotal'], $dec); $rep->fontSize += 2; } $total += $trans['ItemTotal']; @@ -157,7 +161,7 @@ function print_inventory_valuation_report() $rep->NewLine(2, 3); $rep->TextCol(0, 4, _('Total')); } - $rep->Amountcol(4, 5, $total, $dec); + $rep->Amountcol(5, 6, $total, $dec); if ($detail) { $rep->Line($rep->row - 2); @@ -165,7 +169,7 @@ function print_inventory_valuation_report() } $rep->NewLine(2, 1); $rep->TextCol(0, 4, _('Grand Total')); - $rep->AmountCol(4, 5, $grandtotal, $dec); + $rep->AmountCol(5, 6, $grandtotal, $dec); $rep->Line($rep->row - 4); $rep->NewLine(); $rep->End(); diff --git a/reporting/rep303.php b/reporting/rep303.php index e96f32b8..d9904bfc 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -1,12 +1,12 @@ . ***********************************************************************/ $page_security = 'SA_ITEMSVALREP'; @@ -34,6 +34,7 @@ function getTransactions($category, $location) $sql = "SELECT ".TB_PREF."stock_master.category_id, ".TB_PREF."stock_category.description AS cat_description, ".TB_PREF."stock_master.stock_id, + ".TB_PREF."stock_master.units, ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive, IF(".TB_PREF."stock_moves.stock_id IS NULL, '', ".TB_PREF."stock_moves.loc_code) AS loc_code, SUM(IF(".TB_PREF."stock_moves.stock_id IS NULL,0,".TB_PREF."stock_moves.qty)) AS QtyOnHand @@ -94,7 +95,7 @@ function print_stock_check() { $short = _('Yes'); $available = _('Shortage'); - } + } else { $short = _('No'); @@ -104,15 +105,15 @@ function print_stock_check() else $nozeros = _('No'); if ($check) { - $cols = array(0, 100, 250, 295, 345, 390, 445, 515); - $headers = array(_('Stock ID'), _('Description'), _('Quantity'), _('Check'), _('Demand'), $available, _('On Order')); - $aligns = array('left', 'left', 'right', 'right', 'right', 'right', 'right'); + $cols = array(0, 75, 225, 250, 295, 345, 390, 445, 515); + $headers = array(_('Stock ID'), _('Description'), _('UOM'), _('Quantity'), _('Check'), _('Demand'), $available, _('On Order')); + $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right', 'right'); } else { - $cols = array(0, 100, 250, 315, 380, 445, 515); - $headers = array(_('Stock ID'), _('Description'), _('Quantity'), _('Demand'), $available, _('On Order')); - $aligns = array('left', 'left', 'right', 'right', 'right', 'right'); + $cols = array(0, 75, 225, 250, 315, 380, 445, 515); + $headers = array(_('Stock ID'), _('Description'), _('UOM'), _('Quantity'), _('Demand'), $available, _('On Order')); + $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right'); } @@ -127,17 +128,11 @@ function print_stock_check() else $user_comp = ""; - $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize()); + $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize()); -<<<<<<< rep303.php $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); $rep->NewPage(); -======= - $rep->Font(); - $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); ->>>>>>> 1.22 $res = getTransactions($category, $location); $catt = ''; @@ -173,23 +168,24 @@ function print_stock_check() $dec = get_qty_dec($trans['stock_id']); $rep->TextCol(0, 1, $trans['stock_id']); $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); - $rep->AmountCol(2, 3, $trans['QtyOnHand'], $dec); + $rep->TextCol(2, 3, $trans['units']); + $rep->AmountCol(3, 4, $trans['QtyOnHand'], $dec); if ($check) { - $rep->TextCol(3, 4, "_________"); - $rep->AmountCol(4, 5, $demandqty, $dec); - $rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec); - $rep->AmountCol(6, 7, $onorder, $dec); + $rep->TextCol(4, 5, "_________"); + $rep->AmountCol(5, 6, $demandqty, $dec); + $rep->AmountCol(6, 7, $trans['QtyOnHand'] - $demandqty, $dec); + $rep->AmountCol(7, 8, $onorder, $dec); } else { - $rep->AmountCol(3, 4, $demandqty, $dec); - $rep->AmountCol(4, 5, $trans['QtyOnHand'] - $demandqty, $dec); - $rep->AmountCol(5, 6, $onorder, $dec); + $rep->AmountCol(4, 5, $demandqty, $dec); + $rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec); + $rep->AmountCol(6, 7, $onorder, $dec); } if ($pictures) { - $image = company_path() . '/images/' + $image = company_path() . '/images/' . item_img_name($trans['stock_id']) . '.jpg'; if (file_exists($image)) { -- 2.30.2