Small fixes according to Apmuthu's list.

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index f0cad5651c51b34b2d259737c9f865b02b8bb6db..c8bd32550b1204d028fdf0305cf1ff34b2af6c35 100644 (file)
--- 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 0e14b7024eda47f140c72574543eba809b56c564..aaade9058bb9517fb1cf4cddb11499451354621a 100644 (file)
--- 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 27063c609e517e8cf2db4591037374a869534aca..5fccb257fcd2db5f871659cac4d43d3e2a4d9a69 100644 (file)
--- 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 a7dfbf13eb72224727af8aa2302105d6b08acb41..d6ed21e245b36e1e81f8bc0f5a7e5ea2e6924130 100644 (file)
--- 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 85b17ddb01f6fcc3bfc41128060cafedda4f3e4d..7044153d33f20877235aabcb9be0ca10020430d0 100644 (file)
--- 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 95ce5318b9cdfd3545bc3b3b1ae5774e7ea47e14..4f3588b0be16f19dbc953ccdb9f5b1d180ae77d4 100644 (file)
--- 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 10e2130bfd9e542ab93a0b76ca4ad84bfe63e7cc..ee1a0e1f2dddad639450952d4b18f6df664b77b3 100644 (file)
--- 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 522b62f82e74bfc5b10710b2e57b23b171cd83b2..4f20bd92a6a72e82b6285c3b3356505d0d914aaf 100644 (file)
--- 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 905761ab91cf8cf976f36c42692c785e42dababa..11d3aff98780c49557968b6cb29b72166392d329 100644 (file)
--- 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 1d7dbc698d5f6e0d97c81d5e3d90f7386d5c7867..3af1bafbc2eb4ab27bd552d9a08f678ecb25961e 100644 (file)
--- 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 b2ddd39da55f8598c2953274ac2d5c8ed304ba57..218f07faa59191b84f20cdda2c54c61325e2bb59 100644 (file)
--- 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);