X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep108.php;h=9315f64974eba83aca3751cdd2561cc8c3c56acf;hb=0c794db98d716ec8823435d8423c98a12bebba66;hp=0247f7cc3539ef3ec2e95ff9c0900d7080e138ba;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/reporting/rep108.php b/reporting/rep108.php
index 0247f7cc..9315f649 100644
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -30,7 +30,7 @@ print_statements();
 
 //----------------------------------------------------------------------------------------------------
 
-function getTransactions($debtorno, $date, $outstanding)
+function getTransactions($debtorno, $date, $show_also_allocated)
 {
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
 				(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
@@ -43,7 +43,7 @@ function getTransactions($debtorno, $date, $outstanding)
     				AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
     				AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
 				".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) != 0";
-	if ($outstanding)
+	if (!$show_also_allocated)
 		$sql .= " AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
 				".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - alloc <> 0";
 	$sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
@@ -61,7 +61,7 @@ function print_statements()
 
 	$customer = $_POST['PARAM_0'];
 	$currency = $_POST['PARAM_1'];
-	$outstanding = $_POST['PARAM_2'];
+	$show_also_allocated = $_POST['PARAM_2'];
 	$email = $_POST['PARAM_3'];
 	$comments = $_POST['PARAM_4'];
 
@@ -89,7 +89,7 @@ function print_statements()
 	}
 
 	$sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
-	if ($customer != ALL_NUMERIC)
+	if ($customer != ALL_TEXT)
 		$sql .= " WHERE debtor_no = ".db_escape($customer);
 	else
 		$sql .= " ORDER by name";
@@ -101,7 +101,7 @@ function print_statements()
 
 		$myrow['order_'] = "";
 
-		$TransResult = getTransactions($myrow['debtor_no'], $date, $outstanding);
+		$TransResult = getTransactions($myrow['debtor_no'], $date, $show_also_allocated);
 		$baccount = get_default_bank_account($myrow['curr_code']);
 		$params['bankaccount'] = $baccount['id'];
 		if (db_num_rows($TransResult) == 0)
@@ -121,11 +121,9 @@ function print_statements()
 		$rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts);
 		$rep->NewPage();
 		$rep->NewLine();
-		$linetype = true;
 		$doctype = ST_STATEMENT;
-		include($path_to_root . "/reporting/includes/doctext.inc");
 		$rep->fontSize += 2;
-		$rep->TextCol(0, 8, $doc_Outstanding);
+		$rep->TextCol(0, 8, _("Outstanding Transactions"));
 		$rep->fontSize -= 2;
 		$rep->NewLine(2);
 		while ($myrow2=db_fetch($TransResult))
@@ -149,11 +147,11 @@ function print_statements()
 			if ($rep->row < $rep->bottomMargin + (10 * $rep->lineHeight))
 				$rep->NewPage();
 		}
-		$nowdue = "1-" . $PastDueDays1 . " " . $doc_Days;
-		$pastdue1 = $PastDueDays1 + 1 . "-" . $PastDueDays2 . " " . $doc_Days;
-		$pastdue2 = $doc_Over . " " . $PastDueDays2 . " " . $doc_Days;
-		$CustomerRecord = get_customer_details($myrow['debtor_no']);
-		$str = array($doc_Current, $nowdue, $pastdue1, $pastdue2, $doc_Total_Balance);
+		$nowdue = "1-" . $PastDueDays1 . " " . _("Days");
+		$pastdue1 = $PastDueDays1 + 1 . "-" . $PastDueDays2 . " " . _("Days");
+		$pastdue2 = _("Over") . " " . $PastDueDays2 . " " . _("Days");
+		$CustomerRecord = get_customer_details($myrow['debtor_no'], null, $show_also_allocated);
+		$str = array(_("Current"), $nowdue, $pastdue1, $pastdue2, _("Total Balance"));
 		$str2 = array(number_format2(($CustomerRecord["Balance"] - $CustomerRecord["Due"]),$dec),
 			number_format2(($CustomerRecord["Due"]-$CustomerRecord["Overdue1"]),$dec),
 			number_format2(($CustomerRecord["Overdue1"]-$CustomerRecord["Overdue2"]) ,$dec),
@@ -168,7 +166,7 @@ function print_statements()
 		for ($i = 0; $i < 5; $i++)
 			$rep->TextWrap($col[$i], $rep->row, $col[$i + 1] - $col[$i], $str2[$i], 'right');
 		if ($email == 1)
-			$rep->End($email, $doc_Statement . " " . $doc_as_of . " " . sql2date($date), $myrow, ST_STATEMENT);
+			$rep->End($email, _("Statement") . " " . _("as of") . " " . sql2date($date));
 
 	}
 	if ($email == 0)