X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=501cf44c46016e6c0ec613d86cf5fe9e405aa109;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=7982f8a1175d4857238aad6f986b9d706238bf71;hpb=ec58402529d7c61843274582de9174cbb2e56679;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 7982f8a1..501cf44c 100644
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -25,20 +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.reference>=".db_escape(get_reference(ST_SALESINVOICE, $from))
-			." AND trans.reference<=".db_escape(get_reference(ST_SALESINVOICE, $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");
 }
@@ -89,7 +100,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']))
@@ -100,9 +116,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'];
 
@@ -164,6 +181,11 @@ function print_invoices()
 				$rep->TextCol($c++, $c,	$myrow2['stock_id'], -2);
 				$oldrow = $rep->row;
 				$rep->TextColLines($c++, $c, $myrow2['StockDescription'], -2);
+				if (!empty($SysPrefs->prefs['long_description_invoice']) && !empty($myrow2['StockLongDescription']))
+				{
+					$c--;
+					$rep->TextColLines($c++, $c, $myrow2['StockLongDescription'], -2);
+				}
 				$newrow = $rep->row;
 				$rep->row = $oldrow;
 				if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount())