X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_banking.inc;h=ca3d5867442caf51d1443bf37e4d1425878e73a1;hb=b6af4ea4c99734cfd051395289107bbba5a405e9;hp=dc86c0a4f2a0c410413159798edc29d521f32a3b;hpb=7a50c189ea995d5fe6785feb7710c00396065d2b;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index dc86c0a4..ca3d5867 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -1,9 +1,13 @@
 <?php
 
 //----------------------------------------------------------------------------------
-
+//	Add bank tranfer to database.
+//
+//	$from_account - source bank account id
+//	$to_account   -	target bank account id
+//	
 function add_bank_transfer($from_account, $to_account, $date_,
-	$amount, $payment_type, $ref, $memo_)
+	$amount, $ref, $memo_)
 {
 	begin_transaction();
 
@@ -13,24 +17,28 @@ function add_bank_transfer($from_account, $to_account, $date_,
 
 	$trans_no = get_next_trans_no($trans_type);
 
+	$from_gl_account = get_bank_gl_account($from_account);
+	$to_gl_account = get_bank_gl_account($to_account);
+
+	$total = 0;
 	// do the source account postings
-    add_gl_trans($trans_type, $trans_no, $date_, $from_account, 0, 0, "",
+    $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "",
 		-$amount, $currency);
 
     add_bank_trans($trans_type, $trans_no, $from_account, $ref,
-		$date_, $payment_type, -$amount,
+		$date_, -$amount,
 		payment_person_types::misc(), "", $currency,
 		"Cannot insert a source bank transaction");
 
 	// do the destination account postings
-	add_gl_trans($trans_type, $trans_no, $date_, $to_account, 0, 0, "",
+	$total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, "",
 		$amount, $currency);
-
+	/*Post a balance post if $total != 0 */
+	add_gl_balance($trans_type, $trans_no, $date_, -$total);	
+	
 	add_bank_trans($trans_type, $trans_no, $to_account, $ref,
-		$date_, $payment_type, $amount,
-		payment_person_types::misc(), "",
-		$currency,
-		"Cannot insert a destination bank transaction");
+		$date_, $amount, payment_person_types::misc(), "",
+		$currency, "Cannot insert a destination bank transaction");
 
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
@@ -42,13 +50,18 @@ function add_bank_transfer($from_account, $to_account, $date_,
 }
 
 //----------------------------------------------------------------------------------
-
-// $amount is in $from_account's currency
-
+//	Add bank payment or deposit to database.
+//
+//	$from_account - bank account id
+//  $item - transaction cart (line item's amounts in bank account's currency)
+//  $person_type_id - defines type of $person_id identifiers
+//  $person_id	- supplier/customer/other id
+// $person_detail_id - customer branch id or not used
+//
 // returns an array of (inserted trans type, trans no)
 
 function add_bank_transaction($trans_type, $from_account, $items, $date_,
-	$person_type_id, $person_id, $person_detail_id,	$type, $ref, $memo_)
+	$person_type_id, $person_id, $person_detail_id,	$ref, $memo_)
 {
 	// we can only handle type 1 (payment)and type 2 (deposit)
 	if ($trans_type != systypes::bank_payment() && $trans_type != systypes::bank_deposit())
@@ -57,6 +70,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 	begin_transaction();
 
 	$currency = get_bank_account_currency($from_account);
+	$bank_gl_account = get_bank_gl_account($from_account);
 
 	// the gl items are already inversed/negated for type 2 (deposit)
 	$total_amount = $items->gl_items_total();
@@ -67,8 +81,10 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 
 		// convert to customer currency
 		$cust_amount = exchange_from_to($total_amount, $currency, get_customer_currency($person_id), $date_);
+		// we need to negate it too
+		$cust_amount = -$cust_amount;
 
-		$trans_no = add_customer_trans($trans_type, $person_id, $person_detail_id, $date_,
+		$trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_,
         	$ref, $cust_amount);
 
     }
@@ -91,15 +107,15 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
     }
 
 	// do the source account postings
-    add_gl_trans($trans_type, $trans_no, $date_, $from_account, 0, 0, "",
+    add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, "",
     	-$total_amount, $currency, $person_type_id, $person_id);
 
     add_bank_trans($trans_type, $trans_no, $from_account, $ref,
-    	$date_, $type, -$total_amount,
+    	$date_, -$total_amount,
     	$person_type_id, $person_id,
     	$currency,
     	"Cannot insert a source bank transaction");
-
+	$total = 0;
 	foreach ($items->gl_items as $gl_item)
 	{
 		$is_bank_to = is_bank_account($gl_item->code_id);
@@ -111,19 +127,22 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 		}
 
     	// do the destination account postings
-    	add_gl_trans($trans_type, $trans_no, $date_, $gl_item->code_id,
+    	$total += add_gl_trans($trans_type, $trans_no, $date_, $gl_item->code_id,
     		$gl_item->dimension_id, $gl_item->dimension2_id, $gl_item->reference,
     		$gl_item->amount, $currency, $person_type_id, $person_id);
 
     	if ($is_bank_to)
     	{
     		add_bank_trans($trans_type, $trans_no, $gl_item->code_id, $ref,
-    			$date_, $type, $gl_item->amount,
-    			$person_type_id, $person_id, $currency,
-    			"Cannot insert a destination bank transaction");
+    			$date_, $gl_item->amount, $person_type_id, $person_id, 
+				$currency, "Cannot insert a destination bank transaction");
     	}
 	}
 
+	// do the source account postings
+    add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, "",
+    	-$total, null, $person_type_id, $person_id);
+
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
 	references::save_last($ref, $trans_type);
@@ -135,23 +154,4 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 
 //----------------------------------------------------------------------------------------
 
-function add_bank_payment($from_account, $items, $date_,
-	$person_type_id, $person_id, $person_detail_id,	$type, $ref, $memo_)
-{
-	return add_bank_transaction(systypes::bank_payment(), $from_account, $items, $date_,
-		$person_type_id, $person_id, $person_detail_id,	$type, $ref, $memo_);
-}
-
-//---------------------------------------------------------------------------------------------
-
-function add_bank_deposit($from_account, $items, $date_,
-	$person_type_id, $person_id, $person_detail_id,	$type, $ref, $memo_)
-{
-	return add_bank_transaction(systypes::bank_deposit(), $from_account, $items, $date_,
-		$person_type_id, $person_id, $person_detail_id,	$type, $ref, $memo_);
-}
-
-//---------------------------------------------------------------------------------------------
-
-
 ?>
\ No newline at end of file