Two small bugs fixed in bank payment edition.

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

diff --git a/reporting/rep111.php b/reporting/rep111.php
index e3b0ab1fcddf684a6e85cc4cc3da6d96ff4b1e15..69fac4282e2c6149a58035773d1ef6675a212e07 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -80,7 +80,8 @@ function print_sales_quotations()
                        $rep->Info($params, $cols, null, $aligns);
                }
                $rep->title = _("SALES QUOTATION");
-               $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE);
+               $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']);
+               $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
                $rep->headerFunc = 'Header2';
                $rep->NewPage();
 
@@ -124,14 +125,7 @@ function print_sales_quotations()
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $linetype = true;
                $doctype = ST_SALESQUOTE;
-               if ($rep->currency != $myrow['curr_code'])
-               {
-                       include($path_to_root . "/reporting/includes/doctext2.inc");
-               }
-               else
-               {
-                       include($path_to_root . "/reporting/includes/doctext.inc");
-               }
+               include($path_to_root . "/reporting/includes/doctext.inc");
 
                $rep->TextCol(3, 6, $doc_Sub_total, -2);
                $rep->TextCol(6, 7,     $DisplaySubTot, -2);