Skip to content

Commit e177701

Browse files
authored
Merge pull request #1797 from frappe/version-14-hotfix
chore: release v14
2 parents a496fe3 + 4ed93bd commit e177701

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

.github/workflows/release_notes.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ jobs:
2929
steps:
3030
- name: Update notes
3131
run: |
32-
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/frappe/hrms/releases/generate-notes -f tag_name=$RELEASE_TAG | jq -r '.body' | sed -E '/^\* (chore|ci|test|docs|style)/d' )
32+
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/frappe/hrms/releases/generate-notes -f tag_name=$RELEASE_TAG \
33+
| jq -r '.body' \
34+
| sed -E '/^\* (chore|ci|test|docs|style)/d' \
35+
| sed -E 's/by @mergify //'
36+
)
3337
RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/hrms/releases/tags/$RELEASE_TAG | jq -r '.id')
3438
gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/hrms/releases/$RELEASE_ID -f body="$NEW_NOTES"
3539

hrms/hr/doctype/interview_feedback/interview_feedback.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def calculate_average_rating(self):
5757
total_rating = 0
5858
for d in self.skill_assessment:
5959
if d.rating:
60-
total_rating += d.rating
60+
total_rating += flt(d.rating)
6161

6262
self.average_rating = flt(
6363
total_rating / len(self.skill_assessment) if len(self.skill_assessment) else 0

hrms/hr/doctype/interview_feedback/test_interview_feedback.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_average_ratings_on_feedback_submission_and_cancellation(self):
4949
total_rating = 0
5050
for d in feedback_1.skill_assessment:
5151
if d.rating:
52-
total_rating += d.rating
52+
total_rating += flt(d.rating)
5353

5454
avg_rating = flt(
5555
total_rating / len(feedback_1.skill_assessment) if len(feedback_1.skill_assessment) else 0

hrms/overrides/employee_payment_entry.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ def set_missing_ref_details(
4141
continue
4242

4343
ref_details = get_payment_reference_details(
44-
d.reference_doctype, d.reference_name, self.party_account_currency
44+
d.reference_doctype,
45+
d.reference_name,
46+
self.party_account_currency,
47+
self.party_type,
48+
self.party,
4549
)
4650

4751
# Only update exchange rate when the reference is Journal Entry
@@ -201,11 +205,15 @@ def get_paid_amount_and_received_amount(
201205

202206

203207
@frappe.whitelist()
204-
def get_payment_reference_details(reference_doctype, reference_name, party_account_currency):
208+
def get_payment_reference_details(
209+
reference_doctype, reference_name, party_account_currency, party_type=None, party=None
210+
):
205211
if reference_doctype in ("Expense Claim", "Employee Advance", "Gratuity"):
206212
return get_reference_details_for_employee(reference_doctype, reference_name, party_account_currency)
207213
else:
208-
return get_reference_details(reference_doctype, reference_name, party_account_currency)
214+
return get_reference_details(
215+
reference_doctype, reference_name, party_account_currency, party_type, party
216+
)
209217

210218

211219
@frappe.whitelist()

0 commit comments

Comments
 (0)