nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4163 from neilLasrado/develop

Browse Source 
Cost Center - Income Account
This commit is contained in:
Rushabh Mehta
2015-10-14 15:20:11 +05:30
parent adcaf75bb0 58e9590850
commit 591f047974
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/cost_center/cost_center.js
View File

@@ -17,8 +17,7 @@ erpnext.accounts.CostCenterController = frappe.ui.form.Controller.extend({
return { return {
filters:[ filters:[
['Account', 'company', '=', me.frm.doc.company], ['Account', 'company', '=', me.frm.doc.company],
['Account', 'root_type', '=', 'Expense'], ['Account', 'is_group', '=', '0']
['Account', 'is_group', '=', '0'],
] ]
} }
}); });

6
erpnext/accounts/doctype/cost_center/cost_center.py
View File

@@ -32,13 +32,13 @@ class CostCenter(NestedSet):
for d in self.get('budgets'): for d in self.get('budgets'):
if d.account: if d.account:
account_details = frappe.db.get_value("Account", d.account, account_details = frappe.db.get_value("Account", d.account,
["is_group", "company", "root_type"], as_dict=1) ["is_group", "company", "report_type"], as_dict=1)
if account_details.is_group: if account_details.is_group:
frappe.throw(_("Budget cannot be assigned against Group Account {0}").format(d.account)) frappe.throw(_("Budget cannot be assigned against Group Account {0}").format(d.account))
elif account_details.company != self.company: elif account_details.company != self.company:
frappe.throw(_("Account {0} does not belongs to company {1}").format(d.account, self.company)) frappe.throw(_("Account {0} does not belongs to company {1}").format(d.account, self.company))
elif account_details.root_type != "Expense": elif account_details.report_type != "Profit and Loss":
frappe.throw(_("Budget cannot be assigned against {0}, as it's not an Expense account") frappe.throw(_("Budget cannot be assigned against {0}, as it's not an Income or Expense account")
.format(d.account)) .format(d.account))
if [d.account, d.fiscal_year] in check_acc_list: if [d.account, d.fiscal_year] in check_acc_list:

2
erpnext/accounts/utils.py
View File

@@ -310,7 +310,7 @@ def get_stock_and_account_difference(account_list=None, posting_date=None):
def validate_expense_against_budget(args): def validate_expense_against_budget(args):
args = frappe._dict(args) args = frappe._dict(args)
if frappe.db.get_value("Account", {"name": args.account, "report_type": "Profit and Loss"}): if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
budget = frappe.db.sql(""" budget = frappe.db.sql("""
select bd.budget_allocated, cc.distribution_id select bd.budget_allocated, cc.distribution_id
from `tabCost Center` cc, `tabBudget Detail` bd from `tabCost Center` cc, `tabBudget Detail` bd

1
erpnext/change_log/current/cost_center.md Normal file
View File

@@ -0,0 +1 @@
- Allowed Income account to be added to Cost Center

6
erpnext/setup/doctype/company/company.json
View File

@@ -702,7 +702,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "If Yearly Budget Exceeded", "label": "If Yearly Budget Exceeded (for expense account)",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "yearly_bgt_flag", "oldfieldname": "yearly_bgt_flag",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -727,7 +727,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "If Monthly Budget Exceeded", "label": "If Monthly Budget Exceeded (for expense account)",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "monthly_bgt_flag", "oldfieldname": "monthly_bgt_flag",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1092,7 +1092,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-09-14 02:55:54.678003", "modified": "2015-10-13 08:15:29.028637",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",