Included option for Show Service Items in Inventory Sales Report

[fa-stable.git] / reporting / rep205.php

diff --git a/reporting/rep205.php b/reporting/rep205.php
index 25393a39cf5c25e486a049d118f63a0baf14c7c8..f6da337f05d83671e928acec5f14312742a1e55f 100644 (file)
--- a/reporting/rep205.php
+++ b/reporting/rep205.php
@@ -39,8 +39,10 @@ function get_supplier_details_for_report()
                        ".TB_PREF."suppliers.curr_code,
                        ".TB_PREF."suppliers.dimension_id,
                        ".TB_PREF."suppliers.dimension2_id,
+                       ".TB_PREF."suppliers.notes,
                        ".TB_PREF."suppliers.gst_no
                FROM ".TB_PREF."suppliers
+               WHERE inactive = 0
                ORDER BY supp_name";
 
     return db_query($sql,"No transactions were returned");
@@ -129,6 +131,7 @@ function print_supplier_details_listing()
                }
                if ($printsupplier)
                {
+                       $newrow = 0;
                        $rep->NewLine();
                        // Here starts the new report lines 2013-01-28 Joe Hunt
                        $contacts = get_supplier_contacts($myrow['supplier_id']);
@@ -141,6 +144,7 @@ function print_supplier_details_listing()
                        $count1 = count($adr);
                        $count2 = count($adr2);
                        $count1 = max($count1, $count2);
+                       $count1 = max($count1, 4); 
                        if (isset($adr[0]))
                                $rep->TextCol(0, 1, $adr[0]);
                        $rep->TextCol(1, 2,     _('Currency') . ": " . $myrow['curr_code']);
@@ -167,6 +171,14 @@ function print_supplier_details_listing()
                        {
                                $dim = get_dimension($myrow['dimension2_id']);
                                $rep->TextCol(1, 2,     _('Dimension') . " 2: " . $dim['name']);
+                       }
+                       if ($myrow['notes'] != '')
+                       {
+                               $oldrow = $rep->row;
+                               $rep->NewLine();
+                               $rep->TextColLines(1, 2, _("Gereral Notes:")." ".$myrow['notes'], -2);
+                               $newrow = $rep->row;
+                               $rep->row = $oldrow;
                        }       
                        if (isset($contacts[0]))
                                $rep->TextCol(2, 3, _('Fax') . ": " . $contacts[0]['fax']);
@@ -179,14 +191,13 @@ function print_supplier_details_listing()
                                $rep->NewLine();
                                if (isset($adr[$i]))
                                        $rep->TextCol(0, 1, $adr[$i]);
+                               if ($i == 3 && isset($contacts[0]) && isset($contacts[0]['email']))     
+                                       $rep->TextCol(2, 3, _('Email') . ": " . $contacts[0]['email']);
                                if (isset($adr2[$i]))
-                                       $rep->TextCol(0, 1, $adr2[$i]);
+                                       $rep->TextCol(3, 4, $adr2[$i]);
                        }       
-                       if (isset($contacts[0]) && isset($contacts[0]['email']))
-                       {
-                               $rep->NewLine();
-                               $rep->TextCol(2, 4, _('Email') . ": " . $contacts[0]['email']);
-                       }               
+                       if ($newrow != 0 && $newrow < $rep->row)
+                               $rep->row = $newrow;
                        $rep->NewLine();
                        $rep->Line($rep->row + 8);
                        $rep->NewLine(0, 3);