Many bug fixes, found while entering real facility data. Most are quite minor, although there was a functionality change to assignCredits, to support concessions without assigning them to anything other than rent. I've found that there is a glaring problem with charge reversals, which don't work correctly with the collected report. Of course, we're deleting prior disbursements, which obviously needs to be rectified.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@540 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-12 09:37:49 +00:00
parent e33741f579
commit f9ff27cad4
14 changed files with 119 additions and 137 deletions

View File

@@ -315,7 +315,7 @@ echo $this->element('statement_entries', array
'grid_setup' => array('hiddengrid' => true),
'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
'action' => 'idlist',
'exclude' => array('Customer', 'Unit', 'Type', 'Debit', 'Credit'),
'exclude' => array('Customer', 'Type', 'Debit', 'Credit'),
'include' => array('Applied', 'Balance'),
'remap' => array('Applied' => 'Paid'),
'limit' => 8,

View File

@@ -71,7 +71,7 @@ function showResponse(responseText, statusText) {
}
// get a clean slate
//resetForm();
resetForm();
}
else {
$('#results').html('<H2>Failed to save invoice!</H2>');
@@ -331,6 +331,7 @@ Configure::write('debug', '0');
' value="<?php echo date('m/d/Y', $movein['time']); ?>">');
$("#TransactionComment").val('Move-In Charges');
<?php if (!empty($movein['deposit'])): ?>
id = addChargeSource(false);
$('#Entry'+id+'Form').removeCol(2);
$('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
@@ -351,7 +352,7 @@ Configure::write('debug', '0');
' value="<?php echo FormatHelper::currency($movein['deposit']); ?>">');
//$('#Entry'+id+'Comment').val('Move-In Security Deposit');
$('#Entry'+id+'Comment').removeAttr('disabled');
<?php endif; ?>
id = addChargeSource(false);
$('#Entry'+id+'Form').removeCol(2);
@@ -376,8 +377,7 @@ Configure::write('debug', '0');
('<input type="hidden"' +
' name="data[Entry]['+id+'][amount]"' +
' value="<?php echo FormatHelper::currency($movein['prorated_rent']); ?>">');
$('#Entry'+id+'Comment').val('Move-In Rent'
<?php if ($movein['prorated']) echo "+ ' (Prorated)'" ?>);
$('#Entry'+id+'Comment').val("<?php echo($movein['prorated'] ? 'Move-In Rent (Prorated)' : ''); ?>");
$('#Entry'+id+'Comment').removeAttr('disabled');
<?php endif; ?>

View File

@@ -128,7 +128,7 @@ if ($move_type !== 'out') {
),
'include' => array('Deposit'),
'exclude' => array('Balance'),
'action' => 'unoccupied',
'action' => 'vacant',
'nolinks' => true,
'limit' => 10,
)));

View File

@@ -30,7 +30,8 @@ foreach ($depositTypes AS $type) {
'separator' => '<BR>',
'onclick' => "switchSelection({$type['id']})",
'legend' => false,
'value' => $type['stats']['undeposited'] > 0 ? 'all' : 'none',
// REVISIT <AP>: 20080811; Make opt-in, or opt-out?
'value' => $type['stats']['undeposited'] > 0 ? 'none' : 'none',
'disabled' => $type['stats']['undeposited'] <= 0,
'options' => $radioOptions,
));

View File

@@ -87,6 +87,8 @@ if (isset($current_lease['id'])) {
'filter' => array('Lease.id' => $current_lease['id']),
'include' => array('Through'),
'exclude' => array('Customer', 'Lease', 'Unit'),
'sort_column' => 'Effective',
'sort_order' => 'DESC',
)));
}