X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_payment_db.inc;h=a88f9654c7e2fb32b0531a1e8f889898c57b0b6f;hb=59a3056986e176bf155f26366de3c5ec6b4bcb6b;hp=a90a305890181c490d4c7f11575b9193b9d14939;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index a90a3058..a88f9654 100644
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -10,14 +10,14 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 function write_supp_payment($trans_no, $supplier_id, $bank_account,
-	$date_, $ref, $supp_amount, $supp_discount, $memo_, $bank_charge=0, $bank_amount=0)
+	$date_, $ref, $supp_amount, $supp_discount, $memo_, $bank_charge=0, $bank_amount=0, $dimension=0, $dimension2=0)
 {
 	global $Refs;
 
 	begin_transaction();
-	$args = func_get_args(); while (count($args) < 10) $args[] = 0;
+	$args = func_get_args(); while (count($args) < 12) $args[] = 0;
 	$args = (object)array_combine(array('trans_no', 'supplier_id', 'bank_account', 'date_',
-		 'ref', 'bank_amount', 'supp_amount', 'supp_discount', 'memo_', 'bank_charge'), $args);
+		 'ref', 'supp_amount', 'supp_discount', 'memo_', 'bank_charge', 'bank_amount', 'dimension', 'dimension2'), $args);
 	$args->trans_no = 0;
 	hook_db_prewrite( $args, ST_SUPPAYMENT);
 
@@ -25,44 +25,56 @@ function write_supp_payment($trans_no, $supplier_id, $bank_account,
 	  delete_comments(ST_SUPPAYMENT, $trans_no);
 	  void_bank_trans(ST_SUPPAYMENT, $trans_no, true);
 	  void_gl_trans(ST_SUPPAYMENT, $trans_no, true);
-	  void_cust_allocations(ST_SUPPAYMENT, $trans_no, $date_);
+	  void_supp_allocations(ST_SUPPAYMENT, $trans_no, $date_);
 	}
 
+	$bank = get_bank_account($bank_account);
+
+	if (!$bank_amount) 	// auto 
+	{
+		$rate = get_exchange_rate_from_to(get_supplier_currency($supplier_id),
+			$bank['bank_curr_code'], $date_ );
+		$bank_amount = $supp_amount/$rate;
+	}
+
+	if ($bank['bank_curr_code'] == get_company_currency()) // [0002506]
+		$rate = $bank_amount/$supp_amount;
+	else
+		$rate = 0;
+
 	/* Create a supp_trans entry for the supplier payment */
 	$payment_id = write_supp_trans(ST_SUPPAYMENT, 0, $supplier_id, $date_, $date_,
-		$ref, "", -$supp_amount, 0, -$supp_discount);
+		$ref, "", -$supp_amount, 0, -$supp_discount, "", $rate);
 
 	// Now debit creditors account with payment + discount
 
 	$total = 0;
     $supplier_accounts = get_supplier_accounts($supplier_id);
-	$total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
-		$supp_amount + $supp_discount, $supplier_id);
+	$total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], $dimension, $dimension2,
+		$supp_amount + $supp_discount, $supplier_id, "", $rate);
 
 	// Now credit discount received account with discounts
 	if ($supp_discount != 0)
 	{
-		$total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
-			-$supp_discount, $supplier_id);
+		$total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], $dimension, $dimension2,
+			-$supp_discount, $supplier_id, "", $rate);
 	}
 
-	$bank = get_bank_account($bank_account);
-
 	if ($bank_charge != 0)
 	{
 		$charge_act = get_company_pref('bank_charge_act');
-		$total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $charge_act, 0, 0, '',
-			$bank_charge, $bank['bank_curr_code'], PT_SUPPLIER, $supplier_id);
+		$total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $charge_act, $dimension, $dimension2, '',
+			$bank_charge, $bank['bank_curr_code']);
 	}
 
-	$total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], 0, 0, '',
+	$total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], $dimension, $dimension2, '',
 		-($bank_amount + $bank_charge), $bank['bank_curr_code'], PT_SUPPLIER, $supplier_id);
 
 	/*Post a balance post if $total != 0 due to variance in AP and bank posted values*/
 	if ($total != 0)
 	{
 		$variance_act = get_company_pref('exchange_diff_act');
-		add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $variance_act, 0, 0, '',
+		add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $variance_act, $dimension, $dimension2, '',
 			-$total, null, PT_SUPPLIER,  $supplier_id);
 	}
 
@@ -98,4 +110,3 @@ function void_supp_payment($type, $type_no)
 }
 
 
-?>
\ No newline at end of file