X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=1e9cc1487d4ad7afd419be68184aa649071a3d13;hb=9bfa65240d069737c719bdbc472b870414baeeae;hp=2fea78e67e550fcfc27b1364764764d6ec7c69a5;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 2fea78e6..1e9cc148 100644
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -27,9 +27,9 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 //----------------------------------------------------------------------------------------------------
 function get_invoice_range($from, $to)
 {
-	global $print_invoice_no;
+	global $SysPrefs;
 
-	$ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
+	$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
 
 	$sql = "SELECT trans.trans_no, trans.reference
 		FROM ".TB_PREF."debtor_trans trans 
@@ -49,7 +49,7 @@ print_invoices();
 
 function print_invoices()
 {
-	global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount;
+	global $path_to_root, $SysPrefs;
 	
 	$show_this_payment = true; // include payments invoiced here in summary
 
@@ -97,7 +97,10 @@ function print_invoices()
 			$sign = 1;
 			$myrow = get_customer_trans($row['trans_no'], ST_SALESINVOICE);
 
-			if($customer && $myrow['debtor_no'] != $customer) {
+			if ($customer && $myrow['debtor_no'] != $customer) {
+				continue;
+			}
+			if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
 				continue;
 			}
 			$baccount = get_default_bank_account($myrow['curr_code']);
@@ -111,7 +114,6 @@ function print_invoices()
 				$rep->title = _('INVOICE');
 				$rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
 			}	
-			$rep->SetHeaderType('Header2');
 			$rep->currency = $cur;
 			$rep->Font();
 			$rep->Info($params, $cols, null, $aligns);
@@ -119,6 +121,7 @@ function print_invoices()
 			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true);
 			$baccount['payment_service'] = $pay_service;
 			$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
+			$rep->SetHeaderType('Header2');
 			$rep->NewPage();
 			// calculate summary start row for later use
 			$summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight);
@@ -163,7 +166,7 @@ function print_invoices()
 				$rep->TextColLines($c++, $c, $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($c++, $c,	$DisplayQty, -2);
 					$rep->TextCol($c++, $c,	$myrow2['units'], -2);
@@ -185,14 +188,12 @@ function print_invoices()
 			}
 
    			$DisplaySubTot = number_format2($SubTotal,$dec);
-   			$DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
 			// set to start of summary line:
     		$rep->row = $summary_start_row;
 			if (isset($prepayments))
 			{
 				// Partial invoices table
-				//$rep->NewLine();
 				$rep->TextCol(0, 3,_("Prepayments invoiced to this order up to day:"));
 				$rep->TextCol(0, 3,	str_pad('', 150, '_'));
 				$rep->cols[2] -= 20;
@@ -231,9 +232,13 @@ function print_invoices()
 			$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($sign*$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_SALESINVOICE, $row['trans_no']);
 			$first = true;
     		while ($tax_item = db_fetch($tax_items))
@@ -242,14 +247,14 @@ function print_invoices()
     				continue;
     			$DisplayTax = number_format2($sign*$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)
     					{
@@ -303,4 +308,3 @@ function print_invoices()
 		$rep->End();
 }
 
-?>