var $type;
var $person_id = '';
var $person_name = '';
+ var $person_type;
var $date_;
var $amount = 0; /*Total amount of the transaction in FX */
$type = $this->type;
$trans_no = $this->trans_no;
}
-
- $sup = $type == ST_SUPPCREDIT || $type == ST_SUPPAYMENT;
+ if ($type == ST_BANKPAYMENT || $type == ST_BANKDEPOSIT) {
+ $bank_trans = db_fetch(get_bank_trans($type, $trans_no));
+ $this->person_type = $bank_trans['person_type_id'] == PT_SUPPLIER;
+ } else
+ $this->person_type = $type == ST_SUPPCREDIT || $type == ST_SUPPAYMENT;
$this->allocs = array();
if ($trans_no) {
- $trans = $sup ? get_supp_trans($trans_no, $type)
+ $trans = $this->person_type ? get_supp_trans($trans_no, $type)
: get_customer_trans($trans_no, $type);
- $this->person_id = $trans[$sup ? 'supplier_id':'debtor_no'];
- $this->person_name = $trans[$sup ? "supplier_name":"DebtorName"];
+ $this->person_id = $trans[$this->person_type ? 'supplier_id':'debtor_no'];
+ $this->person_name = $trans[$this->person_type ? "supplier_name":"DebtorName"];
$this->amount = $trans["Total"];
$this->date_ = sql2date($trans["tran_date"]);
}
else {
- $this->person_id = get_post($sup ? 'supplier_id':'customer_id');
- $this->date_ = get_post($sup ? 'DatePaid':'DateBanked', Today());
+ $this->person_id = get_post($this->person_type ? 'supplier_id':'customer_id');
+ $this->date_ = get_post($this->person_type ? 'DatePaid':'DateBanked', Today());
}
/* 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)
+ if ($this->person_type)
$trans_items = get_allocatable_to_supp_transactions($this->person_id);
else
$trans_items = get_allocatable_to_cust_transactions($this->person_id);
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)
+ if ($this->person_type)
$trans_items = get_allocatable_to_supp_transactions($this->person_id,
$trans_no, $type);
else
//
function write()
{
- $sup = $this->type == ST_SUPPCREDIT || $this->type == ST_SUPPAYMENT;
-
begin_transaction();
- if ($sup)
+ if ($this->person_type)
clear_supp_alloctions($this->type, $this->trans_no, $this->date_);
else
clear_cust_alloctions($this->type, $this->trans_no, $this->date_);
{
if ($alloc_item->current_allocated > 0)
{
- if ($sup) {
+ if ($this->person_type) {
add_supp_allocation($alloc_item->current_allocated,
$this->type, $this->trans_no,
$alloc_item->type, $alloc_item->type_no, $this->date_);
exchange_variation($this->type, $this->trans_no,
$alloc_item->type, $alloc_item->type_no, $this->date_,
$alloc_item->current_allocated,
- $sup ? PT_SUPPLIER
- : PT_CUSTOMER);
+ $this->person_type ? PT_SUPPLIER : PT_CUSTOMER);
//////////////////////////////////////////////////////////////
}
} /*end of the loop through the array of allocations made */
- if ($sup)
+ if ($this->person_type)
update_supp_trans_allocation($this->type, $this->trans_no,
$total_allocated);
else
amount_cells(null, "amount" . $counter, price_format('amount' . $counter));
$un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6);
- amount_cell($un_allocated);
+ amount_cell($un_allocated, false,'', 'maxval'.$counter);
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;'>"
"colspan=6 align=right", "align=right id='total_allocated'", 3);
$amount = $_SESSION['alloc']->amount;
- if ($_SESSION['alloc']->type == 21 || $_SESSION['alloc']->type == 22)
+ if ($_SESSION['alloc']->type == ST_SUPPCREDIT
+ || $_SESSION['alloc']->type == ST_SUPPAYMENT
+ || $_SESSION['alloc']->type == ST_BANKPAYMENT)
$amount = -$amount;
if ($amount - $total_allocated < 0)
/*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))
+ if (input_num('amount' . $counter) > input_num('un_allocated' . $counter))
{
- //$_POST['amount' . $counter] = $_POST['un_allocated' . $counter];
+ display_error(_("At least one transaction is overallocated."));
+ set_focus('amount'.$counter);
+ return false;
}
$_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
}
$amount = $_SESSION['alloc']->amount;
- if ($_SESSION['alloc']->type == 21 || $_SESSION['alloc']->type == 22)
+
+
+ if (in_array($_SESSION['alloc']->type, array(ST_BANKPAYMENT, ST_SUPPCREDIT, ST_SUPPAYMENT)))
$amount = -$amount;
if ($total_allocated - ($amount + input_num('discount')) > $SysPrefs->allocation_settled_allowance())