X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=7044153d33f20877235aabcb9be0ca10020430d0;hb=17b390efcf904072b02ec866b2a427490471a260;hp=f016948f2ce14248f6d244ce68f305a7d7e2aa28;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index f016948f..7044153d 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -25,7 +25,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 +33,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");
 
@@ -94,13 +93,13 @@ function print_deliveries()
 					$rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
 				}
 			}
-			$rep->SetHeaderType('Header2');
 			$rep->currency = $cur;
 			$rep->Font();
 			$rep->Info($params, $cols, null, $aligns);
 
 			$contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'], true);
 			$rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
+			$rep->SetHeaderType('Header2');
 			$rep->NewPage();
 
    			$result = get_customer_trans_details(ST_CUSTDELIVERY, $i);
@@ -125,7 +124,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);
@@ -170,14 +169,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)
     						{
@@ -222,4 +221,3 @@ function print_deliveries()
 		$rep->End();
 }
 
-?>
\ No newline at end of file