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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta
2013-07-26 16:45:57 +05:30
parent 49aa364820 4d3aa04d15
commit 031e8cf03a
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/accounts_controller.py
View File

@@ -20,7 +20,7 @@ from webnotes import _, msgprint
from webnotes.utils import flt, cint, today, cstr from webnotes.utils import flt, cint, today, cstr
from setup.utils import get_company_currency, get_price_list_currency from setup.utils import get_company_currency, get_price_list_currency
from accounts.utils import get_fiscal_year, validate_fiscal_year from accounts.utils import get_fiscal_year, validate_fiscal_year
from utilities.transaction_base import TransactionBase, validate_conversion_rate, validate_uom_is_integer from utilities.transaction_base import TransactionBase, validate_conversion_rate
import json import json
class AccountsController(TransactionBase): class AccountsController(TransactionBase):
@@ -55,15 +55,15 @@ class AccountsController(TransactionBase):
label=self.meta.get_label(date_field)) label=self.meta.get_label(date_field))
def validate_for_freezed_account(self): def validate_for_freezed_account(self):
for fld in ["customer", "supplier"]: for fieldname in ["customer", "supplier"]:
if self.meta.get_field(fld): if self.meta.get_field(fieldname) and self.doc.fields.get(fieldname):
accounts = webnotes.conn.get_values("Account", {"master_type": fld.upper(), accounts = webnotes.conn.get_values("Account", {"master_type": fieldname.title(),
"master_name": self.doc.fields[fld], "company": self.doc.company}, "master_name": self.doc.fields[fieldname], "company": self.doc.company},
"freeze_account", as_dict=1) "freeze_account", as_dict=1)
if accounts: if accounts:
if not filter(lambda x: cstr(x.freeze_account) in ["", "No"], accounts): if not filter(lambda x: cstr(x.freeze_account) in ["", "No"], accounts):
msgprint(_("Account for this ") + fld + _(" has been freezed. ") + msgprint(_("Account for this ") + fieldname + _(" has been freezed. ") +
self.doc.doctype + _(" can not be made."), raise_exception=1) self.doc.doctype + _(" can not be made."), raise_exception=1)
def set_price_list_currency(self, buying_or_selling): def set_price_list_currency(self, buying_or_selling):

27
hr/doctype/grade/grade.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-01-10 16:34:14", "creation": "2013-01-10 16:34:14",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-22 15:27:26", "modified": "2013-07-26 15:24:31",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -16,11 +16,17 @@
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "grade_name",
"fieldtype": "Data",
"label": "Grade",
"name": "__common__", "name": "__common__",
"oldfieldname": "grade_name",
"oldfieldtype": "Data",
"parent": "Grade", "parent": "Grade",
"parentfield": "fields", "parentfield": "fields",
"parenttype": "DocType", "parenttype": "DocType",
"permlevel": 0 "permlevel": 0,
"reqd": 1
}, },
{ {
"cancel": 1, "cancel": 1,
@@ -42,22 +48,7 @@
"name": "Grade" "name": "Grade"
}, },
{ {
"doctype": "DocField", "doctype": "DocField"
"fieldname": "trash_reason",
"fieldtype": "Small Text",
"label": "Trash Reason",
"oldfieldname": "trash_reason",
"oldfieldtype": "Small Text",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "grade_name",
"fieldtype": "Data",
"label": "Grade",
"oldfieldname": "grade_name",
"oldfieldtype": "Data",
"reqd": 1
}, },
{ {
"doctype": "DocPerm" "doctype": "DocPerm"