X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fallocation_cart.inc;h=22bb1e1caef6596b27251254f52b4bd789c2fdf5;hb=159af00183e3732314b508729b06eae88721954c;hp=b45110b35ade07d366eb4a8622f81e7d9b93ee0f;hpb=19ddc3939071044c8e94b628f1d6a039f50cc493;p=fa-stable.git

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index b45110b3..22bb1e1c 100644
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -310,9 +310,9 @@ function show_allocatable($show_totals) {
 	    		$un_allocated = round((abs($alloc_item->amount) - $alloc_item->amount_allocated), 6);
 	    		amount_cell($un_allocated, false,'', 'maxval'.$id);
     			amount_cells(null, "amount" . $id);//, input_num('amount' . $id));
-				label_cell("<a href='#' name=Alloc$id onclick='allocate_all(this.name.substr(5));return true;'>"
+				label_cell("<a href='javascript:void(0)' name=Alloc$id onclick='allocate_all(this.name.substr(5));return true;'>"
 					 . _("All") . "</a>");
-				label_cell("<a href='#' name=DeAll$id onclick='allocate_none(this.name.substr(5));return true;'>"
+				label_cell("<a href='javascript:void(0)' name=DeAll$id onclick='allocate_none(this.name.substr(5));return true;'>"
 					 . _("None") . "</a>".hidden("un_allocated" . $id, 
 					 price_format($un_allocated), false));
 				end_row();
@@ -371,9 +371,29 @@ function check_allocations()
 			return false;
 		 }
 
-		 $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
+		if ($_SESSION['alloc']->person_type == PT_CUSTOMER) {
+			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);
+
+			if ($trans['debtor_no'] != $_SESSION['alloc']->person_id) {
+				display_error(_("Allocated transaction allocated is not related to company selected."));
+				set_focus('amount'.$counter);
+				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 ($trans['supplier_id'] != $_SESSION['alloc']->person_id) {
+				display_error(_("Allocated transaction allocated is not related to company selected."));
+				set_focus('amount'.$counter);
+				return false;
+			}
+		}
+
+		$_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
 
-		 $total_allocated += input_num('amount' . $counter);
+		$total_allocated += input_num('amount' . $counter);
 	}
 
 	$amount = abs($_SESSION['alloc']->amount);