X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep107.php;h=501cf44c46016e6c0ec613d86cf5fe9e405aa109;hb=630e99edecc3eabe708a9e7bda94eaa60bf16db7;hp=f1d5f9fe0b90a8a4be1cf7c7e6a0c8a3ee479e9d;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git

diff --git a/reporting/rep107.php b/reporting/rep107.php
index f1d5f9fe..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']))
@@ -97,9 +113,13 @@ 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']);
 			$params['bankaccount'] = $baccount['id'];
 
@@ -111,7 +131,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 +138,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);
@@ -161,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())
@@ -181,18 +206,16 @@ function print_invoices()
 			if ($memo != "")
 			{
 				$rep->NewLine();
-				$rep->TextColLines(1, 5, $memo, -2);
+				$rep->TextColLines(1, 3, $memo, -2);
 			}
 
    			$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 +254,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))
@@ -262,7 +289,7 @@ function print_invoices()
 						$first = false;
     				}
     				else
-						$rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
+						$rep->TextCol(3, 6, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
 				}
     			else
     			{
@@ -303,4 +330,3 @@ function print_invoices()
 		$rep->End();
 }
 
-?>