X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=36acff5abcd21e3ca7e592cc14fa3ae72ae8a496;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=e5a832cc44899ab46c3c2ac084ee636178aff766;hpb=565a41e2d7fd4b4a32848e4829c11dbbcb5881d1;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index e5a832cc..36acff5a 100644
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -32,7 +32,7 @@ print_invoices();
 
 function print_invoices()
 {
-	global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates;
+	global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount;
 	
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -43,14 +43,14 @@ function print_invoices()
 	$pay_service = $_POST['PARAM_4'];
 	$comments = $_POST['PARAM_5'];
 
-	if ($from == null)
-		$from = 0;
-	if ($to == null)
-		$to = 0;
+	if (!$from || !$to) return;
+
 	$dec = user_price_dec();
 
  	$fno = explode("-", $from);
 	$tno = explode("-", $to);
+	$from = min($fno[0], $tno[0]);
+	$to = max($fno[0], $tno[0]);
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -69,7 +69,7 @@ function print_invoices()
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
 	}
-	for ($i = $fno[0]; $i <= $tno[0]; $i++)
+	for ($i = $from; $i <= $to; $i++)
 	{
 			if (!exists_customer_trans(ST_SALESINVOICE, $i))
 				continue;
@@ -92,7 +92,7 @@ function print_invoices()
 			}
 			else
 				$rep->title = _('INVOICE');
-			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
 			$baccount['payment_service'] = $pay_service;
 			$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
 			$rep->NewPage();
@@ -118,23 +118,25 @@ function print_invoices()
 				$rep->TextColLines(1, 2, $myrow2['StockDescription'], -2);
 				$newrow = $rep->row;
 				$rep->row = $oldrow;
-				$rep->TextCol(2, 3,	$DisplayQty, -2);
-				$rep->TextCol(3, 4,	$myrow2['units'], -2);
-				$rep->TextCol(4, 5,	$DisplayPrice, -2);
-				$rep->TextCol(5, 6,	$DisplayDiscount, -2);
-				$rep->TextCol(6, 7,	$DisplayNet, -2);
+				if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0)
+				{
+					$rep->TextCol(2, 3,	$DisplayQty, -2);
+					$rep->TextCol(3, 4,	$myrow2['units'], -2);
+					$rep->TextCol(4, 5,	$DisplayPrice, -2);
+					$rep->TextCol(5, 6,	$DisplayDiscount, -2);
+					$rep->TextCol(6, 7,	$DisplayNet, -2);
+				}
 				$rep->row = $newrow;
 				//$rep->NewLine(1);
 				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 					$rep->NewPage();
 			}
 
-			$comments = get_comments(ST_SALESINVOICE, $i);
-			if ($comments && db_num_rows($comments))
+			$memo = get_comments_string(ST_SALESINVOICE, $i);
+			if ($memo != "")
 			{
 				$rep->NewLine();
-    			while ($comment=db_fetch($comments))
-    				$rep->TextColLines(0, 6, $comment['memo_'], -2);
+				$rep->TextColLines(1, 5, $memo, -2);
 			}
 
    			$DisplaySubTot = number_format2($SubTotal,$dec);
@@ -156,7 +158,7 @@ function print_invoices()
     			if ($tax_item['amount'] == 0)
     				continue;
     			$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
-    			
+
     			if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
     				$tax_type_name = $tax_item['tax_type_name'];
     			else
@@ -202,7 +204,7 @@ function print_invoices()
 			$rep->Font();
 			if ($email == 1)
 			{
-				$rep->End($email, '', $myrow, ST_SALESINVOICE);
+				$rep->End($email);
 			}
 	}
 	if ($email == 0)