X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fallocation_cart.inc;h=377456b15e262e6b6718c91944da2add925eab9a;hb=320f9583fa487bd0e14fbfe779e2ecc00b4d909f;hp=e6163392b877497cfc3cc273d89168b35cc3fc71;hpb=9dab04be9d81766f1878d3688ee73d0bcf29f5d2;p=fa-stable.git
diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index e6163392..377456b1 100644
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -22,7 +22,7 @@ class allocation
var $type;
var $person_id = '';
var $person_name = '';
- var $person_type;
+ var $person_type; // true - supplier, otherwise customer
var $date_;
var $amount = 0; /*Total amount of the transaction in FX */
@@ -81,11 +81,13 @@ class allocation
}
return $this->add_item($type, $type_no, $date_, $due_date,
$amount, $amount_allocated, $current_allocated);
- }
+ }
//
// Read payment or credit current/available allocations to cart.
//
+ // FIXME - read all transactions below twice seems to be suboptimal
+ //
function read($type = null, $trans_no = 0)
{
if ($type == null) { // re-read
@@ -131,7 +133,6 @@ class allocation
$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
@@ -144,7 +145,7 @@ class allocation
else
$trans_items = get_allocatable_to_cust_transactions($this->person_id,
$trans_no, $type);
-
+
while ($myrow = db_fetch($trans_items))
{
$this->add_or_update_item ($myrow["type"], $myrow["trans_no"],
@@ -188,12 +189,10 @@ class allocation
$alloc_item->type_no, $alloc_item->current_allocated);
}
// Exchange Variations Joe Hunt 2008-09-20 ////////////////////
-
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);
//////////////////////////////////////////////////////////////
@@ -207,7 +206,7 @@ class allocation
else
update_debtor_trans_allocation($this->type, $this->trans_no,
$total_allocated);
-
+
commit_transaction();
}
@@ -250,13 +249,13 @@ class allocation_item
function show_allocatable($show_totals) {
- global $table_style, $systypes_array;
+ global $systypes_array;
$k = $counter = $total_allocated = 0;
if (count($_SESSION['alloc']->allocs))
{
- start_table("$table_style width=60%");
+ start_table(TABLESTYLE, "width=60%");
$th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"),
_("Other Allocations"), _("This Allocation"), _("Left to Allocate"),'','');
table_header($th);
@@ -275,7 +274,7 @@ function show_allocatable($show_totals) {
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(""
. _("All") . "");
label_cell(""
@@ -331,9 +330,11 @@ function check_allocations()
/*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);
@@ -342,7 +343,9 @@ function check_allocations()
}
$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())