Merged changes up to 2.3.16 into unstable

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

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 8dfb92b139559621b8c88a309319ee8b213ad381..2e8e1dc5484509dbc28aaa39803e19fc7230ada5 100644 (file)
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -44,9 +44,9 @@ function print_credits()
        $comments = $_POST['PARAM_5'];
        $orientation = $_POST['PARAM_6'];
 
-       $orientation = ($orientation ? 'L' : 'P');
        if (!$from || !$to) return;
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
        $fno = explode("-", $from);
@@ -66,7 +66,7 @@ function print_credits()
        if ($email == 0)
                $rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
-       $rep->recalculate_cols($cols);
+       recalculate_cols($cols);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -81,15 +81,17 @@ function print_credits()
                        $branch['disable_branch'] = $paylink; // helper
                        $sales_order = null;
                        if ($email == 1)
+                       {
                                $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
-                       $rep->SetHeaderType('Header2');
+                               $rep->title = _('CREDIT NOTE');
+                               $rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
+                       }
+                   $rep->SetHeaderType('Header2');
                        $rep->currency = $cur;
                        $rep->Font();
-                       $rep->title = _('CREDIT NOTE');
-                       $rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
                        $rep->Info($params, $cols, null, $aligns);
 
-                       $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
+                       $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true);
                        $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
                        $rep->NewPage();