X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fallocation_cart.inc;h=fe232f069af586b4255127c7b23ca3432779ff31;hb=00f413f12b0635864222dbcce4f82d98351b08cf;hp=37c436a0ac3a96b2daa447f0f64985c4d7b014d9;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git
diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index 37c436a0..fe232f06 100644
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -15,7 +15,7 @@
*/
//-----------------------------------------------------------------------------------
-class allocation
+class allocation
{
var $trans_no;
@@ -26,11 +26,12 @@ class allocation
var $person_curr;
var $date_;
var $amount = 0; /*Total amount of the transaction in FX */
+ var $bank_amount = 0;
var $currency;
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();
@@ -130,11 +131,11 @@ class allocation
$this->date_ = sql2date($trans["tran_date"]);
$this->person_curr = $trans['curr_code'];
$this->currency = isset($trans['bank_curr_code']) ? $trans['bank_curr_code'] : $trans['curr_code'];
- $this->bank_amount = @$trans["bank_amount"];
+ $this->bank_amount = isset($trans["bank_amount"]) ? $trans["bank_amount"] : $trans["Total"]; // not set for journal entry
$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 */
@@ -158,9 +159,9 @@ class allocation
}
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,
@@ -169,27 +170,49 @@ class allocation
$trans_items = get_allocatable_to_cust_transactions($this->person_id,
$this->trans_no, $this->type);
+ $amount = $this->amount;
while ($myrow = db_fetch($trans_items))
{
-//_vd($myrow);
+ $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.
//
function write()
{
+ global $no_exchange_variations;
+
begin_transaction();
if ($this->person_type == PT_SUPPLIER)
- clear_supp_alloctions($this->type, $this->trans_no, $this->date_);
+ clear_supp_alloctions($this->type, $this->trans_no, $this->person_id, $this->date_);
else
- clear_cust_alloctions($this->type, $this->trans_no);
+ clear_cust_alloctions($this->type, $this->trans_no, $this->person_id, $this->date_);
// now add the new allocations
$total_allocated = 0;
@@ -203,21 +226,22 @@ class allocation
if ($this->person_type == PT_SUPPLIER) {
add_supp_allocation($amount,
$this->type, $this->trans_no,
- $alloc_item->type, $alloc_item->type_no, $this->date_);
+ $alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_);
- update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no);
+ 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->date_);
+ $alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_);
- update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no);
+ update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no, $this->person_id);
}
// Exchange Variations Joe Hunt 2008-09-20 ////////////////////
- if (!in_array($alloc_item->type, array(ST_SALESQUOTE, ST_SALESORDER, ST_PURCHORDER)))
- exchange_variation($this->type, $this->trans_no,
- $alloc_item->type, $alloc_item->type_no, $this->date_,
- $amount, $this->person_type);
+ if ($alloc_item->type != ST_SALESORDER && !@$no_exchange_variations
+ && $alloc_item->type != ST_PURCHORDER && $alloc_item->type != ST_JOURNAL && $this->type != ST_JOURNAL)
+ exchange_variation($this->type, $this->trans_no,
+ $alloc_item->type, $alloc_item->type_no, $this->date_,
+ $amount, $this->person_type);
//////////////////////////////////////////////////////////////
$total_allocated += $alloc_item->current_allocated;
@@ -225,9 +249,9 @@ class allocation
} /*end of the loop through the array of allocations made */
if ($this->person_type == PT_SUPPLIER)
- update_supp_trans_allocation($this->type, $this->trans_no);
+ update_supp_trans_allocation($this->type, $this->trans_no, $this->person_id);
else
- update_debtor_trans_allocation($this->type, $this->trans_no);
+ update_debtor_trans_allocation($this->type, $this->trans_no, $this->person_id);
commit_transaction();
@@ -252,7 +276,7 @@ class allocation_item
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)
{
@@ -276,16 +300,15 @@ function show_allocatable($show_totals) {
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));
- start_table(TABLESTYLE, "width=60%");
+ 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"),'','');
@@ -297,7 +320,7 @@ function show_allocatable($show_totals) {
{
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");
@@ -309,9 +332,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(""
+ label_cell(""
. _("All") . "");
- label_cell(""
+ label_cell(""
. _("None") . "".hidden("un_allocated" . $id,
price_format($un_allocated), false));
end_row();
@@ -322,14 +345,7 @@ function show_allocatable($show_totals) {
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)
- $amount = -$amount;
-*/
$amount = abs($cart->amount);
if (floatcmp($amount, $total_allocated) < 0)
@@ -359,7 +375,6 @@ function check_allocations()
for ($counter = 0; $counter < get_post("TotalNumberOfAllocs"); $counter++)
{
if (!isset($_POST['amount'.$counter])) continue;
-
if (!check_num('amount' . $counter, 0))
{
display_error(_("The entry for one or more amounts is invalid or negative."));
@@ -378,16 +393,34 @@ 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,$_SESSION['alloc']->person_id);
+
+ 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) {
+ if ($_SESSION['alloc']->allocs[$counter]->type == ST_PURCHORDER)
+ $trans = get_po($_SESSION['alloc']->allocs[$counter]->type_no);
+ else
+ $trans = get_supp_trans($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type, $_SESSION['alloc']->person_id);
+ 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 = $_SESSION['alloc']->amount;
- if (in_array($_SESSION['alloc']->type, array(ST_BANKPAYMENT, ST_SUPPCREDIT, ST_SUPPAYMENT)))
- $amount = -$amount;
-*/
$amount = abs($_SESSION['alloc']->amount);
if ($total_allocated - ($amount + input_num('discount')) > $SysPrefs->allocation_settled_allowance())
@@ -398,3 +431,22 @@ function check_allocations()
return true;
}
+
+//----------------------------------------------------------------------------------------
+//
+// Returns sales or purchase invoice allocations to be reallocated after invoice edition.
+//
+function get_inv_allocations($trans_no, $trans_type, $person_id)
+{
+ $allocs = array();
+ if ($trans_type == ST_SUPPINVOICE || $trans_type == ST_SUPPCREDIT)
+ $result = get_allocatable_from_supp_transactions($person_id, $trans_no, $trans_type);
+ else
+ $result = get_allocatable_from_cust_transactions($person_id, $trans_no, $trans_type);
+
+ while($dat = db_fetch($result))
+ {
+ $allocs[] = array('type'=> $dat['type'], 'trans_no'=> $dat['trans_no'], 'amount'=>$dat['alloc']);
+ }
+ return $allocs;
+}