X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep101.php;h=a7d1c1f33ef04fb6deb1b64a14be1b02971bd408;hb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;hp=df34fe35ef8794136ede0b92b554a04092683d6b;hpb=884c5487fb07e9ad11edecc766bf55b35d06abcf;p=fa-stable.git

diff --git a/reporting/rep101.php b/reporting/rep101.php
index df34fe35..a7d1c1f3 100644
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -35,14 +35,14 @@ function get_open_balance($debtorno, $to)
 	if($to)
 		$to = date2sql($to);
 
-    $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR t.type = ".ST_BANKPAYMENT.",
-    	(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,
-    	SUM(IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",
-	    	(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,
-		SUM(t.alloc) AS Allocated,
-		SUM(IF(t.type = ".ST_SALESINVOICE." OR t.type = ".ST_BANKPAYMENT.",
-			(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount - t.alloc),
-	    	((t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1 + t.alloc))) AS OutStanding
+     $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.", 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)
 		." AND t.type <> ".ST_CUSTDELIVERY;
@@ -59,19 +59,34 @@ function get_transactions($debtorno, $from, $to)
 	$from = date2sql($from);
 	$to = date2sql($to);
 
-    $sql = "SELECT ".TB_PREF."debtor_trans.*,
-		(".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)
-		AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
-		((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
-		AND ".TB_PREF."debtor_trans.due_date < '$to') AS OverDue
-    	FROM ".TB_PREF."debtor_trans
-    	WHERE ".TB_PREF."debtor_trans.tran_date >= '$from'
-		AND ".TB_PREF."debtor_trans.tran_date <= '$to'
-		AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
-		AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
-    	ORDER BY ".TB_PREF."debtor_trans.tran_date";
+ 	$allocated_from = 
+ 			"(SELECT trans_type_from as trans_type, trans_no_from as trans_no, date_alloc, sum(amt) amount
+ 			FROM ".TB_PREF."cust_allocations alloc
+ 				WHERE person_id=".db_escape($debtorno)."
+ 					AND date_alloc <= '$to'
+ 				GROUP BY trans_type_from, trans_no_from) alloc_from";
+ 	$allocated_to = 
+ 			"(SELECT trans_type_to as trans_type, trans_no_to as trans_no, date_alloc, sum(amt) amount
+ 			FROM ".TB_PREF."cust_allocations alloc
+ 				WHERE person_id=".db_escape($debtorno)."
+ 					AND date_alloc <= '$to'
+ 				GROUP BY trans_type_to, trans_no_to) alloc_to";
+
+     $sql = "SELECT trans.*,
+ 		(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount,
+ 		IFNULL(alloc_from.amount, alloc_to.amount) AS Allocated,
+ 		((trans.type = ".ST_SALESINVOICE.")	AND trans.due_date < '$to') AS OverDue
+     	FROM ".TB_PREF."debtor_trans trans
+ 			LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id
+ 			LEFT JOIN $allocated_from ON alloc_from.trans_type = trans.type AND alloc_from.trans_no = trans.trans_no
+ 			LEFT JOIN $allocated_to ON alloc_to.trans_type = trans.type AND alloc_to.trans_no = trans.trans_no
 
+     	WHERE trans.tran_date >= '$from'
+ 			AND trans.tran_date <= '$to'
+ 			AND trans.debtor_no = ".db_escape($debtorno)."
+ 			AND trans.type <> ".ST_CUSTDELIVERY."
+ 			AND ISNULL(voided.id)
+     	ORDER BY trans.tran_date";
     return db_query($sql,"No transactions were returned");
 }
 
@@ -142,14 +157,13 @@ function print_customer_balances()
 		$sql .= "WHERE debtor_no=".db_escape($fromcust);
 	$sql .= " ORDER BY name";
 	$result = db_query($sql, "The customers could not be retrieved");
-	$num_lines = 0;
 
 	while ($myrow = db_fetch($result))
 	{
 		if (!$convert && $currency != $myrow['curr_code']) continue;
 		
 		$accumulate = 0;
-		$rate = $convert ? get_exchange_rate_to_home_currency($myrow['curr_code'], Today()) : 1;
+		$rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
 		$bal = get_open_balance($myrow['debtor_no'], $from, $convert);
 		$init[0] = $init[1] = 0.0;
 		$init[0] = round2(abs($bal['charges']*$rate), $dec);
@@ -166,7 +180,6 @@ function print_customer_balances()
 		$res = get_transactions($myrow['debtor_no'], $from, $to);
 		if ($no_zeros && db_num_rows($res) == 0) continue;
 
- 		$num_lines++;
 		$rep->fontSize += 2;
 		$rep->TextCol(0, 2, $myrow['name']);
 		if ($convert)
@@ -184,9 +197,11 @@ function print_customer_balances()
 			$grandtotal[$i] += $init[$i];
 		}
 		$rep->NewLine(1, 2);
-		if (db_num_rows($res)==0)
-			continue;
 		$rep->Line($rep->row + 4);
+		if (db_num_rows($res)==0) {
+			$rep->NewLine(1, 2);
+			continue;
+		}
 		while ($trans = db_fetch($res))
 		{
 			if ($no_zeros && floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue;
@@ -249,4 +264,3 @@ function print_customer_balances()
     	$rep->End();
 }
 
-?>