Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] Test Case

Browse Source 
- Previous test case fixed
- Additional test case for project against budget
This commit is contained in:
Manas Solanki 2016-11-28 23:53:33 +05:30
parent 17faa794bf
commit 2e0fbdeebe
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/budget/budget.json
View File

@ -15,6 +15,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "Cost Center",
"fieldname": "budget_against",
"fieldtype": "Select",
"hidden": 0,
@ -34,7 +35,7 @@
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@ -370,7 +371,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-11-23 11:20:46.600912",
"modified": "2016-11-30 08:51:10.453935",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Budget",

8
erpnext/accounts/doctype/budget/budget.py
View File

@ -14,12 +14,11 @@ class DuplicateBudgetError(frappe.ValidationError): pass
class Budget(Document):
def autoname(self):
budget_against = self.get(frappe.scrub(self.budget_against))
self.name = make_autoname(budget_against + "/" + self.fiscal_year + "/.###")
self.name = make_autoname(self.get(frappe.scrub(self.budget_against)) + "/" + self.fiscal_year + "/.###")
def validate(self):
if not self.cost_center and not self.project:
frappe.throw(_("Budget should be allocated against either Cost Center or Project."))
if not self.get(frappe.scrub(self.budget_against)):
frappe.throw(_("{0} is mandatory").format(self.budget_against))
self.validate_duplicate()
self.validate_accounts()
@ -58,7 +57,6 @@ def validate_expense_against_budget(args):
args = frappe._dict(args)
if not args.cost_center and not args.project:
return
for budget_against in [args.project, args.cost_center]:
if budget_against:
if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):

39
erpnext/accounts/doctype/budget/test_budget.py
View File

@ -127,7 +127,7 @@ class TestBudget(unittest.TestCase):
def test_monthly_budget_against_group_cost_center(self):
set_total_expense_zero("2013-02-28", "Cost Center")
set_total_expense_zero("2013-02-28", "Cost Center")
set_total_expense_zero("2013-02-28", "Cost Center", "_Test Cost Center 2 - _TC")
budget = make_budget("Cost Center", "_Test Company - _TC")
frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
@ -140,20 +140,20 @@ class TestBudget(unittest.TestCase):
budget.load_from_db()
budget.cancel()
def set_total_expense_zero(posting_date, budget_against_field=None):
def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
if budget_against_field == "Project":
budget_against = "_Test Project"
elif budget_against_field == "Cost Center":
budget_against = "_Test Cost Center - _TC"
existing_expense = get_actual_expense({
else:
budget_against = budget_against_CC or "_Test Cost Center - _TC"
existing_expense = get_actual_expense(frappe._dict({
"account": "_Test Account Cost for Goods Sold - _TC",
"cost_center": cost_center or "_Test Cost Center - _TC",
"cost_center": "_Test Cost Center - _TC",
"monthly_end_date": posting_date,
"company": "_Test Company",
"fiscal_year": "_Test Fiscal Year 2013",
"budget_against_field": budget_against_field,
"budget_against": budget_against
})
}))
if existing_expense:
if budget_against_field == "Cost Center":
@ -163,25 +163,32 @@ def set_total_expense_zero(posting_date, budget_against_field=None):
make_journal_entry("_Test Account Cost for Goods Sold - _TC",
"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True, project="_Test Project")
def make_budget(budget_against_field, budget_against=None):
def make_budget(budget_against=None, cost_center=None):
if budget_against == "Project":
budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", "_Test Project/_Test Fiscal Year 2013%")})
else:
budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", "_Test Cost Center - _TC/_Test Fiscal Year 2013%")})
for d in budget_list:
frappe.db.sql("delete from `tabBudget` where name = %(name)s", d)
frappe.db.sql("delete from `tabBudget Account` where parent = %(name)s", d)
budget = frappe.new_doc("Budget")
if budget_against_field == "Cost Center":
budget.cost_center = budget_against or "_Test Cost Center - _TC"
budget_amount = 100000
elif budget_against == "Project":
budget.project = budget_against or "_Test Project"
budget_amount = 100000
if budget_against == "Project":
budget.project = "_Test Project"
else:
budget.cost_center =cost_center or "_Test Cost Center - _TC"
budget.fiscal_year = "_Test Fiscal Year 2013"
budget.monthly_distribution = "_Test Distribution"
budget.company = "_Test Company"
budget.action_if_annual_budget_exceeded = "Stop"
budget.action_if_accumulated_monthly_budget_exceeded = "Ignore"
budget.budget_against = budget_against
budget.append("accounts", {
"account": "_Test Account Cost for Goods Sold - _TC",
"budget_amount": budget_amount
"budget_amount": 100000
})
budget.insert()

2
erpnext/accounts/doctype/journal_entry/test_journal_entry.py
View File

@ -189,8 +189,6 @@ class TestJournalEntry(unittest.TestCase):
def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False, project=None):
if not cost_center:
cost_center = "_Test Cost Center - _TC"
if not project:
project = "_Test Project"
jv = frappe.new_doc("Journal Entry")
jv.posting_date = posting_date or "2013-02-14"