X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=1362d5d1591816a6304cf7fa8f2765f14c4a2ff6;hb=bddfd188fc7b9c754623c0ffd978ca9f0c4fd4e5;hp=c1ff7c4898c19c3904ee9b1fda7b218f3444ab31;hpb=b5f67d3dffd993ad74f63a04ad33ed2ff4bd61a6;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index c1ff7c48..1362d5d1 100644
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -25,19 +25,31 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 //----------------------------------------------------------------------------------------------------
-function get_invoice_range($from, $to)
+function get_invoice_range($from, $to, $currency=false)
 {
 	global $SysPrefs;
 
 	$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
 
-	$sql = "SELECT trans.trans_no, trans.reference
-		FROM ".TB_PREF."debtor_trans trans 
-			LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id
-		WHERE trans.type=".ST_SALESINVOICE
-			." AND ISNULL(voided.id)"
- 			." AND trans.trans_no BETWEEN ".db_escape($from)." AND ".db_escape($to)			
-		." ORDER BY trans.tran_date, trans.$ref";
+	$sql = "SELECT trans.trans_no, trans.reference";
+
+//  if($currency !== false)
+//		$sql .= ", cust.curr_code";
+
+	$sql .= " FROM ".TB_PREF."debtor_trans trans 
+			LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id";
+
+	if ($currency !== false)
+		$sql .= " LEFT JOIN ".TB_PREF."debtors_master cust ON trans.debtor_no=cust.debtor_no";
+
+	$sql .= " WHERE trans.type=".ST_SALESINVOICE
+		." AND ISNULL(voided.id)"
+ 		." AND trans.trans_no BETWEEN ".db_escape($from)." AND ".db_escape($to);			
+
+	if ($currency !== false)
+		$sql .= " AND cust.curr_code=".db_escape($currency);
+
+	$sql .= " ORDER BY trans.tran_date, trans.$ref";
 
 	return db_query($sql, "Cant retrieve invoice range");
 }
@@ -49,8 +61,6 @@ print_invoices();
 function print_invoices()
 {
 	global $path_to_root, $SysPrefs;
-	
-	$show_this_payment = true; // include payments invoiced here in summary
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -88,7 +98,12 @@ function print_invoices()
 	if ($orientation == 'L')
 		recalculate_cols($cols);
 
-	$range = get_invoice_range($from, $to);
+	$range = Array();
+	if ($currency == ALL_TEXT)
+		$range = get_invoice_range($from, $to);
+	else
+		$range = get_invoice_range($from, $to, $currency);
+
 	while($row = db_fetch($range))
 	{
 			if (!exists_customer_trans(ST_SALESINVOICE, $row['trans_no']))
@@ -99,9 +114,10 @@ function print_invoices()
 			if ($customer && $myrow['debtor_no'] != $customer) {
 				continue;
 			}
-			if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
-				continue;
-			}
+//			if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+//				continue;
+//			}
+			
 			$baccount = get_default_bank_account($myrow['curr_code']);
 			$params['bankaccount'] = $baccount['id'];
 
@@ -125,8 +141,11 @@ function print_invoices()
 			// calculate summary start row for later use
 			$summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight);
 
+			$show_this_payment = $rep->formData['prepaid'] == 'partial'; // include payments invoiced here in summary
+
 			if ($rep->formData['prepaid'])
 			{
+				
 				$result = get_sales_order_invoices($myrow['order_']);
 				$prepayments = array();
 				while($inv = db_fetch($result))
@@ -305,7 +324,7 @@ function print_invoices()
 			$rep->Font();
 			if ($email == 1)
 			{
-				$rep->End($email);
+				$rep->End($email, sprintf(_("Invoice %s from %s"), $myrow['reference'], get_company_pref('coy_name')));
 			}
 	}
 	if ($email == 0)