end date / stop date calc fix
This commit is contained in:
parent
4ce8c7f383
commit
7b3fd85943
@ -541,7 +541,6 @@ class SalesInvoice(SellingController):
|
||||
|
||||
for item in self.items:
|
||||
if item.enable_deferred_revenue:
|
||||
print(vars(item))
|
||||
if date_diff(item.service_stop_date, item.service_start_date) < 0:
|
||||
frappe.throw(_("Service Stop Date cannot be before Service Start Date"))
|
||||
|
||||
@ -1091,16 +1090,18 @@ 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 or item.service_stop_date<=booking_end_date:
|
||||
if booking_end_date.month > item.service_stop_date.month:
|
||||
continue
|
||||
elif booking_end_date>=item.service_end_date:
|
||||
last_gl_entry = True
|
||||
booking_end_date = item.service_end_date
|
||||
elif item.service_stop_date<=booking_end_date:
|
||||
last_gl_entry = True
|
||||
booking_end_date = item.service_stop_date
|
||||
|
||||
total_days = date_diff(item.service_end_date, item.service_start_date)
|
||||
total_booking_days = date_diff(booking_end_date, booking_start_date) + 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user