X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep210.php;h=de184220d10c7941ee764926a1b0afef0f341d96;hb=03dbf580a48b9831dfb6fcbf8c34e1315c26a99e;hp=f177fbc1b480c71d210a9542d84a5608df2d5522;hpb=750d8c237ccb8f4cdfcdc246f1ca196cf69ae8cb;p=fa-stable.git diff --git a/reporting/rep210.php b/reporting/rep210.php index f177fbc1..de184220 100644 --- a/reporting/rep210.php +++ b/reporting/rep210.php @@ -70,9 +70,11 @@ function print_remittances() $currency = $_POST['PARAM_2']; $email = $_POST['PARAM_3']; $comments = $_POST['PARAM_4']; + $orientation = $_POST['PARAM_5']; if (!$from || !$to) return; + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); $fno = explode("-", $from); @@ -90,13 +92,9 @@ function print_remittances() $cur = get_company_Pref('curr_default'); if ($email == 0) - { - $rep = new FrontReport(_('REMITTANCE'), "RemittanceBulk", user_pagesize()); - $rep->SetHeaderType('Header2'); - $rep->currency = $cur; - $rep->Font(); - $rep->Info($params, $cols, null, $aligns); - } + $rep = new FrontReport(_('REMITTANCE'), "RemittanceBulk", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); for ($i = $from; $i <= $to; $i++) { @@ -115,16 +113,15 @@ function print_remittances() 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 = _('REMITTANCE'); $rep->filename = "Remittance" . $i . ".pdf"; - $rep->Info($params, $cols, null, $aligns); } - else - $rep->title = _('REMITTANCE'); + $rep->SetHeaderType('Header2'); + $rep->currency = $cur; + $rep->Font(); + $rep->Info($params, $cols, null, $aligns); + $contacts = get_supplier_contacts($myrow['supplier_id'], 'invoice'); $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_SUPPAYMENT, $contacts); $rep->NewPage(); @@ -152,6 +149,12 @@ function print_remittances() $rep->NewPage(); } + $memo = get_comments_string($j, $i); + if ($memo != "") + { + $rep->NewLine(); + $rep->TextColLines(1, 5, $memo, -2); + } $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight); $rep->TextCol(3, 6, _("Total Allocated"), -2);