From 49af8754d558c4acf867775391528b96cc75bbad Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 11 Jun 2013 12:40:46 +0530 Subject: [PATCH 1/6] [auto inventory accounting] [general ledger entry] calculate valuation amount without rounding --- accounts/doctype/purchase_invoice/purchase_invoice.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py index 95b56dc4ff..32a46cf58f 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -466,9 +466,8 @@ class DocType(BuyingController): # expense will be booked in sales invoice stock_item_and_auto_inventory_accounting = True - valuation_amt = (flt(item.amount, self.precision.item.amount) + - flt(item.item_tax_amount, self.precision.item.item_tax_amount) + - flt(item.rm_supp_cost, self.precision.item.rm_supp_cost)) + valuation_amt = (flt(item.amount) + flt(item.item_tax_amount) + + flt(item.rm_supp_cost)) gl_entries.append( self.get_gl_dict({ From 433047b2e284a707165fc1ae623d402f44a4cd64 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 11 Jun 2013 14:28:42 +0530 Subject: [PATCH 2/6] [customer] [permlevel] changed fields/perms with permlevel 2 to permlevel 1 --- selling/doctype/customer/customer.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index a221daa599..d7cecdd1bf 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-23 19:57:18", + "creation": "2013-06-11 14:26:44", "docstatus": 0, - "modified": "2013-01-29 16:28:03", + "modified": "2013-06-11 14:27:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -270,7 +270,7 @@ "label": "Credit Days", "oldfieldname": "credit_days", "oldfieldtype": "Int", - "permlevel": 2 + "permlevel": 1 }, { "doctype": "DocField", @@ -280,7 +280,7 @@ "oldfieldname": "credit_limit", "oldfieldtype": "Currency", "options": "Company:company:default_currency", - "permlevel": 2 + "permlevel": 1 }, { "doctype": "DocField", @@ -339,7 +339,7 @@ }, { "doctype": "DocPerm", - "permlevel": 2, + "permlevel": 1, "role": "Sales User" }, { @@ -355,7 +355,7 @@ }, { "doctype": "DocPerm", - "permlevel": 2, + "permlevel": 1, "role": "Sales Master Manager", "write": 1 } From 2e0cc41fc6634403d392d3c41fe203e1e2e9dacf Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 11 Jun 2013 17:33:37 +0530 Subject: [PATCH 3/6] [chart of accounts/cost center] [add account/cost center] fix in permission issue --- accounts/utils.py | 2 -- buying/doctype/supplier/supplier.py | 19 ++++++++++++------- selling/doctype/customer/customer.py | 16 +++++++++------- setup/doctype/company/company.py | 6 ++++-- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/accounts/utils.py b/accounts/utils.py index 31e622166e..eb240e796c 100644 --- a/accounts/utils.py +++ b/accounts/utils.py @@ -125,7 +125,6 @@ def add_ac(args=None): ac.doc.doctype = "Account" ac.doc.old_parent = "" ac.doc.freeze_account = "No" - ac.ignore_permissions = 1 ac.insert() return ac.doc.name @@ -138,7 +137,6 @@ def add_cc(args=None): cc = webnotes.bean(args) cc.doc.doctype = "Cost Center" cc.doc.old_parent = "" - cc.ignore_permissions = 1 cc.insert() return cc.doc.name diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py index d41b86c32c..f506439bad 100644 --- a/buying/doctype/supplier/supplier.py +++ b/buying/doctype/supplier/supplier.py @@ -24,7 +24,6 @@ from webnotes.model.doc import make_autoname sql = webnotes.conn.sql -from accounts.utils import add_ac from utilities.transaction_base import TransactionBase class DocType(TransactionBase): @@ -71,14 +70,16 @@ class DocType(TransactionBase): return g def add_account(self, ac, par, abbr): - ac = add_ac({ + ac_bean = webnotes.bean({ + "doctype": "Account", 'account_name':ac, 'parent_account':par, 'group_or_ledger':'Group', 'company':self.doc.company, - 'account_type':'', - 'tax_rate':'0' + "freeze_account": "No", }) + ac_bean.ignore_permissions = True + ac_bean.insert() msgprint(_("Created Group ") + ac) @@ -109,8 +110,8 @@ class DocType(TransactionBase): parent_account = self.get_parent_account(abbr) if not sql("select name from tabAccount where name=%s", (self.doc.name + " - " + abbr)): - - ac = add_ac({ + ac_bean = webnotes.bean({ + "doctype": "Account", 'account_name': self.doc.name, 'parent_account': parent_account, 'group_or_ledger':'Ledger', @@ -119,8 +120,12 @@ class DocType(TransactionBase): 'tax_rate': '0', 'master_type': 'Supplier', 'master_name': self.doc.name, + "freeze_account": "No" }) - msgprint(_("Created Account Head: ") + ac) + ac_bean.ignore_permissions = True + ac_bean.insert() + + msgprint(_("Created Account Head: ") + ac_bean.doc.name) else: self.check_parent_account(parent_account, abbr) else : diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py index 72e12b7942..65ac865304 100644 --- a/selling/doctype/customer/customer.py +++ b/selling/doctype/customer/customer.py @@ -115,18 +115,20 @@ class DocType(TransactionBase): if not webnotes.conn.exists("Account", (self.doc.name + " - " + abbr)): parent_account = self.get_receivables_group() # create - from accounts.utils import add_ac - ac = add_ac({ - 'account_name':self.doc.name, + ac_bean = webnotes.bean({ + "doctype": "Account", + 'account_name': self.doc.name, 'parent_account': parent_account, 'group_or_ledger':'Ledger', 'company':self.doc.company, - 'account_type':'', - 'tax_rate':'0', 'master_type':'Customer', - 'master_name':self.doc.name + 'master_name':self.doc.name, + "freeze_account": "No" }) - msgprint("Account Head: %s created" % ac) + ac_bean.ignore_permissions = True + ac_bean.insert() + + msgprint("Account Head: %s created" % ac_bean.doc.name) else : msgprint("Please Select Company under which you want to create account head") diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index 9863d7d28b..2564503833 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -222,7 +222,6 @@ class DocType: # Create default cost center # --------------------------------------------------- def create_default_cost_center(self): - from accounts.utils import add_cc cc_list = [ { 'cost_center_name':'Root', @@ -244,7 +243,10 @@ class DocType: } ] for cc in cc_list: - add_cc(cc) + cc.update({"doctype": "Cost Center"}) + cc_bean = webnotes.bean(cc) + cc_bean.ignore_permissions = True + cc_bean.insert() webnotes.conn.set_value("Company", self.doc.name, "cost_center", "Default CC Ledger - " + self.doc.abbr) From 0865f606735715b80ee4abb359cc30dfebf5083a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 11 Jun 2013 17:48:59 +0530 Subject: [PATCH 4/6] [chart of accounts/cost center] [fix] check permission before enabling add child --- accounts/page/accounts_browser/accounts_browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index 2e8cc820a6..3541fcbf1f 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -131,7 +131,7 @@ erpnext.AccountsChart = Class.extend({ if (wn.model.can_read(this.ctype) !== -1) { node_links.push('Edit'); } - if (data.expandable) { + if (data.expandable && wn.boot.profile.in_create.indexOf(this.ctype) !== -1) { node_links.push('Add Child'); } else if (this.ctype === 'Account' && wn.boot.profile.can_read.indexOf("GL Entry") !== -1) { node_links.push('View Ledger'); From ad6180ef6d325bb6fc09ee9136e3a36e75483f74 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 17 Jun 2013 11:57:04 +0530 Subject: [PATCH 5/6] [material request on re-order level] [fixes] if error occurs, send email to the System Manager --- .../purchase_common/purchase_common.py | 25 +++--- startup/schedule_handlers.py | 4 +- stock/doctype/stock_entry/test_stock_entry.py | 3 + stock/utils.py | 90 +++++++++++++------ 4 files changed, 81 insertions(+), 41 deletions(-) diff --git a/buying/doctype/purchase_common/purchase_common.py b/buying/doctype/purchase_common/purchase_common.py index 2b6ca27acc..7cc5c22ea8 100644 --- a/buying/doctype/purchase_common/purchase_common.py +++ b/buying/doctype/purchase_common/purchase_common.py @@ -185,21 +185,22 @@ class DocType(BuyingController): if d.fields.has_key(x): d.fields[x] = f_lst[x] - item = sql("select is_stock_item, is_purchase_item, is_sub_contracted_item from tabItem where name=%s and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now())", d.item_code) + item = sql("select is_stock_item, is_purchase_item, is_sub_contracted_item, end_of_life from tabItem where name=%s", + d.item_code) if not item: - msgprint("Item %s does not exist in Item Master." % cstr(d.item_code)) - raise Exception + msgprint("Item %s does not exist in Item Master." % cstr(d.item_code), raise_exception=True) + + from stock.utils import validate_end_of_life + validate_end_of_life(d.item_code, item[0][3]) # validate stock item if item[0][0]=='Yes' and d.qty and not d.warehouse: - msgprint("Warehouse is mandatory for %s, since it is a stock item" % - d.item_code, raise_exception=1) + msgprint("Warehouse is mandatory for %s, since it is a stock item" % + d.item_code, raise_exception=1) # validate purchase item if item[0][1] != 'Yes' and item[0][2] != 'Yes': - msgprint("Item %s is not a purchase item or sub-contracted item. Please check" % (d.item_code)) - raise Exception - + msgprint("Item %s is not a purchase item or sub-contracted item. Please check" % (d.item_code), raise_exception=True) if d.fields.has_key('prevdoc_docname') and d.prevdoc_docname: # check warehouse, uom in previous doc and in current doc are same. @@ -215,13 +216,13 @@ class DocType(BuyingController): # Check if Warehouse has been modified. if not cstr(data[0]['warehouse']) == cstr(d.warehouse): - msgprint("Please check warehouse %s of Item %s which is not present in %s %s ." % (d.warehouse, d.item_code, d.prevdoc_doctype, d.prevdoc_docname)) - raise Exception + msgprint("Please check warehouse %s of Item %s which is not present in %s %s ." % \ + (d.warehouse, d.item_code, d.prevdoc_doctype, d.prevdoc_docname), raise_exception=True) # Check if UOM has been modified. if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Material Request': - msgprint("Please check UOM %s of Item %s which is not present in %s %s ." % (d.uom, d.item_code, d.prevdoc_doctype, d.prevdoc_docname)) - raise Exception + msgprint("Please check UOM %s of Item %s which is not present in %s %s ." % \ + (d.uom, d.item_code, d.prevdoc_doctype, d.prevdoc_docname), raise_exception=True) # list criteria that should not repeat if item is stock item e = [d.schedule_date, d.item_code, d.description, d.warehouse, d.uom, d.fields.has_key('prevdoc_docname') and d.prevdoc_docname or '', d.fields.has_key('prevdoc_detail_docname') and d.prevdoc_detail_docname or '', d.fields.has_key('batch_no') and d.batch_no or ''] diff --git a/startup/schedule_handlers.py b/startup/schedule_handlers.py index cc0d1f4fea..99cc05b041 100644 --- a/startup/schedule_handlers.py +++ b/startup/schedule_handlers.py @@ -53,7 +53,7 @@ def execute_daily(): # daily backup from setup.doctype.backup_manager.backup_manager import take_backups_daily - take_backups_daily() + run_fn(take_backups_daily) # check reorder level from stock.utils import reorder_item @@ -61,7 +61,7 @@ def execute_daily(): def execute_weekly(): from setup.doctype.backup_manager.backup_manager import take_backups_weekly - take_backups_weekly() + run_fn(take_backups_weekly) def execute_monthly(): pass diff --git a/stock/doctype/stock_entry/test_stock_entry.py b/stock/doctype/stock_entry/test_stock_entry.py index c3ce2d7f40..2ab2b1dad8 100644 --- a/stock/doctype/stock_entry/test_stock_entry.py +++ b/stock/doctype/stock_entry/test_stock_entry.py @@ -21,6 +21,9 @@ class TestStockEntry(unittest.TestCase): st2.insert() st2.submit() + from stock.utils import reorder_item + reorder_item() + mr_name = webnotes.conn.sql("""select parent from `tabMaterial Request Item` where item_code='_Test Item'""") diff --git a/stock/utils.py b/stock/utils.py index 5e7e53bb01..53ad69b157 100644 --- a/stock/utils.py +++ b/stock/utils.py @@ -19,13 +19,14 @@ from webnotes import msgprint, _ import json from webnotes.utils import flt, cstr, nowdate, add_days, cint from webnotes.defaults import get_global_default +from webnotes.utils.email_lib import sendmail def validate_end_of_life(item_code, end_of_life=None, verbose=1): if not end_of_life: end_of_life = webnotes.conn.get_value("Item", item_code, "end_of_life") from webnotes.utils import getdate, now_datetime, formatdate - if end_of_life and getdate(end_of_life) > now_datetime().date(): + if end_of_life and getdate(end_of_life) <= now_datetime().date(): msg = (_("Item") + " %(item_code)s: " + _("reached its end of life on") + \ " %(date)s. " + _("Please check") + ": %(end_of_life_label)s " + \ "in Item master") % { @@ -205,7 +206,11 @@ def reorder_item(): if webnotes.auto_indent: material_requests = {} bin_list = webnotes.conn.sql("""select item_code, warehouse, projected_qty - from tabBin where ifnull(item_code, '') != '' and ifnull(warehouse, '') != ''""", + from tabBin where ifnull(item_code, '') != '' and ifnull(warehouse, '') != '' + and exists (select name from `tabItem` + where `tabItem`.name = `tabBin`.item_code and + is_stock_item='Yes' and (is_purchase_item='Yes' or is_sub_contracted_item='Yes') and + (ifnull(end_of_life, '')='') or end_of_life > now())""", as_dict=True) for bin in bin_list: #check if re-order is required @@ -220,7 +225,7 @@ def reorder_item(): ["re_order_level", "re_order_qty"]) material_request_type = "Purchase" - if reorder_level and flt(bin.projected_qty) < flt(reorder_level): + if flt(reorder_level) and flt(bin.projected_qty) < flt(reorder_level): if flt(reorder_level) - flt(bin.projected_qty) > flt(reorder_qty): reorder_qty = flt(reorder_level) - flt(bin.projected_qty) @@ -242,10 +247,14 @@ def create_material_request(material_requests): """ Create indent on reaching reorder level """ mr_list = [] defaults = webnotes.defaults.get_defaults() + exceptions_list = [] for request_type in material_requests: for company in material_requests[request_type]: - items = material_requests[request_type][company] - if items: + try: + items = material_requests[request_type][company] + if not items: + continue + mr = [{ "doctype": "Material Request", "company": company, @@ -257,27 +266,34 @@ def create_material_request(material_requests): quantity reaches re-order level when the following record was created""") }] - for d in items: - item = webnotes.doc("Item", d.item_code) - mr.append({ - "doctype": "Material Request Item", - "parenttype": "Material Request", - "parentfield": "indent_details", - "item_code": d.item_code, - "schedule_date": add_days(nowdate(),cint(item.lead_time_days)), - "uom": item.stock_uom, - "warehouse": d.warehouse, - "item_name": item.item_name, - "description": item.description, - "item_group": item.item_group, - "qty": d.reorder_qty, - "brand": item.brand, - }) + for d in items: + item = webnotes.doc("Item", d.item_code) + mr.append({ + "doctype": "Material Request Item", + "parenttype": "Material Request", + "parentfield": "indent_details", + "item_code": d.item_code, + "schedule_date": add_days(nowdate(),cint(item.lead_time_days)), + "uom": item.stock_uom, + "warehouse": d.warehouse, + "item_name": item.item_name, + "description": item.description, + "item_group": item.item_group, + "qty": d.reorder_qty, + "brand": item.brand, + }) - mr_bean = webnotes.bean(mr) - mr_bean.insert() - mr_bean.submit() - mr_list.append(mr_bean) + mr_bean = webnotes.bean(mr) + mr_bean.insert() + mr_bean.submit() + mr_list.append(mr_bean) + + except: + if webnotes.message_log: + exceptions_list.append([] + webnotes.message_log) + webnotes.message_log = [] + else: + exceptions_list.append(webnotes.getTraceback()) if mr_list: if not hasattr(webnotes, "reorder_email_notify"): @@ -286,11 +302,13 @@ def create_material_request(material_requests): if(webnotes.reorder_email_notify): send_email_notification(mr_list) + + if exceptions_list: + notify_errors(exceptions_list) def send_email_notification(mr_list): """ Notify user about auto creation of indent""" - from webnotes.utils.email_lib import sendmail email_list = webnotes.conn.sql_list("""select distinct r.parent from tabUserRole r, tabProfile p where p.name = r.parent and p.enabled = 1 and p.docstatus < 2 @@ -307,4 +325,22 @@ def send_email_notification(mr_list): cstr(item.qty) + "" + cstr(item.uom) + "" msg += "" - sendmail(email_list, subject='Auto Material Request Generation Notification', msg = msg) \ No newline at end of file + sendmail(email_list, subject='Auto Material Request Generation Notification', msg = msg) + +def notify_errors(exceptions_list): + subject = "[Important] [ERPNext] Error(s) while creating Material Requests based on Re-order Levels" + msg = """Dear System Manager, + + An error occured for certain Items while creating Material Requests based on Re-order level. + + Please rectify these issues: + --- + + %s + + --- + Regards, + Administrator""" % ("\n\n".join(["\n".join(msg) for msg in exceptions_list]),) + + from webnotes.profile import get_system_managers + sendmail(get_system_managers(), subject=subject, msg=msg) From 11d311376eb4b18572a7ae2dedfe9adb617002a5 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 17 Jun 2013 12:51:36 +0530 Subject: [PATCH 6/6] [event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue --- .../p04_fix_event_for_lead_oppty_project.py | 5 +++-- projects/doctype/project/project.py | 9 +++------ .../maintenance_schedule/maintenance_schedule.py | 12 +++--------- utilities/transaction_base.py | 5 +++++ 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/patches/june_2013/p04_fix_event_for_lead_oppty_project.py b/patches/june_2013/p04_fix_event_for_lead_oppty_project.py index 3f66d8bfbb..971e4c7459 100644 --- a/patches/june_2013/p04_fix_event_for_lead_oppty_project.py +++ b/patches/june_2013/p04_fix_event_for_lead_oppty_project.py @@ -1,6 +1,8 @@ import webnotes def execute(): + from utilities.transaction_base import delete_events + # delete orphaned Event User webnotes.conn.sql("""delete from `tabEvent User` where not exists(select name from `tabEvent` where `tabEvent`.name = `tabEvent User`.parent)""") @@ -15,5 +17,4 @@ def execute(): webnotes.get_obj(dt, ref_name).add_calendar_event() else: # remove events where ref doc doesn't exist - webnotes.delete_doc("Event", webnotes.conn.sql_list("""select name from `tabEvent` - where ref_type=%s and ref_name=%s""", (dt, ref_name))) \ No newline at end of file + delete_events(dt, ref_name) \ No newline at end of file diff --git a/projects/doctype/project/project.py b/projects/doctype/project/project.py index 94b6787312..84a216c349 100644 --- a/projects/doctype/project/project.py +++ b/projects/doctype/project/project.py @@ -19,6 +19,7 @@ import webnotes from webnotes.utils import flt, getdate from webnotes import msgprint +from utilities.transaction_base import delete_events class DocType: def __init__(self, doc, doclist=None): @@ -69,7 +70,7 @@ class DocType: def add_calendar_event(self): # delete any earlier event for this project - self.delete_events() + delete_events(self.doc.doctype, self.doc.name) # add events for milestone in self.doclist.get({"parentfield": "project_milestones"}): @@ -87,8 +88,4 @@ class DocType: }).insert() def on_trash(self): - self.delete_events() - - def delete_events(self): - webnotes.delete_doc("Event", webnotes.conn.sql_list("""select name from `tabEvent` - where ref_type=%s and ref_name=%s""", (self.doc.doctype, self.doc.name))) \ No newline at end of file + delete_events(self.doc.doctype, self.doc.name) \ No newline at end of file diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.py b/support/doctype/maintenance_schedule/maintenance_schedule.py index 06c5a47aff..baed6a9dbd 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.py +++ b/support/doctype/maintenance_schedule/maintenance_schedule.py @@ -26,7 +26,7 @@ from webnotes import msgprint sql = webnotes.conn.sql -from utilities.transaction_base import TransactionBase +from utilities.transaction_base import TransactionBase, delete_events class DocType(TransactionBase): def __init__(self, doc, doclist=[]): @@ -327,13 +327,7 @@ class DocType(TransactionBase): if d.serial_no: self.update_amc_date(d.serial_no, '') webnotes.conn.set(self.doc, 'status', 'Cancelled') - self.delete_events() + delete_events(self.doc.doctype, self.doc.name) def on_trash(self): - self.delete_events() - - def delete_events(self): - webnotes.delete_doc("Event", webnotes.conn.sql_list("""select name from `tabEvent` - where ref_type=%s and ref_name=%s""", (self.doc.doctype, self.doc.name))) - - + delete_events(self.doc.doctype, self.doc.name) diff --git a/utilities/transaction_base.py b/utilities/transaction_base.py index f9af912737..03321853a7 100644 --- a/utilities/transaction_base.py +++ b/utilities/transaction_base.py @@ -303,3 +303,8 @@ class TransactionBase(DocListController): }) webnotes.bean(event_doclist).insert() + + +def delete_events(ref_type, ref_name): + webnotes.delete_doc("Event", webnotes.conn.sql_list("""select name from `tabEvent` + where ref_type=%s and ref_name=%s""", (ref_type, ref_name)), for_reload=True) \ No newline at end of file