X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=5b6939976fed524ba2e8fa9d104701c8daf1254d;hb=76ca9fef9bb510236a6a7740fa0f60eb7db384c9;hp=d2657c65edf328d628d8e2e41f942a04ac8d125b;hpb=dc292b0592ea1035129904f5af26037f2e91c4d2;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index d2657c65..5b693997 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -100,15 +100,23 @@ 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;
+	
 	$from = date2sql($from_date);
 	$to = date2sql($to_date);
 
 	$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
+		.TB_PREF."chart_master.account_name FROM "
+		.TB_PREF."gl_trans
+			LEFT JOIN ".TB_PREF."voided v ON "
+			.TB_PREF."gl_trans.type_no=v.id AND v.type=".TB_PREF."gl_trans.type,"
+			.TB_PREF."chart_master"
+		." WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
+		AND ISNULL(v.date_)
 		AND tran_date >= '$from'
 		AND tran_date <= '$to'";
+	if (isset($show_voided_gl_trans) && $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);
 
@@ -152,17 +160,20 @@ function get_gl_trans($type, $trans_id)
 
 //--------------------------------------------------------------------------------
 
-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");
 }
@@ -210,7 +221,7 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
 	$result = db_query($sql, "Transactions for account $account could not be calculated");
 
 	$row = db_fetch_row($result);
-	return $row[0];
+	return (float)$row[0];
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -331,7 +342,7 @@ function get_only_budget_trans_from_to($from_date, $to_date, $account, $dimensio
 //--------------------------------------------------------------------------------
 //	Stores journal/bank transaction tax details if applicable
 //
-function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0)
+function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate, $date, $memo, $included=0, $net_amount = null)
 {
 	$tax_type = is_tax_account($gl_code);
 	if(!$tax_type) return;	// $gl_code is not tax account
@@ -341,18 +352,19 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate,
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTDELIVERY || $trans_type == ST_CUSTCREDIT)
 		$amount = -$amount;
 	// we have to restore net amount as we cannot know the base amount
-	if ($tax['rate'] == 0) {
-//		display_warning(_("You should not post gl transactions  
-//			to tax account with	zero tax rate."));
-		$net_amount = 0;
-	} else { 
-		// calculate net amount
-		$net_amount = $amount/$tax['rate']*100; 
+	if ($net_amount===null) {
+		if ($tax['rate'] == 0) {
+//			display_warning(_("You should not post gl transactions  
+//				to tax account with	zero tax rate."));
+			$net_amount = 0;
+		} else { 
+			// calculate net amount
+			$net_amount = $amount/$tax['rate']*100; 
+		}
 	}
-		
 	add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], $included, 
 		$amount, $net_amount, $ex_rate, $date, $memo);
-			
+
 }
 
 //--------------------------------------------------------------------------------
@@ -381,7 +393,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)."
@@ -497,12 +511,11 @@ function write_journal_entries(&$cart, $reverse, $use_transaction=true)
 			ST_JOURNAL, $trans_id, $journal_item->amount, 1, $date_, $memo_);
 	}
 	
+	$Refs->save($trans_type, $trans_id, $ref);
 	if ($new) {
 		add_comments($trans_type, $trans_id, $date_, $memo_);
-		$Refs->save($trans_type, $trans_id, $ref);
 	} else {
 		update_comments($trans_type, $trans_id, null, $memo_);
-		$Refs->update($trans_type, $trans_id, $ref);
 	}
 
 	add_audit_trail($trans_type, $trans_id, $date_);
@@ -604,49 +617,8 @@ function void_journal_trans($type, $type_no, $use_transaction=true)
 		commit_transaction();
 }
 
-function get_sql_for_journal_inquiry()
+function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false)
 {
-/*
-	// Tom Hallman 11 Nov 2009
-	// IF(gl.type = 1... statement is for deposits/payments that may not actually result
-	// in a deposit, such as when a fix is made.  Without that statement (and the
-	// joining of the bank_trans table), the fix deposit/payment amount would show up 
-	// incorrectly as only the positive side of the fix.    
-	$sql = "SELECT	IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
-		gl.tran_date,
-		gl.type,
-		gl.type_no,
-		refs.reference,
-		IF(gl.type = 1 OR gl.type = 2,
-		  bank_trans.amount,
-		  SUM(IF(gl.amount>0, gl.amount,0))) as amount,
-		com.memo_,
-		IF(ISNULL(u.user_id),'',u.user_id) as user_id
-		FROM ".TB_PREF."gl_trans as gl
-		 LEFT JOIN ".TB_PREF."audit_trail as a ON 
-			(gl.type=a.type AND gl.type_no=a.trans_no)
-		 LEFT JOIN ".TB_PREF."comments as com ON 
-			(gl.type=com.type AND gl.type_no=com.id)
-		 LEFT JOIN ".TB_PREF."refs as refs ON 
-			(gl.type=refs.type AND gl.type_no=refs.id)
-		 LEFT JOIN ".TB_PREF."users as u ON 
-			a.user=u.id
-		 LEFT JOIN ".TB_PREF."bank_trans as bank_trans ON 
-			(gl.type=bank_trans.type AND gl.type_no=bank_trans.trans_no)		
-		WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
-		AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
-		AND gl.amount!=0";
-	if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
-		$sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
-	}	
-	if (get_post('filterType') != -1) {
-		$sql .= " AND gl.type=".get_post('filterType');
-	}	
-	if (!check_value('AlsoClosed')) {
-		$sql .= " AND gl_seq=0";
-	}
-	$sql .= " GROUP BY gl.type, gl.type_no";
-*/
 
 	$sql = "SELECT	IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
 		gl.tran_date,
@@ -665,22 +637,26 @@ function get_sql_for_journal_inquiry()
 			(gl.type=refs.type AND gl.type_no=refs.id)
 		 LEFT JOIN ".TB_PREF."users as u ON
 			a.user=u.id
-		WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
-		AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
+		WHERE gl.tran_date >= '" . date2sql($from) . "'
+		AND gl.tran_date <= '" . date2sql($to) . "'
 		AND gl.amount!=0";
-	if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
-		$sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
+	if ($ref) {
+		$sql .= " AND reference LIKE ". db_escape("%$ref%");
 	}
-	if (isset($_POST['Memo']) && $_POST['Memo'] != "") {
-		$sql .= " AND com.memo_ LIKE '%". $_POST['Memo'] . "%'";
+	if ($memo) {
+		$sql .= " AND com.memo_ LIKE ". db_escape("%$memo%");
 	}
-	if (get_post('filterType') != -1) {
-		$sql .= " AND gl.type=".get_post('filterType');
+	if ($filter != -1) {
+		$sql .= " AND gl.type=".db_escape($filter);
 	}
-	if (!check_value('AlsoClosed')) {
+	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 tran_date, gl_seq, gl.type, gl.type_no";
+
 	return $sql;
 }
 ?>
\ No newline at end of file