Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: expire_allocation api endpoint by fetching allocation object #1576

Merged
merged 4 commits into from
Sep 16, 2024

Conversation

zeel-codder
Copy link
Contributor

Add the code to fetch allocation in expire_allocation endpoint so that after code not break.

Traceback of error which is fixed

Traceback (most recent call last):
  File "apps/frappe/frappe/app.py", line 110, in application
    response = frappe.api.handle(request)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/api/__init__.py", line 49, in handle
    data = endpoint(**arguments)
           ^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/api/v1.py", line 36, in handle_rpc_call
    return frappe.handler.handle()
           ^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/handler.py", line 49, in handle
    data = execute_cmd(cmd)
           ^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/handler.py", line 85, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/__init__.py", line 1682, in call
    return fn(*args, **newargs)
           ^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/utils/typing_validations.py", line 31, in wrapper
    return func(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^
  File "apps/hrms/hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.py", line 193, in expire_allocation
    leaves = get_remaining_leaves(allocation)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/hrms/hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.py", line 178, in get_remaining_leaves
    "employee": allocation.employee,
                ^^^^^^^^^^^^^^^^^^^
AttributeError: 'str' object has no attribute 'employee'

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 72.80%. Comparing base (8f6e819) to head (5a1bcac).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1576      +/-   ##
===========================================
- Coverage    72.85%   72.80%   -0.05%     
===========================================
  Files          202      202              
  Lines        11169    11173       +4     
===========================================
- Hits          8137     8135       -2     
- Misses        3032     3038       +6     
Files Coverage Δ
...r/doctype/leave_ledger_entry/leave_ledger_entry.py 88.05% <50.00%> (-2.42%) ⬇️

... and 2 files with indirect coverage changes

Copy link
Member

@krantheman krantheman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a test for this?

hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.py Outdated Show resolved Hide resolved
@zeel-codder
Copy link
Contributor Author

Can you add a test for this?

Yes, will add.

@zeel-codder
Copy link
Contributor Author

@krantheman I have added the test case.

@ruchamahabal ruchamahabal merged commit 6ddfdac into frappe:develop Sep 16, 2024
7 checks passed
mergify bot pushed a commit that referenced this pull request Sep 16, 2024
)

* fix: expire_allocation api endpoint by fetching allocation object

* fix: add a check to fetch allocation only if the allocation type is str in the expire_allocation endpoint

* feat: add a test case test_expire_allocation for leave ledger entry doctype

(cherry picked from commit 6ddfdac)

# Conflicts:
#	hrms/hr/doctype/leave_allocation/leave_allocation.js
mergify bot pushed a commit that referenced this pull request Sep 16, 2024
)

* fix: expire_allocation api endpoint by fetching allocation object

* fix: add a check to fetch allocation only if the allocation type is str in the expire_allocation endpoint

* feat: add a test case test_expire_allocation for leave ledger entry doctype

(cherry picked from commit 6ddfdac)
ruchamahabal pushed a commit that referenced this pull request Sep 16, 2024
…ckport #1576) (#2195)

* fix: expire_allocation api endpoint by fetching allocation object

* fix: add a check to fetch allocation only if the allocation type is str in the expire_allocation endpoint

* feat: add a test case test_expire_allocation for leave ledger entry doctype

(cherry picked from commit 6ddfdac)

Co-authored-by: zeel prajapati <[email protected]>
ruchamahabal added a commit that referenced this pull request Sep 16, 2024
…ckport #1576) (#2194)

* fix: expire_allocation api endpoint by fetching allocation object (#1576)

* fix: expire_allocation api endpoint by fetching allocation object

* fix: add a check to fetch allocation only if the allocation type is str in the expire_allocation endpoint

* feat: add a test case test_expire_allocation for leave ledger entry doctype

(cherry picked from commit 6ddfdac)

# Conflicts:
#	hrms/hr/doctype/leave_allocation/leave_allocation.js

* chore: fix conflicts

---------

Co-authored-by: zeel prajapati <[email protected]>
Co-authored-by: Rucha Mahabal <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Sep 18, 2024
# [14.31.0](v14.30.1...v14.31.0) (2024-09-18)

### Bug Fixes

* expire_allocation api endpoint by fetching allocation object (backport [#1576](#1576)) ([#2194](#2194)) ([8e8380e](8e8380e))
* **Income Tax Computation:** consideration of new employees without prexisting salary slips ([ceb718f](ceb718f))
* **Monthly Attendance Sheet:** consideration of None values while grouping ([cdbce8e](cdbce8e))
* remove default from Employee Leave Balance report (backport [#2172](#2172)) ([#2190](#2190)) ([967b4bd](967b4bd))
* show shift for month full of leaves ([1a00af0](1a00af0))
* year_start_date in Employee Advance Summary (backport [#2165](#2165)) ([#2192](#2192)) ([51cb889](51cb889))

### Features

* **Monthly Attendance Sheet:** add Include Company Descendants filter ([bf0970c](bf0970c))
frappe-pr-bot pushed a commit that referenced this pull request Sep 18, 2024
# [15.29.0](v15.28.3...v15.29.0) (2024-09-18)

### Bug Fixes

* expire_allocation api endpoint by fetching allocation object (backport [#1576](#1576)) ([#2195](#2195)) ([a0e8ddf](a0e8ddf))
* **Income Tax Computation:** consideration of new employees without prexisting salary slips ([a2033c1](a2033c1))
* mark translatable strings in setup fixtures (backport [#2129](#2129)) ([#2196](#2196)) ([a61d8cf](a61d8cf))
* **Monthly Attendance Sheet:** consideration of None values while grouping ([00e57e1](00e57e1))
* remove default from Employee Leave Balance report (backport [#2172](#2172)) ([#2191](#2191)) ([028b1e1](028b1e1))
* show shift for month full of leaves ([11223ca](11223ca))
* year_start_date in Employee Advance Summary (backport [#2165](#2165)) ([#2193](#2193)) ([94ca0c5](94ca0c5))

### Features

* **Monthly Attendance Sheet:** add Include Company Descendants filter ([93a0431](93a0431))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants