nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fetch base_net_total for each Invoice

Browse Source
This commit is contained in:
GangaManoj
2021-08-24 23:32:19 +05:30
parent 452c613974
commit 391bf86e0a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,7 +429,8 @@ 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': frappe.db.get_value('Sales Invoice', row.parent, 'base_net_total'),
'base_rate': None
}) })
self.si_list.insert(index, invoice) self.si_list.insert(index, invoice)
@@ -444,7 +445,7 @@ class GrossProfitGenerator(object):
# if not self.si_list[parents_index-1].base_net_amount: # if not self.si_list[parents_index-1].base_net_amount:
# self.si_list[parents_index-1].base_net_amount = 0 # self.si_list[parents_index-1].base_net_amount = 0
# self.si_list[parents_index-1].base_net_amount += row.base_net_amount # self.si_list[parents_index-1].base_net_amount += row.base_net_amount
# print("\n\n\n\n\nRow Details: ", index, ". ", row.parent, ": ", row.base_net_amount) # print("\n\n\n\n\nRow Details: ", index, ". ", row.parent, ": ", row.base_net_amount)
@@ -459,7 +460,7 @@ class GrossProfitGenerator(object):
base_net_amount += row.get('base_net_amount') base_net_amount += row.get('base_net_amount')
elif row.indent == 0.0: elif row.indent == 0.0:
row.base_net_amount = base_net_amount row.base_net_amount = base_net_amount
base_net_amount = 0 base_net_amount = 0
# print("\n"*10) # print("\n"*10)
@@ -471,7 +472,7 @@ class GrossProfitGenerator(object):
# elif row.indent == 2.0: # elif row.indent == 2.0:
# print("\t\t", index, ". ", row.parent, ": ", row.base_net_amount) # print("\t\t", index, ". ", row.parent, ": ", row.base_net_amount)
# print("") # print("")
def add_bundle_items(self, product_bundle, index): def add_bundle_items(self, product_bundle, index):
bundle_items = frappe.get_all( bundle_items = frappe.get_all(
'Product Bundle Item', 'Product Bundle Item',