From: Joe Hunt Date: Tue, 6 Apr 2010 07:44:06 +0000 (+0000) Subject: Inactive items should not show in Price List Report. In Item lists they are stamped... X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=e9f3c75f21a287945c96ef55e50b5317cc7859f7;p=textcart.git Inactive items should not show in Price List Report. In Item lists they are stamped (Inactive) after the description. --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8ec8d57..0412a84 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,16 @@ Legend: ! -> Note $ -> Affected files +06-Apr-2010 Joe Hunt/Albin +# Inactive items should not show in Price List Report. In Item lists they are + stamped (Inactive) after the description. +$ /reporting/rep104.php + /reporting/rep301.php + /reporting/rep302.php + /reporting/rep303.php + /reporting/rep304.php + /reporting/rep305.php + 03-Apr-2010 Joe Hunt/Chaitanya # [0000219] Incorrect behaviors regarding Payment forms $ /purchasing/supplier_payment.php diff --git a/reporting/rep104.php b/reporting/rep104.php index d6249e0..b7888ad 100644 --- a/reporting/rep104.php +++ b/reporting/rep104.php @@ -38,7 +38,7 @@ function fetch_items($category=0) ".TB_PREF."stock_category.description FROM ".TB_PREF."stock_master, ".TB_PREF."stock_category - WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id"; + WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id AND NOT ".TB_PREF."stock_master.inactive"; if ($category != 0) $sql .= " AND ".TB_PREF."stock_category.category_id = ".db_escape($category); $sql .= " ORDER BY ".TB_PREF."stock_master.category_id, diff --git a/reporting/rep301.php b/reporting/rep301.php index b23ab85..5c123e4 100644 --- a/reporting/rep301.php +++ b/reporting/rep301.php @@ -33,7 +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.description, + ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive, ".TB_PREF."stock_moves.loc_code, SUM(".TB_PREF."stock_moves.qty) AS QtyOnHand, ".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost AS UnitCost, @@ -143,7 +143,7 @@ function print_inventory_valuation_report() $rep->NewLine(); $rep->fontsize -= 2; $rep->TextCol(0, 1, $trans['stock_id']); - $rep->TextCol(1, 2, $trans['description']); + $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); diff --git a/reporting/rep302.php b/reporting/rep302.php index 08fd8d2..0a63333 100644 --- a/reporting/rep302.php +++ b/reporting/rep302.php @@ -34,7 +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.description, + ".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 qty_on_hand FROM (".TB_PREF."stock_master, @@ -163,13 +163,13 @@ function print_inventory_planning() $rep->NewLine(); $dec = get_qty_dec($trans['stock_id']); $rep->TextCol(0, 1, $trans['stock_id']); - $rep->TextCol(1, 2, $trans['description']); + $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->AmountCol(2, 3, $period['prd0'], $dec); $rep->AmountCol(3, 4, $period['prd1'], $dec); $rep->AmountCol(4, 5, $period['prd2'], $dec); $rep->AmountCol(5, 6, $period['prd3'], $dec); $rep->AmountCol(6, 7, $period['prd4'], $dec); - + $MaxMthSales = Max($period['prd0'], $period['prd1'], $period['prd2'], $period['prd3']); $IdealStockHolding = $MaxMthSales * 3; $rep->AmountCol(7, 8, $IdealStockHolding, $dec); diff --git a/reporting/rep303.php b/reporting/rep303.php index b603b74..2b26c26 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -34,7 +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.description, + ".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 FROM (".TB_PREF."stock_master, @@ -157,7 +157,7 @@ function print_stock_check() $rep->NewLine(); $dec = get_qty_dec($trans['stock_id']); $rep->TextCol(0, 1, $trans['stock_id']); - $rep->TextCol(1, 2, $trans['description']); + $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->AmountCol(2, 3, $trans['QtyOnHand'], $dec); if ($check) { diff --git a/reporting/rep304.php b/reporting/rep304.php index f1262a1..d847b02 100644 --- a/reporting/rep304.php +++ b/reporting/rep304.php @@ -36,7 +36,7 @@ function getTransactions($category, $location, $fromcust, $from, $to) $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.description, + ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive, ".TB_PREF."stock_moves.loc_code, ".TB_PREF."debtor_trans.debtor_no, ".TB_PREF."debtors_master.name AS debtor_name, @@ -165,11 +165,11 @@ function print_inventory_sales() $rep->TextCol(0, 1, $trans['stock_id']); if ($fromcust == ALL_NUMERIC) { - $rep->TextCol(1, 2, $trans['description']); + $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->TextCol(2, 3, $trans['debtor_name']); } else - $rep->TextCol(1, 3, $trans['description']); + $rep->TextCol(1, 3, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->AmountCol(3, 4, $trans['qty'], get_qty_dec($trans['stock_id'])); $rep->AmountCol(4, 5, $trans['amt'], $dec); $rep->AmountCol(5, 6, $trans['cost'], $dec); diff --git a/reporting/rep305.php b/reporting/rep305.php index bfbaf6b..334a6d2 100644 --- a/reporting/rep305.php +++ b/reporting/rep305.php @@ -36,7 +36,7 @@ function getTransactions($from, $to) $sql = "SELECT DISTINCT ".TB_PREF."grn_batch.supplier_id, ".TB_PREF."purch_order_details.*, - ".TB_PREF."stock_master.description + ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive FROM ".TB_PREF."stock_master, ".TB_PREF."purch_order_details, ".TB_PREF."grn_batch @@ -108,7 +108,7 @@ function print_grn_valuation() $rep->NewLine(); $rep->TextCol(0, 1, $trans['item_code']); - $rep->TextCol(1, 2, $trans['description']); + $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); $rep->TextCol(2, 3, $trans['order_no']); $qdec = get_qty_dec($trans['item_code']); $rep->AmountCol(3, 4, $trans['quantity_received'], $qdec);