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

use generator when updating and notify user of long process (#10777)

Browse Source
This commit is contained in:
tundebabzy 2017-09-21 13:57:33 +01:00 committed by Nabin Hait
parent 3d5d858933
commit e4be3f8dc9
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/setup/doctype/company/company.js
View File

@ -111,8 +111,9 @@ cur_frm.cscript.change_abbr = function() {
dialog.fields_dict.update.$input.click(function() { dialog.fields_dict.update.$input.click(function() {
var args = dialog.get_values(); var args = dialog.get_values();
if(!args) return; if(!args) return;
frappe.show_alert(__("Update in progress. It might take a while."));
return frappe.call({ return frappe.call({
method: "erpnext.setup.doctype.company.company.replace_abbr", method: "erpnext.setup.doctype.company.company.enqueue_replace_abbr",
args: { args: {
"company": cur_frm.doc.name, "company": cur_frm.doc.name,
"old": cur_frm.doc.abbr, "old": cur_frm.doc.abbr,

25
erpnext/setup/doctype/company/company.py
View File

@ -282,6 +282,13 @@ class Company(Document):
where doctype='Global Defaults' and field='default_company' where doctype='Global Defaults' and field='default_company'
and value=%s""", self.name) and value=%s""", self.name)
@frappe.whitelist()
def enqueue_replace_abbr(company, old, new):
kwargs = dict(company=company, old=old, new=new)
frappe.enqueue('erpnext.setup.doctype.company.company.replace_abbr', **kwargs)
@frappe.whitelist() @frappe.whitelist()
def replace_abbr(company, old, new): def replace_abbr(company, old, new):
new = new.strip() new = new.strip()
@ -292,16 +299,22 @@ def replace_abbr(company, old, new):
frappe.db.set_value("Company", company, "abbr", new) frappe.db.set_value("Company", company, "abbr", new)
def _rename_record(dt): def _rename_record(doc):
for d in frappe.db.sql("select name from `tab%s` where company=%s" % (dt, '%s'), company): parts = doc[0].rsplit(" - ", 1)
parts = d[0].rsplit(" - ", 1) if len(parts) == 1 or parts[1].lower() == old.lower():
if len(parts) == 1 or parts[1].lower() == old.lower(): frappe.rename_doc(dt, doc[0], parts[0] + " - " + new)
frappe.rename_doc(dt, d[0], parts[0] + " - " + new)
def _rename_records(dt):
# rename is expensive so let's be economical with memory usage
doc = (d for d in frappe.db.sql("select name from `tab%s` where company=%s" % (dt, '%s'), company))
for d in doc:
_rename_record(d)
for dt in ["Warehouse", "Account", "Cost Center"]: for dt in ["Warehouse", "Account", "Cost Center"]:
_rename_record(dt) _rename_records(dt)
frappe.db.commit() frappe.db.commit()
def get_name_with_abbr(name, company): def get_name_with_abbr(name, company):
company_abbr = frappe.db.get_value("Company", company, "abbr") company_abbr = frappe.db.get_value("Company", company, "abbr")
parts = name.split(" - ") parts = name.split(" - ")