X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep108.php;h=a64a71b05d5322b53af4b8f2cb1c0dacc243d750;hb=5db847e8f5705e80dd9b057e09d7c3ee12c94027;hp=b78f5596d57c0576b953c5f4b845b7e3a6c34da7;hpb=9b1b5c83a37376d2076334952db1d1f739a26d1c;p=fa-stable.git

diff --git a/reporting/rep108.php b/reporting/rep108.php
index b78f5596..a64a71b0 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,10 +61,12 @@ 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'];
+	$orientation = $_POST['PARAM_5'];
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
 	$cols = array(4, 100, 130, 190,	250, 320, 385, 450, 515);
@@ -80,14 +82,10 @@ function print_statements()
 	$PastDueDays2 = 2 * $PastDueDays1;
 
 	if ($email == 0)
-	{
-		$rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize());
-		$rep->SetHeaderType('Header2');
-		$rep->currency = $cur;
-		$rep->Font();
-		$rep->Info($params, $cols, null, $aligns);
-	}
-
+		$rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
+   if ($orientation == 'L')
+    	recalculate_cols($cols);
+ 
 	$sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
 	if ($customer != ALL_TEXT)
 		$sql .= " WHERE debtor_no = ".db_escape($customer);
@@ -101,31 +99,30 @@ 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)
 			continue;
 		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 = _('STATEMENT');
 			$rep->filename = "Statement" . $myrow['debtor_no'] . ".pdf";
-			$rep->Info($params, $cols, null, $aligns);
-		}
+		}	
+		$rep->SetHeaderType('Header2');
+		$rep->currency = $cur;
+		$rep->Font();
+		$rep->Info($params, $cols, null, $aligns);
+
 		$contacts = get_customer_contacts($myrow['debtor_no'], 'invoice');
 		//= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
 		$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 +146,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 +165,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)