Fixed problems with excel report generation.

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

diff --git a/reporting/rep103.php b/reporting/rep103.php
index 84fbd6d6951f00e7e3e8894016090edb42071a88..bf0096e62e3b543df505a41069eb40a8aef0166f 100644 (file)
--- a/reporting/rep103.php
+++ b/reporting/rep103.php
@@ -35,10 +35,12 @@ function get_customer_details_for_report($area=0, $salesid=0)
                        ".TB_PREF."debtors_master.curr_code,
                        ".TB_PREF."debtors_master.dimension_id,
                        ".TB_PREF."debtors_master.dimension2_id,
+                       ".TB_PREF."debtors_master.notes,
                        ".TB_PREF."sales_types.sales_type,
                        ".TB_PREF."cust_branch.branch_code,
                        ".TB_PREF."cust_branch.br_name,
                        ".TB_PREF."cust_branch.br_address,
+                       ".TB_PREF."cust_branch.br_post_address,
                        ".TB_PREF."cust_branch.contact_name,
                        ".TB_PREF."cust_branch.area,
                        ".TB_PREF."cust_branch.salesman,
@@ -52,17 +54,18 @@ function get_customer_details_for_report($area=0, $salesid=0)
                INNER JOIN ".TB_PREF."areas
                        ON ".TB_PREF."cust_branch.area = ".TB_PREF."areas.area_code
                INNER JOIN ".TB_PREF."salesman
-                       ON ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code";
+                       ON ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code
+               WHERE ".TB_PREF."debtors_master.inactive = 0";
        if ($area != 0)
        {
                if ($salesid != 0)
-                       $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid)."
+                       $sql .= " AND ".TB_PREF."salesman.salesman_code=".db_escape($salesid)."
                                AND ".TB_PREF."areas.area_code=".db_escape($area);
                else
-                       $sql .= " WHERE ".TB_PREF."areas.area_code=".db_escape($area);
+                       $sql .= " AND ".TB_PREF."areas.area_code=".db_escape($area);
        }
        elseif ($salesid != 0)
-               $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid);
+               $sql .= " AND ".TB_PREF."salesman.salesman_code=".db_escape($salesid);
        $sql .= " ORDER BY description,
                        ".TB_PREF."salesman.salesman_name,
                        ".TB_PREF."debtors_master.debtor_no,
@@ -185,6 +188,7 @@ function print_customer_details_listing()
                }
                if ($printcustomer)
                {
+                       $newrow = 0;
                        if ($carea != $myrow['description'])
                        {
                                $rep->fontSize += 2;
@@ -215,10 +219,14 @@ function print_customer_details_listing()
                        $rep->TextCol(2, 3,     $myrow['br_name']);
                        $rep->NewLine();
                        $adr = Explode("\n", $myrow['address']);
-                       $adr2 = Explode("\n", $myrow['br_address']);
+                       if ($myrow['br_post_address'] == '')
+                               $adr2 = Explode("\n", $myrow['br_address']);
+                       else
+                               $adr2 = Explode("\n", $myrow['br_post_address']);
                        $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']);
@@ -246,6 +254,14 @@ function print_customer_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']);
                        if (isset($adr2[2]))
@@ -257,14 +273,13 @@ function print_customer_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->TextCol(0, 1,     $myrow['name']);