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();
}
function add_item($type, $type_no, $date_, $due_date, $amount, $amount_allocated,
- $current_allocated, $ref)
+ $current_allocated, $ref, $early_discount=0, $early_days=0, $discount=0)
{
if (floatcmp($amount, 0))
{
$this->allocs[count($this->allocs)] = new allocation_item($type, $type_no,
- $date_, $due_date, $amount, $amount_allocated, $current_allocated, $ref);
- return true;
+ $date_, $due_date, $amount, $amount_allocated, $current_allocated, $ref, $early_discount, $early_days, $discount);
+ return $this->allocs[count($this->allocs)-1];
}
else
{
}
function update_item($index, $type, $type_no, $date_, $due_date,
- $amount, $amount_allocated, $current_allocated, $ref)
+ $amount, $amount_allocated, $current_allocated, $ref, $early_discount=0, $early_days=0, $discount=0)
{
if (floatcmp($amount, 0))
{
$this->allocs[$index] = new allocation_item($type, $type_no,
- $date_, $due_date, $amount, $amount_allocated, $current_allocated, $ref);
- return true;
+ $date_, $due_date, $amount, $amount_allocated, $current_allocated, $ref, $early_discount, $early_days, $discount);
+ return $this->allocs[$index];
}
else
{
}
function add_or_update_item($type, $type_no, $date_, $due_date,
- $amount, $amount_allocated, $current_allocated, $ref)
+ $amount, $amount_allocated, $current_allocated, $ref, $early_discount=0, $early_days=0, $discount=0)
{
for ($i = 0; $i < count($this->allocs); $i++)
{
if (($item->type == $type) && ($item->type_no == $type_no))
{
return $this->update_item($i, $type, $type_no, $date_, $due_date,
- $amount, $amount_allocated, $current_allocated, $ref);
+ $amount, $amount_allocated, $current_allocated, $ref, $early_discount, $early_days, $discount);
}
}
return $this->add_item($type, $type_no, $date_, $due_date,
- $amount, $amount_allocated, $current_allocated, $ref);
+ $amount, $amount_allocated, $current_allocated, $ref, $early_discount, $early_days, $discount);
}
//
$this->amount = $trans["Total"];
}
}
- /* 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 */
+ /* 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 */
$this->allocs = array();
if ($this->person_id)
{
if ($this->person_type==PT_SUPPLIER)
- $trans_items = get_allocatable_to_supp_transactions($this->person_id);
+ $trans_items = get_allocatable_to_supp_transactions($this->person_id, $this->trans_no, $this->type);
else
- $trans_items = get_allocatable_to_cust_transactions($this->person_id);
+ $trans_items = get_allocatable_to_cust_transactions($this->person_id, $this->trans_no, $this->type);
+
while ($myrow = db_fetch($trans_items))
{
- $this->add_item($myrow["type"], $myrow["trans_no"],
+ $this->add_or_update_item ($myrow["type"], $myrow["trans_no"],
sql2date($myrow["tran_date"]),
sql2date($myrow["due_date"]),
- $myrow["Total"], // trans total
- $myrow["alloc"], // trans total allocated
- 0,
- $myrow["reference"]); // this allocation
+ $myrow["Total"], $myrow["alloc"]-$myrow["amt"], $myrow["amt"],
+ $myrow["reference"],
+ $myrow["early_discount"], $myrow["early_days"], $myrow["discount"]);
}
}
- 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 */
-
- if ($this->person_type==PT_SUPPLIER)
- $trans_items = get_allocatable_to_supp_transactions($this->person_id,
- $this->trans_no, $this->type);
- else
- $trans_items = get_allocatable_to_cust_transactions($this->person_id,
- $this->trans_no, $this->type);
-
- while ($myrow = db_fetch($trans_items))
- {
- $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"]);
- }
}
//
// Update allocations in database.
if ($this->person_type == PT_SUPPLIER) {
add_supp_allocation($amount,
$this->type, $this->trans_no,
- $alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_);
+ $alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_, round2($alloc_item->early_discount*abs($alloc_item->amount), user_price_dec()));
update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no, $this->person_id);
} else {
add_cust_allocation($amount,
$this->type, $this->trans_no,
- $alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_);
+ $alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_, round2($alloc_item->early_discount*abs($alloc_item->amount), user_price_dec()));
update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no, $this->person_id);
}
+
// Exchange Variations Joe Hunt 2008-09-20 ////////////////////
if ($alloc_item->type != ST_SALESORDER && !@$no_exchange_variations
&& $alloc_item->type != ST_PURCHORDER && $alloc_item->type != ST_JOURNAL && $this->type != ST_JOURNAL)
var $ref;
var $current_allocated;
+ var $early_discount; // nominal early payment discount according to payment terms
+ var $early_days; // days for early payment
+ var $discount_confirmed = false;
- function allocation_item ($type, $type_no, $date_, $due_date, $amount,
- $amount_allocated, $current_allocated, $ref)
+ function __construct($type, $type_no, $date_, $due_date, $amount,
+ $amount_allocated, $current_allocated, $ref, $early_discount=0, $early_days=0)
{
$this->type = $type;
$this->amount = $amount;
$this->amount_allocated = $amount_allocated;
$this->current_allocated = $current_allocated;
+ $this->early_discount = $early_discount;
+ $this->early_days = $early_days;
+ }
+
+ function confirm_discount($confirmed)
+ {
+ $this->discount_confirmed = $confirmed;
}
}
//--------------------------------------------------------------------------------
-function show_allocatable($show_totals) {
+function show_allocatable($reallocation) {
global $systypes_array;
- $k = $counter = $total_allocated = 0;
+ $k = $total_allocated = $total_discount = 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"),'','');
+ _("Other Allocations"), _("Left to Allocate"), _("Early Payment Discount"), _("This Allocation"),'','');
table_header($th);
-
+ $doc_ids = array();
foreach ($cart->allocs as $id => $alloc_item)
{
- if (floatcmp(abs($alloc_item->amount), $alloc_item->amount_allocated))
- {
+ $doc_ids[] = $id;
+ $early_discount = $alloc_item->early_discount != 0 && !date1_greater_date2($cart->date_, add_days($alloc_item->date_, $alloc_item->early_days));
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");
amount_cell($alloc_item->amount_allocated);
$_POST['amount' . $id] = price_format($alloc_item->current_allocated);
-
+
$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));
+
+ amount_cell($un_allocated-$alloc_item->current_allocated, false,'', 'left'.$id);
+
+ if ($early_discount) {
+ $discount = round2($alloc_item->early_discount*abs($alloc_item->amount),user_price_dec());
+ check_cells(null, 'early_disc'.$id, price_format($discount), false, false, 'align=center');
+ $total_discount += $discount;
+ } else {
+ label_cell(_("N/A"), 'align=center', 'early_disc'.$id); hidden('early_disc'.$id, 0);
+ }
+ amount_cells(null, "amount" . $id);
+
label_cell("<a href='#' 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;'>"
- . _("None") . "</a>".hidden("un_allocated" . $id,
- price_format($un_allocated), false));
+ . _("None") . "</a>".hidden("un_allocated".$id, price_format($un_allocated), false));
end_row();
$total_allocated += input_num('amount' . $id);
- }
}
- if ($show_totals) {
+ add_js_source('var docs=['.implode(',', $doc_ids).']');
+ if ($reallocation) {
label_row(_("Total Allocated"), price_format($total_allocated),
- "colspan=8 align=right", "align=right id='total_allocated'", 3);
-/*
- $amount = $_SESSION['alloc']->amount;
+ "colspan=9 align=right", "align=right id='total_allocated'", 3);
+
+ label_row(_("Total Discount"), price_format($total_discount),
+ "colspan=9 align=right", "align=right id='total_discount'", 3);
- 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)
$font1 = $font2 = "";
$left_to_allocate = price_format($amount - $total_allocated);
label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2,
- "colspan=8 align=right", "nowrap align=right id='left_to_allocate'",
+ "colspan=9 align=right", "nowrap align=right id='left_to_allocate'",
3);
}
end_table(1);
{
global $SysPrefs;
- $total_allocated = 0;
+ $total_allocated = $discount=0;
for ($counter = 0; $counter < get_post("TotalNumberOfAllocs"); $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;
-*/
+ $_SESSION['alloc']->allocs[$counter]->discount_confirmed = check_value('early_disc'.$counter) != 0;
+ $discount += check_value('early_disc'.$counter)
+ ? round2($_SESSION['alloc']->allocs[$counter]->early_discount*input_num('amount' . $counter), user_price_dec()) : 0;
+ }
$amount = abs($_SESSION['alloc']->amount);
- if ($total_allocated - ($amount + input_num('discount')) > $SysPrefs->allocation_settled_allowance())
+ if ($total_allocated - ($amount + $discount) > $SysPrefs->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 $allocs;
}
+
projects / fa-stable.git / blobdiff