var $allocs; /*array of transactions allocated to */
- function allocation($type, $trans_no, $person_id = null, $person_type_id=null)
+ function __construct($type, $trans_no, $person_id = null, $person_type_id=null)
{
$this->allocs = array();
$this->amount = $trans["Total"];
}
}
- /* Now populate the array of possible (and previous actual) allocations
+ /* 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 ($this->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 */
+ /* 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 ($this->person_type==PT_SUPPLIER)
$trans_items = get_allocatable_to_supp_transactions($this->person_id,
$trans_items = get_allocatable_to_cust_transactions($this->person_id,
$this->trans_no, $this->type);
+ $amount = $this->amount;
while ($myrow = db_fetch($trans_items))
{
+ $amount -= $myrow["Total"];
$this->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"], $myrow["reference"]);
}
+
+ /* Finally, if there any unallocated money remaining, assign the unallocated portion to
+ the earliest transactions. This makes the javascript All/None keys consistent
+ with the transaction amount. */
+
+ if ($amount > 0) {
+ foreach ($this->allocs as $alloc_item) {
+ $allocatable = $alloc_item->amount - $alloc_item->amount_allocated;
+ if ($allocatable > 0) {
+ if ($amount >= $allocatable) {
+ $alloc_item->current_allocated = $allocatable;
+ $amount -= $allocatable;
+ } else {
+ $alloc_item->current_allocated += $amount;
+ break;
+ }
+ }
+ }
+ }
}
//
// Update allocations in database.
var $current_allocated;
- function allocation_item ($type, $type_no, $date_, $due_date, $amount,
+ function __construct($type, $type_no, $date_, $due_date, $amount,
$amount_allocated, $current_allocated, $ref)
{
global $systypes_array;
- $k = $counter = $total_allocated = 0;
+ $k = $total_allocated = 0;
$cart = $_SESSION['alloc'];
$supp_ref = in_array($cart->type, array(ST_SUPPCREDIT, ST_SUPPAYMENT, ST_BANKPAYMENT));
if (count($cart->allocs))
{
-// if ($cart->currency != $cart->person_curr)
- display_heading(sprintf(_("Allocated amounts in %s:"), $cart->person_curr));
+ display_heading(sprintf(_("Allocated amounts in %s:"), $cart->person_curr));
start_table(TABLESTYLE, "width='60%'");
$th = array(_("Transaction Type"), _("#"), $supp_ref ? _("Supplier Ref"): _("Ref"), _("Date"), _("Due Date"), _("Amount"),
_("Other Allocations"), _("Left to Allocate"), _("This Allocation"),'','');
{
alt_table_row_color($k);
label_cell($systypes_array[$alloc_item->type]);
- label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no));
+ label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no), "nowrap align='right'");
label_cell($alloc_item->ref);
label_cell($alloc_item->date_, "align=right");
label_cell($alloc_item->due_date, "align=right");
$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();
if ($show_totals) {
label_row(_("Total Allocated"), price_format($total_allocated),
"colspan=8 align=right", "align=right id='total_allocated'", 3);
-/*
- $amount = $_SESSION['alloc']->amount;
- if ($_SESSION['alloc']->type == ST_SUPPCREDIT
- || $_SESSION['alloc']->type == ST_SUPPAYMENT
- || $_SESSION['alloc']->type == ST_BANKPAYMENT ||
- ($_SESSION['alloc']->type == ST_JOURNAL && $_SESSION['alloc']->person_type == PT_SUPPLIER))
- $amount = -$amount;
-*/
$amount = abs($cart->amount);
if (floatcmp($amount, $total_allocated) < 0)
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;
+ }
+ }
- $total_allocated += input_num('amount' . $counter);
+ $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
+
+ $total_allocated += input_num('amount' . $counter);
}
-/*
- $amount = $_SESSION['alloc']->amount;
- if (in_array($_SESSION['alloc']->type, array(ST_BANKPAYMENT, ST_SUPPCREDIT, ST_SUPPAYMENT)) ||
- ($_SESSION['alloc']->type==ST_JOURNAL && $_SESSION['alloc']->person_type == PT_SUPPLIER))
- $amount = -$amount;
-*/
$amount = abs($_SESSION['alloc']->amount);
if ($total_allocated - ($amount + input_num('discount')) > $SysPrefs->allocation_settled_allowance())