[0003240] Tax Report: duplicated lines were listed for edited transactions.

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

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 8e36f5543df42abc27cf0edf4076444446626b50..c73388abf565650c4c097d4fa0c84f9bfe0cabda 100644 (file)
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -42,15 +42,17 @@ function print_credits()
        $email = $_POST['PARAM_3'];
        $paylink = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_6'];
 
-       if ($from == null)
-               $from = 0;
-       if ($to == null)
-               $to = 0;
+       if (!$from || !$to) return;
+
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
        $fno = explode("-", $from);
        $tno = explode("-", $to);
+       $from = min($fno[0], $tno[0]);
+       $to = max($fno[0], $tno[0]);
 
        $cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -62,20 +64,19 @@ function print_credits()
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-       {
-               $rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
+               $rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
-       for ($i = $fno[0]; $i <= $tno[0]; $i++)
+       for ($i = $from; $i <= $to; $i++)
        {
                        if (!exists_customer_trans(ST_CUSTCREDIT, $i))
                                continue;
                        $sign = -1;
                        $myrow = get_customer_trans($i, ST_CUSTCREDIT);
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                               continue;
+                       }
                        $baccount = get_default_bank_account($myrow['curr_code']);
                        $params['bankaccount'] = $baccount['id'];
 
@@ -84,17 +85,16 @@ function print_credits()
                        $sales_order = null;
                        if ($email == 1)
                        {
-                               $rep = new FrontReport("", "", user_pagesize());
-                           $rep->SetHeaderType('Header2');
-                               $rep->currency = $cur;
-                               $rep->Font();
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
                                $rep->title = _('CREDIT NOTE');
                                $rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
-                               $rep->Info($params, $cols, null, $aligns);
                        }
-                       else
-                               $rep->title = _('CREDIT NOTE');
-                       $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+                   $rep->SetHeaderType('Header2');
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       $rep->Info($params, $cols, null, $aligns);
+
+                       $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true);
                        $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
                        $rep->NewPage();
 
@@ -131,26 +131,23 @@ function print_credits()
                                        $rep->NewPage();
                        }
 
-                       $comments = get_comments(ST_CUSTCREDIT, $i);
-                       if ($comments && db_num_rows($comments))
+                       $memo = get_comments_string(ST_CUSTCREDIT, $i);
+                       if ($memo != "")
                        {
                                $rep->NewLine();
-                       while ($comment=db_fetch($comments))
-                               $rep->TextColLines(0, 6, $comment['memo_'], -2);
+                               $rep->TextColLines(1, 5, $memo, -2);
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);
                        $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
-                       $linetype = true;
                        $doctype = ST_CUSTCREDIT;
-                       include($path_to_root . "/reporting/includes/doctext.inc");
 
-                       $rep->TextCol(3, 6, $doc_Sub_total, -2);
+                       $rep->TextCol(3, 6, _("Sub-total"), -2);
                        $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                        $rep->NewLine();
-                       $rep->TextCol(3, 6, $doc_Shipping, -2);
+                       $rep->TextCol(3, 6, _("Shipping"), -2);
                        $rep->TextCol(6, 7,     $DisplayFreight, -2);
                        $rep->NewLine();
                        $tax_items = get_trans_tax_details(ST_CUSTCREDIT, $i);
@@ -181,7 +178,7 @@ function print_credits()
                                                $first = false;
                                }
                                else
-                                               $rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
+                                               $rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
                                }
                        else
                        {
@@ -194,7 +191,7 @@ function print_credits()
                        $DisplayTotal = number_format2($sign*($myrow["ov_freight"] + $myrow["ov_gst"] +
                                $myrow["ov_amount"]+$myrow["ov_freight_tax"]),$dec);
                        $rep->Font('bold');
-                       $rep->TextCol(3, 6, $doc_TOTAL_INVOICE, - 2);
+                       $rep->TextCol(3, 6, _("TOTAL CREDIT"), - 2);
                        $rep->TextCol(6, 7, $DisplayTotal, -2);
                        $words = price_in_words($myrow['Total'], ST_CUSTCREDIT);
                        if ($words != "")
@@ -206,7 +203,7 @@ function print_credits()
                        if ($email == 1)
                        {
                                $myrow['dimension_id'] = $paylink; // helper for pmt link
-                               $rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow, ST_CUSTCREDIT);
+                               $rep->End($email);
                        }
        }
        if ($email == 0)