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

Merge branch 'deferred_revenue' into hotfix

Browse Source
This commit is contained in:
Nabin Hait 2019-03-29 13:26:16 +05:30
commit 862f77cc13
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/deferred_revenue.py
View File

@ -92,9 +92,9 @@ def get_booking_dates(doc, item, posting_date=None):
if end_date >= item.service_end_date: if end_date >= item.service_end_date:
end_date = item.service_end_date end_date = item.service_end_date
last_gl_entry = True last_gl_entry = True
elif item.service_stop_date and end_date >= item.service_stop_date: elif item.service_stop_date and end_date >= item.service_stop_date:
end_date = item.service_stop_date end_date = item.service_stop_date
last_gl_entry = True last_gl_entry = True
if end_date > getdate(posting_date): if end_date > getdate(posting_date):
end_date = posting_date end_date = posting_date