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

Make formatting fixes

This commit is contained in:
Suraj Shetty 2018-07-14 19:56:18 +05:30
parent 2f92899f09
commit 4bc97c0d20
4 changed files with 173 additions and 152 deletions

View File

@ -23,8 +23,8 @@ module.exports = {
frappe.desk.menu.addItem('Purchase Order', '#list/PurchaseOrder'); frappe.desk.menu.addItem('Purchase Order', '#list/PurchaseOrder');
frappe.desk.menu.addItem('Purchase Receipt', '#list/PurchaseReceipt'); frappe.desk.menu.addItem('Purchase Receipt', '#list/PurchaseReceipt');
frappe.desk.menu.addItem('Journal Entry', '#list/JournalEntry'); frappe.desk.menu.addItem('Journal Entry', '#list/JournalEntry');
frappe.desk.menu.addItem('Address', "#list/Address"); frappe.desk.menu.addItem('Address', '#list/Address');
frappe.desk.menu.addItem('Contact', "#list/Contact"); frappe.desk.menu.addItem('Contact', '#list/Contact');
frappe.desk.menu.addItem('Settings', () => frappe.desk.showFormModal('SystemSettings')); frappe.desk.menu.addItem('Settings', () => frappe.desk.showFormModal('SystemSettings'));
// reports // reports
@ -40,6 +40,5 @@ module.exports = {
frappe.router.default = '#tree/Account'; frappe.router.default = '#tree/Account';
frappe.router.show(window.location.hash); frappe.router.show(window.location.hash);
}
} }
};

View File

@ -16,7 +16,8 @@ require.extensions['.html'] = function (module, filename) {
(async () => { (async () => {
let electronSettings = getSettings(); let electronSettings = getSettings();
let firstRun = false, setupWizardValues = null; let firstRun = false;
let setupWizardValues = null;
if (!electronSettings.dbPath) { if (!electronSettings.dbPath) {
const values = await runSetupWizard(); const values = await runSetupWizard();

View File

@ -6,14 +6,36 @@ module.exports = class GeneralLedgerView extends ReportPage {
super({ super({
title: frappe._('General Ledger'), title: frappe._('General Ledger'),
filterFields: [ filterFields: [
{fieldtype: 'Select', options: ['', 'Invoice', 'Payment'], {
label: 'Reference Type', fieldname: 'referenceType'}, fieldtype: 'Select',
{fieldtype: 'DynamicLink', references: 'referenceType', options: ['', 'Invoice', 'Payment'],
label: 'Reference Name', fieldname: 'referenceName'}, label: 'Reference Type',
{fieldtype: 'Link', target: 'Account', label: 'Account'}, fieldname: 'referenceType'
{fieldtype: 'Link', target: 'Party', label: 'Party'}, },
{fieldtype: 'Date', label: 'From Date'}, {
{fieldtype: 'Date', label: 'To Date'} fieldtype: 'DynamicLink',
references: 'referenceType',
label: 'Reference Name',
fieldname: 'referenceName'
},
{
fieldtype: 'Link',
target: 'Account',
label: 'Account'
},
{
fieldtype: 'Link',
target: 'Party',
label: 'Party'
},
{
fieldtype: 'Date',
label: 'From Date'
},
{
fieldtype: 'Date',
label: 'To Date'
}
] ]
}); });
@ -30,8 +52,7 @@ module.exports = class GeneralLedgerView extends ReportPage {
{label: 'Reference Type', fieldtype: 'Data'}, {label: 'Reference Type', fieldtype: 'Data'},
{label: 'Reference Name', fieldtype: 'Data'}, {label: 'Reference Name', fieldtype: 'Data'},
{label: 'Party', fieldtype: 'Link'}, {label: 'Party', fieldtype: 'Link'},
{label: 'Description', fieldtype: 'Data'}, {label: 'Description', fieldtype: 'Data'}
] ];
} }
} };

View File

@ -31,6 +31,6 @@ module.exports = {
{ label: 'Reference Name', fieldtype: 'Data' }, { label: 'Reference Name', fieldtype: 'Data' },
{ label: 'Party', fieldtype: 'Link' }, { label: 'Party', fieldtype: 'Link' },
{ label: 'Description', fieldtype: 'Data' } { label: 'Description', fieldtype: 'Data' }
] ];
}
} }
};