Got the ledger closings to work again. This seems to work ok, although I notice closing the ledger after deposit results in a balance forward entry of $0.00 . I'll work on it next

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@421 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-30 01:59:10 +00:00
parent 42677ae2f4
commit 55c5c9e9e6
11 changed files with 186 additions and 192 deletions

View File

@@ -4,7 +4,7 @@ class Ledger extends AppModel {
var $belongsTo = array(
'Account',
'PriorLedger' => array('className' => 'Ledger'),
'Close',
'CloseTransaction' => array('className' => 'Transaction'),
);
var $hasMany = array(
@@ -48,57 +48,49 @@ class Ledger extends AppModel {
* function: closeLedger
* - Closes the current ledger, and returns a fresh one
*/
function closeLedger($id, $close_id) {
$this->recursive = -1;
function closeLedgers($ids) {
$ret = array('new_ledger_ids' => array());
$stamp = date('Y-m-d G:i:s');
$this->id = $id;
$this->read();
$this->data['Ledger']['close_id'] = $close_id;
$this->save($this->data, false);
$entries = array();
foreach ($ids AS $id) {
// Query stats to get the balance forward
$stats = $this->stats($id);
$stats = $this->stats($id);
// Populate fields from the current ledger
$this->recursive = -1;
$this->id = $id;
$this->read();
$this->read();
$this->data['Ledger']['id'] = null;
$this->data['Ledger']['close_id'] = null;
$this->data['Ledger']['prior_ledger_id'] = $id;
$this->data['Ledger']['comment'] = null;
++$this->data['Ledger']['sequence'];
$this->id = null;
$this->save($this->data, false);
//pr($this->data);
// Build a new ledger to replace the current one
$this->data['Ledger']['id'] = null;
$this->data['Ledger']['close_transaction_id'] = null;
$this->data['Ledger']['prior_ledger_id'] = $id;
$this->data['Ledger']['comment'] = null;
++$this->data['Ledger']['sequence'];
$this->data['Ledger']['name'] =
($this->data['Ledger']['account_id'] .
'-' .
$this->data['Ledger']['sequence']);
if ($stats['balance'] == 0)
return $this->id;
// Save the new ledger
$this->id = null;
if (!$this->save($this->data, false))
return array('error' => true, 'new_ledger_data' => $this->data) + $ret;
$ret['new_ledger_ids'][] = $this->id;
$this->read();
$ftype = $this->Account->fundamentalType($this->data['Ledger']['account_id']);
$otype = $this->Account->fundamentalOpposite($ftype);
// Create a transaction for balance transfer
$transaction = new Transaction();
$transaction->create();
if (!$transaction->save(array(), false)) {
return null;
$entries[] = array('old_ledger_id' => $id,
'new_ledger_id' => $this->id,
'amount' => $stats['balance']);
}
// Create an entry to carry the balance forward
$carry_entry_data = array
($ftype.'_ledger_id' => $this->id,
$otype.'_ledger_id' => $id,
'transaction_id' => $transaction->id,
'amount' => $stats['balance'],
'comment' => "Ledger Balance Forward",
);
// Perform the close
$result = $this->Transaction->addClose(array('Transaction' => array(),
'Ledger' => $entries));
$ret['Transaction'] = $result;
if ($result['error'])
return array('error' => true) + $ret;
$carry_entry = new LedgerEntry();
$carry_entry->create();
if (!$carry_entry->save($carry_entry_data, false)) {
return null;
}
return $this->id;
return $ret + array('error' => false);
}