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

Merge pull request #43727 from aerele/deferred-expense-period

Browse Source 
fix: get period estimate till service end date
This commit is contained in:
ruthra kumar
2024-10-21 12:19:09 +05:30
committed by GitHub
parent 9404303755 a7ba7e9c28
commit 0f19b59d53
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py
View File

@@ -122,21 +122,24 @@ class Deferred_Item:
""" """
simulate future posting by creating dummy gl entries. starts from the last posting date. simulate future posting by creating dummy gl entries. starts from the last posting date.
""" """
if self.service_start_date != self.service_end_date: if (
if add_days(self.last_entry_date, 1) < self.period_list[-1].to_date: self.service_start_date != self.service_end_date
self.estimate_for_period_list = get_period_list( and add_days(self.last_entry_date, 1) < self.service_end_date
self.filters.from_fiscal_year, ):
self.filters.to_fiscal_year, self.estimate_for_period_list = get_period_list(
add_days(self.last_entry_date, 1), self.filters.from_fiscal_year,
self.period_list[-1].to_date, self.filters.to_fiscal_year,
"Date Range", add_days(self.last_entry_date, 1),
"Monthly", self.service_end_date,
company=self.filters.company, "Date Range",
) "Monthly",
for period in self.estimate_for_period_list: company=self.filters.company,
amount = self.calculate_amount(period.from_date, period.to_date) )
gle = self.make_dummy_gle(period.key, period.to_date, amount)
self.gle_entries.append(gle) for period in self.estimate_for_period_list:
amount = self.calculate_amount(period.from_date, period.to_date)
gle = self.make_dummy_gle(period.key, period.to_date, amount)
self.gle_entries.append(gle)
def calculate_item_revenue_expense_for_period(self): def calculate_item_revenue_expense_for_period(self):
""" """