nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes for deferred calculations

Browse Source
This commit is contained in:
Zlash65
2019-01-15 14:16:32 +05:30
parent ba54209c86
commit 627be1de51
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/get_item_details.py
View File

@@ -273,7 +273,7 @@ def get_basic_details(args, item):
"transaction_date": args.get("transaction_date") "transaction_date": args.get("transaction_date")
}) })
if item.enable_deferred_revenue: if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"):
out.update(calculate_service_end_date(args, item)) out.update(calculate_service_end_date(args, item))
# calculate conversion factor # calculate conversion factor
@@ -310,9 +310,10 @@ def calculate_service_end_date(args, item=None):
if not item: if not item:
item = frappe.get_cached_doc("Item", args.item_code) item = frappe.get_cached_doc("Item", args.item_code)
enable_deferred = "enable_deferred_revenue" if args.doctype=="Sales Invoice" else "enable_deferred_expense" doctype = args.get("parenttype") or args.get("doctype")
no_of_months = "no_of_months" if args.doctype=="Sales Invoice" else "no_of_months_exp" enable_deferred = "enable_deferred_revenue" if doctype=="Sales Invoice" else "enable_deferred_expense"
account = "deferred_revenue_account" if args.doctype=="Sales Invoice" else "deferred_expense_account" no_of_months = "no_of_months" if doctype=="Sales Invoice" else "no_of_months_exp"
account = "deferred_revenue_account" if doctype=="Sales Invoice" else "deferred_expense_account"
service_start_date = args.service_start_date if args.service_start_date else args.transaction_date 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.get(no_of_months)) service_end_date = add_months(service_start_date, item.get(no_of_months))
@@ -336,7 +337,7 @@ def get_default_expense_account(args, item, item_group):
or args.expense_account) or args.expense_account)
def get_default_deferred_account(args, item, fieldname=None): def get_default_deferred_account(args, item, fieldname=None):
if item.enable_deferred_revenue: if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"):
return (item.get(fieldname) return (item.get(fieldname)
or args.get(fieldname) or args.get(fieldname)
or frappe.get_cached_value('Company', args.company, "default_"+fieldname)) or frappe.get_cached_value('Company', args.company, "default_"+fieldname))