X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fallocation_cart.inc;h=fe232f069af586b4255127c7b23ca3432779ff31;hb=bca406d61d1f94c5dcefdbad041b3e0bf77a2919;hp=968bae42a7131e848976f011359ea7d9883527cc;hpb=75564761d1429129282bd04ab00575c5e80fe4c2;p=fa-stable.git

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index 968bae42..fe232f06 100644
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -15,7 +15,7 @@
 */
 //-----------------------------------------------------------------------------------
 
-class allocation 
+class allocation
 {
 
 	var $trans_no; 
@@ -26,6 +26,7 @@ class allocation
 	var $person_curr;
 	var $date_;
 	var $amount = 0; /*Total amount of the transaction in FX */
+	var $bank_amount = 0;
 	var $currency;
 
 	var $allocs; /*array of transactions allocated to */
@@ -396,7 +397,7 @@ function check_allocations()
 			if ($_SESSION['alloc']->allocs[$counter]->type == ST_SALESORDER)
 				$trans = get_sales_order_header($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type);
 			else
-				$trans = get_customer_trans($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type);
+				$trans = get_customer_trans($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type,$_SESSION['alloc']->person_id);
 
 			if ($trans['debtor_no'] != $_SESSION['alloc']->person_id) {
 				display_error(_("Allocated transaction allocated is not related to company selected."));
@@ -404,7 +405,10 @@ function check_allocations()
 				return false;
 			}
 		} elseif ($_SESSION['alloc']->person_type == PT_SUPPLIER) {
-			$trans = get_supp_trans($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type);
+			if ($_SESSION['alloc']->allocs[$counter]->type == ST_PURCHORDER)
+                $trans = get_po($_SESSION['alloc']->allocs[$counter]->type_no);
+            else
+                $trans = get_supp_trans($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type,  $_SESSION['alloc']->person_id);			
 			if ($trans['supplier_id'] != $_SESSION['alloc']->person_id) {
 				display_error(_("Allocated transaction allocated is not related to company selected."));
 				set_focus('amount'.$counter);