accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-11-14 01:14:03 +00:00
Code Issues Releases Activity

Organize sidebar items, fix layout

Browse Source
This commit is contained in:
Faris Ansari 2018-09-26 19:53:53 +05:30
parent 41680c82b0
commit 4eeabe9238
5 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounting/ledgerPosting.js
View File

@ -70,7 +70,7 @@ module.exports = class LedgerPosting {
}
if (debit !== credit) {
throw frappe.errors.ValidationError(frappe._('Debit {0} must be equal to Credit {1}', [debit, credit]));
throw new frappe.errors.ValidationError(frappe._('Debit {0} must be equal to Credit {1}', [debit, credit]));
}
}

8
models/doctype/JournalEntry/JournalEntry.js
View File

@ -68,7 +68,11 @@ module.exports = {
},
// section 2
{
columns: [
{ fields: ["accounts"]},
]
},
// section 3
{
columns: [
@ -78,6 +82,8 @@ module.exports = {
]
},
// section 4
{ fields: [ "userRemark" ] },
{
columns: [{ fields: [ "userRemark" ] }],
}
]
}

8
models/doctype/Payment/Payment.js
View File

@ -64,12 +64,20 @@ module.exports = {
{ fields: ['account', 'paymentAccount'] },
]
},
{
columns: [
{
fields: ['for']
}
]
},
{
columns: [
{
fields: ['amount', 'writeoff']
}
]
}
],
links: [

9
server/index.js
View File

@ -37,6 +37,15 @@ async function postStart() {
await naming.createNumberSeries('PREC-', 'PurchaseReceiptSettings');
registerReportMethods();
frappe.registerMethod({
method: 'import-coa',
handler() {
const standardCOA = require('../fixtures/standardCOA');
const importCOA = require('../models/doctype/Account/importCOA');
importCOA(standardCOA);
}
})
}
start();

30
src/sidebarConfig.js
View File

@ -7,16 +7,6 @@ export default {
return accountingSettings.companyName;
},
groups: [
{
items: [
{
label: _('ToDo'), route: '#/list/ToDo'
},
{
label: _('Event'), route: '#/list/Event'
}
]
},
{
title: _('Masters'),
items: [
@ -26,9 +16,6 @@ export default {
{
label: _('Party'), route: '#/list/Party'
},
{
label: _('Invoice'), route: '#/list/Invoice'
},
{
label: _('Tax'), route: '#/list/Tax'
},
@ -37,6 +24,23 @@ export default {
}
]
},
{
title: _('Transactions'),
items: [
{
label: _('Invoice'), route: '#/list/Invoice'
},
{
label: _('Journal Entry'), route: '#/list/JournalEntry'
}
// {
// label: _('Payment'), route: '#/list/Payment'
// },
// {
// label: _('AccountingLedgerEntry'), route: '#/list/AccountingLedgerEntry'
// },
]
},
{
title: _('Reports'),
items: [