Replaced sys_types names from table to systypes::name in reports

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

diff --git a/reporting/rep102.php b/reporting/rep102.php
index cbb8df42e66eae7d837d49b64e2164fd4f08b8a8..d6cc82d825e15221b0c0abc54f3af39090a0e3fa 100644 (file)
--- a/reporting/rep102.php
+++ b/reporting/rep102.php
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_aged_customer_analysis();
 
 function get_invoices($costomer_id, $to)
@@ -39,7 +38,7 @@ function get_invoices($costomer_id, $to)
                .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + "
                .TB_PREF."debtor_trans.ov_discount)";
        $due = "IF (".TB_PREF."debtor_trans.type=10,".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)";
-       $sql = "SELECT ".TB_PREF."sys_types.type_name, ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference,
+       $sql = "SELECT ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference,
                ".TB_PREF."debtor_trans.tran_date,
                $value as Balance,
                IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0) AS Due,
@@ -48,11 +47,9 @@ function get_invoices($costomer_id, $to)
 
                FROM ".TB_PREF."debtors_master,
                        ".TB_PREF."payment_terms,
-                       ".TB_PREF."debtor_trans,
-                       ".TB_PREF."sys_types
+                       ".TB_PREF."debtor_trans
 
-               WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."debtor_trans.type
-                   AND ".TB_PREF."debtor_trans.type <> 13
+               WHERE ".TB_PREF."debtor_trans.type <> 13
                        AND ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator
                        AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
                        AND ".TB_PREF."debtor_trans.debtor_no = $costomer_id
@@ -69,14 +66,17 @@ function print_aged_customer_analysis()
 {
     global $comp_path, $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $to = $_POST['PARAM_0'];
     $fromcust = $_POST['PARAM_1'];
     $currency = $_POST['PARAM_2'];
        $summaryOnly = $_POST['PARAM_3'];
     $graphics = $_POST['PARAM_4'];
     $comments = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
+       if ($destination)
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+       else
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
        if ($graphics)
        {
                include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -121,7 +121,7 @@ function print_aged_customer_analysis()
 
        if ($convert)
                $headers[2] = _('Currency');
-    $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis.pdf", user_pagesize());
+    $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -140,11 +140,11 @@ function print_aged_customer_analysis()
                if (!$convert && $currency != $myrow['curr_code'])
                        continue;
                $rep->fontSize += 2;
-               $rep->TextCol(0, 3, $myrow['name']);
+               $rep->TextCol(0, 2, $myrow['name']);
                if ($convert)
                {
                        $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to);
-                       $rep->TextCol(2, 4,     $myrow['curr_code']);
+                       $rep->TextCol(2, 3,     $myrow['curr_code']);
                }
                else
                        $rate = 1.0;
@@ -157,13 +157,13 @@ function print_aged_customer_analysis()
                $total[2] += ($custrec["Overdue1"]-$custrec["Overdue2"]);
                $total[3] += $custrec["Overdue2"];
                $total[4] += $custrec["Balance"];
-               $str = array(number_format2(($custrec["Balance"] - $custrec["Due"]),$dec),
-                       number_format2(($custrec["Due"]-$custrec["Overdue1"]),$dec),
-                       number_format2(($custrec["Overdue1"]-$custrec["Overdue2"]) ,$dec),
-                       number_format2($custrec["Overdue2"],$dec),
-                       number_format2($custrec["Balance"],$dec));
+               $str = array($custrec["Balance"] - $custrec["Due"],
+                       $custrec["Due"]-$custrec["Overdue1"],
+                       $custrec["Overdue1"]-$custrec["Overdue2"],
+                       $custrec["Overdue2"],
+                       $custrec["Balance"]);
                for ($i = 0; $i < count($str); $i++)
-                       $rep->TextCol($i + 3, $i + 4, $str[$i]);
+                       $rep->AmountCol($i + 3, $i + 4, $str[$i], $dec);
                $rep->NewLine(1, 2);
                if (!$summaryOnly)
                {
@@ -174,9 +174,9 @@ function print_aged_customer_analysis()
                        while ($trans=db_fetch($res))
                        {
                                $rep->NewLine(1, 2);
-                       $rep->TextCol(0, 1,     $trans['type_name'], -2);
+                       $rep->TextCol(0, 1,     systypes::name($trans['type']), -2);
                                $rep->TextCol(1, 2,     $trans['reference'], -2);
-                               $rep->TextCol(2, 3, sql2date($trans['tran_date']), -2);
+                               $rep->DateCol(2, 3, $trans['tran_date'], true, -2);
                                if ($trans['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2)
                                {
                                        $trans['Balance'] *= -1;
@@ -186,13 +186,13 @@ function print_aged_customer_analysis()
                                }
                                foreach ($trans as $i => $value)
                                        $trans[$i] *= $rate;
-                               $str = array(number_format2(($trans["Balance"] - $trans["Due"]),$dec),
-                                       number_format2(($trans["Due"]-$trans["Overdue1"]),$dec),
-                                       number_format2(($trans["Overdue1"]-$trans["Overdue2"]) ,$dec),
-                                       number_format2($trans["Overdue2"],$dec),
-                                       number_format2($trans["Balance"],$dec));
+                               $str = array($trans["Balance"] - $trans["Due"],
+                                       $trans["Due"]-$trans["Overdue1"],
+                                       $trans["Overdue1"]-$trans["Overdue2"],
+                                       $trans["Overdue2"],
+                                       $trans["Balance"]);
                                for ($i = 0; $i < count($str); $i++)
-                                       $rep->TextCol($i + 3, $i + 4, $str[$i]);
+                                       $rep->AmountCol($i + 3, $i + 4, $str[$i], $dec);
                        }
                        $rep->Line($rep->row - 8);
                        $rep->NewLine(2);
@@ -208,7 +208,7 @@ function print_aged_customer_analysis()
        $rep->fontSize -= 2;
        for ($i = 0; $i < count($total); $i++)
        {
-               $rep->TextCol($i + 3, $i + 4, number_format2($total[$i], $dec));
+               $rep->AmountCol($i + 3, $i + 4, $total[$i], $dec);
                if ($graphics && $i < count($total) - 1)
                {
                        $pg->y[$i] = abs($total[$i]);
@@ -238,6 +238,7 @@ function print_aged_customer_analysis()
                        $rep->Header();
                $rep->AddImage($filename, $x, $rep->row - $h, $w, $h);
        }
+       $rep->NewLine();
     $rep->End();
 }