Common ui code for allocations moved toallocation_cart.inc
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Fri, 10 Jul 2009 11:02:44 +0000 (11:02 +0000)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Fri, 10 Jul 2009 11:02:44 +0000 (11:02 +0000)
includes/ui/allocation_cart.inc
purchasing/allocations/supplier_allocate.php
sales/allocations/customer_allocate.php

index 039e3bfb350632b704f7919bc819663cfec4b5cd..864d117f12e32e7c2d27e51d2f071aa99a44d774 100644 (file)
@@ -117,6 +117,222 @@ class allocation_item
        }
 }
 
+//--------------------------------------------------------------------------------
+function get_allocations_for_transaction($type, $trans_no)
+{
+       $sup = $type == 21 || $type == 22;
+
+       if ($trans_no) {
+               $trans = $sup ? get_supp_trans($trans_no, $type) 
+                       : get_customer_trans($trans_no, $type);
+
+               $_SESSION['alloc'] = new allocation($trans_no, $type,
+                       $trans[$sup ? 'supplier_id':'debtor_no'], 
+                       $trans[$sup ? "supplier_name":"DebtorName"],
+                       $trans["Total"], sql2date($trans["tran_date"]));
+       } else {
+               $_SESSION['alloc'] = new allocation($trans_no, $type,
+                       $_POST[$sup ? 'supplier_id':'customer_id'], '', 0, 
+                       $_POST[$sup ? 'DatePaid':'DateBanked'] );
+       }
+
+       /* Now populate the array of possible (and previous actual) allocations for this customer/supplier */
+       /*First get the transactions that have outstanding balances ie Total-alloc >0 */
+
+       if ($sup)
+               $trans_items = get_allocatable_to_supp_transactions($_SESSION['alloc']->person_id);
+       else
+               $trans_items = get_allocatable_to_cust_transactions($_SESSION['alloc']->person_id);
+
+       while ($myrow = db_fetch($trans_items))
+       {
+               $_SESSION['alloc']->add_item($myrow["type"], $myrow["trans_no"],
+                       sql2date($myrow["tran_date"]),
+                       sql2date($myrow["due_date"]),
+                       $myrow["Total"], // trans total
+                       $myrow["alloc"], // trans total allocated
+                       0); // this allocation
+       }
+
+       if ($trans_no == 0) return; // this is new payment
+
+       /* Now get trans that might have previously been allocated to by this trans
+       NB existing entries where still some of the trans outstanding entered from
+       above logic will be overwritten with the prev alloc detail below */
+
+       if ($sup)
+               $trans_items = get_allocatable_to_supp_transactions($_SESSION['alloc']->person_id, $trans_no, $type);
+       else
+               $trans_items = get_allocatable_to_cust_transactions($_SESSION['alloc']->person_id, $trans_no, $type);
+       
+       while ($myrow = db_fetch($trans_items))
+       {
+               $_SESSION['alloc']->add_or_update_item ($myrow["type"], $myrow["trans_no"],
+                       sql2date($myrow["tran_date"]),
+                       sql2date($myrow["due_date"]),
+                       $myrow["Total"],
+                       $myrow["alloc"] - $myrow["amt"], $myrow["amt"]);
+       }
+}
+
+//---------------------------------------------------------------------------------------------------
+
+function show_allocatable($show_totals) {
+
+       global $table_style;
+       
+    $k = $counter = $total_allocated = 0;
+
+       if (count($_SESSION['alloc']->allocs)) 
+       {
+               start_table($table_style);
+               $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
+                       _("Other Allocations"), _("This Allocation"), _("Left to Allocate"),'','');
+               table_header($th);
+
+               foreach ($_SESSION['alloc']->allocs as $alloc_item)
+           {
+                       alt_table_row_color($k);
+               label_cell(systypes::name($alloc_item->type));
+                       label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no));
+               label_cell($alloc_item->date_, "align=right");
+               label_cell($alloc_item->due_date, "align=right");
+               amount_cell($alloc_item->amount);
+                       amount_cell($alloc_item->amount_allocated);
+
+               $_POST['amount' . $counter] = price_format($alloc_item->current_allocated);
+               amount_cells(null, "amount" . $counter, price_format('amount' . $counter));
+
+               $un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6);
+               amount_cell($un_allocated);
+                       label_cell("<a href='#' name=Alloc$counter onclick='allocate_all(this.name.substr(5));return true;'>"
+                                . _("All") . "</a>");
+                       label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>"
+                                . _("None") . "</a>".hidden("un_allocated" . $counter, 
+                                price_format($un_allocated), false));
+                       end_row();
+
+               $total_allocated += input_num('amount' . $counter);
+                   $counter++;
+               }
+               if ($show_totals) {
+               label_row(_("Total Allocated"), price_format($total_allocated),
+                       "colspan=6 align=right", "align=right id='total_allocated'", 3);
+                       $amount = $_SESSION['alloc']->amount;
+
+                       if ($_SESSION['alloc']->type == 21 || $_SESSION['alloc']->type == 22) 
+                               $amount = -$amount;
+                       
+                       if ($amount - $total_allocated < 0)
+               {
+                       $font1 = "<font color=red>";
+                       $font2 = "</font>";
+           }
+               else
+                       $font1 = $font2 = "";
+                       $left_to_allocate = price_format($amount - $total_allocated);
+               label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, 
+                               "colspan=6 align=right", "nowrap align=right id='left_to_allocate'",
+                                3);
+               }
+               end_table(1);
+       }
+       hidden('TotalNumberOfAllocs', $counter);
+}
+//--------------------------------------------------------------------------------
+
+function check_allocations()
+{
+       $total_allocated = 0;
+
+       for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
+       {
+               if (!check_num('amount' . $counter, 0))
+               {
+                       display_error(_("The entry for one or more amounts is invalid or negative."));
+                       set_focus('amount'.$counter);
+                       return false;
+                }
+
+                 /*Now check to see that the AllocAmt is no greater than the
+                amount left to be allocated against the transaction under review */
+                if (input_num('amount' . $counter) > get_post('un_allocated' . $counter))
+                {
+                    //$_POST['amount' . $counter] = $_POST['un_allocated' . $counter];
+                }
+
+                $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
+
+                $total_allocated += input_num('amount' . $counter);
+       }
+
+       $amount = $_SESSION['alloc']->amount;
+       if ($_SESSION['alloc']->type == 21 || $_SESSION['alloc']->type == 22) 
+               $amount = -$amount;
+
+       if ($total_allocated - $amount  > sys_prefs::allocation_settled_allowance())
+       {
+               display_error(_("These allocations cannot be processed because the amount allocated is more than the total amount left to allocate."));
+               return false;
+       }
+
+       return true;
+}
 //-----------------------------------------------------------------------------------
 
+function handle_allocate()
+{
+       $sup = $_SESSION['alloc']->type == 21 || $_SESSION['alloc']->type == 22;
+
+       begin_transaction();
+
+       if ($sup)
+               clear_supp_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, $_SESSION['alloc']->date_);
+       else
+               clear_cust_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, $_SESSION['alloc']->date_);
+
+       // now add the new allocations
+       $total_allocated = 0;
+       foreach ($_SESSION['alloc']->allocs as $alloc_item)
+       {
+               if ($alloc_item->current_allocated > 0)
+               {
+                       if ($sup) {
+                               add_supp_allocation($alloc_item->current_allocated,
+                                       $_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
+                               $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_);
+
+                               update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no,
+                                       $alloc_item->current_allocated);
+                       } else {
+                               add_cust_allocation($alloc_item->current_allocated,
+                                       $_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
+                               $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_);
+                       
+                               update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no,
+                                       $alloc_item->current_allocated);
+                       }
+                       // Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
+
+                       exchange_variation($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
+                               $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_,
+                               $alloc_item->current_allocated,
+                               $sup ? payment_person_types::supplier() :payment_person_types::customer());
+                               
+
+                       ///////////////////////////////////////////////////////////////////////////
+                       $total_allocated += $alloc_item->current_allocated;
+               }
+
+       }  /*end of the loop through the array of allocations made */
+       if ($sup)
+               update_supp_trans_allocation($_SESSION['alloc']->type,
+                       $_SESSION['alloc']->trans_no, $total_allocated);
+       else
+               update_debtor_trans_allocation($_SESSION['alloc']->type,
+                       $_SESSION['alloc']->trans_no, $total_allocated);
+       
+       commit_transaction();
+
+}
 ?>
index d6a4da7c487b3e3a58d1a03a33eacb4b640f5343..6b9b94b64868aee736006133c37be459b8387284 100644 (file)
@@ -18,6 +18,7 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
+//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc");
 
 $js = "";
 if ($use_popup_windows)
@@ -40,151 +41,8 @@ function clear_allocations()
 }
 //--------------------------------------------------------------------------------
 
-function check_data()
-{
-       $total_allocated = 0;
-
-       for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
-       {
-               if (!check_num('amount' . $counter, 0))
-               {
-                       display_error(_("The entry for one or more amounts is invalid or negative."));
-                       set_focus('amount'.$counter);
-                       return false;
-                }
-
-                 /*Now check to see that the AllocAmt is no greater than the
-                amount left to be allocated against the transaction under review */
-                if (input_num('amount' . $counter) > $_POST['un_allocated' . $counter])
-                {
-                    //$_POST['amount' . $counter] = $_POST['un_allocated' . $counter];
-                }
-
-                $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
-
-                $total_allocated += input_num('amount' . $counter);
-       }
-
-       if ($total_allocated + $_SESSION['alloc']->amount > sys_prefs::allocation_settled_allowance())
-       {
-               display_error(_("These allocations cannot be processed because the amount allocated is more than the total amount left to allocate."));
-          //echo  _("Total allocated:") . " " . $total_allocated ;
-          //echo "  " . _("Total amount that can be allocated:") . " " . -$_SESSION['alloc']->TransAmt . "<BR>";
-               return false;
-       }
-
-       return true;
-}
-
-//-----------------------------------------------------------------------------------
-
-function handle_process()
-{
-       begin_transaction();
-
-       // clear all the allocations for this payment/credit
-       clear_supp_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, $_SESSION['alloc']->date_);
-
-       // now add the new allocations
-       $total_allocated = 0;
-       foreach ($_SESSION['alloc']->allocs as $alloc_item)
-       {
-               if ($alloc_item->current_allocated > 0)
-               {
-                       add_supp_allocation($alloc_item->current_allocated,
-                               $_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
-                       $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_);
-
-                       update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no,
-                               $alloc_item->current_allocated);
-
-                       // Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
-
-                       exchange_variation($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
-                               $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_,
-                               $alloc_item->current_allocated, payment_person_types::supplier());
-
-                       ///////////////////////////////////////////////////////////////////////////
-                       $total_allocated += $alloc_item->current_allocated;
-               }
-
-       }  /*end of the loop through the array of allocations made */
-       update_supp_trans_allocation($_SESSION['alloc']->type,
-               $_SESSION['alloc']->trans_no, $total_allocated);
-
-       commit_transaction();
-
-       clear_allocations();
-}
-
-//--------------------------------------------------------------------------------
-
-if (isset($_POST['Process']))
-{
-       if (check_data())
-       {
-               handle_process();
-               $_POST['Cancel'] = 1;
-       }
-}
-
-//--------------------------------------------------------------------------------
-
-if (isset($_POST['Cancel']))
-{
-       clear_allocations();
-       meta_forward($path_to_root . "/purchasing/allocations/supplier_allocation_main.php");
-}
-//--------------------------------------------------------------------------------
-
-function get_allocations_for_transaction($type, $trans_no)
-{
-       clear_allocations();
-
-       $supptrans = get_supp_trans($trans_no, $type);
-
-       $_SESSION['alloc'] = new allocation($trans_no, $type,
-               $supptrans["supplier_id"], $supptrans["supplier_name"],
-               $supptrans["Total"], sql2date($supptrans["tran_date"]));
-
-       /* Now populate the array of possible (and previous actual) allocations for this supplier */
-       /*First get the transactions that have outstanding balances ie Total-alloc >0 */
-
-       $trans_items = get_allocatable_to_supp_transactions($_SESSION['alloc']->person_id);
-
-       while ($myrow = db_fetch($trans_items))
-       {
-               $_SESSION['alloc']->add_item($myrow["type"], $myrow["trans_no"],
-                       sql2date($myrow["tran_date"]),
-                       sql2date($myrow["due_date"]),
-                       $myrow["Total"], // trans total
-                       $myrow["alloc"], // trans total allocated
-                       0); // this allocation
-       }
-
-
-       /* Now get trans that might have previously been allocated to by this trans
-       NB existing entries where still some of the trans outstanding entered from
-       above logic will be overwritten with the prev alloc detail below */
-
-       $trans_items = get_allocatable_to_supp_transactions($_SESSION['alloc']->person_id, $trans_no, $type);
-
-       while ($myrow = db_fetch($trans_items))
-       {
-               $_SESSION['alloc']->add_or_update_item ($myrow["type"], $myrow["trans_no"],
-                       sql2date($myrow["tran_date"]),
-                       sql2date($myrow["due_date"]),
-                       $myrow["Total"],
-                       $myrow["alloc"] - $myrow["amt"], $myrow["amt"]);
-       }
-}
-
-//--------------------------------------------------------------------------------
-
 function edit_allocations_for_transaction($type, $trans_no)
 {
-       global $table_style;
-
        start_form();
 
     display_heading(_("Allocation of") . " " . systypes::name($_SESSION['alloc']->type) . " # " . $_SESSION['alloc']->trans_no);
@@ -199,54 +57,7 @@ function edit_allocations_for_transaction($type, $trans_no)
        div_start('alloc_tbl');
     if (count($_SESSION['alloc']->allocs) > 0)
     {
-               start_table($table_style);
-               $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
-                       _("Other Allocations"), _("This Allocation"), _("Left to Allocate"),'','');
-               table_header($th);
-
-        $k = $counter = $total_allocated = 0;
-
-        foreach ($_SESSION['alloc']->allocs as $alloc_item)
-        {
-               alt_table_row_color($k);
-
-           label_cell(systypes::name($alloc_item->type));
-               label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no));
-               label_cell($alloc_item->date_, "align=right");
-               label_cell($alloc_item->due_date, "align=right");
-               amount_cell($alloc_item->amount);
-               amount_cell($alloc_item->amount_allocated);
-
-               $_POST['amount' . $counter] = price_format($alloc_item->current_allocated);
-           amount_cells(null, "amount" . $counter, price_format('amount' . $counter));
-
-               $un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6);
-               amount_cell($un_allocated);
-                       label_cell("<a href='#' name=Alloc$counter onclick='allocate_all(this.name.substr(5));return true;'>"
-                                        . _("All") . "</a>");
-                       label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>"
-                                        . _("None") . "</a>".hidden("un_allocated" . $counter, $un_allocated, false));
-                       end_row();
-
-           $total_allocated += input_num('amount' . $counter);
-           $counter++;
-               }
-
-        label_row(_("Total Allocated"), number_format2($total_allocated,user_price_dec()),
-               "colspan=6 align=right", "align=right id='total_allocated'", 3);
-        if (-$_SESSION['alloc']->amount - $total_allocated < 0)
-        {
-               $font1 = "<font color=red>";
-               $font2 = "</font>";
-        }
-        else
-               $font1 = $font2 = "";
-               $left_to_allocate = price_format(-$_SESSION['alloc']->amount - $total_allocated);
-        label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, "colspan=6 align=right",
-               "nowrap align=right id='left_to_allocate'", 3);
-               end_table();
-
-               hidden('TotalNumberOfAllocs', $counter);
+               show_allocatable(true);
 
        submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true);
                submit('Process', _("Process"), true, _('Process allocations'), 'default');
@@ -263,11 +74,31 @@ function edit_allocations_for_transaction($type, $trans_no)
        div_end();
        end_form();
 }
+//--------------------------------------------------------------------------------
+
+if (isset($_POST['Process']))
+{
+       if (check_allocations())
+       {
+               handle_allocate();
+               clear_allocations();
+               $_POST['Cancel'] = 1;
+       }
+}
+
+//--------------------------------------------------------------------------------
+
+if (isset($_POST['Cancel']))
+{
+       clear_allocations();
+       meta_forward($path_to_root . "/purchasing/allocations/supplier_allocation_main.php");
+}
 
 //--------------------------------------------------------------------------------
 
 if (isset($_GET['trans_no']) && isset($_GET['trans_type']))
 {
+       clear_allocations();
        get_allocations_for_transaction($_GET['trans_type'], $_GET['trans_no']);
 }
 if(get_post('UpdateDisplay'))
index f32db9616270d6c6dc9545ed5035ae3ba251458d..6132c4f58eebb452d7182170c3bd7c07e9aa3091 100644 (file)
@@ -17,6 +17,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
+//include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc");
 
 $js = "";
 if ($use_popup_windows)
@@ -38,100 +39,15 @@ function clear_allocations()
        session_register('alloc');
 }
 
-//--------------------------------------------------------------------------------
-
-function check_data()
-{
-       $total_allocated = 0;
-
-       for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
-       {
-
-               if (!check_num('amount' . $counter, 0))
-               {
-                       display_error(_("The entry for one or more amounts is invalid or negative."));
-                       set_focus('amount'.$counter);
-                       return false;
-               }
-
-               if (!check_num('amount' . $counter,0))
-               {
-                       display_error(_("The entry for an amount to allocate was negative. A positive allocation amount is expected."));
-               set_focus('amount'.$counter);
-                       return false;
-               }
-
-                 /*Now check to see that the AllocAmt is no greater than the
-               amount left to be allocated against the transaction under review */
-               if (input_num('amount' . $counter) > input_num('un_allocated' . $counter))
-               {
-                   //$_POST['amount' . $counter] = $_POST['un_allocated' . $counter];
-               }
-
-               $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
-
-               $total_allocated += input_num('amount' . $counter);
-       }
-
-       if ($total_allocated - $_SESSION['alloc']->amount > sys_prefs::allocation_settled_allowance())
-       {
-               display_error(_("These allocations cannot be processed because the amount allocated is more than the total amount left to allocate."));
-               //echo  _("Total allocated:") . " " . $total_allocated ;
-               //echo "  " . _("Total amount that can be allocated:") . " " . -$_SESSION['alloc']->TransAmt . "<BR>";
-               return false;
-       }
-
-       return true;
-}
-
-//-----------------------------------------------------------------------------------
-
-function handle_process()
-{
-       begin_transaction();
-
-       // clear all the allocations for this payment/credit
-       clear_cust_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, $_SESSION['alloc']->date_);
-
-       // now add the new allocations
-       $total_allocated = 0;
-       foreach ($_SESSION['alloc']->allocs as $allocn_item)
-       {
-               if ($allocn_item->current_allocated > 0)
-               {
-                       add_cust_allocation($allocn_item->current_allocated,
-                               $_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
-                       $allocn_item->type, $allocn_item->type_no, $_SESSION['alloc']->date_);
-
-                       update_debtor_trans_allocation($allocn_item->type, $allocn_item->type_no,
-                               $allocn_item->current_allocated);
 
-                       // Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
-
-                       exchange_variation($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no,
-                               $allocn_item->type, $allocn_item->type_no, $_SESSION['alloc']->date_,
-                               $allocn_item->current_allocated, payment_person_types::customer());
-
-                       ///////////////////////////////////////////////////////////////////////////
-                       $total_allocated += $allocn_item->current_allocated;
-               }
-
-       }  /*end of the loop through the array of allocations made */
-
-       update_debtor_trans_allocation($_SESSION['alloc']->type,
-               $_SESSION['alloc']->trans_no, $total_allocated);
-
-       commit_transaction();
-
-       clear_allocations();
-}
 //--------------------------------------------------------------------------------
 
 if (isset($_POST['Process']))
 {
-       if (check_data())
+       if (check_allocations())
        {
-               handle_process();
+               handle_allocate();
+               clear_allocations();
                $_POST['Cancel'] = 1;
        }
 }
@@ -144,47 +60,8 @@ if (isset($_POST['Cancel']))
 }
 //--------------------------------------------------------------------------------
 
-function get_allocations_for_transaction($type, $trans_no)
-{
-       clear_allocations();
-
-       $debtor = get_customer_trans($trans_no, $type);
-
-       $_SESSION['alloc'] = new allocation($trans_no, $type, $debtor["debtor_no"],
-               $debtor["DebtorName"], $debtor["Total"], sql2date($debtor["tran_date"]));
-
-       /* Now populate the array of possible (and previous actual) allocations for this customer */
-       /*First get the transactions that have outstanding balances ie Total-alloc >0 */
-
-       $trans_items = get_allocatable_to_cust_transactions($_SESSION['alloc']->person_id);
-
-       while ($myrow = db_fetch($trans_items))
-       {
-               $_SESSION['alloc']->add_item($myrow["type"], $myrow["trans_no"],
-                       sql2date($myrow["tran_date"]), sql2date($myrow["due_date"]),
-                       $myrow["Total"], // trans total
-                       $myrow["alloc"], // trans total allocated
-                       0); // this allocation
-       }
-
-       /* Now get trans that might have previously been allocated to by this trans
-       NB existing entries where still some of the trans outstanding entered from
-       above logic will be overwritten with the prev alloc detail below */
-
-       $trans_items = get_allocatable_to_cust_transactions($_SESSION['alloc']->person_id, $trans_no, $type);
-
-       while ($myrow = db_fetch($trans_items))
-       {
-               $_SESSION['alloc']->add_or_update_item ($myrow["type"], $myrow["trans_no"],
-                       sql2date($myrow["tran_date"]), sql2date($myrow["due_date"]),
-                       $myrow["Total"], $myrow["alloc"] - $myrow["amt"], $myrow["amt"]);
-       }
-}
-//--------------------------------------------------------------------------------
-
 function edit_allocations_for_transaction($type, $trans_no)
 {
-       global $table_style;
 
     display_heading(sprintf(_("Allocation of %s # %d"), systypes::name($_SESSION['alloc']->type),$_SESSION['alloc']->trans_no));
 
@@ -199,58 +76,7 @@ function edit_allocations_for_transaction($type, $trans_no)
        div_start('alloc_tbl');
     if (count($_SESSION['alloc']->allocs) > 0)
     {
-               start_table($table_style);
-
-               $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
-                       _("Other Allocations"), _("This Allocation"), _("Left to Allocate"), "", "");
-
-               table_header($th);
-
-        $k = $counter = $total_allocated = 0;
-
-        foreach ($_SESSION['alloc']->allocs as $allocn_item)
-        {
-                       alt_table_row_color($k);
-
-           label_cell(systypes::name($allocn_item->type));
-               label_cell(get_trans_view_str($allocn_item->type, $allocn_item->type_no));
-               label_cell($allocn_item->date_, "align=right");
-               label_cell($allocn_item->due_date, "align=right");
-               amount_cell($allocn_item->amount);
-                       amount_cell($allocn_item->amount_allocated);
-
-           $_POST['amount' . $counter] = price_format($allocn_item->current_allocated);
-           amount_cells(null, 'amount' . $counter, price_format('amount' . $counter));
-
-               $un_allocated = round($allocn_item->amount - $allocn_item->amount_allocated, 6);
-               amount_cell($un_allocated);
-
-                       label_cell("<a href='#' name='Alloc$counter' onclick='allocate_all(this.name.substr(5));return true;'>"
-                                        . _("All") . "</a>");
-                       label_cell("<a href='#' name='DeAll$counter' onclick='allocate_none(this.name.substr(5));return true;'>"
-                                        . _("None") . "</a>".hidden("un_allocated" . $counter, price_format($un_allocated), false));
-                       end_row();
-
-           $total_allocated += input_num('amount' . $counter);
-           $counter++;
-               }
-
-               label_row(_("Total Allocated"), price_format($total_allocated),
-                       "colspan=6 align=right", "nowrap align=right id='total_allocated'", 3);
-        if ($_SESSION['alloc']->amount - $total_allocated < 0)
-        {
-               $font1 = "<font color=red>";
-               $font2 = "</font>";
-        }
-        else
-               $font1 = $font2 = "";
-               $left_to_allocate = $_SESSION['alloc']->amount - $total_allocated;
-               $left_to_allocate = price_format($left_to_allocate);
-        label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2,
-               "colspan=6 align=right ", "nowrap align=right id='left_to_allocate'", 3);
-        end_table(1);
-
-               hidden('TotalNumberOfAllocs', $counter);
+               show_allocatable(true);
                submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true);
                submit('Process', _("Process"), true, _('Process allocations'), 'default');
                submit_center_last('Cancel', _("Back to Allocations"),_('Abandon allocations and return to selection of allocatable amounts'), 'cancel');
@@ -270,6 +96,7 @@ function edit_allocations_for_transaction($type, $trans_no)
 
 if (isset($_GET['trans_no']) && isset($_GET['trans_type']))
 {
+       clear_allocations();
        get_allocations_for_transaction($_GET['trans_type'], $_GET['trans_no']);
 }
 if(get_post('UpdateDisplay'))