mirror of
https://github.com/frappe/books.git
synced 2025-01-25 16:18:33 +00:00
72c6d7f6c7
* init() * Country-wise Chart of accounts on setup * Add a sample invoice template * Some error fixes * [fix] missing COA - move importCOA.js from models/doctype/account to models/doctype/Account * All Account initial balance zero * setup Bank Reconciliation * New chart of accounts tree component * GST taxes added. initialized gst reports. * [chore] add *.db to .gitignore * [fix] importCOA path error * fix error + bank reconciliation fields * [feat] add gst taxes * GST report initialized * GST report finalized * GST report finalized * Complete min. reconciliation * [feat] auto select tax in invoice based on states * [chore] fix merge changes * Fix date issue - Make Payment * Add invoice templates and invoice customizer panel * Restructure invoice vue components * update file with fiscal year * Fix issues in invoice designs * Add company settings. Dynamic addresses in invoice * Move invoice styles to different file and add separate components for addresses * [feat] add export-filtered-data-to-csv to reports * [feat] add Export Wizard component for customizing export * Fix invoice customizer position while scrolling. Fix address displayed as undefined in invoice if not found in db * [chore] change markup for select all chkbox * Setup config as doctype * GSTIN bug fix * Add custom google fonts * Add Send email footer * Fix DateTime * Complete Merge + Resolve * Complete Merge + Resolve * [chore] change layout of Export Wizard * [enh] optimize checkNoneSelected, style export modal footer divider * Add Tax to SideBar * Remove extra logs * [fix] db name section in sidebar showing absolute path instead of dbname in windows i.e. platform=win32 * Country-wise Chart of accounts on setup (#78) * Country-wise Chart of accounts on setup * Some error fixes * All Account initial balance zero * Update README.md - updated installation instructions with more detail * Merge #79 Winter Sprint: Work https://github.com/frappe/accounting/pull/79 * Revert "Merge #79 Winter Sprint: Work" This reverts commit 171511666817caa430af672791c8d452e3b4b680.
43 lines
1.4 KiB
JavaScript
43 lines
1.4 KiB
JavaScript
const frappe = require('frappejs');
|
|
|
|
class BankReconciliation {
|
|
async run(params) {
|
|
const filters = {};
|
|
if (params.paymentAccount) filters.paymentAccount = params.paymentAccount;
|
|
if (params.party) filters.party = params.party;
|
|
// if (params.referenceType) filters.referenceType = params.referenceType;
|
|
// if (params.referenceName) filters.referenceName = params.referenceName;
|
|
if (params.toDate || params.fromDate) {
|
|
filters.date = [];
|
|
if (params.toDate) filters.date.push('<=', params.toDate);
|
|
if (params.fromDate) filters.date.push('>=', params.fromDate);
|
|
}
|
|
|
|
let data = await frappe.db.getAll({
|
|
doctype: 'Payment',
|
|
fields: ['date', 'account', 'paymentAccount', 'party', 'name', 'referenceDate','clearanceDate'],
|
|
filters: filters,
|
|
});
|
|
|
|
for (var i = 0; i < data.length; i++) {
|
|
let ledger = await frappe.db.getAll({
|
|
doctype: 'AccountingLedgerEntry',
|
|
fields: ['date', 'referenceType', 'referenceName', 'debit', 'credit'],
|
|
filters: {
|
|
referenceType: 'Payment',
|
|
account: data[i].paymentAccount,
|
|
referenceName: data[i].name
|
|
}
|
|
})
|
|
data[i].credit = ledger[0].credit;
|
|
data[i].debit = ledger[0].debit;
|
|
data[i].referenceName = ledger[0].referenceName;
|
|
data[i].referenceType = ledger[0].referenceType;
|
|
}
|
|
|
|
return data;
|
|
}
|
|
}
|
|
|
|
module.exports = BankReconciliation;
|