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

fix: Assign indent and parent_invoice

Browse Source
This commit is contained in:
GangaManoj 2021-08-20 03:54:19 +05:30
parent 779a1d68a5
commit 97a1d426a3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@ -46,18 +46,13 @@ def execute(filters=None):
for src in gross_profit_data.si_list: for src in gross_profit_data.si_list:
row = frappe._dict() row = frappe._dict()
row['currency'] = filters.currency row.indent = src.indent
row.parent_invoice = src.parent_invoice
row.currency = filters.currency
for col in group_wise_columns.get(scrub(filters.group_by)): for col in group_wise_columns.get(scrub(filters.group_by)):
row[column_names[col]] = src.get(col) row[column_names[col]] = src.get(col)
if row.item_code:
row.indent = 1.0
row.parent_invoice = src.parent_invoice
else:
row.indent = 0.0
row.parent_invoice = ''
data.append(row) data.append(row)
else: else:
@ -412,7 +407,9 @@ class GrossProfitGenerator(object):
'item_row': None, 'item_row': None,
'is_return': row.is_return, 'is_return': row.is_return,
'cost_center': row.cost_center, 'cost_center': row.cost_center,
'base_net_amount': 0 'base_net_amount': 0,
'indent': 0.0,
'parent_invoice': ''
}) })
self.si_list.insert(index, invoice) self.si_list.insert(index, invoice)
@ -422,7 +419,8 @@ class GrossProfitGenerator(object):
row.indent = 1.0 row.indent = 1.0
row.parent_invoice = row.parent row.parent_invoice = row.parent
row.parent = row.item_code row.parent = row.item_code
self.si_list[0].base_net_amount += row.base_net_amount # ind = parents_index-1 if parents_index > 0 else parents_index
# self.si_list[ind].base_net_amount += row.base_net_amount
def load_stock_ledger_entries(self): def load_stock_ledger_entries(self):
res = frappe.db.sql("""select item_code, voucher_type, voucher_no, res = frappe.db.sql("""select item_code, voucher_type, voucher_no,