Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
diff --git a/erpnext/accounts/doctype/party_account/__init__.py b/erpnext/accounts/doctype/party_account/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/party_account/__init__.py
diff --git a/erpnext/accounts/doctype/party_account/party_account.json b/erpnext/accounts/doctype/party_account/party_account.json
new file mode 100644
index 0000000..14e9250
--- /dev/null
+++ b/erpnext/accounts/doctype/party_account/party_account.json
@@ -0,0 +1,75 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "creation": "2014-08-29 16:02:39.740505",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Company",
+ "no_copy": 0,
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0
+ },
+ {
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break",
+ "label": "col_break1",
+ "permlevel": 0,
+ "width": "50%"
+ },
+ {
+ "allow_on_submit": 0,
+ "fieldname": "account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Account",
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "modified": "2014-08-29 16:08:49.388820",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Party Account",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/party_account/party_account.py b/erpnext/accounts/doctype/party_account/party_account.py
new file mode 100644
index 0000000..e5672d4
--- /dev/null
+++ b/erpnext/accounts/doctype/party_account/party_account.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PartyAccount(Document):
+ pass
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 5339067..3958410 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -43,12 +43,14 @@
},
callback: function(r) {
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
- cur_frm.dashboard.set_headline(
- __("Total Billing This Year: ") + "<b>"
- + format_currency(r.message.total_billing, erpnext.get_currency(cur_frm.doc.company))
- + '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
- + format_currency(r.message.total_unpaid, erpnext.get_currency(cur_frm.doc.company))
- + '</b></span>');
+ if(r.message["company_currency"].length == 1) {
+ cur_frm.dashboard.set_headline(
+ __("Total Billing This Year: ") + "<b>"
+ + format_currency(r.message.total_billing, company_currency[0])
+ + '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
+ + format_currency(r.message.total_unpaid, company_currency[0])
+ + '</b></span>');
+ }
}
cur_frm.dashboard.set_badge_count(r.message);
}
@@ -99,3 +101,14 @@
filters:{'buying': 1}
}
}
+
+cur_frm.fields_dict['party_accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
+ return {
+ filters: {
+ 'account_type': 'Payable',
+ 'company': d.company,
+ 'group_or_ledger': 'Ledger'
+ }
+ }
+}
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 2c2fbff..1fa295e 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -84,6 +84,19 @@
"read_only": 1
},
{
+ "fieldname": "default_payable_accounts",
+ "fieldtype": "Section Break",
+ "label": "Default Payable Accounts",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "party_accounts",
+ "fieldtype": "Table",
+ "label": "Party Accounts",
+ "options": "Party Account",
+ "permlevel": 0
+ },
+ {
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
@@ -170,7 +183,7 @@
],
"icon": "icon-user",
"idx": 1,
- "modified": "2014-09-12 12:26:37.606976",
+ "modified": "2014-09-10 17:53:09.286715",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 02983bd..afd1f14 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -35,9 +35,6 @@
self.update_address()
self.update_contact()
- def get_company_abbr(self):
- return frappe.db.sql("select abbr from tabCompany where name=%s", self.company)[0][0]
-
def validate(self):
#validation for Naming Series mandatory field...
if frappe.defaults.get_global_default('supp_master_name') == 'Naming Series':
@@ -96,5 +93,6 @@
out["total_billing"] = billing[0][0]
out["total_unpaid"] = billing[0][1]
+ out["company_currency"] = frappe.db.sql_list("select distinct default_currency from tabCompany")
return out
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 9829ed2..1f5d1f4 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -62,12 +62,14 @@
},
callback: function(r) {
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
- cur_frm.dashboard.set_headline(
- __("Total Billing This Year: ") + "<b>"
- + format_currency(r.message.total_billing, erpnext.get_currency(cur_frm.doc.company))
- + '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
- + format_currency(r.message.total_unpaid, erpnext.get_currency(cur_frm.doc.company))
- + '</b></span>');
+ if(r.message["company_currency"].length == 1) {
+ cur_frm.dashboard.set_headline(
+ __("Total Billing This Year: ") + "<b>"
+ + format_currency(r.message.total_billing, company_currency[0])
+ + '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
+ + format_currency(r.message.total_unpaid, company_currency[0])
+ + '</b></span>');
+ }
}
cur_frm.dashboard.set_badge_count(r.message);
}
@@ -129,3 +131,14 @@
filters:{'selling': 1}
}
}
+
+cur_frm.fields_dict['party_accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
+ return {
+ filters: {
+ 'account_type': 'Receivable',
+ 'company': d.company,
+ 'group_or_ledger': 'Ledger'
+ }
+ }
+}
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index bb481fa..557334a 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -130,6 +130,19 @@
"read_only": 1
},
{
+ "fieldname": "default_receivable_accounts",
+ "fieldtype": "Section Break",
+ "label": "Default Receivable Accounts",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "party_accounts",
+ "fieldtype": "Table",
+ "label": "Party Accounts",
+ "options": "Party Account",
+ "permlevel": 0
+ },
+ {
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
@@ -144,19 +157,6 @@
"width": "50%"
},
{
- "description": "To create an Account Head under a different company, select the company and save customer.",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "reqd": 1,
- "search_index": 1
- },
- {
"description": "Your Customer's TAX registration numbers (if applicable) or any general information",
"fieldname": "customer_details",
"fieldtype": "Text",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 4d0642c..dc5ae7d 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -22,9 +22,6 @@
else:
self.name = make_autoname(self.naming_series+'.#####')
- def get_company_abbr(self):
- return frappe.db.get_value('Company', self.company, 'abbr')
-
def validate_values(self):
if frappe.defaults.get_global_default('cust_master_name') == 'Naming Series' and not self.naming_series:
frappe.throw(_("Series is mandatory"), frappe.MandatoryError)
@@ -130,6 +127,7 @@
out["total_billing"] = billing[0][0]
out["total_unpaid"] = billing[0][1]
+ out["company_currency"] = frappe.db.sql_list("select distinct default_currency from tabCompany")
return out
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 2e5898e..090c308 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -87,16 +87,26 @@
cur_frm.fields_dict.default_cash_account.get_query = cur_frm.fields_dict.default_bank_account.get_query;
-cur_frm.fields_dict.receivables_group.get_query = function(doc) {
+cur_frm.fields_dict.default_receivable_account.get_query = function(doc) {
return{
filters:{
'company': doc.name,
- 'group_or_ledger': "Group"
+ 'group_or_ledger': "Ledger",
+ "account_type": "Receivable"
}
}
}
-cur_frm.fields_dict.payables_group.get_query = cur_frm.fields_dict.receivables_group.get_query;
+cur_frm.fields_dict.default_payable_account.get_query = function(doc) {
+ return{
+ filters:{
+ 'company': doc.name,
+ 'group_or_ledger': "Ledger",
+ "account_type": "Payable"
+ }
+ }
+}
+
cur_frm.fields_dict.default_expense_account.get_query = function(doc) {
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 70ca844..3439f0a 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -61,6 +61,13 @@
"reqd": 0
},
{
+ "fieldname": "charts_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "label": "Chart of Accounts",
+ "permlevel": 0
+ },
+ {
"fieldname": "country",
"fieldtype": "Link",
"in_list_view": 1,
@@ -70,13 +77,6 @@
"reqd": 1
},
{
- "fieldname": "charts_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "label": "Chart of Accounts",
- "permlevel": 0
- },
- {
"fieldname": "chart_of_accounts",
"fieldtype": "Select",
"hidden": 0,
@@ -118,10 +118,10 @@
},
{
"depends_on": "eval:!doc.__islocal",
- "fieldname": "receivables_group",
+ "fieldname": "default_receivable_account",
"fieldtype": "Link",
"ignore_user_permissions": 1,
- "label": "Receivables Group",
+ "label": "Default Receivable Account",
"no_copy": 1,
"oldfieldname": "receivables_group",
"oldfieldtype": "Link",
@@ -131,10 +131,10 @@
},
{
"depends_on": "eval:!doc.__islocal",
- "fieldname": "payables_group",
+ "fieldname": "default_payable_account",
"fieldtype": "Link",
"ignore_user_permissions": 1,
- "label": "Payables Group",
+ "label": "Default Payable Account",
"no_copy": 1,
"oldfieldname": "payables_group",
"oldfieldtype": "Link",
@@ -356,7 +356,7 @@
],
"icon": "icon-building",
"idx": 1,
- "modified": "2014-08-25 17:11:09.320856",
+ "modified": "2014-08-29 15:50:18.539228",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index c3149df..9a60b9c 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -39,7 +39,7 @@
self.validate_default_accounts()
def validate_default_accounts(self):
- for field in ["default_bank_account", "default_cash_account", "receivables_group", "payables_group",
+ for field in ["default_bank_account", "default_cash_account", "default_receivable_account", "default_payable_account",
"default_expense_account", "default_income_account", "stock_received_but_not_billed",
"stock_adjustment_account", "expenses_included_in_valuation"]:
if self.get(field):
@@ -55,8 +55,7 @@
self.create_default_warehouses()
self.install_country_fixtures()
- if not frappe.db.get_value("Cost Center", {"group_or_ledger": "Ledger",
- "company": self.name}):
+ if not frappe.db.get_value("Cost Center", {"group_or_ledger": "Ledger", "company": self.name}):
self.create_default_cost_center()
self.set_default_accounts()
@@ -87,8 +86,11 @@
create_charts(self.chart_of_accounts, self.name)
else:
self.create_standard_accounts()
- frappe.db.set(self, "receivables_group", _("Accounts Receivable") + " - " + self.abbr)
- frappe.db.set(self, "payables_group", _("Accounts Payable") + " - " + self.abbr)
+
+ frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account",
+ {"company": self.name, "account_type": "Receivable"}))
+ frappe.db.set(self, "default_payable_account", frappe.db.get_value("Account",
+ {"company": self.name, "account_type": "Payable"}))
def add_acc(self, lst):
account = frappe.get_doc({
diff --git a/erpnext/setup/doctype/customer_group/customer_group.js b/erpnext/setup/doctype/customer_group/customer_group.js
index 2e8cd7e..902f4a6 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.js
+++ b/erpnext/setup/doctype/customer_group/customer_group.js
@@ -25,3 +25,14 @@
}
}
}
+
+cur_frm.fields_dict['party_accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
+ return {
+ filters: {
+ 'account_type': 'Receivable',
+ 'company': d.company,
+ 'group_or_ledger': 'Ledger'
+ }
+ }
+}
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 7490158..5e1ccab 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -108,12 +108,25 @@
"permlevel": 0,
"print_hide": 1,
"report_hide": 1
+ },
+ {
+ "fieldname": "default_receivable_account",
+ "fieldtype": "Section Break",
+ "label": "Default Receivable Account",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "party_accounts",
+ "fieldtype": "Table",
+ "label": "Party Accounts",
+ "options": "Party Account",
+ "permlevel": 0
}
],
"icon": "icon-sitemap",
"idx": 1,
"in_create": 1,
- "modified": "2014-08-27 17:41:35.154380",
+ "modified": "2014-08-29 16:37:35.877256",
"modified_by": "Administrator",
"module": "Setup",
"name": "Customer Group",
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.js b/erpnext/setup/doctype/supplier_type/supplier_type.js
index 0949b6a..f54edca 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.js
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.js
@@ -3,4 +3,15 @@
cur_frm.cscript.refresh = function(doc) {
cur_frm.set_intro(doc.__islocal ? "" : __("There is nothing to edit."))
-}
\ No newline at end of file
+}
+
+cur_frm.fields_dict['party_accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
+ return {
+ filters: {
+ 'account_type': 'Payable',
+ 'company': d.company,
+ 'group_or_ledger': 'Ledger'
+ }
+ }
+}
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index e44e9a8..51ffb2a 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json
@@ -22,11 +22,24 @@
"fieldtype": "Int",
"label": "Credit Days",
"permlevel": 1
+ },
+ {
+ "fieldname": "default_payable_account",
+ "fieldtype": "Section Break",
+ "label": "Default Payable Account",
+ "permlevel": 0
+ },
+ {
+ "fieldname": "party_accounts",
+ "fieldtype": "Table",
+ "label": "Party Accounts",
+ "options": "Party Account",
+ "permlevel": 0
}
],
"icon": "icon-flag",
"idx": 1,
- "modified": "2014-08-27 17:43:31.479133",
+ "modified": "2014-08-29 16:38:22.219286",
"modified_by": "Administrator",
"module": "Setup",
"name": "Supplier Type",