From 0518849c28cc497af72168ec4c6713c1a191c0be Mon Sep 17 00:00:00 2001 From: Joe Date: Wed, 21 Jan 2015 09:46:11 +0100 Subject: [PATCH] Small fixes according to Apmuthu's list. --- reporting/includes/pdf_report.inc | 1 + reporting/rep107.php | 2 +- reporting/rep108.php | 2 +- reporting/rep109.php | 2 +- reporting/rep110.php | 2 +- reporting/rep111.php | 3 +-- reporting/rep112.php | 2 +- reporting/rep113.php | 2 +- reporting/rep209.php | 2 +- reporting/rep210.php | 2 +- reporting/rep409.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc index f0cad565..c8bd3255 100644 --- a/reporting/includes/pdf_report.inc +++ b/reporting/includes/pdf_report.inc @@ -20,6 +20,7 @@ */ include_once(dirname(__FILE__)."/class.pdf.inc"); include_once(dirname(__FILE__)."/printer_class.inc"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); include_once($path_to_root . "/admin/db/company_db.inc"); include_once($path_to_root . "/admin/db/fiscalyears_db.inc"); include_once($path_to_root . "/admin/db/printers_db.inc"); diff --git a/reporting/rep107.php b/reporting/rep107.php index 0e14b702..aaade905 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -111,7 +111,6 @@ function print_invoices() $rep->title = _('INVOICE'); $rep->filename = "Invoice" . $myrow['reference'] . ".pdf"; } - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -119,6 +118,7 @@ function print_invoices() $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true); $baccount['payment_service'] = $pay_service; $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); // calculate summary start row for later use $summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight); diff --git a/reporting/rep108.php b/reporting/rep108.php index 27063c60..5fccb257 100644 --- a/reporting/rep108.php +++ b/reporting/rep108.php @@ -113,13 +113,13 @@ function print_statements() } $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice'); - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); //= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']); $rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); $rep->NewLine(); $doctype = ST_STATEMENT; diff --git a/reporting/rep109.php b/reporting/rep109.php index a7dfbf13..d6ed21e2 100644 --- a/reporting/rep109.php +++ b/reporting/rep109.php @@ -95,13 +95,13 @@ function print_sales_orders() } else $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER")); - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true); $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); $result = get_sales_order_details($i, ST_SALESORDER); diff --git a/reporting/rep110.php b/reporting/rep110.php index 85b17ddb..7044153d 100644 --- a/reporting/rep110.php +++ b/reporting/rep110.php @@ -93,13 +93,13 @@ function print_deliveries() $rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf"; } } - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], true); $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); $result = get_customer_trans_details(ST_CUSTDELIVERY, $i); diff --git a/reporting/rep111.php b/reporting/rep111.php index 95ce5318..4f3588b0 100644 --- a/reporting/rep111.php +++ b/reporting/rep111.php @@ -79,14 +79,13 @@ function print_sales_quotations() else $rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf"; } - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true); + $rep->SetHeaderType('Header2'); $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts); - //$rep->headerFunc = 'Header2'; $rep->NewPage(); $result = get_sales_order_details($i, ST_SALESQUOTE); diff --git a/reporting/rep112.php b/reporting/rep112.php index 10e2130b..ee1a0e1f 100644 --- a/reporting/rep112.php +++ b/reporting/rep112.php @@ -83,7 +83,6 @@ function print_receipts() $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize(), 9, $orientation); if ($orientation == 'L') recalculate_cols($cols); - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -105,6 +104,7 @@ function print_receipts() $contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']); $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); $result = get_allocatable_to_cust_transactions($myrow['debtor_no'], $myrow['trans_no'], $myrow['type']); diff --git a/reporting/rep113.php b/reporting/rep113.php index 522b62f8..4f20bd92 100644 --- a/reporting/rep113.php +++ b/reporting/rep113.php @@ -86,13 +86,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); diff --git a/reporting/rep209.php b/reporting/rep209.php index 905761ab..11d3aff9 100644 --- a/reporting/rep209.php +++ b/reporting/rep209.php @@ -100,13 +100,13 @@ function print_po() $rep->title = _('PURCHASE ORDER'); $rep->filename = "PurchaseOrder" . $i . ".pdf"; } - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); $contacts = get_supplier_contacts($myrow['supplier_id'], 'order'); $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_PURCHORDER, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); $result = get_po_details($i); diff --git a/reporting/rep210.php b/reporting/rep210.php index 1d7dbc69..3af1bafb 100644 --- a/reporting/rep210.php +++ b/reporting/rep210.php @@ -106,13 +106,13 @@ function print_remittances() $rep->title = _('REMITTANCE'); $rep->filename = "Remittance" . $i . ".pdf"; } - $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->SetHeaderType('Header2'); $rep->NewPage(); $result = get_allocatable_to_supp_transactions($myrow['supplier_id'], $myrow['trans_no'], $myrow['type']); diff --git a/reporting/rep409.php b/reporting/rep409.php index b2ddd39d..218f07fa 100644 --- a/reporting/rep409.php +++ b/reporting/rep409.php @@ -72,7 +72,6 @@ function print_workorders() $rep->title = _('WORK ORDER'); $rep->filename = "WorkOrder" . $myrow['wo_ref'] . ".pdf"; } - $rep->SetHeaderType('Header2'); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -81,6 +80,7 @@ function print_workorders() 'name' => $myrow['contact'], 'name2' => '', 'contact'); $rep->SetCommonData($myrow, null, null, '', 26, $contact); + $rep->SetHeaderType('Header2'); $rep->NewPage(); $result = get_wo_requirements($i); -- 2.30.2