X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=bfc1e4e6ccc4850b23b92172c42a62e046a93c2f;hb=ac225986becec853c5ade5d6464d69788f395817;hp=7b9318d0e845ac9ecd2920aa87580bb3d5456b78;hpb=661dccbdc80ee5c9ef5b8a515e60e60249827869;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 7b9318d0..bfc1e4e6 100644
--- 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();