X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=56498f0b62658a773552024f1329ec7cc4e2f1d6;hb=4b01b6447fcf5849486a8b048f06c1c8bbb13021;hp=96b972ed3d2d4e4430853af070193d5c758ddcfb;hpb=b37623cf1de2cfce6825744557d76475f002321f;p=fa-stable.git diff --git a/reporting/rep109.php b/reporting/rep109.php index 96b972ed..56498f0b 100644 --- a/reporting/rep109.php +++ b/reporting/rep109.php @@ -96,7 +96,9 @@ function print_sales_orders() } else $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER")); - $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER); + + $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']); + $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts); $rep->NewPage(); $result = get_sales_order_details($i, ST_SALESORDER); @@ -139,14 +141,7 @@ function print_sales_orders() $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $linetype = true; $doctype = ST_SALESORDER; - 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); @@ -170,6 +165,7 @@ function print_sales_orders() $rep->Font(); if ($email == 1) { + $res = get_branch_contacts(branch_code, 'order', customer_id); if ($myrow['contact_email'] == '') { $myrow['contact_email'] = $branch['email'];