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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index e5a832cc..d3f74dd7 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");
 
@@ -42,15 +42,18 @@ function print_invoices()
 	$email = $_POST['PARAM_3'];
 	$pay_service = $_POST['PARAM_4'];
 	$comments = $_POST['PARAM_5'];
+	$customer = $_POST['PARAM_6'];
+	$orientation = $_POST['PARAM_7'];
 
-	if ($from == null)
-		$from = 0;
-	if ($to == null)
-		$to = 0;
+	if (!$from || !$to) return;
+
+	$orientation = ($orientation ? 'L' : 'P');
 	$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);
 
@@ -62,19 +65,22 @@ function print_invoices()
 	$cur = get_company_Pref('curr_default');
 
 	if ($email == 0)
-	{
-		$rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
-		$rep->SetHeaderType('Header2');
-		$rep->currency = $cur;
-		$rep->Font();
-		$rep->Info($params, $cols, null, $aligns);
-	}
-	for ($i = $fno[0]; $i <= $tno[0]; $i++)
+		$rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
+	if ($orientation == 'L')
+		recalculate_cols($cols);
+	for ($i = $from; $i <= $to; $i++)
 	{
 			if (!exists_customer_trans(ST_SALESINVOICE, $i))
 				continue;
 			$sign = 1;
 			$myrow = get_customer_trans($i, ST_SALESINVOICE);
+
+			if ($customer && $myrow['debtor_no'] != $customer) {
+				continue;
+			}
+			if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+				continue;
+			}
 			$baccount = get_default_bank_account($myrow['curr_code']);
 			$params['bankaccount'] = $baccount['id'];
 
@@ -82,17 +88,16 @@ function print_invoices()
 			$sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
 			if ($email == 1)
 			{
-				$rep = new FrontReport("", "", user_pagesize());
-			    $rep->SetHeaderType('Header2');
-				$rep->currency = $cur;
-				$rep->Font();
+				$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
 				$rep->title = _('INVOICE');
 				$rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
-				$rep->Info($params, $cols, null, $aligns);
-			}
-			else
-				$rep->title = _('INVOICE');
-			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+			}	
+			$rep->SetHeaderType('Header2');
+			$rep->currency = $cur;
+			$rep->Font();
+			$rep->Info($params, $cols, null, $aligns);
+
+			$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->NewPage();
@@ -118,23 +123,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);
@@ -202,11 +209,11 @@ function print_invoices()
 			$rep->Font();
 			if ($email == 1)
 			{
-				$rep->End($email, '', $myrow, ST_SALESINVOICE);
+				$rep->End($email);
 			}
 	}
 	if ($email == 0)
 		$rep->End();
 }
 
-?>
\ No newline at end of file
+?>