X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=34c975ea98771145faabb99acb7fa35a4653dfcb;hb=41bdd7820211334cef5c087889e6cd5e6e45af86;hp=a68668375117d07cb56117e069c99cfdb9318ccf;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git

diff --git a/reporting/rep101.php b/reporting/rep101.php
index a6866837..34c975ea 100644
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -33,14 +33,15 @@ function get_open_balance($debtorno, $to)
 {
 	if($to)
 		$to = date2sql($to);
+	$sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0),
+             -abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,";
 
-     $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type = ".ST_JOURNAL." AND t.ov_amount>0),
-     	-abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,";
-     $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type = ".ST_JOURNAL." AND t.ov_amount>0),
-     	abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,";
-     $sql .= "SUM(t.alloc) AS Allocated,";
+	$sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0),
+             abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,";		
 
- 	$sql .=	"SUM(IF(t.type = ".ST_SALESINVOICE.", 1, -1) *
+    $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.")), t.alloc * -1, t.alloc)) AS Allocated,";
+
+ 	$sql .=	"SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), 1, -1) *
  			(abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) - abs(t.alloc))) AS OutStanding
 		FROM ".TB_PREF."debtor_trans t
     	WHERE t.debtor_no = ".db_escape($debtorno)
@@ -116,6 +117,9 @@ function print_customer_balances()
 		$cust = get_customer_name($fromcust);
     	$dec = user_price_dec();
 
+	if ($show_balance) $sb = _('Yes');
+	else $sb = _('No');
+
 	if ($currency == ALL_TEXT)
 	{
 		$convert = true;
@@ -127,7 +131,7 @@ function print_customer_balances()
 	if ($no_zeros) $nozeros = _('Yes');
 	else $nozeros = _('No');
 
-	$cols = array(0, 100, 130, 190,	250, 320, 385, 450,	515);
+	$cols = array(0, 95, 140, 200,	250, 320, 385, 450,	515);
 
 	$headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Charges'), _('Credits'),
 		_('Allocated'), 	_('Outstanding'));
@@ -139,8 +143,9 @@ function print_customer_balances()
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Period'), 'from' => $from, 		'to' => $to),
     				    2 => array('text' => _('Customer'), 'from' => $cust,   	'to' => ''),
-    				    3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''),
-						4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
+    				    3 => array('text' => _('Show Balance'), 'from' => $sb,   	'to' => ''),
+    				    4 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''),
+						5 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
     $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
@@ -203,7 +208,13 @@ function print_customer_balances()
 		}
 		while ($trans = db_fetch($res))
 		{
-			if ($no_zeros && floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue;
+            if ($no_zeros) {
+                if ($show_balance) {
+                    if ($trans['TotalAmount'] == 0) continue;
+                } else {
+                    if (floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue;
+                }
+            }
 			$rep->NewLine(1, 2);
 			$rep->TextCol(0, 1, $systypes_array[$trans['type']]);
 			$rep->TextCol(1, 2,	$trans['reference']);
@@ -218,19 +229,20 @@ function print_customer_balances()
 				$item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec);
 				$rep->AmountCol(4, 5, $item[0], $dec);
 				$accumulate += $item[0];
+				$item[2] = round2($trans['Allocated'] * $rate, $dec);
 			}
 			else
 			{
 				$item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec);
 				$rep->AmountCol(5, 6, $item[1], $dec);
 				$accumulate -= $item[1];
+				$item[2] = round2($trans['Allocated'] * $rate, $dec) * -1;
 			}
-			$item[2] = round2($trans['Allocated'] * $rate, $dec);
 			$rep->AmountCol(6, 7, $item[2], $dec);
 			if ($trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT)
-				$item[3] = $item[0] + $item[1] - $item[2];
+				$item[3] = $item[0] - $item[2];
 			else	
-				$item[3] = $item[0] - $item[1] + $item[2];
+				$item[3] = -$item[1] - $item[2];
 			if ($show_balance)	
 				$rep->AmountCol(7, 8, $accumulate, $dec);
 			else