nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 10:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-27785

Browse Source
This commit is contained in:
Afshan
2021-10-05 13:26:47 +05:30
committed by GitHub
parent 877820b902 32d72fdecb
commit 0c55a98190
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -390,6 +390,9 @@ class PaymentEntry(AccountsController):
invoice_paid_amount_map[invoice_key]['discounted_amt'] = ref.total_amount * (term.discount / 100) invoice_paid_amount_map[invoice_key]['discounted_amt'] = ref.total_amount * (term.discount / 100)
for key, allocated_amount in iteritems(invoice_payment_amount_map): for key, allocated_amount in iteritems(invoice_payment_amount_map):
if not invoice_paid_amount_map.get(key):
frappe.throw(_('Payment term {0} not used in {1}').format(key[0], key[1]))
outstanding = flt(invoice_paid_amount_map.get(key, {}).get('outstanding')) outstanding = flt(invoice_paid_amount_map.get(key, {}).get('outstanding'))
discounted_amt = flt(invoice_paid_amount_map.get(key, {}).get('discounted_amt')) discounted_amt = flt(invoice_paid_amount_map.get(key, {}).get('discounted_amt'))

2
erpnext/support/doctype/issue/issue.py
View File

@@ -539,7 +539,7 @@ def get_time_in_timedelta(time):
def set_first_response_time(communication, method): def set_first_response_time(communication, method):
if communication.get('reference_doctype') == "Issue": if communication.get('reference_doctype') == "Issue":
issue = get_parent_doc(communication) issue = get_parent_doc(communication)
if is_first_response(issue): if is_first_response(issue) and issue.service_level_agreement:
first_response_time = calculate_first_response_time(issue, get_datetime(issue.first_responded_on)) first_response_time = calculate_first_response_time(issue, get_datetime(issue.first_responded_on))
issue.db_set("first_response_time", first_response_time) issue.db_set("first_response_time", first_response_time)