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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-11-23 12:31:54 +01:00
commit 4c90b3fc7e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/page/voucher_import_tool/voucher_import_tool.py
View File

@ -206,7 +206,7 @@ def get_data(rows, company_abbr):
if accounts: if accounts:
total_debit = total_credit = 0 total_debit = total_credit = 0
for acc_idx in xrange(len(accounts)): for acc_idx in xrange(len(accounts)):
col_idx = len(columns) - 1 + acc_idx col_idx = len(columns) + acc_idx
if flt(r[col_idx]) != 0: if flt(r[col_idx]) != 0:
if not acc_dict.get(accounts[acc_idx]): if not acc_dict.get(accounts[acc_idx]):
acc_dict[accounts[acc_idx]] = 0 acc_dict[accounts[acc_idx]] = 0
@ -228,4 +228,8 @@ def get_data(rows, company_abbr):
if not c.endswith(" - " + company_abbr)] if not c.endswith(" - " + company_abbr)]
accounts = [c for c in rows[i+1] if c.endswith(" - " + company_abbr)] accounts = [c for c in rows[i+1] if c.endswith(" - " + company_abbr)]
if accounts and (len(columns) != rows[i+1].index(accounts[0])):
raise Exception, """A non-account column cannot be after an account \
column. Please rectify it in the file and try again."""
return data, start_row_idx return data, start_row_idx

10
selling/doctype/sales_common/sales_common.js
View File

@ -29,6 +29,8 @@ cur_frm.cscript.load_taxes = function(doc, cdt, cdn, callback) {
if(callback) { if(callback) {
callback(doc, cdt, cdn); callback(doc, cdt, cdn);
} }
} else if(doc.charge) {
cur_frm.cscript.get_charges(doc, cdt, cdn, callback);
} else { } else {
$c_obj(make_doclist(doc.doctype, doc.name),'load_default_taxes','',function(r,rt){ $c_obj(make_doclist(doc.doctype, doc.name),'load_default_taxes','',function(r,rt){
refresh_field('other_charges'); refresh_field('other_charges');
@ -374,12 +376,14 @@ cur_frm.fields_dict.charge.get_query = function(doc) {
} }
// ********************* Get Charges **************************** // ********************* Get Charges ****************************
cur_frm.cscript.get_charges = function(doc, cdt, cdn) { cur_frm.cscript.get_charges = function(doc, cdt, cdn, callback) {
$c_obj(make_doclist(doc.doctype,doc.name), $c_obj(make_doclist(doc.doctype,doc.name),
'get_other_charges', 'get_other_charges',
'', '',
function(r, rt) { cur_frm.cscript.calculate_charges(doc, cdt, cdn);} function(r, rt) {
,null,null,cur_frm.fields_dict.get_charges.input); cur_frm.cscript.calculate_charges(doc, cdt, cdn);
if(callback) callback(doc, cdt, cdn);
}, null,null,cur_frm.fields_dict.get_charges.input);
} }