X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=1e9cc1487d4ad7afd419be68184aa649071a3d13;hb=fcf15181965c266c81d7f142cd5e92e7818e958e;hp=0e14b7024eda47f140c72574543eba809b56c564;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 0e14b702..1e9cc148 100644
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -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);
@@ -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))