From 339c2e9f15744102c0ca5a8de5ab6ca9c26183c6 Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Fri, 24 Aug 2018 17:15:29 +0530 Subject: [PATCH] book last gl_entry based on service stop date --- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 16232273922..1e5166f99ef 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1083,11 +1083,14 @@ class SalesInvoice(SellingController): for item in self.get('items'): last_gl_entry = False + if item.service_end_date.month > item.service_stop_date.month: + continue + booking_start_date = getdate(add_months(today(), -1)) booking_start_date = booking_start_date if booking_start_date>item.service_start_date else item.service_start_date booking_end_date = getdate(add_days(today(), -1)) - if booking_end_date>=item.service_end_date: + if booking_end_date>=item.service_end_date or item.service_stop_date<=booking_end_date: last_gl_entry = True booking_end_date = item.service_end_date