X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fallocation_cart.inc;h=377456b15e262e6b6718c91944da2add925eab9a;hb=7b9032da05f92d030cf5ba36e1d524d123129159;hp=0446600213998e7213bbeac7f3235b4d943d8d3e;hpb=55c51a9db64c9fe402d615e204824f8e4cd6a310;p=fa-stable.git diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc index 04466002..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,7 +189,6 @@ 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, @@ -206,7 +206,7 @@ class allocation else update_debtor_trans_allocation($this->type, $this->trans_no, $total_allocated); - + commit_transaction(); }