Implemented Selectable Print Orientation (Portrait, Landscape) for all reports in...

diff --git a/config.default.php b/config.default.php
index a5a8920e0e12d895c151658b664b29b0e624e3c5..5d32e432a03e5be90ead9422fe4282d5b47f8405 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -107,6 +107,9 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        /* default print destination. 0 = PDF/Printer, 1 = Excel */
        $def_print_destination = 0;
 
+       /* default print orientation. 0 = Portrait, 1 = Landscape */
+       $def_print_orientation = 0;
+
        // Wiki context help configuration
        // If your help wiki use translated page titles uncomment next line
        // $old_style_help = 1; // this setting is depreciated and subject to removal in next FA versions

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 7d1379b43676d9bb45929b6173ac95cfed7ad060..01872157cf3654cb447f89d7bea23befac947dc0 100644 (file)
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -693,8 +693,16 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                return ($px / $unit_offset_length);
        }       
 
+       function recalculate_cols(&$cols)
+       {
+               $factor = (user_pagesize() == "A4" ? 1.4 : 1.3);
+               foreach($cols as $key => $col)
+                       $cols[$key] = intval($col * $factor); 
+       }
+
        function End($email=0, $subject='')
        {
+               global $path_to_root;
                ++$this->y;
                for ($i = 0; $i < $this->numcols; $i++)
                        $this->sheet->writeBlank($this->y, $i, $this->formatFooter);

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 682b8af319c5a61e644677ce1600f97582cd9eed..20b96bd4dc117553f39c593fd8e85c50521b2d9a 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -946,6 +946,13 @@ class FrontReport extends Cpdf
                        $this->{$this->headerTmpl}();
        }
 
+       function recalculate_cols(&$cols)
+       {
+               $factor = (user_pagesize() == "A4" ? 1.4 : 1.3);
+               foreach($cols as $key => $col)
+                       $cols[$key] = intval($col * $factor); 
+       }
+
        function End($email=0, $subject='')
        {
                global $pdf_debug, $path_to_root;

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index a789132cedb83cc07de6e669052a2f817a130050..fdb8a17561e50956ca7e81c38f3cf5e773b0898b 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -165,7 +165,7 @@ class BoxReports
        function get_ctrl($name, $type)
        {
                global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no,
-                       $def_print_destination, $type_shortcuts;
+                       $def_print_destination, $def_print_orientation, $type_shortcuts;
 
                $st = '';
                        switch ($type)
@@ -234,6 +234,13 @@ class BoxReports
                                                $def = 1;
                                        return array_selector($name, $def, $sel);
 
+                               case 'ORIENTATION':
+                                       $sel = array(_("Portrait"), _("Landscape"));
+                                       $def = 0;
+                                       if (isset($def_print_orientation) && $def_print_orientation == 1)
+                                               $def = 1;
+                                       return array_selector($name, $def, $sel);
+
                                case 'COMPARE':
                                        $sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));
                                        return array_selector($name, null, $sel);
@@ -373,6 +380,9 @@ class BoxReports
                                case 'ITEMS':
                                        return stock_manufactured_items_list($name);
 
+                               case 'ITEMS_P':
+                                       return stock_purchasable_items_list($name, null, true);
+                               
                                case 'WORKORDER':
                                        $sql = "SELECT ".TB_PREF."workorders.id, concat(".TB_PREF."workorders.id, '-',
                                                ".TB_PREF."stock_master.description) as IName

diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php
index 855df012b55241560714f9a97a2aeb9f0ed34790..f42fb63020c6e74d5cd45af78d605f35e1ba3ccc 100644 (file)
--- a/reporting/prn_redirect.php
+++ b/reporting/prn_redirect.php
@@ -19,7 +19,7 @@ $page_security = 'SA_OPEN';   // this level is later overriden in rep file
 include_once($path_to_root . "/includes/session.inc");
 
 if (isset($save_report_selections) && $save_report_selections > 0 && isset($_POST['REP_ID'])) {        // save parameters from Report Center
-       for($i=0; $i<10; $i++) { // 2010-10-06 Joe Hunt
+       for($i=0; $i<12; $i++) { // 2013-01-14 Joe Hunt
                if (isset($_POST['PARAM_'.$i]) && !is_array($_POST['PARAM_'.$i])) {
                        $rep = $_POST['REP_ID'];
                        setcookie("select[$rep][$i]", $_POST['PARAM_'.$i], time()+60*60*24*$save_report_selections); // days from $save_report_selections

diff --git a/reporting/rep101.php b/reporting/rep101.php
index 0ff78c8ba7bb569df8b8be90f7608560ab292cf3..3fee1e8f00c59deefcce79ac951c44d8d697c02c 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -102,12 +102,15 @@ function print_customer_balances()
        $currency = $_POST['PARAM_3'];
        $no_zeros = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
-       $destination = $_POST['PARAM_6'];
+       $orientation = $_POST['PARAM_6'];
+       $destination = $_POST['PARAM_7'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
+
        if ($fromcust == ALL_TEXT)
                $cust = _('All');
        else
@@ -138,7 +141,9 @@ function print_customer_balances()
                                    3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''),
                                                4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
-    $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize());
+    $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();

diff --git a/reporting/rep102.php b/reporting/rep102.php
index f4ec4a88ea4909e548d80329a1de208537143eae..5940cc5102ef4f522c4e879e2f6d4d6c7a96023c 100644 (file)
--- a/reporting/rep102.php
+++ b/reporting/rep102.php
@@ -79,11 +79,13 @@ function print_aged_customer_analysis()
        $no_zeros = $_POST['PARAM_5'];
        $graphics = $_POST['PARAM_6'];
        $comments = $_POST['PARAM_7'];
-       $destination = $_POST['PARAM_8'];
+       $orientation = $_POST['PARAM_8'];
+       $destination = $_POST['PARAM_9'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
        if ($graphics)
        {
                include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -135,7 +137,9 @@ function print_aged_customer_analysis()
 
        if ($convert)
                $headers[2] = _('Currency');
-       $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis", user_pagesize());
+    $rep = new FrontReport(_('Aged Customer Analysis'), "AgedCustomerAnalysis", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep103.php b/reporting/rep103.php
index 3a5fa14493a632f9e2dc20a1c0b7dee8dfd04129..cccef402c006e2f2dd9c1f1054657f0b5ffc6307 100644 (file)
--- a/reporting/rep103.php
+++ b/reporting/rep103.php
@@ -98,11 +98,13 @@ function print_customer_details_listing()
     $more = $_POST['PARAM_3'];
     $less = $_POST['PARAM_4'];
     $comments = $_POST['PARAM_5'];
-       $destination = $_POST['PARAM_6'];
+       $orientation = $_POST['PARAM_6'];
+       $destination = $_POST['PARAM_7'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
 
     $dec = 0;
 
@@ -144,7 +146,9 @@ function print_customer_details_listing()
                                    3 => array('text' => _('Sales Folk'),               'from' => $salesfolk,   'to' => ''),
                                    4 => array('text' => _('Activity'),                 'from' => $morestr,     'to' => $lessstr));
 
-    $rep = new FrontReport(_('Customer Details Listing'), "CustomerDetailsListing", user_pagesize());
+    $rep = new FrontReport(_('Customer Details Listing'), "CustomerDetailsListing", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep104.php b/reporting/rep104.php
index a9bec54ba2115c1e61c30dc8908d324f9216f868..72dfb9cc3fc90258688cebcc6825a4c06b91f819 100644 (file)
--- a/reporting/rep104.php
+++ b/reporting/rep104.php
@@ -74,11 +74,13 @@ function print_price_listing()
     $pictures = $_POST['PARAM_3'];
     $showGP = $_POST['PARAM_4'];
     $comments = $_POST['PARAM_5'];
-       $destination = $_POST['PARAM_6'];
+       $orientation = $_POST['PARAM_6'];
+       $destination = $_POST['PARAM_7'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
 
     $dec = user_price_dec();
 
@@ -121,7 +123,9 @@ function print_price_listing()
        else
                $user_comp = "";
 
-    $rep = new FrontReport(_('Price Listing'), "PriceListing", user_pagesize());
+    $rep = new FrontReport(_('Price Listing'), "PriceListing", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep105.php b/reporting/rep105.php
index 70c8c0d0a203cac7bb1aaf90d28ea15033ef9dfe..a8d879313866eb6ad22e8d58d321284a71257ad2 100644 (file)
--- a/reporting/rep105.php
+++ b/reporting/rep105.php
@@ -79,11 +79,13 @@ function print_order_status_list()
        $location = $_POST['PARAM_3'];
        $backorder = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
-       $destination = $_POST['PARAM_6'];
+       $orientation = $_POST['PARAM_6'];
+       $destination = $_POST['PARAM_7'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
 
        if ($category == ALL_NUMERIC)
                $category = 0;
@@ -118,10 +120,12 @@ function print_order_status_list()
                                        3 => array(  'text' => _('Location'), 'from' => $loc, 'to' => ''),
                                        4 => array(  'text' => _('Selection'),'from' => $back,'to' => ''));
 
-       $cols2 = $cols;
        $aligns2 = $aligns;
 
-       $rep = new FrontReport(_('Order Status Listing'), "OrderStatusListing", user_pagesize());
+       $rep = new FrontReport(_('Order Status Listing'), "OrderStatusListing", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
+       $cols2 = $cols;
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
 

diff --git a/reporting/rep106.php b/reporting/rep106.php
index ca1c84725b1b7a8bc07dabf96f6cf5331c1e92c4..c1d37466b866b89ec053532effa573fb3b527e31 100644 (file)
--- a/reporting/rep106.php
+++ b/reporting/rep106.php
@@ -63,11 +63,13 @@ function print_salesman_list()
        $to = $_POST['PARAM_1'];
        $summary = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
 
        if ($summary == 0)
                $sum = _("No");
@@ -90,10 +92,12 @@ function print_salesman_list()
                                        1 => array(  'text' => _('Period'), 'from' => $from, 'to' => $to),
                                        2 => array(  'text' => _('Summary Only'),'from' => $sum,'to' => ''));
 
-       $cols2 = $cols;
        $aligns2 = $aligns;
 
-       $rep = new FrontReport(_('Salesman Listing'), "SalesmanListing", user_pagesize());
+       $rep = new FrontReport(_('Salesman Listing'), "SalesmanListing", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
+       $cols2 = $cols;
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
 

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 9220166b4fdbd8a48338a17ab3dd4b66f8601215..ae2e8d96dcb4f40dbdbc990914300eabdd9afb80 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -61,7 +61,9 @@ function print_invoices()
        $email = $_POST['PARAM_3'];
        $pay_service = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_6'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if (!$from || !$to) return;
 
        $dec = user_price_dec();
@@ -82,7 +84,9 @@ function print_invoices()
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-               $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
+               $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
        $range = get_invoice_range($from, $to);
        while($row = db_fetch($range))
@@ -98,7 +102,7 @@ function print_invoices()
                        $branch = get_branch($myrow["branch_code"]);
                        $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
                        if ($email == 1)
-                               $rep = new FrontReport("", "", user_pagesize());
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
                    $rep->SetHeaderType('Header2');
                        $rep->currency = $cur;
                        $rep->Font();
@@ -111,7 +115,7 @@ function print_invoices()
                        $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
                        $rep->NewPage();
                        // calculate summary start row for later use
-                       $summary_start_row = $rep->bottomMargin + (20 * $rep->lineHeight);
+                       $summary_start_row = $rep->bottomMargin + (12 * $rep->lineHeight);
 
                        if ($rep->formData['prepaid'])
                        {
@@ -182,7 +186,7 @@ function print_invoices()
                        if (isset($prepayments))
                        {
                                // Partial invoices table
-                               $rep->NewLine();
+                               //$rep->NewLine();
                                $rep->TextCol(1, 4,_("Prepayments invoiced to this order up to day:"));
                                $rep->TextCol(1, 4,     str_pad('', 150, '_'));
                                $rep->cols[3] -= 20;
@@ -213,6 +217,7 @@ function print_invoices()
 
 
                        $doctype = ST_SALESINVOICE;
+               $rep->row = $summary_start_row;
 
                        $rep->TextCol(3, 6, _("Sub-total"), -2);
                        $rep->TextCol(6, 7,     $DisplaySubTot, -2);

diff --git a/reporting/rep108.php b/reporting/rep108.php
index 9315f64974eba83aca3751cdd2561cc8c3c56acf..7f2d6069bade395ef321c7ead7cff0fea3ed3065 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -64,7 +64,9 @@ function print_statements()
        $show_also_allocated = $_POST['PARAM_2'];
        $email = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
        $cols = array(4, 100, 130, 190, 250, 320, 385, 450, 515);
@@ -80,14 +82,9 @@ function print_statements()
        $PastDueDays2 = 2 * $PastDueDays1;
 
        if ($email == 0)
-       {
-               $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
-
+               $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
        if ($customer != ALL_TEXT)
                $sql .= " WHERE debtor_no = ".db_escape($customer);
@@ -107,15 +104,14 @@ function print_statements()
                if (db_num_rows($TransResult) == 0)
                        continue;
                if ($email == 1)
-               {
-                       $rep = new FrontReport("", "", user_pagesize());
-                       $rep->SetHeaderType('Header2');
-                       $rep->currency = $cur;
-                       $rep->Font();
-                       $rep->title = _('STATEMENT');
-                       $rep->filename = "Statement" . $myrow['debtor_no'] . ".pdf";
-                       $rep->Info($params, $cols, null, $aligns);
-               }
+                       $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+               $rep->SetHeaderType('Header2');
+               $rep->currency = $cur;
+               $rep->Font();
+               $rep->title = _('STATEMENT');
+               $rep->filename = "Statement" . $myrow['debtor_no'] . ".pdf";
+               $rep->Info($params, $cols, null, $aligns);
+
                $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice');
                //= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
                $rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts);

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 43ec09f5ea9c0327c0ecbae9f6283dee0adbda1e..64502e2abd6202f3958b58f739ca347579f95592 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -43,7 +43,9 @@ function print_sales_orders()
        $email = $_POST['PARAM_3'];
        $print_as_quote = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_6'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($from == null)
                $from = 0;
        if ($to == null)
@@ -63,14 +65,12 @@ function print_sales_orders()
        {
 
                if ($print_as_quote == 0)
-                       $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize());
+                       $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize(), 9, $orientation);
                else
-                       $rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
+                       $rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize(), 9, $orientation);
        }
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -79,25 +79,21 @@ function print_sales_orders()
                $params['bankaccount'] = $baccount['id'];
                $branch = get_branch($myrow["branch_code"]);
                if ($email == 1)
+                       $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+               $rep->SetHeaderType('Header2');
+               $rep->currency = $cur;
+               $rep->Font();
+               if ($print_as_quote == 1)
                {
-                       $rep = new FrontReport("", "", user_pagesize());
-                       $rep->SetHeaderType('Header2');
-                       $rep->currency = $cur;
-                       $rep->Font();
-                       if ($print_as_quote == 1)
-                       {
-                               $rep->title = _('QUOTE');
-                               $rep->filename = "Quote" . $i . ".pdf";
-                       }
-                       else
-                       {
-                               $rep->title = _("SALES ORDER");
-                               $rep->filename = "SalesOrder" . $i . ".pdf";
-                       }
-                       $rep->Info($params, $cols, null, $aligns);
+                       $rep->title = _('QUOTE');
+                       $rep->filename = "Quote" . $i . ".pdf";
                }
                else
-                       $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
+               {
+                       $rep->title = _("SALES ORDER");
+                       $rep->filename = "SalesOrder" . $i . ".pdf";
+               }
+               $rep->Info($params, $cols, null, $aligns);
 
                $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], false);
                $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts);

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 488d58318d5006738bdd756a37cd774537f89cfc..9e9fee28f0ee028ee88d9feba5bca2683a445ecc 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -43,7 +43,9 @@ function print_deliveries()
        $email = $_POST['PARAM_2'];
        $packing_slip = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if (!$from || !$to) return;
 
        $dec = user_price_dec();
@@ -65,15 +67,12 @@ function print_deliveries()
        if ($email == 0)
        {
                if ($packing_slip == 0)
-                       $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize());
+                       $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize(), 9, $orientation);
                else
-                       $rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
+                       $rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize(), 9, $orientation);
        }
-
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        for ($i = $from; $i <= $to; $i++)
        {
                        if (!exists_customer_trans(ST_CUSTDELIVERY, $i))
@@ -82,25 +81,21 @@ function print_deliveries()
                        $branch = get_branch($myrow["branch_code"]);
                        $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); // ?
                        if ($email == 1)
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+                       $rep->SetHeaderType('Header2');
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       if ($packing_slip == 0)
                        {
-                               $rep = new FrontReport("", "", user_pagesize());
-                               $rep->SetHeaderType('Header2');
-                               $rep->currency = $cur;
-                               $rep->Font();
-                               if ($packing_slip == 0)
-                               {
-                                       $rep->title = _('DELIVERY NOTE');
-                                       $rep->filename = "Delivery" . $myrow['reference'] . ".pdf";
-                               }
-                               else
-                               {
-                                       $rep->title = _('PACKING SLIP');
-                                       $rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
-                               }
-                               $rep->Info($params, $cols, null, $aligns);
+                               $rep->title = _('DELIVERY NOTE');
+                               $rep->filename = "Delivery" . $myrow['reference'] . ".pdf";
                        }
                        else
-                               $rep->title = _('DELIVERY NOTE');
+                       {
+                               $rep->title = _('PACKING SLIP');
+                               $rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
+                       }
+                       $rep->Info($params, $cols, null, $aligns);
                        $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], false);
                        $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
                        $rep->NewPage();

diff --git a/reporting/rep111.php b/reporting/rep111.php
index be0c48c0c55a4007b23c22f4a0874918ac7926ba..be0c16bb459e88fe8d99e5df3f3fb0ba0c9b0705 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -40,7 +40,9 @@ function print_sales_quotations()
        $currency = $_POST['PARAM_2'];
        $email = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($from == null)
                $from = 0;
        if ($to == null)
@@ -57,13 +59,9 @@ function print_sales_quotations()
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-       {
-               $rep = new FrontReport(_("SALES QUOTATION"), "SalesQuotationBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
+               $rep = new FrontReport(_("SALES QUOTATION"), "SalesQuotationBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -72,17 +70,15 @@ function print_sales_quotations()
                $params['bankaccount'] = $baccount['id'];
                $branch = get_branch($myrow["branch_code"]);
                if ($email == 1)
-               {
-                       $rep = new FrontReport("", "", user_pagesize());
-                       $rep->SetHeaderType('Header2');
-                       $rep->currency = $cur;
-                       $rep->Font();
-                       if ($print_invoice_no == 1)
-                               $rep->filename = "SalesQuotation" . $i . ".pdf";
-                       else    
-                               $rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf";
-                       $rep->Info($params, $cols, null, $aligns);
-               }
+                       $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+               $rep->SetHeaderType('Header2');
+               $rep->currency = $cur;
+               $rep->Font();
+               if ($print_invoice_no == 1)
+                       $rep->filename = "SalesQuotation" . $i . ".pdf";
+               else    
+                       $rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf";
+               $rep->Info($params, $cols, null, $aligns);
                $rep->title = _("SALES QUOTATION");
                $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], false);
                $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
@@ -132,6 +128,7 @@ function print_sales_quotations()
                $DisplaySubTot = number_format2($SubTotal,$dec);
                $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
+               $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $doctype = ST_SALESQUOTE;
 
                $rep->TextCol(3, 6, _("Sub-total"), -2);

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 044b8437d141f754f81239e49c437efb8be08475..d9297b870a17afd1bd3a8760fdf6f5b1dcc66081 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -58,7 +58,9 @@ function print_receipts()
        $to = $_POST['PARAM_1'];
        $currency = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_4'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if (!$from || !$to) return;
 
        $dec = user_price_dec();
@@ -77,7 +79,9 @@ function print_receipts()
 
        $cur = get_company_Pref('curr_default');
 
-       $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize());
+       $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        $rep->SetHeaderType('Header2');
        $rep->currency = $cur;
        $rep->Font();

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 26f51fbde9c934b0161b157af97652cc08ee569e..8dfb92b139559621b8c88a309319ee8b213ad381 100644 (file)
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -42,7 +42,9 @@ function print_credits()
        $email = $_POST['PARAM_3'];
        $paylink = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_6'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if (!$from || !$to) return;
 
        $dec = user_price_dec();
@@ -62,13 +64,9 @@ function print_credits()
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-       {
-               $rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
+               $rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -83,17 +81,14 @@ function print_credits()
                        $branch['disable_branch'] = $paylink; // helper
                        $sales_order = null;
                        if ($email == 1)
-                       {
-                               $rep = new FrontReport("", "", user_pagesize());
-                           $rep->SetHeaderType('Header2');
-                               $rep->currency = $cur;
-                               $rep->Font();
-                               $rep->title = _('CREDIT NOTE');
-                               $rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
-                               $rep->Info($params, $cols, null, $aligns);
-                       }
-                       else
-                               $rep->title = _('CREDIT NOTE');
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+                       $rep->SetHeaderType('Header2');
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       $rep->title = _('CREDIT NOTE');
+                       $rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
+                       $rep->Info($params, $cols, null, $aligns);
+
                        $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
                        $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
                        $rep->NewPage();

diff --git a/reporting/rep114.php b/reporting/rep114.php
index 1b555d6c3b06bf7b178c166623be64427647272e..6dda958e599bd18faf141dda90b2b8ea69556d92 100644 (file)
--- a/reporting/rep114.php
+++ b/reporting/rep114.php
@@ -68,7 +68,8 @@ function print_sales_summary_report()
        $to = $_POST['PARAM_1'];
        $tax_id = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($tax_id == 0)
                $tid = _('No');
        else
@@ -79,10 +80,11 @@ function print_sales_summary_report()
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
 
        $dec = user_price_dec();
 
-       $rep = new FrontReport(_('Sales Summary Report'), "SalesSummaryReport", user_pagesize());
+       $rep = new FrontReport(_('Sales Summary Report'), "SalesSummaryReport", user_pagesize(), 9, $orientation);
 
        $params =   array(      0 => $comments,
                                                1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
@@ -92,6 +94,9 @@ function print_sales_summary_report()
 
        $headers = array(_('Customer'), _('Tax Id'), _('Total ex. Tax'), _('Tax'));
        $aligns = array('left', 'left', 'right', 'right');
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
+       
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        $rep->NewPage();

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 4004c8a219c335bb279198fb0ff014c5e721bd08..ee2bbcbcd40e4bc13c054c040e7ebaee31cc7417 100644 (file)
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -90,12 +90,14 @@ function print_supplier_balances()
        $currency = $_POST['PARAM_3'];
        $no_zeros = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
-       $destination = $_POST['PARAM_6'];
+       $orientation = $_POST['PARAM_6'];
+       $destination = $_POST['PARAM_7'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($fromsupp == ALL_TEXT)
                $supp = _('All');
        else
@@ -126,7 +128,9 @@ function print_supplier_balances()
                        3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''),
                        4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
-    $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", user_pagesize());
+    $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep202.php b/reporting/rep202.php
index 5901260596b53b878a93ff35f6fbdbbb1bb163b2..3a674d89cabce5179352de4fa5cfa33f6414c705 100644 (file)
--- a/reporting/rep202.php
+++ b/reporting/rep202.php
@@ -82,12 +82,14 @@ function print_aged_supplier_analysis()
     $no_zeros = $_POST['PARAM_5'];
     $graphics = $_POST['PARAM_6'];
     $comments = $_POST['PARAM_7'];
-       $destination = $_POST['PARAM_8'];
+       $orientation = $_POST['PARAM_8'];
+       $destination = $_POST['PARAM_9'];
 
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
        if ($graphics)
        {
                include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -140,7 +142,9 @@ function print_aged_supplier_analysis()
 
        if ($convert)
                $headers[2] = _('currency');
-       $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis", user_pagesize());
+    $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 7ca090d9d043fef8cfa88aad3550104cdb889b38..95c3c0e664fe732ba3f2013a542b3981bd1edd85 100644 (file)
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -62,12 +62,14 @@ function print_payment_report()
        $currency = $_POST['PARAM_2'];
        $no_zeros = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
-       $destination = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($fromsupp == ALL_TEXT)
                $from = _('All');
        else
@@ -99,7 +101,9 @@ function print_payment_report()
                        3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''),
                        4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
-    $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize());
+    $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep204.php b/reporting/rep204.php
index 21624cf489481b56811fff5291f4c426b4082212..cfd7f8dfa485f587a04c18ad63f69d044544dc4a 100644 (file)
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -65,12 +65,14 @@ function print_outstanding_GRN()
 
     $fromsupp = $_POST['PARAM_0'];
     $comments = $_POST['PARAM_1'];
-       $destination = $_POST['PARAM_2'];
+       $orientation = $_POST['PARAM_2'];
+       $destination = $_POST['PARAM_3'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($fromsupp == ALL_TEXT)
                $from = _('All');
        else
@@ -87,7 +89,9 @@ function print_outstanding_GRN()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''));
 
-    $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize());
+    $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep209.php b/reporting/rep209.php
index b74ac209845ce4cc8abd5446e6b9943ac5193280..1340c61b0623b7ed24ada8a6ec2817604a9fd4ca 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -67,7 +67,9 @@ function print_po()
        $currency = $_POST['PARAM_2'];
        $email = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($from == null)
                $from = 0;
        if ($to == null)
@@ -84,13 +86,9 @@ function print_po()
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-       {
-               $rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
+               $rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -99,17 +97,14 @@ function print_po()
                $params['bankaccount'] = $baccount['id'];
 
                if ($email == 1)
-               {
-                       $rep = new FrontReport("", "", user_pagesize());
-                       $rep->SetHeaderType('Header2');
-                       $rep->currency = $cur;
-                       $rep->Font();
-                       $rep->title = _('PURCHASE ORDER');
-                       $rep->filename = "PurchaseOrder" . $i . ".pdf";
-                       $rep->Info($params, $cols, null, $aligns);
-               }
-               else
-                       $rep->title = _('PURCHASE ORDER');
+                       $rep = new FrontReport("", "", user_pagesize(), $orientation);
+               $rep->SetHeaderType('Header2');
+               $rep->currency = $cur;
+               $rep->Font();
+               $rep->title = _('PURCHASE ORDER');
+               $rep->filename = "PurchaseOrder" . $i . ".pdf";
+               $rep->Info($params, $cols, null, $aligns);
+
                $contacts = get_supplier_contacts($myrow['supplier_id'], 'order');
                $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_PURCHORDER, $contacts);
                $rep->NewPage();

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 62f9e68b9dd94344f168c45d2be1854888b92e9c..4b9489c53685c00bb38c958ca8c0a1fc9aa14cbd 100644 (file)
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -58,7 +58,9 @@ function print_remittances()
        $currency = $_POST['PARAM_2'];
        $email = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if (!$from || !$to) return;
 
        $dec = user_price_dec();
@@ -78,13 +80,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')
+       $rep->recalculate_cols($cols);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -102,17 +100,14 @@ function print_remittances()
                        $params['bankaccount'] = $baccount['bank_act'];
 
                        if ($email == 1)
-                       {
-                               $rep = new FrontReport("", "", user_pagesize());
-                               $rep->SetHeaderType('Header2');
-                               $rep->currency = $cur;
-                               $rep->Font();
-                               $rep->title = _('REMITTANCE');
-                               $rep->filename = "Remittance" . $i . ".pdf";
-                               $rep->Info($params, $cols, null, $aligns);
-                       }
-                       else
-                               $rep->title = _('REMITTANCE');
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+                       $rep->SetHeaderType('Header2');
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       $rep->title = _('REMITTANCE');
+                       $rep->filename = "Remittance" . $i . ".pdf";
+                       $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();

diff --git a/reporting/rep301.php b/reporting/rep301.php
index 36093b1b7c4bf5289f7e9a5a97b676bb29dd60b1..8c154050d0d9ecbee2b1107ee33691c091412503 100644 (file)
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -76,7 +76,8 @@ function print_inventory_valuation_report()
     $location = $_POST['PARAM_2'];
     $detail = $_POST['PARAM_3'];
     $comments = $_POST['PARAM_4'];
-       $destination = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
@@ -84,6 +85,7 @@ function print_inventory_valuation_report()
        $detail = !$detail;
     $dec = user_price_dec();
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($category == ALL_NUMERIC)
                $category = 0;
        if ($category == 0)
@@ -109,8 +111,9 @@ function print_inventory_valuation_report()
                                    2 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
                                    3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Valuation Report'), "InventoryValReport", user_pagesize());
-
+    $rep = new FrontReport(_('Inventory Valuation Report'), "InventoryValReport", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();

diff --git a/reporting/rep302.php b/reporting/rep302.php
index cdeae91dc7e4be8c7e5ca383afbdfa0a77635a25..5c9584b5e8b7ea9efa2d047856f3169627ab7146 100644 (file)
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -91,12 +91,14 @@ function print_inventory_planning()
     $category = $_POST['PARAM_0'];
     $location = $_POST['PARAM_1'];
     $comments = $_POST['PARAM_2'];
-       $destination = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_3'];
+       $destination = $_POST['PARAM_4'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($category == ALL_NUMERIC)
                $category = 0;
        if ($category == 0)
@@ -129,7 +131,9 @@ function print_inventory_planning()
                                    1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
                                    2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Planning Report'), "InventoryPlanning", user_pagesize());
+    $rep = new FrontReport(_('Inventory Planning Report'), "InventoryPlanning", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep303.php b/reporting/rep303.php
index a7beebc1988b1ba5b0a39a83b44acc6a18be8b63..978810c7936bc8f049ff691d756a968416dcdc25 100644 (file)
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -71,13 +71,15 @@ function print_stock_check()
        $shortage = $_POST['PARAM_4'];
        $no_zeros = $_POST['PARAM_5'];
        $comments = $_POST['PARAM_6'];
-               $destination = $_POST['PARAM_7'];
+               $orientation = $_POST['PARAM_7'];
+               $destination = $_POST['PARAM_8'];
 
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        if ($category == ALL_NUMERIC)
                $category = 0;
        if ($category == 0)
@@ -128,7 +130,9 @@ function print_stock_check()
        else
                $user_comp = "";
 
-       $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize());
+       $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep304.php b/reporting/rep304.php
index 054a12d613b19c1d90c10d32bf6599151b8d1699..e54a9759cedbe26579cabc6ff87cba72472f1564 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -82,12 +82,14 @@ function print_inventory_sales()
     $location = $_POST['PARAM_3'];
     $fromcust = $_POST['PARAM_4'];
        $comments = $_POST['PARAM_5'];
-       $destination = $_POST['PARAM_6'];
+       $orientation = $_POST['PARAM_6'];
+       $destination = $_POST['PARAM_7'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
     $dec = user_price_dec();
 
        if ($category == ALL_NUMERIC)
@@ -121,8 +123,10 @@ function print_inventory_sales()
                                    3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''),
                                    4 => array('text' => _('Customer'), 'from' => $fromc, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize());
-
+    $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize(), 9, $orientation);
+       if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
+ 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();

diff --git a/reporting/rep305.php b/reporting/rep305.php
index 1fa6e8cdf934fa3be5634f4e51e3873b2dad9813..010fa364df86eafee18cc641e7d07d7181c9adbd 100644 (file)
--- a/reporting/rep305.php
+++ b/reporting/rep305.php
@@ -86,12 +86,14 @@ function print_grn_valuation()
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
        $comments = $_POST['PARAM_2'];
-       $destination = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_3'];
+       $destination = $_POST['PARAM_4'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
     $dec = user_price_dec();
 
        $cols = array(0, 75, 225, 260, 295, 330, 370, 410, 455, 515);
@@ -102,7 +104,9 @@ function print_grn_valuation()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Period'),'from' => $from, 'to' => $to));
 
-    $rep = new FrontReport(_('GRN Valuation Report'), "GRNValuationReport", user_pagesize());
+    $rep = new FrontReport(_('GRN Valuation Report'), "GRNValuationReport", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep401.php b/reporting/rep401.php
index 341c2247a6655562c764e09d178f917de72bb363..a65f35e9190640eeafddfd390ceb9027cfe7eaa5 100644 (file)
--- a/reporting/rep401.php
+++ b/reporting/rep401.php
@@ -58,12 +58,14 @@ function print_bill_of_material()
     $frompart = $_POST['PARAM_0'];
     $topart = $_POST['PARAM_1'];
     $comments = $_POST['PARAM_2'];
-       $destination = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_3'];
+       $destination = $_POST['PARAM_4'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        $cols = array(0, 50, 305, 375, 445,     515);
 
        $headers = array(_('Component'), _('Description'), _('Loc'), _('Wrk Ctr'), _('Quantity'));
@@ -73,7 +75,9 @@ function print_bill_of_material()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Component'), 'from' => $frompart, 'to' => $topart));
 
-    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial", user_pagesize());
+    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep409.php b/reporting/rep409.php
index a57974260ce9c0f28b7f8d5fd0609b940a1f667a..d5a66e040652fcb409872ba1421482e131eab4f9 100644 (file)
--- a/reporting/rep409.php
+++ b/reporting/rep409.php
@@ -36,7 +36,9 @@ function print_workorders()
        $to = $_POST['PARAM_1'];
        $email = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_4'];
 
+       $orientation = ($orientation ? 'L' : 'P');
        if (!$from || !$to) return;
 
        $fno = explode("-", $from);
@@ -54,14 +56,10 @@ function print_workorders()
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-       {
-               $rep = new FrontReport(_('WORK ORDER'), "WorkOrderBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
-
+               $rep = new FrontReport(_('WORK ORDER'), "WorkOrderBulk", user_pagesize(), 9, $orientation);
+       if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
+ 
        for ($i = $from; $i <= $to; $i++)
        {
                $myrow = get_work_order($i);
@@ -69,17 +67,13 @@ function print_workorders()
                        continue;
                $date_ = sql2date($myrow["date_"]);
                if ($email == 1)
-               {
-                       $rep = new FrontReport("", "", user_pagesize());
-                       $rep->SetHeaderType('Header2');
-                       $rep->currency = $cur;
-                       $rep->Font();
-                               $rep->title = _('WORK ORDER');
-                               $rep->filename = "WorkOrder" . $myrow['wo_ref'] . ".pdf";
-                       $rep->Info($params, $cols, null, $aligns);
-               }
-               else
+                       $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+               $rep->SetHeaderType('Header2');
+               $rep->currency = $cur;
+               $rep->Font();
                        $rep->title = _('WORK ORDER');
+                       $rep->filename = "WorkOrder" . $myrow['wo_ref'] . ".pdf";
+               $rep->Info($params, $cols, null, $aligns);
 
                $contact = array('email' =>$myrow['email'],'lang' => $dflt_lang, // ???
                        'name' => $myrow['contact'], 'name2' => '', 'contact');

diff --git a/reporting/rep501.php b/reporting/rep501.php
index 22c00c34855850075c00726ff2a5649d32decf3d..bba03cde2be4d1a345c8bd5d5e93923747a65834 100644 (file)
--- a/reporting/rep501.php
+++ b/reporting/rep501.php
@@ -74,12 +74,14 @@ function print_dimension_summary()
     $todim = $_POST['PARAM_1'];
     $showbal = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        $cols = array(0, 50, 210, 250, 320, 395, 465,   515);
 
        $headers = array(_('Reference'), _('Name'), _('Type'), _('Date'), _('Due Date'), _('Closed'), _('YTD'));
@@ -89,7 +91,9 @@ function print_dimension_summary()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Dimension'), 'from' => get_dimension_string($fromdim), 'to' => get_dimension_string($todim)));
 
-    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary", user_pagesize());
+    $rep = new FrontReport(_('Dimension Summary'), "DimensionSummary", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 41eb26aff9e7ce406c5aef5332a0555bdd9a8a6c..6f9c41b963e7c4f7babd43846f10784ed980a319 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -61,13 +61,15 @@ function print_bank_transactions()
        $to = $_POST['PARAM_2'];
        $zero = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
-       $destination = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-       $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize());
+       $orientation = ($orientation ? 'L' : 'P');
+       $rep = new FrontReport(_('Bank Statement'), "BankStatement", user_pagesize(), 9, $orientation);
        $dec = user_price_dec();
 
        $cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520);
@@ -83,6 +85,8 @@ function print_bank_transactions()
            1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
            2 => array('text' => _('Bank Account'),'from' => $act,'to' => ''));
 
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        $rep->NewPage();

diff --git a/reporting/rep701.php b/reporting/rep701.php
index 2bfffade74b2ee4bb6ff385933db231422bb5263..c3dfb3b6e4fff30acd341d23fa605a3a3abc8ce1 100644 (file)
--- a/reporting/rep701.php
+++ b/reporting/rep701.php
@@ -96,12 +96,14 @@ function print_Chart_of_Accounts()
 
        $showbalance = $_POST['PARAM_0'];
        $comments = $_POST['PARAM_1'];
-       $destination = $_POST['PARAM_2'];
+       $orientation = $_POST['PARAM_2'];
+       $destination = $_POST['PARAM_3'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = 0;
 
        $cols = array(0, 50, 300, 425, 500);
@@ -112,7 +114,9 @@ function print_Chart_of_Accounts()
        
        $params = array(0 => $comments);
 
-       $rep = new FrontReport(_('Chart of Accounts'), "ChartOfAccounts", user_pagesize());
+       $rep = new FrontReport(_('Chart of Accounts'), "ChartOfAccounts", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep702.php b/reporting/rep702.php
index 5b5ab535370bb64fab8b43de1d0680f9f899bd48..6d6f324533c512cabf1c77971924c6b6e0a001e2 100644 (file)
--- a/reporting/rep702.php
+++ b/reporting/rep702.php
@@ -38,12 +38,14 @@ function print_list_of_journal_entries()
     $to = $_POST['PARAM_1'];
     $systype = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
     $dec = user_price_dec();
 
     $cols = array(0, 100, 240, 300, 400, 460, 520, 580);
@@ -59,7 +61,9 @@ function print_list_of_journal_entries()
                                                $systype == -1 ? _('All') : $systypes_array[$systype],
                             'to' => ''));
 
-    $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize());
+    $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep704.php b/reporting/rep704.php
index e8063a82a1d7174284d1355ee1ff08c713e64235..d3cf9047cac4c5d3c0ba3c01958d90c85a5e9748 100644 (file)
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -46,25 +46,29 @@ function print_GL_transactions()
                $dimension = $_POST['PARAM_4'];
                $dimension2 = $_POST['PARAM_5'];
                $comments = $_POST['PARAM_6'];
-               $destination = $_POST['PARAM_7'];
+               $orientation = $_POST['PARAM_7'];
+               $destination = $_POST['PARAM_8'];
        }
        else if ($dim == 1)
        {
                $dimension = $_POST['PARAM_4'];
                $comments = $_POST['PARAM_5'];
-               $destination = $_POST['PARAM_6'];
+               $orientation = $_POST['PARAM_6'];
+               $destination = $_POST['PARAM_7'];
        }
        else
        {
                $comments = $_POST['PARAM_4'];
-               $destination = $_POST['PARAM_5'];
+               $orientation = $_POST['PARAM_5'];
+               $destination = $_POST['PARAM_6'];
        }
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
 
-       $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize());
+       $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize(), 9, $orientation);
        $dec = user_price_dec();
 
   //$cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570);
@@ -109,6 +113,8 @@ function print_GL_transactions()
                                    1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
                                    2 => array('text' => _('Accounts'),'from' => $fromacc,'to' => $toacc));
     }
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
 
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);

diff --git a/reporting/rep705.php b/reporting/rep705.php
index 258307430f687146a95a03a33ea9274b49252a1f..88e1ec6b92d17b2126875bbfb21bdc54d343d79d 100644 (file)
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -175,7 +175,8 @@ function print_annual_expense_breakdown()
                $dimension2 = $_POST['PARAM_2'];
                $tags = (isset($_POST['PARAM_3']) ? $_POST['PARAM_3'] : -1);
                $comments = $_POST['PARAM_4'];
-               $destination = $_POST['PARAM_5'];
+               $orientation = $_POST['PARAM_5'];
+               $destination = $_POST['PARAM_6'];
        }
        else if ($dim == 1)
        {
@@ -183,20 +184,23 @@ function print_annual_expense_breakdown()
                $dimension = $_POST['PARAM_1'];
                $tags = (isset($_POST['PARAM_2']) ? $_POST['PARAM_2'] : -1);
                $comments = $_POST['PARAM_3'];
-               $destination = $_POST['PARAM_4'];
+               $orientation = $_POST['PARAM_4'];
+               $destination = $_POST['PARAM_5'];
        }
        else
        {
                $year = $_POST['PARAM_0'];
                $tags = (isset($_POST['PARAM_1']) ? $_POST['PARAM_1'] : -1);
                $comments = $_POST['PARAM_2'];
-               $destination = $_POST['PARAM_3'];
+               $orientation = $_POST['PARAM_3'];
+               $destination = $_POST['PARAM_4'];
        }
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = 1;
        //$pdec = user_percent_dec();
 
@@ -271,8 +275,9 @@ function print_annual_expense_breakdown()
                                'to' => ''));
     }
 
-       $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize());
-
+       $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        $rep->NewPage();

diff --git a/reporting/rep706.php b/reporting/rep706.php
index 8a0e4d459c60bdac2f50db7607a3490781c8842a..e670e2e8f8d74d079f08fd7dd23bf33a28699178 100644 (file)
--- a/reporting/rep706.php
+++ b/reporting/rep706.php
@@ -142,7 +142,8 @@ function print_balance_sheet()
                $decimals = $_POST['PARAM_5'];
                $graphics = $_POST['PARAM_6'];
                $comments = $_POST['PARAM_7'];
-               $destination = $_POST['PARAM_8'];
+               $orientation = $_POST['PARAM_8'];
+               $destination = $_POST['PARAM_9'];
        }
        else if ($dim == 1)
        {
@@ -151,7 +152,8 @@ function print_balance_sheet()
                $decimals = $_POST['PARAM_4'];
                $graphics = $_POST['PARAM_5'];
                $comments = $_POST['PARAM_6'];
-               $destination = $_POST['PARAM_7'];
+               $orientation = $_POST['PARAM_7'];
+               $destination = $_POST['PARAM_8'];
        }
        else
        {
@@ -159,12 +161,14 @@ function print_balance_sheet()
                $decimals = $_POST['PARAM_3'];
                $graphics = $_POST['PARAM_4'];
                $comments = $_POST['PARAM_5'];
-               $destination = $_POST['PARAM_6'];
+               $orientation = $_POST['PARAM_6'];
+               $destination = $_POST['PARAM_7'];
        }
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
        if ($graphics)
        {
                include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -208,7 +212,9 @@ function print_balance_sheet()
                                    2 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''));
     }
 
-       $rep = new FrontReport(_('Balance Sheet'), "BalanceSheet", user_pagesize());
+       $rep = new FrontReport(_('Balance Sheet'), "BalanceSheet", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        $rep->NewPage();

diff --git a/reporting/rep707.php b/reporting/rep707.php
index 211e504fe473aa04a68eca5a7cd2d4de2f09d60a..d38d3c3326f87392e7f24eb06b3a1825da98abd2 100644 (file)
--- a/reporting/rep707.php
+++ b/reporting/rep707.php
@@ -166,7 +166,8 @@ function print_profit_and_loss_statement()
                $decimals = $_POST['PARAM_6'];
                $graphics = $_POST['PARAM_7'];
                $comments = $_POST['PARAM_8'];
-               $destination = $_POST['PARAM_9'];
+               $orientation = $_POST['PARAM_9'];
+               $destination = $_POST['PARAM_10'];
        }
        else if ($dim == 1)
        {
@@ -175,7 +176,8 @@ function print_profit_and_loss_statement()
                $decimals = $_POST['PARAM_5'];
                $graphics = $_POST['PARAM_6'];
                $comments = $_POST['PARAM_7'];
-               $destination = $_POST['PARAM_8'];
+               $orientation = $_POST['PARAM_8'];
+               $destination = $_POST['PARAM_9'];
        }
        else
        {
@@ -183,12 +185,14 @@ function print_profit_and_loss_statement()
                $decimals = $_POST['PARAM_4'];
                $graphics = $_POST['PARAM_5'];
                $comments = $_POST['PARAM_6'];
-               $destination = $_POST['PARAM_7'];
+               $orientation = $_POST['PARAM_7'];
+               $destination = $_POST['PARAM_8'];
        }
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
        if ($graphics)
        {
                include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -251,8 +255,9 @@ function print_profit_and_loss_statement()
                $headers[3] = _('Period Y-1');
        }
 
-       $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize());
-
+       $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        $rep->NewPage();

diff --git a/reporting/rep708.php b/reporting/rep708.php
index 9ff9b2964783a21f4966185605b06ed8d5fe2c38..ff82c89bc1abec771b94d2dab003a93af3f6e129 100644 (file)
--- a/reporting/rep708.php
+++ b/reporting/rep708.php
@@ -147,23 +147,27 @@ function print_trial_balance()
                $dimension = $_POST['PARAM_4'];
                $dimension2 = $_POST['PARAM_5'];
                $comments = $_POST['PARAM_6'];
-               $destination = $_POST['PARAM_7'];
+               $orientation = $_POST['PARAM_7'];
+               $destination = $_POST['PARAM_8'];
        }
        else if ($dim == 1)
        {
                $dimension = $_POST['PARAM_4'];
                $comments = $_POST['PARAM_5'];
-               $destination = $_POST['PARAM_6'];
+               $orientation = $_POST['PARAM_6'];
+               $destination = $_POST['PARAM_7'];
        }
        else
        {
                $comments = $_POST['PARAM_4'];
-               $destination = $_POST['PARAM_5'];
+               $orientation = $_POST['PARAM_5'];
+               $destination = $_POST['PARAM_6'];
        }
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
        $cols2 = array(0, 50, 190, 310, 430, 530);
@@ -203,8 +207,12 @@ function print_trial_balance()
                                    1 => array('text' => _('Period'),'from' => $from, 'to' => $to));
     }
 
-       $rep = new FrontReport(_('Trial Balance'), "TrialBalance", user_pagesize());
-
+       $rep = new FrontReport(_('Trial Balance'), "TrialBalance", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    {
+       $rep->recalculate_cols($cols);
+       $rep->recalculate_cols($cols2);
+       }
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
        $rep->NewPage();

diff --git a/reporting/rep709.php b/reporting/rep709.php
index bd518b594f52adc7ed235709541a3cea217f1a6b..f5b9dd072f0ff5d9ec86b0a20915358fcdf6961b 100644 (file)
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -79,16 +79,18 @@ function print_tax_report()
        $to = $_POST['PARAM_1'];
        $summaryOnly = $_POST['PARAM_2'];
        $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
 
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
-       $rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize());
+       $rep = new FrontReport(_('Tax Report'), "TaxReport", user_pagesize(), 9, $orientation);
        if ($summaryOnly == 1)
                $summary = _('Summary Only');
        else
@@ -109,6 +111,9 @@ function print_tax_report()
        $headers = array(_('Trans Type'), _('Ref'), _('Date'), _('Name'), _('Branch Name'),
                _('Net'), _('Rate'), _('Tax'), '', _('Name'));
        $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right', 'right','left');
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
+       
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        if (!$summaryOnly)
@@ -172,6 +177,8 @@ function print_tax_report()
        
        // Summary
        $cols2 = array(0, 100, 180,     260, 340, 420, 500);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols2);
 
        $headers2 = array(_('Tax Rate'), _('Outputs'), _('Output Tax'), _('Inputs'), _('Input Tax'), _('Net Tax'));
 

diff --git a/reporting/rep710.php b/reporting/rep710.php
index 06485b2c2b20b828c103703bf93ab236763cad15..eb4ea411a98d9a623c0a5ee812fdcd36a6dc84aa 100644 (file)
--- a/reporting/rep710.php
+++ b/reporting/rep710.php
@@ -62,12 +62,14 @@ function print_audit_trail()
     $systype = $_POST['PARAM_2'];
     $user = $_POST['PARAM_3'];
     $comments = $_POST['PARAM_4'];
-       $destination = $_POST['PARAM_5'];
+       $orientation = $_POST['PARAM_5'];
+       $destination = $_POST['PARAM_6'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+       $orientation = ($orientation ? 'L' : 'P');
     $dec = user_price_dec();
 
     $cols = array(0, 60, 120, 180, 240, 340, 400, 460, 520);
@@ -84,8 +86,9 @@ function print_audit_trail()
                        2 => array('text' => _('Type'), 'from' => ($systype != -1 ? $systypes_array[$systype] : _('All')), 'to' => ''),
                        3 => array('text' => _('User'), 'from' => ($user != -1 ? $user_id : _('All')), 'to' => ''));
 
-    $rep = new FrontReport(_('Audit Trail'), "AuditTrail", user_pagesize());
-
+    $rep = new FrontReport(_('Audit Trail'), "AuditTrail", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       $rep->recalculate_cols($cols);
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 45dc419a701f9a37fa698a7afa1e17925c9628fb..500c7b54e3cde8479cf327170d0e0b543da97b86 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -37,6 +37,7 @@ $reports->addReport(RC_CUSTOMER, 101, _('Customer &Balances'),
                        _('Currency Filter') => 'CURRENCY',
                        _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 102, _('&Aged Customer Analysis'),
        array(  _('End Date') => 'DATE',
@@ -47,6 +48,7 @@ $reports->addReport(RC_CUSTOMER, 102, _('&Aged Customer Analysis'),
                        _('Suppress Zeros') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 103, _('Customer &Detail Listing'),
        array(  _('Activity Since') => 'DATEBEGIN',
@@ -55,12 +57,14 @@ $reports->addReport(RC_CUSTOMER, 103, _('Customer &Detail Listing'),
                        _('Activity Greater Than') => 'TEXT',
                        _('Activity Less Than') => 'TEXT',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 114, _('Sales &Summary Report'),
        array(  _('Start Date') => 'DATEBEGINTAX',
                        _('End Date') => 'DATEENDTAX',
                        _('Tax Id Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 104, _('&Price Listing'),
        array(  _('Currency Filter') => 'CURRENCY',
@@ -69,6 +73,7 @@ $reports->addReport(RC_CUSTOMER, 104, _('&Price Listing'),
                        _('Show Pictures') => 'YES_NO',
                        _('Show GP %') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 105, _('&Order Status Listing'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -77,12 +82,14 @@ $reports->addReport(RC_CUSTOMER, 105, _('&Order Status Listing'),
                        _('Stock Location') => 'LOCATIONS',
                        _('Back Orders Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 106, _('&Salesman Listing'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Summary Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices'),
        array(  _('From') => 'INVOICE',
@@ -90,44 +97,51 @@ $reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices'),
                        _('Currency Filter') => 'CURRENCY',
                        _('email Customers') => 'YES_NO',
                        _('Payment Link') => 'PAYMENT_LINK',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 113, _('Print &Credit Notes'),
        array(  _('From') => 'CREDIT',
                        _('To') => 'CREDIT',
                        _('Currency Filter') => 'CURRENCY',
                        _('email Customers') => 'YES_NO',
                        _('Payment Link') => 'PAYMENT_LINK',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 110, _('Print &Deliveries'),
        array(  _('From') => 'DELIVERY',
                        _('To') => 'DELIVERY',
                        _('email Customers') => 'YES_NO',
                        _('Print as Packing Slip') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 108, _('Print &Statements'),
        array(  _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Currency Filter') => 'CURRENCY',
                        _('Show Also Allocated') => 'YES_NO',
                        _('Email Customers') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),
        array(  _('From') => 'ORDERS',
                        _('To') => 'ORDERS',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
                        _('Print as Quote') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 111, _('&Print Sales Quotations'),
        array(  _('From') => 'QUOTATIONS',
                        _('To') => 'QUOTATIONS',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_CUSTOMER, 112, _('Print Receipts'),
        array(  _('From') => 'RECEIPT',
                        _('To') => 'RECEIPT',
                        _('Currency Filter') => 'CURRENCY',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 
 $reports->addReportClass(_('Supplier'), RC_SUPPLIER);
 $reports->addReport(RC_SUPPLIER, 201, _('Supplier &Balances'),
@@ -137,6 +151,7 @@ $reports->addReport(RC_SUPPLIER, 201, _('Supplier &Balances'),
                        _('Currency Filter') => 'CURRENCY',
                        _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 202, _('&Aged Supplier Analyses'),
        array(  _('End Date') => 'DATE',
@@ -147,6 +162,7 @@ $reports->addReport(RC_SUPPLIER, 202, _('&Aged Supplier Analyses'),
                        _('Suppress Zeros') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 203, _('&Payment Report'),
        array(  _('End Date') => 'DATE',
@@ -154,23 +170,27 @@ $reports->addReport(RC_SUPPLIER, 203, _('&Payment Report'),
                        _('Currency Filter') => 'CURRENCY',
                        _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 204, _('Outstanding &GRNs Report'),
        array(  _('Supplier') => 'SUPPLIERS_NO_FILTER',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_SUPPLIER, 209, _('Print Purchase &Orders'),
        array(  _('From') => 'PO',
                        _('To') => 'PO',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReport(RC_SUPPLIER, 210, _('Print Remi&ttances'),
        array(  _('From') => 'REMITTANCE',
                        _('To') => 'REMITTANCE',
                        _('Currency Filter') => 'CURRENCY',
                        _('Email Customers') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 
 $reports->addReportClass(_('Inventory'), RC_INVENTORY);
 
@@ -180,11 +200,13 @@ $reports->addReport(RC_INVENTORY,  301, _('Inventory &Valuation Report'),
                        _('Location') => 'LOCATIONS',
                        _('Summary Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_INVENTORY,  302, _('Inventory &Planning Report'),
        array(  _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_INVENTORY, 303, _('Stock &Check Sheets'),
        array(  _('Inventory Category') => 'CATEGORIES',
@@ -194,6 +216,7 @@ $reports->addReport(RC_INVENTORY, 303, _('Stock &Check Sheets'),
                        _('Show Shortage') => 'YES_NO',
                        _('Suppress Zeros') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_INVENTORY, 304, _('Inventory &Sales Report'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -202,11 +225,23 @@ $reports->addReport(RC_INVENTORY, 304, _('Inventory &Sales Report'),
                        _('Location') => 'LOCATIONS',
                        _('Customer') => 'CUSTOMERS_NO_FILTER',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_INVENTORY, 305, _('&GRN Valuation Report'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
+                       _('Destination') => 'DESTINATION'));
+$reports->addReport(RC_INVENTORY, 306, _('Inventory P&urchasing Report'),
+       array(  _('Start Date') => 'DATEBEGINM',
+                       _('End Date') => 'DATEENDM',
+                       _('Inventory Category') => 'CATEGORIES',
+                       _('Location') => 'LOCATIONS',
+                       _('Supplier') => 'SUPPLIERS_NO_FILTER',
+                       _('Items') => 'ITEMS_P',
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 
 $reports->addReportClass(_('Manufacturing'), RC_MANUFACTURE);
@@ -214,12 +249,14 @@ $reports->addReport(RC_MANUFACTURE, 401, _('&Bill of Material Listing'),
        array(  _('From product') => 'ITEMS',
                        _('To product') => 'ITEMS',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_MANUFACTURE, 409, _('Print &Work Orders'),
        array(  _('From') => 'WORKORDER',
                        _('To') => 'WORKORDER',
                        _('Email Locations') => 'YES_NO',
-                       _('Comments') => 'TEXTBOX'));
+                       _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION'));
 $reports->addReportClass(_('Dimensions'), RC_DIMENSIONS);
 if ($dim > 0)
 {
@@ -228,6 +265,7 @@ if ($dim > 0)
                        _('To Dimension') => 'DIMENSION',
                        _('Show Balance') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        //$reports->addReport(_('Dimensions'),502, _('Dimension Details'),
        //array(        _('Dimension'),'DIMENSIONS'),
@@ -240,18 +278,21 @@ $reports->addReportClass(_('Banking'), RC_BANKING);
                        _('End Date') => 'DATEENDM',
                        _('Zero values') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 
 $reports->addReportClass(_('General Ledger'), RC_GL);
 $reports->addReport(RC_GL, 701, _('Chart of &Accounts'),
        array(  _('Show Balances') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_GL, 702, _('List of &Journal Entries'),
        array(  _('Start Date') => 'DATEBEGINM',
                        _('End Date') => 'DATEENDM',
                        _('Type') => 'SYS_TYPES',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 //$reports->addReport(RC_GL, 703, _('GL Account Group Summary'),
 //     array(  _('Comments'),'TEXTBOX')));
@@ -266,6 +307,7 @@ if ($dim == 2)
                        _('Dimension')." 1" =>  'DIMENSIONS1',
                        _('Dimension')." 2" =>  'DIMENSIONS2',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
        array(  _('Year') => 'TRANS_YEARS',
@@ -273,6 +315,7 @@ if ($dim == 2)
                        _('Dimension')." 2" =>  'DIMENSIONS2',
                        _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
@@ -283,6 +326,7 @@ if ($dim == 2)
                        _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -294,6 +338,7 @@ if ($dim == 2)
                        _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 708, _('Trial &Balance'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -303,6 +348,7 @@ if ($dim == 2)
                        _('Dimension')." 1" =>  'DIMENSIONS1',
                        _('Dimension')." 2" =>  'DIMENSIONS2',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 }
 else if ($dim == 1)
@@ -314,12 +360,14 @@ else if ($dim == 1)
                        _('To Account') => 'GL_ACCOUNTS',
                        _('Dimension') =>  'DIMENSIONS1',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
        array(  _('Year') => 'TRANS_YEARS',
                        _('Dimension') =>  'DIMENSIONS1',
                        _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
@@ -329,6 +377,7 @@ else if ($dim == 1)
                        _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -339,6 +388,7 @@ else if ($dim == 1)
                        _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 708, _('Trial &Balance'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -347,6 +397,7 @@ else if ($dim == 1)
                        _('Only balances') => 'YES_NO',
                        _('Dimension') => 'DIMENSIONS1',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 }
 else
@@ -357,11 +408,13 @@ else
                        _('From Account') => 'GL_ACCOUNTS',
                        _('To Account') => 'GL_ACCOUNTS',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 705, _('Annual &Expense Breakdown'),
        array(  _('Year') => 'TRANS_YEARS',
                        _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
@@ -370,6 +423,7 @@ else
                        _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 707, _('&Profit and Loss Statement'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -379,6 +433,7 @@ else
                        _('Decimal values') => 'YES_NO',
                        _('Graphics') => 'GRAPHIC',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 708, _('Trial &Balance'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -386,6 +441,7 @@ else
                        _('Zero values') => 'YES_NO',
                        _('Only balances') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 }
 $reports->addReport(RC_GL, 709, _('Ta&x Report'),
@@ -393,6 +449,7 @@ $reports->addReport(RC_GL, 709, _('Ta&x Report'),
                        _('End Date') => 'DATEENDTAX',
                        _('Summary Only') => 'YES_NO',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 $reports->addReport(RC_GL, 710, _('Audit Trail'),
        array(  _('Start Date') => 'DATEBEGINM',
@@ -400,6 +457,7 @@ $reports->addReport(RC_GL, 710, _('Audit Trail'),
                        _('Type') => 'SYS_TYPES_ALL',
                        _('User') => 'USERS',
                        _('Comments') => 'TEXTBOX',
+                       _('Orientation') => 'ORIENTATION',
                        _('Destination') => 'DESTINATION'));
 
 add_custom_reports($reports);