accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2025-02-02 12:08:27 +00:00
Code Issues Releases Activity

Merge pull request #305 from piyushsinghania/fix/profit-loss-report-filter-fields

Browse Source 
Fixed profit loss report half-yearly filter field
This commit is contained in:
Alan 2022-01-14 13:02:10 +05:30 committed by GitHub
commit 2758580a12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
reports/FinancialStatements/FinancialStatements.js
View File

@ -192,10 +192,13 @@ function getPeriodKey(date, periodicity) {
}[quarter]; }[quarter];
}, },
'Half Yearly': () => { 'Half Yearly': () => {
if (month > 3) {
return { return {
1: `Apr ${year} - Sep ${year}`, 1: `Apr ${year} - Sep ${year}`,
2: `Oct ${year} - Mar ${year}`, 2: `Oct ${year} - Mar ${year + 1}`,
}[[2, 3].includes(quarter) ? 1 : 2]; }[[2, 3].includes(quarter) ? 1 : 2];
}
return `Oct ${year - 1} - Mar ${year}`;
}, },
Yearly: () => { Yearly: () => {
if (month > 3) { if (month > 3) {

1
reports/ProfitAndLoss/viewConfig.js
View File

@ -52,6 +52,7 @@ export default {
label: name, label: name,
fieldname: name, fieldname: name,
fieldtype: 'Currency', fieldtype: 'Currency',
width: 1
})); }));
columns.push(...columnDefs); columns.push(...columnDefs);