Merge branch 'slow' of github.com:webnotes/erpnext into slow
diff --git a/accounts/doctype/gl_entry/gl_entry.py b/accounts/doctype/gl_entry/gl_entry.py
index 2a0985b..64d84b0 100644
--- a/accounts/doctype/gl_entry/gl_entry.py
+++ b/accounts/doctype/gl_entry/gl_entry.py
@@ -35,8 +35,9 @@
self.check_credit_limit()
self.check_pl_account()
- def on_update(self,adv_adj, cancel, update_outstanding = 'Yes'):
+ def on_update(self, adv_adj, cancel, update_outstanding = 'Yes'):
self.validate_account_details(adv_adj)
+ self.validate_cost_center()
self.check_freezing_date(adv_adj)
self.check_negative_balance(adv_adj)
@@ -97,21 +98,36 @@
from tabAccount where name=%s""", self.doc.account, as_dict=1)
if ret and ret[0]["group_or_ledger"]=='Group':
- msgprint(_("Account: ") + self.doc.account + _(" is not a ledger"), raise_exception=1)
+ msgprint(_("Account") + ": " + self.doc.account + _(" is not a ledger"), raise_exception=1)
if ret and ret[0]["docstatus"]==2:
- msgprint(_("Account: ") + self.doc.account + _(" is not active"), raise_exception=1)
+ msgprint(_("Account") + ": " + self.doc.account + _(" is not active"), raise_exception=1)
# Account has been freezed for other users except account manager
if ret and ret[0]["freeze_account"]== 'Yes' and not adv_adj \
and not 'Accounts Manager' in webnotes.user.get_roles():
- msgprint(_("Account: ") + self.doc.account + _(" has been freezed. \
+ msgprint(_("Account") + ": " + self.doc.account + _(" has been freezed. \
Only Accounts Manager can do transaction against this account"), raise_exception=1)
if ret and ret[0]["company"] != self.doc.company:
- msgprint(_("Account: ") + self.doc.account + _(" does not belong to the company: ") +
- self.doc.company, raise_exception=1)
-
+ msgprint(_("Account") + ": " + self.doc.account + _(" does not belong to the company") \
+ + ": " + self.doc.company, raise_exception=1)
+
+ def validate_cost_center(self):
+ if not hasattr(self, "cost_center_company"):
+ self.cost_center_company = {}
+
+ def _get_cost_center_company():
+ if not self.cost_center_company.get(self.doc.cost_center):
+ self.cost_center_company[self.doc.cost_center] = webnotes.conn.get_value("Cost Center",
+ self.doc.cost_center, "company_name")
+
+ return self.cost_center_company[self.doc.cost_center]
+
+ if self.doc.cost_center and _get_cost_center_company() != self.doc.company:
+ msgprint(_("Cost Center") + ": " + self.doc.cost_center \
+ + _(" does not belong to the company") + ": " + self.doc.company, raise_exception=True)
+
def check_freezing_date(self, adv_adj):
"""
Nobody can do GL Entries where posting date is before freezing date
diff --git a/patches/april_2013/p06_default_cost_center.py b/patches/april_2013/p06_default_cost_center.py
new file mode 100644
index 0000000..4f80d95
--- /dev/null
+++ b/patches/april_2013/p06_default_cost_center.py
@@ -0,0 +1,10 @@
+import webnotes
+
+def execute():
+ for dt, fieldname in \
+ (("Journal Voucher Detail", "cost_center"),
+ ("Sales Taxes and Charges", "cost_center_other_charges"),
+ ("Purchase Taxes and Charges", "cost_center"), ("Delivery Note Item", "cost_center"),
+ ("Purchase Invoice Item", "cost_center"), ("Sales Invoice Item", "cost_center")):
+ webnotes.conn.sql_ddl("""alter table `tab%s` alter `%s` drop default""" % (dt, fieldname))
+ webnotes.reload_doc(webnotes.conn.get_value("DocType", dt, "module"), "DocType", dt)
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 79e6f59..f6a5996 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -241,5 +241,6 @@
"execute:webnotes.delete_doc('Search Criteria', 'time_log_summary')",
"patches.april_2013.p04_update_role_in_pages",
"patches.april_2013.p05_fixes_in_reverse_modules",
- "execute:webnotes.delete_doc('DocType Mapper', 'Delivery Note-Packing Slip')"
+ "execute:webnotes.delete_doc('DocType Mapper', 'Delivery Note-Packing Slip')",
+ "patches.april_2013.p06_default_cost_center",
]
\ No newline at end of file