X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=cac714b062f1504faeaffde4cb289d75367a84b5;hb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;hp=fc581e088be037aaca8abc86075471ad24dc7b95;hpb=a4f5314521187b67feb7742ed1b6c51aa199a6b0;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index fc581e08..cac714b0 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -19,7 +19,7 @@
 function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
 	$amount, $currency=null, $person_type_id=null, $person_id=null,	$err_msg="", $rate=0)
 {
-	global $use_audit_trail;
+	global $SysPrefs;
 
 	$date = date2sql($date_);
 	if ($currency != null)
@@ -35,13 +35,16 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 		$dimension = 0;
 	if ($dimension2 == null || $dimension2 < 0)
 		$dimension2 = 0;
-	if (isset($use_audit_trail) && $use_audit_trail)
+	if (isset($SysPrefs->use_audit_trail) && $SysPrefs->use_audit_trail)
 	{
 		if ($memo_ == "" || $memo_ == null)
 			$memo_ = $_SESSION["wa_current_user"]->username;
 		else
 			$memo_ = $_SESSION["wa_current_user"]->username . " - " . $memo_;
 	}
+	if (!is_subledger_account($account) || $account==get_company_pref('grn_clearing_act'))
+		$person_id = $person_type_id = null;
+
 	$sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
 		account, dimension_id, dimension2_id, memo_, amount";
 
@@ -87,12 +90,15 @@ function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $
 function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null, $person_id=null)
 {
 	$amount = round2($amount, user_price_dec());
-	if ($amount != 0)
+
+	if (floatcmp($amount, 0))
+	{
+		error_log(sprintf( _("Rounding error %s encountered for trans_type:%s,trans_no:%s"), $amount, $type, $trans_id));
 		return add_gl_trans($type, $trans_id, $date_, get_company_pref('exchange_diff_act'), 0, 0, "",
 			$amount, null, $person_type_id, $person_id, "The balanced GL transaction could not be inserted");
-	else
+	} else
 		return 0;
-}	
+}
 
 //--------------------------------------------------------------------------------
 
@@ -100,7 +106,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 	$account=null, $dimension=0, $dimension2=0, $filter_type=null,
 	$amount_min=null, $amount_max=null)
 {
-	global $show_voided_gl_trans;
+	global $SysPrefs;
 	
 	$from = date2sql($from_date);
 	$to = date2sql($to_date);
@@ -115,7 +121,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 		AND ISNULL(v.date_)
 		AND tran_date >= '$from'
 		AND tran_date <= '$to'";
-	if (isset($show_voided_gl_trans) && $show_voided_gl_trans == 1)
+	if (isset($SysPrefs->show_voided_gl_trans) && $SysPrefs->show_voided_gl_trans == 0)
 		$sql .= " AND ".TB_PREF."gl_trans.amount <> 0"; 
 	if ($trans_no > 0)
 		$sql .= " AND ".TB_PREF."gl_trans.type_no LIKE ".db_escape('%'.$trans_no);
@@ -154,23 +160,27 @@ function get_gl_trans($type, $trans_id)
 		LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
 		." WHERE gl.type= ".db_escape($type) 
 		." AND gl.type_no = ".db_escape($trans_id)
+		." AND gl.amount <> 0"
 		." ORDER BY counter";
 	return db_query($sql, "The gl transactions could not be retrieved");
 }
 
 //--------------------------------------------------------------------------------
 
-function get_gl_wo_cost_trans($trans_id, $person_id=-1)
+function get_gl_wo_cost_trans($trans_id, $cost_type=-1)
 {
-	$sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM "
-		.TB_PREF."gl_trans, ".TB_PREF."chart_master
-		WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
-		AND ".TB_PREF."gl_trans.type=".ST_WORKORDER
-		." AND ".TB_PREF."gl_trans.type_no=".db_escape($trans_id)."
-		AND ".TB_PREF."gl_trans.person_type_id=".PT_WORKORDER;
-	if ($person_id != -1)
-		$sql .= " AND ".TB_PREF."gl_trans.person_id=".db_escape($person_id);
-	$sql .= " AND amount < 0";	
+	$sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_ FROM "
+		.TB_PREF."wo_costing costing, "
+		.TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type	AND gl.type_no=com.id,"
+		.TB_PREF."chart_master chart
+		WHERE 
+			costing.workorder_id=".db_escape($trans_id)
+		."	AND chart.account_code=gl.account
+			AND gl.type=costing.trans_type
+			AND gl.type_no=costing.trans_no";
+	if ($cost_type != -1)
+		$sql .= " AND costing.cost_type=".db_escape($cost_type);
+	$sql .= " AND amount < 0";
 
 	return db_query($sql, "The gl transactions could not be retrieved");
 }
@@ -361,7 +371,7 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate,
 	}
 	add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], $included, 
 		$amount, $net_amount, $ex_rate, $date, $memo);
-			
+
 }
 
 //--------------------------------------------------------------------------------
@@ -390,7 +400,9 @@ function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included
 function get_trans_tax_details($trans_type, $trans_no)
 {
 	$sql = "SELECT ".TB_PREF."trans_tax_details.*, "
-		.TB_PREF."tax_types.name AS tax_type_name
+		.TB_PREF."tax_types.name AS tax_type_name, "
+		.TB_PREF."trans_tax_details.rate AS effective_rate, "
+		.TB_PREF."tax_types.rate AS rate
 		FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types
 		WHERE trans_type = ".db_escape($trans_type)."
 		AND trans_no = ".db_escape($trans_no)."
@@ -440,12 +452,12 @@ function get_tax_summary($from, $to)
 					." || (trans_type=".ST_JOURNAL ." AND amount<0)"
 					." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable,
 
-				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
 				IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
 					." || (trans_type=".ST_JOURNAL ." AND amount<0)"
 					." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input,
 
-				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
 				IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
 					." || (trans_type=".ST_JOURNAL ." AND amount<0)"
 					." || trans_type=".ST_CUSTCREDIT.", 0, amount*ex_rate)) collectible,
@@ -492,9 +504,12 @@ function write_journal_entries(&$cart, $reverse, $use_transaction=true)
 		// post to first found bank account using given gl acount code.
 		$is_bank_to = is_bank_account($journal_item->code_id);
 
-		add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
-			$journal_item->dimension_id, $journal_item->dimension2_id,
-			$journal_item->reference, $journal_item->amount);
+ 		add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
+ 			$journal_item->dimension_id, $journal_item->dimension2_id,
+			$journal_item->reference, $journal_item->amount, null, 
+			$journal_item->person_type_id, 
+			$journal_item->person_id);
+
     	if ($is_bank_to)
     	{
     		add_bank_trans($trans_type, $trans_id, $is_bank_to, $ref,
@@ -529,7 +544,9 @@ function write_journal_entries(&$cart, $reverse, $use_transaction=true)
 
     		add_gl_trans($trans_type, $trans_id_reverse, $reversingDate,
     			$journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id,
-    			$journal_item->reference, -$journal_item->amount);
+    			$journal_item->reference, -$journal_item->amount, 
+    			null, $journal_item->person_type_id, $journal_item->person_id);
+
     		if ($is_bank_to)
     		{
     			add_bank_trans($trans_type, $trans_id_reverse, $is_bank_to, $ref,
@@ -581,7 +598,7 @@ function void_gl_trans($type, $trans_id, $nested=false)
 		commit_transaction();
 }
 
-//--------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 
 function clear_gl_trans($type, $trans_id, $nested=false)
 {
@@ -647,7 +664,9 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
 	if (!$alsoclosed) {
 		$sql .= " AND gl_seq=0";
 	}
-	$sql .= " GROUP BY gl.type, gl.type_no";
+	else
+		$sql .= " AND NOT ISNULL(a.gl_seq)";
+
+	$sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
 	return $sql;
 }
-?>
\ No newline at end of file