accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2025-01-24 23:58:27 +00:00
Code Issues Releases Activity

Refactored filter fields

Browse Source
This commit is contained in:
Piyush Singhania 2021-12-12 15:30:50 +05:30 committed by Alan
parent 776f12c2d1
commit d652ee800d
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
reports/GoodsAndServiceTax/BaseViewConfig.js
View File

@ -1,5 +1,6 @@
import ExportWizard from '../../src/components/ExportWizard'; import ExportWizard from '../../src/components/ExportWizard';
import { generateGstr1Json } from '../../accounting/gst'; import { generateGstr1Json } from '../../accounting/gst';
import { DateTime } from 'luxon';
export default { export default {
filterFields: [ filterFields: [
@ -30,6 +31,7 @@ export default {
size: 'small', size: 'small',
placeholder: 'From Date', placeholder: 'From Date',
fieldname: 'fromDate', fieldname: 'fromDate',
default: DateTime.local().minus({ months: 3 }).toISODate(),
}, },
{ {
fieldtype: 'Date', fieldtype: 'Date',
@ -37,6 +39,7 @@ export default {
size: 'small', size: 'small',
placeholder: 'To Date', placeholder: 'To Date',
fieldname: 'toDate', fieldname: 'toDate',
default: DateTime.local().toISODate(),
}, },
], ],
linkFields: [ linkFields: [

13
reports/GoodsAndServiceTax/GSTR1View.js
View File

@ -2,21 +2,10 @@ const title = 'GSTR 1';
import baseConfig from './BaseViewConfig'; import baseConfig from './BaseViewConfig';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
const filterFields = baseConfig.filterFields;
filterFields.forEach((field) => {
if (field.fieldname === 'toDate') {
field.default = DateTime.local().toISODate();
}
else if(field.fieldname === 'fromDate') {
field.default = DateTime.local().minus({months: 3}).toISODate();
}
});
export default { export default {
title: title, title: title,
method: 'gstr-1', method: 'gstr-1',
filterFields, filterFields: baseConfig.filterFields,
linkFields: baseConfig.linkFields, linkFields: baseConfig.linkFields,
getColumns: baseConfig.getColumns, getColumns: baseConfig.getColumns,
}; };

2
reports/GoodsAndServiceTax/GSTR2View.js
View File

@ -6,5 +6,5 @@ export default {
method: 'gstr-2', method: 'gstr-2',
filterFields: baseConfig.filterFields, filterFields: baseConfig.filterFields,
linkFields: baseConfig.linkFields, linkFields: baseConfig.linkFields,
getColumns: baseConfig.getColumns getColumns: baseConfig.getColumns,
}; };