accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2025-04-03 08:41:51 +00:00
Code Issues Releases Activity

fixing reports/ledger issues

Browse Source
This commit is contained in:
Isaac GC 2024-02-06 16:29:44 -08:00
parent 8db453c2f0
commit dd7cb43abc
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
models/Transactional/LedgerPosting.ts
View File

@ -61,6 +61,21 @@ export class LedgerPosting {
this._validateIsEqual(); this._validateIsEqual();
} }
timezoneDateTimeAdjuster(setDate: string | Date) {
const dateTimeValue = new Date(setDate);
const dtFixedValue = dateTimeValue;
const dtMinutes = dtFixedValue.getTimezoneOffset() % 60;
const dtHours = (dtFixedValue.getTimezoneOffset() - dtMinutes) / 60;
// Forcing the time to always be set to 00:00.000 for locale time
dtFixedValue.setHours(0 - dtHours);
dtFixedValue.setMinutes(0 - dtMinutes);
dtFixedValue.setSeconds(0);
dtFixedValue.setMilliseconds(0);
return dtFixedValue;
}
async makeRoundOffEntry() { async makeRoundOffEntry() {
const { debit, credit } = this._getTotalDebitAndCredit(); const { debit, credit } = this._getTotalDebitAndCredit();
const difference = debit.sub(credit); const difference = debit.sub(credit);
@ -90,23 +105,6 @@ export class LedgerPosting {
return map[account]; return map[account];
} }
// Timezone inconsistency fix (very ugly code for now)
const entryDateTime = this.refDoc.date as string | Date;
let dateTimeValue: Date;
if (typeof entryDateTime === 'string' || entryDateTime instanceof String) {
dateTimeValue = new Date(entryDateTime);
} else {
dateTimeValue = entryDateTime;
}
const dtFixedValue = dateTimeValue;
const dtMinutes = dtFixedValue.getTimezoneOffset() % 60;
const dtHours = (dtFixedValue.getTimezoneOffset() - dtMinutes) / 60;
// Forcing the time to always be set to 00:00.000 for locale time
dtFixedValue.setHours(0 - dtHours);
dtFixedValue.setMinutes(0 - dtMinutes);
dtFixedValue.setSeconds(0);
dtFixedValue.setMilliseconds(0);
// end ugly timezone fix code // end ugly timezone fix code
const ledgerEntry = this.fyo.doc.getNewDoc( const ledgerEntry = this.fyo.doc.getNewDoc(
@ -114,7 +112,7 @@ export class LedgerPosting {
{ {
account: account, account: account,
party: (this.refDoc.party as string) ?? '', party: (this.refDoc.party as string) ?? '',
date: dtFixedValue, date: this.timezoneDateTimeAdjuster(this.refDoc.date as string | Date),
referenceType: this.refDoc.schemaName, referenceType: this.refDoc.schemaName,
referenceName: this.refDoc.name!, referenceName: this.refDoc.name!,
reverted: this.reverted, reverted: this.reverted,