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

asynchronus issue in get_party_details

Browse Source
This commit is contained in:
Nabin Hait 2014-05-02 15:45:10 +05:30
parent 1e6c32e95f
commit 6b03914731
6 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
View File

@ -227,8 +227,7 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
"company": doc.company "company": doc.company
}, },
callback: function(r) { callback: function(r) {
frappe.model.clear_table("Journal Voucher Detail", "Journal Voucher", frappe.model.clear_table(doc, "entries");
doc.name, "entries");
if(r.message) { if(r.message) {
update_jv_details(doc, r); update_jv_details(doc, r);
} }

3
erpnext/accounts/party.py
View File

@ -39,7 +39,8 @@ def _get_party_details(party=None, account=None, party_type="Customer", company=
if party_type=="Customer": if party_type=="Customer":
out["sales_team"] = [{ out["sales_team"] = [{
"sales_person": d.sales_person, "sales_person": d.sales_person,
"sales_designation": d.sales_designation "sales_designation": d.sales_designation,
"allocated_percentage": d.allocated_percentage
} for d in party.get("sales_team")] } for d in party.get("sales_team")]
return out return out

30
erpnext/controllers/accounts_controller.py
View File

@ -122,17 +122,8 @@ class AccountsController(TransactionBase):
tax_doctype = self.meta.get_field(tax_parentfield).options tax_doctype = self.meta.get_field(tax_parentfield).options
from frappe.model import default_fields self.extend(tax_parentfield,
tax_master = frappe.get_doc(tax_master_doctype, self.get(tax_master_field)) get_taxes_and_charges(tax_doctype, self.get(tax_master_field)), tax_parentfield)
for i, tax in enumerate(tax_master.get(tax_parentfield)):
tax = tax.as_dict()
for fieldname in default_fields:
if fieldname in tax:
del tax[fieldname]
self.append(tax_parentfield, tax)
def set_other_charges(self): def set_other_charges(self):
self.set("other_charges", []) self.set("other_charges", [])
@ -457,3 +448,20 @@ class AccountsController(TransactionBase):
@frappe.whitelist() @frappe.whitelist()
def get_tax_rate(account_head): def get_tax_rate(account_head):
return frappe.db.get_value("Account", account_head, "tax_rate") return frappe.db.get_value("Account", account_head, "tax_rate")
@frappe.whitelist()
def get_taxes_and_charges(master_doctype, master_name, tax_parentfield):
from frappe.model import default_fields
tax_master = frappe.get_doc(master_doctype, master_name)
taxes_and_charges = []
for i, tax in enumerate(tax_master.get(tax_parentfield)):
tax = tax.as_dict()
for fieldname in default_fields:
if fieldname in tax:
del tax[fieldname]
taxes_and_charges.append(tax)
return taxes_and_charges

8
erpnext/controllers/selling_controller.py
View File

@ -33,8 +33,12 @@ class SellingController(StockController):
def set_missing_lead_customer_details(self): def set_missing_lead_customer_details(self):
if getattr(self, "customer", None): if getattr(self, "customer", None):
from erpnext.accounts.party import _get_party_details from erpnext.accounts.party import _get_party_details
self.update_if_missing(_get_party_details(self.customer, party_details = _get_party_details(self.customer,
ignore_permissions=getattr(self, "ignore_permissions", None))) ignore_permissions=getattr(self, "ignore_permissions", None))
if not self.meta.get_field("sales_team"):
party_details.pop("sales_team")
self.update_if_missing(party_details)
elif getattr(self, "lead", None): elif getattr(self, "lead", None):
from erpnext.selling.doctype.lead.lead import get_lead_details from erpnext.selling.doctype.lead.lead import get_lead_details

11
erpnext/public/js/transaction.js
View File

@ -702,15 +702,20 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
var me = this; var me = this;
if(this.frm.doc.taxes_and_charges) { if(this.frm.doc.taxes_and_charges) {
return this.frm.call({ return this.frm.call({
doc: this.frm.doc, method: "erpnext.controllers.accounts_controller.get_taxes_and_charges",
method: "set_other_charges", args: {
"master_doctype": "Sales Taxes and Charges Master",
"master_name": this.frm.doc.taxes_and_charges,
"tax_parentfield": this.other_fname
},
callback: function(r) { callback: function(r) {
if(!r.exc) { if(!r.exc) {
me.frm.set_value(me.other_fname, r.message);
me.calculate_taxes_and_totals(); me.calculate_taxes_and_totals();
} }
} }
}); });
} });
}, },
show_item_wise_taxes: function() { show_item_wise_taxes: function() {