2
0
mirror of https://github.com/frappe/books.git synced 2024-12-23 03:19:01 +00:00

Added gstr-1 gstr-2 reports feature

This commit is contained in:
Piyush Singhania 2021-12-02 14:04:26 +05:30 committed by Alan
parent 1eb9431767
commit 60f0d00eb5
5 changed files with 22 additions and 17 deletions

View File

@ -25,6 +25,7 @@
"core-js": "^3.19.0",
"csvjson-csv2json": "^5.0.6",
"electron-store": "^8.0.1",
"file-saver": "^2.0.5",
"frappe-charts": "1.6.1",
"frappejs": "https://github.com/frappe/frappejs",
"knex": "^0.95.12",

View File

@ -86,73 +86,64 @@ export default {
label: 'GSTIN No.',
fieldname: 'gstin',
fieldtype: 'Data',
width: 100,
width: 1.5,
},
{
label: 'Party',
fieldtype: 'Data',
fieldname: 'partyName',
label: 'Party',
width: 100,
width: 1.5,
},
{
label: 'Invoice No.',
fieldname: 'invNo',
fieldtype: 'Data',
width: 100,
},
{
label: 'Invoice Value',
fieldname: 'invAmt',
fieldtype: 'Currency',
width: 100,
},
{
label: 'Invoice Date',
fieldname: 'invDate',
fieldtype: 'Date',
width: 100,
},
{
label: 'Place of supply',
fieldname: 'place',
fieldtype: 'Data',
width: 100,
},
{
label: 'Rate',
fieldname: 'rate',
fieldtype: 'Data',
width: 80,
width: 0.5,
},
{
label: 'Taxable Value',
fieldname: 'taxVal',
fieldtype: 'Currency',
width: 100,
},
{
label: 'Reverse Chrg.',
fieldname: 'reverseCharge',
fieldtype: 'Data',
width: 80,
},
{
label: 'Intergrated Tax',
fieldname: 'igstAmt',
fieldtype: 'Currency',
width: 100,
},
{
label: 'Central Tax',
fieldname: 'cgstAmt',
fieldtype: 'Currency',
width: 100,
},
{
label: 'State Tax',
fieldname: 'sgstAmt',
fieldtype: 'Currency',
width: 100,
},
];
},

View File

@ -5,8 +5,8 @@ import BalanceSheetViewConfig from './BalanceSheet/viewConfig';
import ProfitAndLossViewConfig from './ProfitAndLoss/viewConfig';
import TrialBalanceViewConfig from './TrialBalance/viewConfig';
// import BankReconciliationViewConfig from './BankReconciliation/viewConfig';
// import GoodsAndServiceTaxGSTR1View from './GoodsAndServiceTax/GSTR1View';
// import GoodsAndServiceTaxGSTR2View from './GoodsAndServiceTax/GSTR2View';
import GoodsAndServiceTaxGSTR1View from './GoodsAndServiceTax/GSTR1View';
import GoodsAndServiceTaxGSTR2View from './GoodsAndServiceTax/GSTR2View';
export default {
'general-ledger' : GeneralLedgerViewConfig,
@ -16,6 +16,6 @@ export default {
'profit-and-loss' : ProfitAndLossViewConfig,
'trial-balance' : TrialBalanceViewConfig,
// 'bank-reconciliation' : BankReconciliationViewConfig,
// 'gstr-1' : GoodsAndServiceTaxGSTR1View,
// 'gstr-2' : GoodsAndServiceTaxGSTR2View,
'gstr-1' : GoodsAndServiceTaxGSTR1View,
'gstr-2' : GoodsAndServiceTaxGSTR2View,
};

View File

@ -95,6 +95,14 @@ const config = {
label: _('Trial Balance'),
route: '/report/trial-balance',
},
{
label: _('GSTR1'),
route: '/report/gstr-1',
},
{
label: _('GSTR2'),
route: '/report/gstr-2',
},
],
},
{

View File

@ -5792,6 +5792,11 @@ file-loader@^4.2.0:
loader-utils "^1.2.3"
schema-utils "^2.5.0"
file-saver@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
file-uri-to-path@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"