X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=6218052b3d4eb194fca41ea42bffc8e4c751ef97;hb=22486f7826944e00937e7ccceab1a927c94d8f6a;hp=cc5b5cb875345ac33a207ccdb0082ced35a02eb3;hpb=28e5f95d81850e496e1b0387126e7bb836da61c5;p=fa-stable.git

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index cc5b5cb8..6218052b 100644
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -124,6 +124,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 
 	$supplier = get_supplier($supp_trans->supplier_id);
 
+	add_new_exchange_rate($supplier['curr_code'], $supp_trans->tran_date, $supp_trans->ex_rate);
+
     foreach ($taxes as $n => $taxitem)
     {
 		$taxes[$n]['Value'] =  round2($taxitem['Value'], user_price_dec());
@@ -137,7 +139,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
     {
 	    $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
 	    foreach ($taxes as $n => $taxitem)
-			$item_added_tax += isset($taxitem['Override']) ? $taxitem['Override'] : round2($taxitem['Value'], $dec);
+			$item_added_tax += isset($taxitem['Override']) ? $taxitem['Override'] : round2($taxitem['Value'], user_price_dec());
 	}
 
 	$trans_type = $supp_trans->trans_type;
@@ -343,24 +345,24 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 		if ($invoice_alloc_balance > 0) 
 		{ 	//the invoice is not already fully allocated 
 
-			$trans = get_supp_trans($invoice_no, ST_SUPPINVOICE);
-			$total = $trans['Total'];
+			$trans = get_supp_trans($invoice_id, ST_SUPPCREDIT);
+			$total = -$trans['Total'];
 
 			$allocate_amount = ($invoice_alloc_balance > $total) ? $total : $invoice_alloc_balance;
+
 			/*Now insert the allocation record if > 0 */
 			if ($allocate_amount != 0) 
 			{
-				update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $allocate_amount);
-				update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $allocate_amount);
 				add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no,
 					$date_);
+				update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no);
+				update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id);
 
 				exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_,
 					$allocate_amount, PT_SUPPLIER);
 			}
 		}
 	}
-
 	$supp_trans->trans_no = $invoice_id;
 	hook_db_postwrite($supp_trans, $supp_trans->trans_type);
     commit_transaction();