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

end date should reset if start date is changed

Browse Source
This commit is contained in:
Zlash65 2018-08-28 12:16:59 +05:30
parent d676a67769
commit 4ce8c7f383
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -757,6 +757,13 @@ frappe.ui.form.on('Sales Invoice Item', {
frappe.throw(__("Service Stop Date cannot be after Service End Date")); frappe.throw(__("Service Stop Date cannot be after Service End Date"));
} }
} }
},
service_start_date: function(frm, cdt, cdn) {
var child = locals[cdt][cdn];
if(child.service_start_date) {
frappe.model.set_value(cdt, cdn, "service_end_date", "");
}
} }
}) })

5
erpnext/stock/get_item_details.py
View File

@ -274,11 +274,12 @@ def get_basic_details(args, item):
}) })
if item.enable_deferred_revenue: if item.enable_deferred_revenue:
service_end_date = add_months(args.transaction_date, item.no_of_months) service_start_date = args.service_start_date if args.service_start_date else args.transaction_date
service_end_date = add_months(service_start_date, item.no_of_months)
out.update({ out.update({
"enable_deferred_revenue": item.enable_deferred_revenue, "enable_deferred_revenue": item.enable_deferred_revenue,
"deferred_revenue_account": get_default_deferred_revenue_account(args, item), "deferred_revenue_account": get_default_deferred_revenue_account(args, item),
"service_start_date": args.transaction_date, "service_start_date": service_start_date,
"service_end_date": service_end_date "service_end_date": service_end_date
}) })