schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappe/frappe#478

Browse Source
This commit is contained in:
Rushabh Mehta
2014-03-27 17:51:41 +05:30
parent d2b34dc30c
commit e88bc8b12a
36 changed files with 81 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/controllers/accounts_controller.py
View File

@@ -121,17 +121,11 @@ class AccountsController(TransactionBase):
from frappe.model import default_fields
tax_master = frappe.bean(tax_master_doctype, self.doc.fields.get(tax_master_field))
for i, tax in enumerate(tax_master.doclist.get({"parentfield": tax_parentfield})):
for i, tax in enumerate(tax_master.get(tax_parentfield)):
for fieldname in default_fields:
tax.fields[fieldname] = None
tax.fields.update({
"doctype": tax_doctype,
"parentfield": tax_parentfield,
"idx": i+1
})
self.doclist.append(tax)
tax.set(fieldname, None)
self.append(tax_parentfield, tax)
def get_other_charges(self):
self.set("other_charges", [])
@@ -410,9 +404,8 @@ class AccountsController(TransactionBase):
self.set(parentfield, [])
for d in res:
self.doclist.append({
self.append(parentfield, {
"doctype": child_doctype,
"parentfield": parentfield,
"journal_voucher": d.jv_no,
"jv_detail_no": d.jv_detail_no,
"remarks": d.remark,