Merged changes up to 2.3.16 into unstable

[fa-stable.git] / reporting / rep110.php

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 7b9318d0e845ac9ecd2920aa87580bb3d5456b78..f016948f2ce14248f6d244ce68f305a7d7e2aa28 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -43,9 +43,11 @@ function print_deliveries()
        $email = $_POST['PARAM_2'];
        $packing_slip = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
        if (!$from || !$to) return;
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
        $fno = explode("-", $from);
@@ -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')
+       recalculate_cols($cols);
        for ($i = $from; $i <= $to; $i++)
        {
                        if (!exists_customer_trans(ST_CUSTDELIVERY, $i))
@@ -83,10 +82,7 @@ function print_deliveries()
                        $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); // ?
                        if ($email == 1)
                        {
-                               $rep = new FrontReport("", "", user_pagesize());
-                               $rep->SetHeaderType('Header2');
-                               $rep->currency = $cur;
-                               $rep->Font();
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
                                if ($packing_slip == 0)
                                {
                                        $rep->title = _('DELIVERY NOTE');
@@ -97,11 +93,13 @@ function print_deliveries()
                                        $rep->title = _('PACKING SLIP');
                                        $rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
                                }
-                               $rep->Info($params, $cols, null, $aligns);
                        }
-                       else
-                               $rep->title = _('DELIVERY NOTE');
-                       $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], false);
+                       $rep->SetHeaderType('Header2');
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       $rep->Info($params, $cols, null, $aligns);
+
+                       $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], true);
                        $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
                        $rep->NewPage();
 
@@ -111,7 +109,7 @@ function print_deliveries()
                        {
                                if ($myrow2["quantity"] == 0)
                                        continue;
-                                       
+
                                $Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
                                   user_price_dec());
                                $SubTotal += $Net;
@@ -128,7 +126,7 @@ function print_deliveries()
                                $newrow = $rep->row;
                                $rep->row = $oldrow;
                                if ($Net != 0.0  || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0)
-                               {                       
+                               {
                                        $rep->TextCol(2, 3,     $DisplayQty, -2);
                                        $rep->TextCol(3, 4,     $myrow2['units'], -2);
                                        if ($packing_slip == 0)
@@ -137,7 +135,7 @@ function print_deliveries()
                                                $rep->TextCol(5, 6,     $DisplayDiscount, -2);
                                                $rep->TextCol(6, 7,     $DisplayNet, -2);
                                        }
-                               }       
+                               }
                                $rep->row = $newrow;
                                //$rep->NewLine(1);
                                if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
@@ -176,8 +174,8 @@ function print_deliveries()
                                                $tax_type_name = $tax_item['tax_type_name'];
                                        else
                                                $tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
- 
-                                       if ($tax_item['included_in_price'])
+
+                                       if ($myrow['tax_included'])
                                {
                                                if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
                                        {