X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=888181ebae9b811a4b04c863364e5a488d8879ad;hb=5d8f36d15260bfd9215315935af86b7d96065489;hp=f9c12a4dcd42523990e94d8c3fe216d4410eaf2e;hpb=ae115f787d84c11c6140137b054261a398b2f077;p=fa-stable.git

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index f9c12a4d..888181eb 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -111,15 +111,16 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 	}
 	db_query($sql, "The debtor transaction record could not be inserted");
 
-	add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
+	if ($trans_type != ST_JOURNAL) // skip for journal entries
+		add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
 
 	return $trans_no;
 }
 //----------------------------------------------------------------------------------------
 
-function get_customer_trans($trans_id, $trans_type)
+function get_customer_trans($trans_id, $trans_type, $customer_id=null)
 {
-	global $go_debug;
+	global $SysPrefs;
 
 	$sql = "SELECT trans.*,"
 		."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
@@ -131,7 +132,6 @@ function get_customer_trans($trans_id, $trans_type)
 
 	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
-		// Chaitanya : Added bank_act to support Customer Payment Edit
 		$sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
 			".TB_PREF."bank_accounts.account_type AS BankTransType,
 			".TB_PREF."bank_accounts.bank_curr_code,
@@ -149,6 +149,10 @@ function get_customer_trans($trans_id, $trans_type)
 		.TB_PREF."tax_groups.id AS tax_group_id ";
 	}
 
+	if ($trans_type == ST_JOURNAL) {
+		$sql .= ", branch.*";
+	}
+
 	$sql .= " FROM ".TB_PREF."debtor_trans trans
 					LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
 					LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via, 
@@ -166,10 +170,17 @@ function get_customer_trans($trans_id, $trans_type)
 		.TB_PREF."tax_groups ";
 	}
 
+	if ($trans_type == ST_JOURNAL) {
+		$sql .= ", ".TB_PREF."cust_branch branch ";
+	}
+
 	$sql .= " WHERE trans.trans_no=".db_escape($trans_id)."
 		AND trans.type=".db_escape($trans_type)."
 		AND trans.debtor_no=cust.debtor_no";
 
+	if (isset($customer_id))
+		$sql .= " AND trans.debtor_no=".db_escape($customer_id);
+
 	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
 		$sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)."
@@ -183,19 +194,22 @@ function get_customer_trans($trans_id, $trans_type)
 			AND branch.branch_code = trans.branch_code
 			AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
 	}
+	if ($trans_type == ST_JOURNAL) {
+		$sql .= " AND branch.branch_code = trans.branch_code ";
+	}
 
 	$result = db_query($sql, "Cannot retreive a debtor transaction");
 
 	if (db_num_rows($result) == 0) {
 		// can't return nothing
-		if($go_debug)
+		if ($SysPrefs->go_debug)
 			display_backtrace();
 		display_db_error("no debtor trans found for given params", $sql, true);
 		exit;
 	}
 	if (db_num_rows($result) > 1) {
 		// can't return multiple
-		if($go_debug)
+		if($SysPrefs->go_debug)
 			display_backtrace();
 		display_db_error("duplicate debtor transactions found for given params", $sql, true);
 		exit;
@@ -236,11 +250,14 @@ function get_customer_trans_order($type, $type_no)
 
 function get_customer_details_from_trans($type, $type_no)
 {
-	$sql = "SELECT ".TB_PREF."debtors_master.name, ".TB_PREF."debtors_master.curr_code, ".TB_PREF."cust_branch.br_name
-		FROM ".TB_PREF."debtors_master,".TB_PREF."cust_branch,".TB_PREF."debtor_trans
-		WHERE ".TB_PREF."debtor_trans.type=".db_escape($type)." AND ".TB_PREF."debtor_trans.trans_no=".db_escape($type_no)."
-		AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
-		AND	".TB_PREF."cust_branch.branch_code = ".TB_PREF."debtor_trans.branch_code";
+	$sql = "SELECT debtor.name, debtor.curr_code, branch.br_name
+		FROM "
+			.TB_PREF."debtors_master debtor,"
+			.TB_PREF."cust_branch branch,"
+			.TB_PREF."debtor_trans trans
+		WHERE trans.type=".db_escape($type)." AND trans.trans_no=".db_escape($type_no)."
+		AND debtor.debtor_no = trans.debtor_no
+		AND	branch.branch_code = trans.branch_code";
 
 	$result = db_query($sql, "could not get customer details from trans");
 	return db_fetch($result);
@@ -285,7 +302,7 @@ function post_void_customer_trans($type, $type_no)
 }
 
 //----------------------------------------------------------------------------------------
-function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT)
+function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT, $show_voided = 0)
 {
     $date_after = date2sql($from);
     $date_to = date2sql($to);
@@ -300,29 +317,47 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
 		debtor.name, 
 		branch.br_name,
 		debtor.curr_code,
-		(trans.ov_amount + trans.ov_gst + trans.ov_freight 
-			+ trans.ov_freight_tax + trans.ov_discount)	AS TotalAmount, "; 
-   	if ($filter != ALL_TEXT)
-		$sql .= "@bal := @bal+(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), ";
+		IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight 
+			+ trans.ov_freight_tax + trans.ov_discount)	AS TotalAmount,"
+//   	if ($filter != ALL_TEXT)
+//  		$sql .= "@bal := @bal+IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), ";
 
 //	else
 //		$sql .= "IF(trans.type=".ST_CUSTDELIVERY.",'', IF(trans.type=".ST_SALESINVOICE." OR trans.type=".ST_BANKPAYMENT.",@bal := @bal+
 //			(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), @bal := @bal-
 //			(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount))) , ";
+		. "IF(trans.type IN(".implode(',',  array(ST_CUSTCREDIT,ST_CUSTPAYMENT,ST_BANKDEPOSIT))."), -1, 1)
+				*(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight 
+			+ trans.ov_freight_tax + trans.ov_discount)-trans.alloc) Balance, 
+		debtor.debtor_no,";
+
 		$sql .= "trans.alloc AS Allocated,
-		((trans.type = ".ST_SALESINVOICE.")
+		((trans.type = ".ST_SALESINVOICE." || trans.type = ".ST_JOURNAL.")
 			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
-		Sum(line.quantity-line.qty_done) AS Outstanding
+		Sum(line.quantity-line.qty_done) AS Outstanding,
+		Sum(line.qty_done) AS HasChild,
+		prep_amount
 		FROM "
 			.TB_PREF."debtor_trans as trans
 			LEFT JOIN ".TB_PREF."debtor_trans_details as line
-				ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type,"
-			.TB_PREF."debtors_master as debtor, "
-			.TB_PREF."cust_branch as branch
-		WHERE debtor.debtor_no = trans.debtor_no
-			AND trans.tran_date >= '$date_after'
-			AND trans.tran_date <= '$date_to'
-			AND trans.branch_code = branch.branch_code";
+				ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type
+			LEFT JOIN ".TB_PREF."voided as v
+				ON trans.trans_no=v.id AND trans.type=v.type
+                        LEFT JOIN ".TB_PREF."audit_trail as audit ON (trans.type=audit.type AND trans.trans_no=audit.trans_no)
+                        LEFT JOIN ".TB_PREF."users as user ON (audit.user=user.id)
+			LEFT JOIN ".TB_PREF."cust_branch as branch ON trans.branch_code=branch.branch_code,"
+			.TB_PREF."debtors_master as debtor
+		WHERE debtor.debtor_no = trans.debtor_no"; // exclude voided transactions and self-balancing (journal) transactions:
+    if (!$show_voided) 	
+    	 	$sql .= " AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0";
+
+	if ($filter == '2')
+		$sql .= " AND ABS(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)-trans.alloc)>"
+			.FLOAT_COMP_DELTA;
+	else {
+		$sql .= " AND trans.tran_date >= '$date_after'
+			AND trans.tran_date <= '$date_to'";
+	}
 
    	if ($cust_id != ALL_TEXT)
    		$sql .= " AND trans.debtor_no = ".db_escape($cust_id);
@@ -335,7 +370,7 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
    		}
    		elseif ($filter == '2')
    		{
-   			$sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
+   			$sql .= " AND (trans.type <> ".ST_CUSTDELIVERY.") ";
    		}
    		elseif ($filter == '3')
    		{
@@ -359,6 +394,7 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
 				trans.ov_freight + trans.ov_discount - trans.alloc > 0) ";
     	}
    	}
+
 	$sql .= " GROUP BY trans.trans_no, trans.type";
 
    	return $sql;