0000593,0001093: Prepayments made against orders implemented.

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

diff --git a/reporting/rep709.php b/reporting/rep709.php
index 3fc4c6375673372cf19974563a047c1fb5625ee0..c3cd8e193a4f46ad550e37a477392fb4c8e552c8 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -33,11 +33,13 @@ function getTaxTransactions($from, $to)
        $fromdate = date2sql($from);
        $todate = date2sql($to);
 
-       $sql = "SELECT taxrec.*, taxrec.amount*ex_rate AS amount,
+       $sql = "SELECT tt.name as taxname, taxrec.*, taxrec.amount*ex_rate AS amount,
                    taxrec.net_amount*ex_rate AS net_amount,
                                IF(ISNULL(supp.supp_name), debt.name, supp.supp_name) as name,
                                branch.br_name
                FROM ".TB_PREF."trans_tax_details taxrec
+               LEFT JOIN ".TB_PREF."tax_types tt
+                       ON taxrec.tax_type_id=tt.id
                LEFT JOIN ".TB_PREF."supp_trans strans
                        ON taxrec.trans_no=strans.trans_no AND taxrec.trans_type=strans.type
                LEFT JOIN ".TB_PREF."suppliers as supp ON strans.supplier_id=supp.supplier_id
@@ -49,7 +51,7 @@ function getTaxTransactions($from, $to)
                        AND taxrec.trans_type <> ".ST_CUSTDELIVERY."
                        AND taxrec.tran_date >= '$fromdate'
                        AND taxrec.tran_date <= '$todate'
-               ORDER BY taxrec.tran_date";
+               ORDER BY taxrec.trans_type, taxrec.tran_date, taxrec.trans_no, taxrec.ex_rate";
 //display_error($sql);
     return db_query($sql,"No transactions were returned");
 }
@@ -72,13 +74,17 @@ function getTaxInfo($id)
 function print_tax_report()
 {
        global $path_to_root, $trans_dir, $Hooks, $systypes_array;
-       
+
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
        $summaryOnly = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
+       $destination = $_POST['PARAM_4'];
 
-       include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       if ($destination)
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+       else
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        $dec = user_price_dec();
 
@@ -98,16 +104,16 @@ function print_tax_report()
                                                1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
                                                2 => array('text' => _('Type'), 'from' => $summary, 'to' => ''));
 
-       $cols = array(0, 100, 130, 180, 290, 370, 420, 470, 520);
+       $cols = array(0, 80, 130, 180, 270, 350, 400, 430, 480, 485, 520);
 
        $headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
-               _('Net'), _('Rate'), _('Tax'));
-       $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+               _('Net'), _('Rate'), _('Tax'), '', _('Name'));
+       $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right', 'right','left');
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        if (!$summaryOnly)
        {
-               $rep->Header();
+               $rep->NewPage();
        }
        
        $totalnet = 0.0;
@@ -120,7 +126,7 @@ function print_tax_report()
                        $trans['net_amount'] *= -1;
                        $trans['amount'] *= -1;
                }
-               
+
                if (!$summaryOnly)
                {
                        $rep->TextCol(0, 1, $systypes_array[$trans['trans_type']]);
@@ -135,12 +141,14 @@ function print_tax_report()
                        $rep->AmountCol(6, 7, $trans['rate'], $dec);
                        $rep->AmountCol(7, 8, $trans['amount'], $dec);
 
+                       $rep->TextCol(9, 10, $trans['taxname']);
+
                        $rep->NewLine();
 
                        if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                        {
                                $rep->Line($rep->row - 2);
-                               $rep->Header();
+                               $rep->NewPage();
                        }
                }
                if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
@@ -165,12 +173,14 @@ function print_tax_report()
 
        $aligns2 = array('left', 'right', 'right', 'right',     'right', 'right', 'right');
 
-       for ($i = 0; $i < count($cols2); $i++)
-               $rep->cols[$i] = $rep->leftMargin + $cols2[$i];
+       $rep->Info($params, $cols2, $headers2, $aligns2);
+
+       //for ($i = 0; $i < count($cols2); $i++)
+       //      $rep->cols[$i] = $rep->leftMargin + $cols2[$i];
 
        $rep->headers = $headers2;
        $rep->aligns = $aligns2;
-       $rep->Header();
+       $rep->NewPage();
 
        $taxtotal = 0;
        foreach( $taxes as $id=>$sum)
@@ -196,10 +206,7 @@ function print_tax_report()
        $rep->Font();
        $rep->NewLine();
 
-       if (method_exists($Hooks, 'TaxFunction'))
-       {
-               $Hooks->TaxFunction();
-       }
+       hook_tax_report_done();
 
        $rep->End();
 }