Added a more automated mechanism for adding multiple rent charges to an invoice. Also included is a proration tool. This needs more work though, since it relies on server side data from the lease. Selecting a new lease on the client side will cause this change to fail, and so we'll need to add a column for charged-through. Finally, error messages for invoice and receipt were improved slightly to better explain the error.
git-svn-id: file:///svn-source/pmgr/branches/v0.2.0_work@871 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -67,7 +67,17 @@ function dump(element, limit, depth) {
|
||||
if (props.length == 0)
|
||||
return '';
|
||||
|
||||
return pad + '<ol><li>' + props.join("</li>\n" + pad + pad1 + "<li>") + "</li>\n" + pad + "</ol>";
|
||||
if (typeof dump.dumpid == 'undefined')
|
||||
dump.dumpid = 0;
|
||||
|
||||
++dump.dumpid;
|
||||
return (pad
|
||||
+ '<A HREF="#" ONCLICK="$(\'#dumpid-'+dump.dumpid+'\').toggle(); return false;">(hide members)</A><BR>'
|
||||
+ '<ol id="dumpid-'+dump.dumpid+'" STYLE="padding-top:0; margin-top:0;">'
|
||||
+ '<li>'
|
||||
+ props.join("</li>\n" + pad + pad1 + '<li id="dumpid-'+dump.dumpid+'">')
|
||||
+ "</li>\n"
|
||||
+ pad + "</ol>");
|
||||
}
|
||||
|
||||
function dump_window(element, limit) {
|
||||
@@ -158,70 +168,103 @@ function datepicker(id) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function datepickerNow(id, usetime) {
|
||||
var now = new Date();
|
||||
if ($("#"+id).datepicker != null) {
|
||||
// datepicker seems to squash the time portion,
|
||||
// so we have to pass in a copy of now instead.
|
||||
$("#"+id).datepicker('setDate', new Date(now));
|
||||
}
|
||||
else {
|
||||
$("#"+id).val(((now.getMonth()+1) < 10 ? '0' : '')
|
||||
+ (now.getMonth()+1) + '/'
|
||||
+ (now.getDate() < 10 ? '0' : '')
|
||||
+ now.getDate() + '/'
|
||||
+ now.getFullYear());
|
||||
}
|
||||
|
||||
if (usetime == null)
|
||||
usetime = true;
|
||||
|
||||
$("#"+id).val($("#"+id).val() +
|
||||
(usetime
|
||||
? (' '
|
||||
+ (now.getHours() < 10 ? '0' : '')
|
||||
+ now.getHours() + ':'
|
||||
+ (now.getMinutes() < 10 ? '0' : '')
|
||||
+ now.getMinutes())
|
||||
: ''));
|
||||
}
|
||||
|
||||
function datepickerSet(fromid, id, a, b) {
|
||||
var dt;
|
||||
if (fromid == null)
|
||||
function datepickerGet(id) {
|
||||
if (id == null)
|
||||
dt = new Date();
|
||||
else {
|
||||
if ($("#"+id).datepicker != null)
|
||||
dt = new Date($("#"+fromid).datepicker('getDate'));
|
||||
else
|
||||
dt = new Date($("#"+fromid).val());
|
||||
if ($("#"+id).datepicker != null && $("#"+id).datepicker('getDate') != null)
|
||||
dt = new Date($("#"+id).datepicker('getDate'));
|
||||
else if ($("#"+id).val())
|
||||
dt = new Date($("#"+id).val());
|
||||
else
|
||||
dt = null;
|
||||
}
|
||||
|
||||
if (a != null)
|
||||
dt.setDate(a);
|
||||
if (b != null)
|
||||
dt.setDate(b);
|
||||
return dt;
|
||||
}
|
||||
|
||||
if ($("#"+id).datepicker != null)
|
||||
$("#"+id).datepicker('setDate', dt);
|
||||
function datepickerStr(id) {
|
||||
return dateStr(datepickerGet(id));
|
||||
}
|
||||
|
||||
function datepickerSet(id, dt_or_str, usetime) {
|
||||
if ($("#"+id).datepicker != null && $("#"+id).datepicker('getDate') != null) {
|
||||
// datepicker seems to squash the time portion,
|
||||
// so we have to pass in a copy of dt instead.
|
||||
$("#"+id).datepicker('setDate', new Date(dt_or_str));
|
||||
if (usetime)
|
||||
$("#"+id).val($("#"+id).val() + ' ' + timeStr(dt_or_str));
|
||||
}
|
||||
else {
|
||||
$("#"+id).val(((dt.getMonth()+1) < 10 ? '0' : '')
|
||||
+ (dt.getMonth()+1) + '/'
|
||||
+ (dt.getDate() < 10 ? '0' : '')
|
||||
+ dt.getDate() + '/'
|
||||
+ dt.getFullYear());
|
||||
$("#"+id).val(dateStr(dt_or_str), usetime);
|
||||
}
|
||||
}
|
||||
|
||||
function datepickerBOM(fromid, id) {
|
||||
datepickerSet(fromid, id, 1);
|
||||
function datepickerNow(id, usetime) {
|
||||
datepickerSet(id, new Date(), usetime == null ? true : usetime);
|
||||
}
|
||||
|
||||
function datepickerEOM(fromid, id) {
|
||||
datepickerSet(fromid, id, 32, 0);
|
||||
function dateStr(dt_or_str, usetime) {
|
||||
var dt = new Date(dt_or_str);
|
||||
|
||||
return (((dt.getMonth()+1) < 10 ? '0' : '')
|
||||
+ (dt.getMonth()+1) + '/'
|
||||
+ (dt.getDate() < 10 ? '0' : '')
|
||||
+ dt.getDate() + '/'
|
||||
+ dt.getFullYear()
|
||||
+ (usetime ? ' ' + timeStr(dt) : ''));
|
||||
}
|
||||
|
||||
function timeStr(dt_or_str) {
|
||||
var dt = new Date(dt_or_str);
|
||||
|
||||
return ((dt.getHours() < 10 ? '0' : '')
|
||||
+ dt.getHours() + ':'
|
||||
+ (dt.getMinutes() < 10 ? '0' : '')
|
||||
+ dt.getMinutes());
|
||||
}
|
||||
|
||||
function dateAdd(dt_or_str, a, b, m, d) {
|
||||
var dt = new Date(dt_or_str);
|
||||
if (m != null) {
|
||||
dt.setDate(1);
|
||||
dt.setMonth(dt.getMonth() + m);
|
||||
//$('#debug').append('set month ('+m+') ' + (dt.getMonth() + m) + '= ' + dt + '<BR>');
|
||||
}
|
||||
if (d != null) {
|
||||
dt.setDate(dt.getDate() + d);
|
||||
//$('#debug').append('set day ('+d+') ' + (dt.getDate() + d) + '= ' + dt + '<BR>');
|
||||
}
|
||||
if (a != null) {
|
||||
dt.setDate(a);
|
||||
//$('#debug').append('set date ('+a+') = ' + dt + '<BR>');
|
||||
}
|
||||
if (b != null) {
|
||||
dt.setDate(b);
|
||||
//$('#debug').append('set date ('+b+') = ' + dt + '<BR>');
|
||||
}
|
||||
return dt;
|
||||
}
|
||||
|
||||
function dateYesterday(dt) { return dateAdd(dt,null,null,null,-1); }
|
||||
function dateTomorrow(dt) { return dateAdd(dt,null,null,null,1); }
|
||||
function dateBOM(dt) { return dateAdd(dt,1); }
|
||||
function dateNextBOM(dt) { return dateAdd(dt,1,null,1); }
|
||||
function dateEOM(dt) { return dateAdd(dt,32,0); }
|
||||
function dateNextEOM(dt) { return dateAdd(dt,32,0,1); }
|
||||
|
||||
function datepickerBOM(fromid, id)
|
||||
{ datepickerSet(id, dateBOM(datepickerGet(fromid))); }
|
||||
|
||||
function datepickerEOM(fromid, id)
|
||||
{ datepickerSet(id, dateEOM(datepickerGet(fromid))); }
|
||||
|
||||
function datepickerNextBOM(fromid, id)
|
||||
{ datepickerSet(id, dateNextBOM(datepickerGet(fromid))); }
|
||||
|
||||
function datepickerNextEOM(fromid, id)
|
||||
{ datepickerSet(id, dateNextEOM(datepickerGet(fromid))); }
|
||||
|
||||
|
||||
// REVISIT <AP>: 20090617
|
||||
// I would rather use XML to pass from JS to PHP, but at the
|
||||
|
||||
Reference in New Issue
Block a user