feat: fetch income account and cost center from dunning type
This commit is contained in:
parent
60b6afb470
commit
28dfbdda93
@ -23,6 +23,14 @@ frappe.ui.form.on("Dunning", {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
frm.set_query("cost_center", () => {
|
||||||
|
return {
|
||||||
|
filters: {
|
||||||
|
company: frm.doc.company,
|
||||||
|
is_group: 0
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
frm.set_query("contact_person", erpnext.queries.contact_query);
|
frm.set_query("contact_person", erpnext.queries.contact_query);
|
||||||
frm.set_query("customer_address", erpnext.queries.address_query);
|
frm.set_query("customer_address", erpnext.queries.address_query);
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
"actions": [],
|
"actions": [],
|
||||||
"allow_events_in_timeline": 1,
|
"allow_events_in_timeline": 1,
|
||||||
"autoname": "naming_series:",
|
"autoname": "naming_series:",
|
||||||
|
"beta": 1,
|
||||||
"creation": "2019-07-05 16:34:31.013238",
|
"creation": "2019-07-05 16:34:31.013238",
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"engine": "InnoDB",
|
"engine": "InnoDB",
|
||||||
@ -52,8 +53,9 @@
|
|||||||
"letter_head",
|
"letter_head",
|
||||||
"closing_text",
|
"closing_text",
|
||||||
"accounting_details_section",
|
"accounting_details_section",
|
||||||
"cost_center",
|
|
||||||
"income_account",
|
"income_account",
|
||||||
|
"column_break_48",
|
||||||
|
"cost_center",
|
||||||
"amended_from"
|
"amended_from"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
@ -247,6 +249,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "For dunning fee and interest",
|
"description": "For dunning fee and interest",
|
||||||
|
"fetch_from": "dunning_type.income_account",
|
||||||
"fieldname": "income_account",
|
"fieldname": "income_account",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Income Account",
|
"label": "Income Account",
|
||||||
@ -308,6 +311,7 @@
|
|||||||
"label": "Accounting Details"
|
"label": "Accounting Details"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"fetch_from": "dunning_type.cost_center",
|
||||||
"fieldname": "cost_center",
|
"fieldname": "cost_center",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Cost Center",
|
"label": "Cost Center",
|
||||||
@ -375,6 +379,10 @@
|
|||||||
"label": "Dunning Amount (Company Currency)",
|
"label": "Dunning Amount (Company Currency)",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_48",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
|
@ -1,8 +1,24 @@
|
|||||||
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
|
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
|
||||||
// For license information, please see license.txt
|
// For license information, please see license.txt
|
||||||
|
|
||||||
frappe.ui.form.on('Dunning Type', {
|
frappe.ui.form.on("Dunning Type", {
|
||||||
// refresh: function(frm) {
|
setup: function (frm) {
|
||||||
|
frm.set_query("income_account", () => {
|
||||||
// }
|
return {
|
||||||
|
filters: {
|
||||||
|
root_type: "Income",
|
||||||
|
is_group: 0,
|
||||||
|
company: frm.doc.company,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
});
|
||||||
|
frm.set_query("cost_center", () => {
|
||||||
|
return {
|
||||||
|
filters: {
|
||||||
|
is_group: 0,
|
||||||
|
company: frm.doc.company,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"actions": [],
|
"actions": [],
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"autoname": "field:dunning_type",
|
"beta": 1,
|
||||||
"creation": "2019-12-04 04:59:08.003664",
|
"creation": "2019-12-04 04:59:08.003664",
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"editable_grid": 1,
|
"editable_grid": 1,
|
||||||
@ -9,12 +9,18 @@
|
|||||||
"field_order": [
|
"field_order": [
|
||||||
"dunning_type",
|
"dunning_type",
|
||||||
"is_default",
|
"is_default",
|
||||||
|
"column_break_3",
|
||||||
|
"company",
|
||||||
"section_break_6",
|
"section_break_6",
|
||||||
"dunning_fee",
|
"dunning_fee",
|
||||||
"column_break_8",
|
"column_break_8",
|
||||||
"rate_of_interest",
|
"rate_of_interest",
|
||||||
"text_block_section",
|
"text_block_section",
|
||||||
"dunning_letter_text"
|
"dunning_letter_text",
|
||||||
|
"section_break_9",
|
||||||
|
"income_account",
|
||||||
|
"column_break_13",
|
||||||
|
"cost_center"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
@ -61,6 +67,38 @@
|
|||||||
"fieldname": "is_default",
|
"fieldname": "is_default",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Is Default"
|
"label": "Is Default"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_break_9",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Accounting Details"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "income_account",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Income Account",
|
||||||
|
"options": "Account"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "cost_center",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Cost Center",
|
||||||
|
"options": "Cost Center"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_3",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "company",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Company",
|
||||||
|
"options": "Company",
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_13",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"links": [
|
"links": [
|
||||||
@ -69,12 +107,11 @@
|
|||||||
"link_fieldname": "dunning_type"
|
"link_fieldname": "dunning_type"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"migration_hash": "3a2c71ceb1a15469ffe1eca6053656a0",
|
"modified": "2021-11-13 00:25:35.659283",
|
||||||
"modified": "2021-10-12 17:26:48.080519",
|
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Dunning Type",
|
"name": "Dunning Type",
|
||||||
"naming_rule": "By fieldname",
|
"naming_rule": "By script",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
|
@ -2,9 +2,11 @@
|
|||||||
# For license information, please see license.txt
|
# For license information, please see license.txt
|
||||||
|
|
||||||
|
|
||||||
# import frappe
|
import frappe
|
||||||
from frappe.model.document import Document
|
from frappe.model.document import Document
|
||||||
|
|
||||||
|
|
||||||
class DunningType(Document):
|
class DunningType(Document):
|
||||||
pass
|
def autoname(self):
|
||||||
|
company_abbr = frappe.get_value("Company", self.company, "abbr")
|
||||||
|
self.name = self.dunning_type + " - " + company_abbr
|
||||||
|
Loading…
Reference in New Issue
Block a user