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

added payment

Browse Source
This commit is contained in:
Rushabh Mehta 2018-03-27 09:50:58 +05:30
parent bfe679d48f
commit 66cdea78a5
14 changed files with 328 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/index.js
View File

@ -1,4 +1,4 @@
const GeneralLedgerView = require('../reports/GeneralLedgerView');
const GeneralLedgerView = require('../reports/generalLedger/GeneralLedgerView');
const frappe = require('frappejs');
module.exports = {
@ -9,10 +9,6 @@ module.exports = {
frappe.registerView('List', 'ToDo', require('frappejs/models/doctype/ToDo/ToDoList.js'));
frappe.registerView('Form', 'FilterSelector', require('frappejs/models/doctype/FilterSelector/FilterSelectorForm.js'));
frappe.registerView('List', 'Account', require('../models/doctype/Account/AccountList.js'));
frappe.registerView('Form', 'Account', require('../models/doctype/Account/AccountForm.js'));
frappe.registerView('List', 'Invoice', require('../models/doctype/Invoice/InvoiceList.js'));
frappe.registerView('List', 'Customer', require('../models/doctype/Party/CustomerList.js'));
frappe.router.add('report/general-ledger', async (params) => {

17
models/doctype/Account/Account.js
View File

@ -18,7 +18,13 @@ module.exports = {
"fieldname": "parent_account",
"label": "Parent Account",
"fieldtype": "Link",
"target": "Account"
"target": "Account",
getFilters: (query, control) => {
return {
keywords: ["like", query],
name: ["!=", control.doc.name]
}
}
},
{
"fieldname": "account_type",
@ -38,5 +44,14 @@ module.exports = {
validate: (doc) => {
}
},
listSettings: {
getFields(list) {
return ['name', 'account_type'];
},
getRowHTML(list, data) {
return `<div class="col-11">${list.getNameHTML(data)} (${data.account_type})</div>`;
}
}
}

15
models/doctype/Account/AccountForm.js
View File

@ -1,15 +0,0 @@
const BaseForm = require('frappejs/client/view/form');
module.exports = class AccountForm extends BaseForm {
make() {
super.make();
// override controller event
this.controls['parent_account'].getFilters = (query) => {
return {
keywords: ["like", query],
name: ["!=", this.doc.name]
}
}
}
}

10
models/doctype/Account/AccountList.js
View File

@ -1,10 +0,0 @@
const BaseList = require('frappejs/client/view/list');
module.exports = class AccountList extends BaseList {
getFields() {
return ['name', 'account_type'];
}
getRowHTML(data) {
return `<div class="col-11">${this.getNameHTML(data)} (${data.account_type})</div>`;
}
}

2
models/doctype/AccountingLedgerEntry/AccountingLedgerEntry.js
View File

@ -59,7 +59,7 @@ module.exports = {
{
fieldname: "referenceName",
label: "Reference Name",
fieldtype: "Dynamic Link",
fieldtype: "DynamicLink",
references: "referenceType"
},
{

29
models/doctype/Invoice/Invoice.js
View File

@ -102,8 +102,8 @@ module.exports = {
links: [
{
label: 'Ledger Entries',
condition: (form) => form.doc.submitted,
action:(form) => {
condition: form => form.doc.submitted,
action: form => {
return {
route: ['table', 'AccountingLedgerEntry'],
params: {
@ -114,6 +114,29 @@ module.exports = {
}
};
}
},
{
label: 'Make Payment',
condition: form => form.doc.submitted,
action: async form => {
const payment = await frappe.getNewDoc('Payment');
payment.party = form.doc.customer,
payment.account = form.doc.account,
payment.for = [{referenceType: form.doc.doctype, referenceName: form.doc.name, amount: form.doc.grandTotal}]
const formModal = await frappe.desk.showFormModal('Payment', payment.name);
}
}
],
listSettings: {
getFields(list) {
return ['name', 'customer', 'grandTotal', 'submitted'];
},
getRowHTML(list, data) {
return `<div class="col-3">${list.getNameHTML(data)}</div>
<div class="col-4 text-muted">${data.customer}</div>
<div class="col-4 text-muted text-right">${frappe.format(data.grandTotal, "Currency")}</div>`;
}
}
]
}

13
models/doctype/Invoice/InvoiceList.js
View File

@ -1,13 +0,0 @@
const BaseList = require('frappejs/client/view/list');
const frappe = require('frappejs');
module.exports = class InvoiceList extends BaseList {
getFields() {
return ['name', 'customer', 'grandTotal', 'submitted'];
}
getRowHTML(data) {
return `<div class="col-3">${this.getNameHTML(data)}</div>
<div class="col-4 text-muted">${data.customer}</div>
<div class="col-4 text-muted text-right">${frappe.format(data.grandTotal, "Currency")}</div>`;
}
}

71
models/doctype/Payment/Payment.js Normal file
View File

@ -0,0 +1,71 @@
module.exports = {
name: "Payment",
label: "Payment",
naming: "name", // {random|autoincrement}
isSingle: 0,
isChild: 0,
keywordFields: [],
fields: [
{
"fieldname": "date",
"label": "Date",
"fieldtype": "Date"
},
{
fieldname: "party",
label: "Party",
fieldtype: "Link",
target: "Party",
required: 1
},
{
fieldname: "account",
label: "Account",
fieldtype: "Link",
target: "Account",
required: 1
},
{
fieldname: "paymentAccount",
label: "Payment Account",
fieldtype: "Link",
target: "Account",
required: 1
},
{
fieldname: "amount",
label: "Amount",
fieldtype: "Currency",
required: 1,
disabled: true,
formula: (doc) => doc.getSum('for', 'amount')
},
{
fieldname: "writeoff",
label: "Write Off / Refund",
fieldtype: "Currency",
},
{
fieldname: "for",
label: "Payment For",
fieldtype: "Table",
childtype: "PaymentFor",
required: 1
}
],
layout: [
{
columns: [
{ fields: ['date', 'party'] },
{ fields: ['account', 'paymentAccount'] },
]
},
{
fields: ['for']
},
{
fields: ['amount', 'writeoff']
}
]
}

28
models/doctype/PaymentFor/PaymentFor.js Normal file
View File

@ -0,0 +1,28 @@
module.exports = {
name: "PaymentFor",
label: "Payment For",
isSingle: 0,
isChild: 1,
keywordFields: [],
fields: [
{
fieldname: "referenceType",
label: "Reference Type",
fieldtype: "Data",
required: 1
},
{
fieldname: "referenceName",
label: "Reference Name",
fieldtype: "DynamicLink",
references: "referenceType",
required: 1
},
{
fieldname: "amount",
label: "Amount",
fieldtype: "Currency",
required: 1
},
]
}

2
models/index.js
View File

@ -3,6 +3,8 @@ module.exports = {
Account: require('./doctype/Account/Account.js'),
AccountingLedgerEntry: require('./doctype/AccountingLedgerEntry/AccountingLedgerEntry.js'),
Party: require('./doctype/Party/Party.js'),
Payment: require('./doctype/Payment/Payment.js'),
PaymentFor: require('./doctype/PaymentFor/PaymentFor.js'),
Item: require('./doctype/Item/Item.js'),
Invoice: require('./doctype/Invoice/Invoice.js'),
InvoiceItem: require('./doctype/InvoiceItem/InvoiceItem.js'),

0
reports/GeneralLedger.js → reports/generalLedger/GeneralLedger.js
View File

0
reports/GeneralLedgerView.js → reports/generalLedger/GeneralLedgerView.js
View File

2
server/index.js
View File

@ -1,6 +1,6 @@
const server = require('frappejs/server');
const frappe = require('frappejs');
const GeneralLedger = require('../reports/GeneralLedger')
const GeneralLedger = require('../reports/generalLedger/GeneralLedger')
module.exports = {
async start() {

263
www/dist/js/bundle.js vendored
View File

@ -4575,7 +4575,7 @@ if (typeof undefined === 'function' && undefined.amd) {
}
}).call(commonjsGlobal);
//# sourceMappingURL=showdown.js.map
});
var moment = createCommonjsModule(function (module, exports) {
@ -10230,7 +10230,7 @@ var http = class HTTPClient extends observable {
, 'Text': true
, 'Data': true
, 'Link': true
, 'Dynamic Link': true
, 'DynamicLink': true
, 'Password': true
, 'Select': true
, 'Read Only': true
@ -23046,7 +23046,7 @@ Popper.placements = placements;
Popper.Defaults = Defaults;
//# sourceMappingURL=popper.js.map
var popper = Object.freeze({
@ -26945,7 +26945,7 @@ exports.Tooltip = Tooltip;
Object.defineProperty(exports, '__esModule', { value: true });
})));
//# sourceMappingURL=bootstrap.js.map
});
unwrapExports(bootstrap);
@ -27346,7 +27346,7 @@ var keyboard = {
};
var list = class BaseList extends observable {
constructor({doctype, parent, fields, page}) {
constructor({doctype, parent, fields=[], page}) {
super();
Object.assign(this, arguments[0]);
@ -27360,11 +27360,29 @@ var list = class BaseList extends observable {
this.rows = [];
this.data = [];
this.setupListSettings();
frappejs.db.on(`change:${this.doctype}`, (params) => {
this.refresh();
});
}
setupListSettings() {
// list settings that can be overridden by meta
this.listSettings = {
getFields: list => list.fields,
getRowHTML: (list, data) => {
return `<div class="col-11">
${list.getNameHTML(data)}
</div>`;
}
};
if (this.meta.listSettings) {
Object.assign(this.listSettings, this.meta.listSettings);
}
}
makeBody() {
if (!this.body) {
this.makeToolbar();
@ -27405,7 +27423,7 @@ var list = class BaseList extends observable {
}
async getData() {
let fields = this.getFields();
let fields = this.listSettings.getFields(this) || [];
this.updateStandardFields(fields);
return await frappejs.db.getAll({
doctype: this.doctype,
@ -27416,10 +27434,6 @@ var list = class BaseList extends observable {
});
}
getFields() {
return [];
}
updateStandardFields(fields) {
if (!fields.includes('name')) fields.push('name');
if (!fields.includes('modified')) fields.push('modified');
@ -27448,14 +27462,9 @@ var list = class BaseList extends observable {
getRowBodyHTML(data) {
return `<div class="col-1">
<input class="checkbox" type="checkbox" data-name="${data.name}">
</div>` + this.getRowHTML(data);
</div>` + this.listSettings.getRowHTML(this, data);
}
getRowHTML(data) {
return `<div class="col-11">
${this.getNameHTML(data)}
</div>`;
}
getNameHTML(data) {
return `<span class="indicator ${this.meta.getIndicatorColor(data)}">${data[this.meta.titleField]}</span>`;
@ -27691,7 +27700,7 @@ class BaseControl {
}
renderTemplate() {
if (this.form.doc) {
if (this.form && this.form.doc) {
this.wrapper.innerHTML = this.template(this.form.doc, this.doc);
} else {
this.wrapper.innerHTML = '';
@ -27823,6 +27832,7 @@ class BaseControl {
}
async updateDocValue(value) {
if (!this.doc) return;
if (this.doc[this.fieldname] !== value) {
if (this.parentControl) {
// its a child
@ -39796,11 +39806,6 @@ var htmlmixed = createCommonjsModule(function (module, exports) {
});
});
// const frappe = require('frappejs');
// eslint-disable-line
// eslint-disable-line
class CodeControl extends base {
makeInput() {
if (!this.options) {
@ -48118,9 +48123,6 @@ DataTable.__version__ = packageJson.version;
module.exports = DataTable;
});
// eslint-disable-line
var modal = class Modal extends observable {
constructor({ title, body, primary, secondary }) {
super();
@ -56645,7 +56647,7 @@ module.exports = installCompat;
/***/ })
/******/ ]);
});
//# sourceMappingURL=nunjucks.js.map
});
unwrapExports(nunjucks);
@ -56846,10 +56848,6 @@ var menu = class DeskMenu {
}
};
// const Search = require('./search');
const views = {};
views.Form = formpage;
views.List = listpage;
@ -57587,10 +57585,6 @@ var client = {
}
};
// baseclass for report
// `url` url for report
// `getColumns` return columns
var reportpage = class ReportPage extends page {
constructor({title, }) {
super({title: title, hasRoute: true});
@ -57612,7 +57606,7 @@ var reportpage = class ReportPage extends page {
}
addFilter(field) {
if (field.fieldname) {
if (!field.fieldname) {
field.fieldname = frappejs.slug(field.label);
}
@ -57633,6 +57627,7 @@ var reportpage = class ReportPage extends page {
return false;
}
}
console.log(values);
return values;
}
@ -57699,7 +57694,8 @@ var AccountDocument = class Account extends document$1 {
}
};
var Account = {
var Account = createCommonjsModule(function (module) {
module.exports = {
"name": "Account",
"doctype": "DocType",
"documentClass": AccountDocument,
@ -57719,7 +57715,13 @@ var Account = {
"fieldname": "parent_account",
"label": "Parent Account",
"fieldtype": "Link",
"target": "Account"
"target": "Account",
getFilters: (query, control) => {
return {
keywords: ["like", query],
name: ["!=", control.doc.name]
}
}
},
{
"fieldname": "account_type",
@ -57739,8 +57741,21 @@ var Account = {
validate: (doc) => {
}
},
listSettings: {
getFields(list) {
return ['name', 'account_type'];
},
getRowHTML(list, data) {
return `<div class="col-11">${list.getNameHTML(data)} (${data.account_type})</div>`;
}
}
};
});
var Account_1 = Account.events;
var Account_2 = Account.listSettings;
var AccountingLedgerEntry = {
name: "AccountingLedgerEntry",
@ -57803,7 +57818,7 @@ var AccountingLedgerEntry = {
{
fieldname: "referenceName",
label: "Reference Name",
fieldtype: "Dynamic Link",
fieldtype: "DynamicLink",
references: "referenceType"
},
{
@ -57864,6 +57879,107 @@ module.exports = {
var Party_1 = Party.links;
var Payment = {
name: "Payment",
label: "Payment",
naming: "name", // {random|autoincrement}
isSingle: 0,
isChild: 0,
keywordFields: [],
fields: [
{
"fieldname": "date",
"label": "Date",
"fieldtype": "Date"
},
{
fieldname: "party",
label: "Party",
fieldtype: "Link",
target: "Party",
required: 1
},
{
fieldname: "account",
label: "Account",
fieldtype: "Link",
target: "Account",
required: 1
},
{
fieldname: "paymentAccount",
label: "Payment Account",
fieldtype: "Link",
target: "Account",
required: 1
},
{
fieldname: "amount",
label: "Amount",
fieldtype: "Currency",
required: 1,
disabled: true,
formula: (doc) => doc.getSum('for', 'amount')
},
{
fieldname: "writeoff",
label: "Write Off / Refund",
fieldtype: "Currency",
},
{
fieldname: "for",
label: "Payment For",
fieldtype: "Table",
childtype: "PaymentFor",
required: 1
}
],
layout: [
{
columns: [
{ fields: ['date', 'party'] },
{ fields: ['account', 'paymentAccount'] },
]
},
{
fields: ['for']
},
{
fields: ['amount', 'writeoff']
}
]
};
var PaymentFor = {
name: "PaymentFor",
label: "Payment For",
isSingle: 0,
isChild: 1,
keywordFields: [],
fields: [
{
fieldname: "referenceType",
label: "Reference Type",
fieldtype: "Data",
required: 1
},
{
fieldname: "referenceName",
label: "Reference Name",
fieldtype: "DynamicLink",
references: "referenceType",
required: 1
},
{
fieldname: "amount",
label: "Amount",
fieldtype: "Currency",
required: 1
},
]
};
var Item = {
name: "Item",
doctype: "DocType",
@ -58117,8 +58233,8 @@ module.exports = {
links: [
{
label: 'Ledger Entries',
condition: (form) => form.doc.submitted,
action:(form) => {
condition: form => form.doc.submitted,
action: form => {
return {
route: ['table', 'AccountingLedgerEntry'],
params: {
@ -58129,13 +58245,35 @@ module.exports = {
}
};
}
},
{
label: 'Make Payment',
condition: form => form.doc.submitted,
action: async form => {
const payment = await frappejs.getNewDoc('Payment');
payment.party = form.doc.customer, payment.account = form.doc.account, payment.for = [{referenceType: form.doc.doctype, referenceName: form.doc.name, amount: form.doc.grandTotal}];
const formModal = await frappejs.desk.showFormModal('Payment', payment.name);
}
}
],
listSettings: {
getFields(list) {
return ['name', 'customer', 'grandTotal', 'submitted'];
},
getRowHTML(list, data) {
return `<div class="col-3">${list.getNameHTML(data)}</div>
<div class="col-4 text-muted">${data.customer}</div>
<div class="col-4 text-muted text-right">${frappejs.format(data.grandTotal, "Currency")}</div>`;
}
}
]
};
});
var Invoice_1 = Invoice.layout;
var Invoice_2 = Invoice.links;
var Invoice_3 = Invoice.listSettings;
var InvoiceItem = {
name: "InvoiceItem",
@ -58304,6 +58442,8 @@ var models$2 = {
Account: Account,
AccountingLedgerEntry: AccountingLedgerEntry,
Party: Party,
Payment: Payment,
PaymentFor: PaymentFor,
Item: Item,
Invoice: Invoice,
InvoiceItem: InvoiceItem,
@ -58315,7 +58455,7 @@ var models$2 = {
};
var ToDoList_1 = class ToDoList extends list {
getFields() {
getFields(list$$1) {
return ['name', 'subject', 'status'];
}
};
@ -58332,40 +58472,6 @@ var FilterSelectorForm_1 = class FilterSelectorForm extends form {
}
};
var AccountList_1 = class AccountList extends list {
getFields() {
return ['name', 'account_type'];
}
getRowHTML(data) {
return `<div class="col-11">${this.getNameHTML(data)} (${data.account_type})</div>`;
}
};
var AccountForm_1 = class AccountForm extends form {
make() {
super.make();
// override controller event
this.controls['parent_account'].getFilters = (query) => {
return {
keywords: ["like", query],
name: ["!=", this.doc.name]
}
};
}
};
var InvoiceList_1 = class InvoiceList extends list {
getFields() {
return ['name', 'customer', 'grandTotal', 'submitted'];
}
getRowHTML(data) {
return `<div class="col-3">${this.getNameHTML(data)}</div>
<div class="col-4 text-muted">${data.customer}</div>
<div class="col-4 text-muted text-right">${frappejs.format(data.grandTotal, "Currency")}</div>`;
}
};
var CustomerList_1 = class CustomerList extends list {
constructor({doctype, parent, fields, page}) {
super({doctype: 'Party', parent: parent, fields: fields, page: page});
@ -58385,10 +58491,6 @@ var client$2 = {
frappejs.registerView('List', 'ToDo', ToDoList_1);
frappejs.registerView('Form', 'FilterSelector', FilterSelectorForm_1);
frappejs.registerView('List', 'Account', AccountList_1);
frappejs.registerView('Form', 'Account', AccountForm_1);
frappejs.registerView('List', 'Invoice', InvoiceList_1);
frappejs.registerView('List', 'Customer', CustomerList_1);
frappejs.router.add('report/general-ledger', async (params) => {
@ -58412,7 +58514,6 @@ var client$2 = {
}
};
// start server
client.start({
columns: 3,
server: 'localhost:8000'