Inactive items should not show in Price List Report. In Item lists they are stamped...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8ec8d576bdd6c64ee6f4577509efef682ef5b790..0412a84da891f1d15b4dde3e51e3dda91f512a5a 100644 (file)
--- 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 d6249e0d5a5dfeaf109b421c98655f56bcb3f81e..b7888ad7c1bcaf5cb3eb869be10b7999f210771e 100644 (file)
--- 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 b23ab855aa7643efdcc00dfca9712985c233b2be..5c123e42b9f3ba117876de4bb4e7ebfcfaed2061 100644 (file)
--- 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 08fd8d2af29ce5be489e0f26581d898dc67e7091..0a633335cb86ec688afeb7afcdfa89dbf1d86f9a 100644 (file)
--- 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 b603b7489be059027493ac9c84d9836ffd8d1f82..2b26c26421390d055817b71654f535219539844b 100644 (file)
--- 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 f1262a1873730d0d5602e7d2769d647cec0feb90..d847b024fb3be57660aefc6989c340193cec4dfe 100644 (file)
--- 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 bfbaf6b01acc1e41f0494d72b798288d182b4d1a..334a6d20d801a00399e703a71f7c7b2af7503128 100644 (file)
--- 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);