Merged changes from stable branch up to 2.3.23.

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

diff --git a/reporting/rep113.php b/reporting/rep113.php
index c73388abf565650c4c097d4fa0c84f9bfe0cabda..acf855c426618f39bd1e18ff7df4caf6bfc386be 100644 (file)
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -32,7 +32,7 @@ print_credits();
 
 function print_credits()
 {
-       global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates;
+       global $path_to_root, $SysPrefs;
        
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -89,13 +89,13 @@ function print_credits()
                                $rep->title = _('CREDIT NOTE');
                                $rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
                        }
-                   $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->SetHeaderType('Header2');
                        $rep->NewPage();
 
                        $result = get_customer_trans_details(ST_CUSTCREDIT, $i);
@@ -158,14 +158,14 @@ function print_credits()
                                continue;
                        $DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
                        
-                       if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+                       if ($SysPrefs->suppress_tax_rates() == 1)
                                $tax_type_name = $tax_item['tax_type_name'];
                        else
                                $tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
 
-                       if ($tax_item['included_in_price'])
+                       if ($myrow['tax_included'])
                        {
-                               if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+                               if ($SysPrefs->alternative_tax_include_on_docs() == 1)
                                {
                                        if ($first)
                                        {
@@ -210,4 +210,3 @@ function print_credits()
                $rep->End();
 }
 
-?>
\ No newline at end of file