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

fixed default tax fetch issue

Browse Source
This commit is contained in:
Anand Doshi 2012-06-13 14:20:24 +05:30
parent 61ade3d486
commit 7deaff1979
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/sales_common/sales_common.js
View File

@ -30,7 +30,7 @@ cur_frm.cscript.load_taxes = function(doc, cdt, cdn, callback) {
callback(doc, cdt, cdn);
}
} else {
$c_obj([doc],'load_default_taxes','',function(r,rt){
$c_obj(make_doclist(doc.doctype, doc.name),'load_default_taxes','',function(r,rt){
refresh_field('other_charges');
if(callback) callback(doc, cdt, cdn);
});
@ -72,6 +72,8 @@ cur_frm.cscript.update_item_details = function(doc, dt, dn, callback) {
cur_frm.cscript.load_defaults(doc, dt, dn, callback);
}
});
} else {
cur_frm.cscript.load_taxes(doc, dt, dn, callback);
}
}

7
erpnext/selling/doctype/sales_common/sales_common.py
View File

@ -214,12 +214,15 @@ class DocType(TransactionBase):
# Load Default Taxes
# ====================
def load_default_taxes(self, obj):
self.get_other_charges(obj,1)
if cstr(obj.doc.charge):
self.get_other_charges(obj)
else:
self.get_other_charges(obj, 1)
# Get other charges from Master
# =================================================================================
def get_other_charges(self,obj,default = 0):
def get_other_charges(self,obj, default=0):
obj.doc.clear_table(obj.doclist,'other_charges')
if not getlist(obj.doclist, 'other_charges'):
if default: add_cond = 'ifnull(t2.is_default,0) = 1'