X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=cc0f1c10b18b0ff01cdd43661820fd93e9f81cf6;hb=b72c2a0476688017a61969cbc35dd7cffb4ed78e;hp=9e9fee28f0ee028ee88d9feba5bca2683a445ecc;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 9e9fee28..cc0f1c10 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -16,7 +16,6 @@ $page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
 // Creator:	Janusz Dobrwolski
 // date_:	2008-01-14
 // Title:	Print Delivery Notes
-// draft version!
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -25,7 +24,6 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
-$packing_slip = 0;
 //----------------------------------------------------------------------------------------------------
 
 print_deliveries();
@@ -34,7 +32,7 @@ print_deliveries();
 
 function print_deliveries()
 {
-	global $path_to_root, $packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -45,9 +43,9 @@ function print_deliveries()
 	$comments = $_POST['PARAM_4'];
 	$orientation = $_POST['PARAM_5'];
 
-	$orientation = ($orientation ? 'L' : 'P');
 	if (!$from || !$to) return;
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
 	$fno = explode("-", $from);
@@ -60,7 +58,7 @@ function print_deliveries()
 	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'right', 'left', 'right', 'right', 'right');
 
-	$params = array('comments' => $comments);
+	$params = array('comments' => $comments, 'packing_slip' => $packing_slip);
 
 	$cur = get_company_Pref('curr_default');
 
@@ -72,7 +70,7 @@ function print_deliveries()
 			$rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize(), 9, $orientation);
 	}
     if ($orientation == 'L')
-    	$rep->recalculate_cols($cols);
+    	recalculate_cols($cols);
 	for ($i = $from; $i <= $to; $i++)
 	{
 			if (!exists_customer_trans(ST_CUSTDELIVERY, $i))
@@ -81,23 +79,26 @@ 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');
+				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->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);
-			$contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], false);
+
+			$contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], true);
 			$rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
+			$rep->SetHeaderType('Header2');
 			$rep->NewPage();
 
    			$result = get_customer_trans_details(ST_CUSTDELIVERY, $i);
@@ -122,7 +123,7 @@ function print_deliveries()
 				$rep->TextColLines(1, 2, $myrow2['StockDescription'], -2);
 				$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)
+				if ($Net != 0.0  || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount())
 				{
 					$rep->TextCol(2, 3,	$DisplayQty, -2);
 					$rep->TextCol(3, 4,	$myrow2['units'], -2);
@@ -143,11 +144,10 @@ function print_deliveries()
 			if ($memo != "")
 			{
 				$rep->NewLine();
-				$rep->TextColLines(1, 5, $memo, -2);
+				$rep->TextColLines(1, 3, $memo, -2);
 			}
 
    			$DisplaySubTot = number_format2($SubTotal,$dec);
-   			$DisplayFreight = number_format2($myrow["ov_freight"],$dec);
 
     		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 			$doctype=ST_CUSTDELIVERY;
@@ -156,9 +156,13 @@ function print_deliveries()
 				$rep->TextCol(3, 6, _("Sub-total"), -2);
 				$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 				$rep->NewLine();
-				$rep->TextCol(3, 6, _("Shipping"), -2);
-				$rep->TextCol(6, 7,	$DisplayFreight, -2);
-				$rep->NewLine();
+				if ($myrow['ov_freight'] != 0.0)
+				{
+					$DisplayFreight = number_format2($myrow["ov_freight"],$dec);
+					$rep->TextCol(3, 6, _("Shipping"), -2);
+					$rep->TextCol(6, 7,	$DisplayFreight, -2);
+					$rep->NewLine();
+				}	
 				$tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $i);
 				$first = true;
     			while ($tax_item = db_fetch($tax_items))
@@ -167,14 +171,14 @@ function print_deliveries()
     					continue;
     				$DisplayTax = number_format2($tax_item['amount'], $dec);
  
- 					if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+ 					if ($SysPrefs->suppress_tax_rates() == 1)
  		   				$tax_type_name = $tax_item['tax_type_name'];
  		   			else
  		   				$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
 
  					if ($myrow['tax_included'])
     				{
-   						if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+   						if ($SysPrefs->alternative_tax_include_on_docs() == 1)
     					{
     						if ($first)
     						{
@@ -219,4 +223,3 @@ function print_deliveries()
 		$rep->End();
 }
 
-?>
\ No newline at end of file