abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the problem with zero dollar balance forward entries when closing a ledger.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@422 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-30 02:17:49 +00:00
parent 25e3c87213
commit e4426cde55
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/transactions_controller.php
View File

@@ -167,7 +167,7 @@ class TransactionsController extends AppController {
// have their corresponding account ledgers closed. // have their corresponding account ledgers closed.
$type_ids = $close_type_ids = array(); $type_ids = $close_type_ids = array();
foreach ($this->data['TenderType'] AS $type_id => $type) { foreach ($this->data['TenderType'] AS $type_id => $type) {
if (!$type['checked']) if (empty($type['checked']))
continue; continue;
$type_ids[] = $type_id; $type_ids[] = $type_id;

6
models/transaction.php
View File

@@ -164,6 +164,7 @@ class Transaction extends AppModel {
$close['lease_id'] = null; $close['lease_id'] = null;
$ledger_ids = array(); $ledger_ids = array();
$data['Entry'] = array();
foreach ($data['Ledger'] AS $ledger) { foreach ($data['Ledger'] AS $ledger) {
$ledger_id = $ledger['old_ledger_id']; $ledger_id = $ledger['old_ledger_id'];
$new_ledger_id = $ledger['new_ledger_id']; $new_ledger_id = $ledger['new_ledger_id'];
@@ -176,7 +177,7 @@ class Transaction extends AppModel {
$ledger_ids[] = $ledger_id; $ledger_ids[] = $ledger_id;
// No need to generate ledger entries if there is no balance // No need to generate ledger entries if there is no balance
if (empty($ledger['amount'])) if (empty($ledger['amount']) || $ledger['amount'] == 0)
continue; continue;
// Add an entry to carry the ledger balance forward // Add an entry to carry the ledger balance forward
@@ -311,7 +312,8 @@ class Transaction extends AppModel {
/* => compact('data'))); */ /* => compact('data'))); */
// Verify that we have a transaction and entries // Verify that we have a transaction and entries
if (empty($data['Transaction']) || empty($data['Entry'])) if (empty($data['Transaction']) ||
($data['Transaction']['type'] !== 'CLOSE' && empty($data['Entry'])))
return array('error' => true); return array('error' => true);
// Extract the transaction to a local variable // Extract the transaction to a local variable