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: allow both custodian and location while creating asset #36263

Merged
merged 1 commit into from
Jul 24, 2023
Merged

fix: allow both custodian and location while creating asset #36263

merged 1 commit into from
Jul 24, 2023

Conversation

anandbaburajan
Copy link
Contributor

This #36093 recent change in Asset Movement blocked users from setting both custodian and location while creating an asset, so fixed that.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jul 24, 2023
@anandbaburajan
Copy link
Contributor Author

@Mergifyio copy develop

@mergify
Copy link
Contributor

mergify bot commented Jul 24, 2023

copy develop

✅ Pull request copies have been created

@anandbaburajan anandbaburajan merged commit 2b47f58 into frappe:version-14-hotfix Jul 24, 2023
11 checks passed
anandbaburajan added a commit that referenced this pull request Jul 24, 2023
) (#36264)

fix: allow both custodian and location while creating asset

(cherry picked from commit bff00bc)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
mergify bot pushed a commit that referenced this pull request Jul 24, 2023
anandbaburajan added a commit that referenced this pull request Jul 24, 2023
…36263) (#36270)

fix: allow both custodian and location while creating asset (#36263)

(cherry picked from commit 2b47f58)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jul 26, 2023
## [13.52.7](v13.52.6...v13.52.7) (2023-07-26)

### Bug Fixes

* allow both custodian and location while creating asset (backport [#36263](#36263)) ([#36270](#36270)) ([e4f28e8](e4f28e8))
* apply discount on item after applying price list ([#36125](#36125)) ([bde9e89](bde9e89))
* group by in fixed asset register (copy [#36310](#36310)) ([#36312](#36312)) ([a5e1c47](a5e1c47))
frappe-pr-bot pushed a commit that referenced this pull request Jul 26, 2023
# [14.32.0](v14.31.3...v14.32.0) (2023-07-26)

### Bug Fixes

* added missing option Partially Received in the status dropdown field ([4fa93b0](4fa93b0))
* allocation logic on 'Get Outstanding Invoices' btn in PE ([14600fa](14600fa))
* allow both custodian and location while creating asset ([#36263](#36263)) ([2b47f58](2b47f58))
* Ambiguous column error while submitting stock entry (backport [#36209](#36209)) ([#36222](#36222)) ([844ec58](844ec58))
* apply discount on item after applying price list ([#36316](#36316)) ([cff6e72](cff6e72))
* apply terms validaton only in Sales/Purchase documents ([8f24292](8f24292))
* broken overallocation validation in payment entry ([e1d31aa](e1d31aa))
* clear accounting dimension value when based on field changes ([1fe6d4e](1fe6d4e))
* customer filter in process soa ([5938af9](5938af9))
* Default fiscal year in accounting, buying and sellingcharts ([8ca3d6b](8ca3d6b))
* fetch acc dimension fieldname ([542c804](542c804))
* FY in naming series variable for orders ([6a6a3ae](6a6a3ae))
* group by in fixed asset register ([#36310](#36310)) ([6cca18e](6cca18e))
* Ignore permissions while submitting account closing balance record ([#35536](#35536)) ([c2976ef](c2976ef))
* itemised tax breakup ([6f2e639](6f2e639))
* made item or warehouse filter mandatory (backport [#36208](#36208)) ([#36215](#36215)) ([57cf3c2](57cf3c2))
* no default email account causing reposting issue ([026f9f5](026f9f5))
* **regional:** set `frappe.flags.company` temporarily, where required ([73e9b38](73e9b38))
* set new purchase_receipt_amount on asset split ([#36272](#36272)) ([e867fe7](e867fe7))
* timeout error while cancelling the Purchase Receipt ([0575005](0575005))
* Trial Balance report considering cancelled entries ([ca4f86d](ca4f86d))

### Features

* filter based on accounting dimension in profitability analysis ([ba95df2](ba95df2))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.32.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-13-hotfix needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants