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.

Sign up for GitHub

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

Jump to bottom

fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (backport #41919) #42058

Merged
merged 4 commits into from
Jul 1, 2024
Merged

fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (backport #41919) #42058

merged 4 commits into from
Jul 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 27, 2024

This pull request addresses an issue with the linkage between Asset Repair and Stock Entry doctypes that caused errors when amending Asset Repair records. The following changes have been made to resolve the issue and improve the overall functionality:

  • Removed Stock Entry Link from Asset Repair
  • Added Asset Repair Link in Stock Entry

Additional Changes:

  • Moved Warehouse Field to Correct Location: The warehouse field, previously located in the Asset Repair doctype, has been moved to the Stock Items child table where it appropriately belongs.

Additional validations:

  • Completion Date: Added validation to ensure that the completion date is appropriately set and follows logical constraints.
  • Purchase Invoice: Added validation to ensure that a valid purchase invoice is associated where required.

no-docs

This is an automatic backport of pull request #41919 done by [Mergify](https://mergify.com).

@khushi8112 @mergify
fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (
7808b21 
#41919)

* fix: refactor Asset Repair and Stock Entry linkage to resolve amendment issues

* chore: added missing patch to patches.txt

* chore: fixing previous changes

* chore: fixing minor issues

* fix: code changes to enhance efficiency

* chore: replaced frappe.qb with db.sql because of conflict

* fix: minor changes

(cherry picked from commit ba79e68)

# Conflicts:
#	erpnext/assets/doctype/asset_repair/asset_repair.json
#	erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#	erpnext/patches.txt
#	erpnext/stock/doctype/stock_entry/stock_entry.json
@mergify mergify bot requested a review from deepeshgarg007 as a code owner June 27, 2024 12:06
@mergify mergify bot added the conflicts label Jun 27, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jun 27, 2024

Cherry-pick of ba79e68 has failed:

On branch mergify/bp/version-15-hotfix/pr-41919
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit ba79e68190.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/assets/doctype/asset_repair/asset_repair.js
	modified:   erpnext/assets/doctype/asset_repair/asset_repair.py
	modified:   erpnext/assets/doctype/asset_repair/test_asset_repair.py
	modified:   erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.py
	new file:   erpnext/patches/v15_0/update_asset_repair_field_in_stock_entry.py
	new file:   erpnext/patches/v15_0/update_warehouse_field_in_asset_repair_consumed_item_doctype.py
	modified:   erpnext/stock/doctype/stock_entry/stock_entry.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/assets/doctype/asset_repair/asset_repair.json
	both modified:   erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
	both modified:   erpnext/patches.txt
	both modified:   erpnext/stock/doctype/stock_entry/stock_entry.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@khushi8112 khushi8112 requested a review from nabinhait July 1, 2024 11:20
@nabinhait nabinhait merged commit 97c49b9 into version-15-hotfix Jul 1, 2024
11 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-15-hotfix/pr-41919 branch July 1, 2024 11:23
frappe-pr-bot pushed a commit that referenced this pull request Jul 3, 2024
@frappe-bot
chore(release): Bumped to Version 15.29.0
5812577 
# [15.29.0](v15.28.2...v15.29.0) (2024-07-03)

### Bug Fixes

* add auto-update for overdue status ([#42105](#42105)) ([317cc03](317cc03))
* add string for translation (backport [#41903](#41903)) ([#41963](#41963)) ([48dc24b](48dc24b))
* always post to tax account heads if LCV is booked ([706a6c1](706a6c1))
* batch picking in pick list based on Stock Settings (backport [#42021](#42021)) ([#42134](#42134)) ([a45f8ca](a45f8ca))
* batch reset while making SABB (backport [#42076](#42076)) ([#42123](#42123)) ([c3f5a49](c3f5a49))
* decimal issue in pick list (backport [#41972](#41972)) ([#41982](#41982)) ([9945a90](9945a90))
* **Delivery Note:** only show permitted actions ([cef6d0d](cef6d0d))
* do not show zero balance stock items in stock balance report (backport [#41958](#41958)) ([#41961](#41961)) ([c10b123](c10b123))
* expense account from item group not fetched (backport [#41957](#41957)) ([#41962](#41962)) ([760b2e2](760b2e2))
* fixed asset value in Fixed Asset Register (backport [#41930](#41930)) ([#42027](#42027)) ([f2feeaf](f2feeaf))
* handle none type object error ([b0aef9e](b0aef9e))
* incorrect against_account upon reposting ([a41577a](a41577a))
* incorrect Difference Amount (backport [#42008](#42008)) ([#42013](#42013)) ([838cc5b](838cc5b))
* incorrect discount on other item ([77f4199](77f4199))
* incorrect dr/cr on Adv Payment against Journals ([4e74257](4e74257))
* incorrect time period in asset depreciation schedule (backport [#41805](#41805)) ([#42043](#42043)) ([cf4d4ba](cf4d4ba))
* lead status filter (backport [#41816](#41816)) ([#42046](#42046)) ([3536a75](3536a75))
* manufacturing date issue in the batch (backport [#42034](#42034)) ([#42037](#42037)) ([a981633](a981633))
* move condition for shipment ([2180239](2180239))
* not able to make purchase return (backport [#42053](#42053)) ([#42055](#42055)) ([8a91bf3](8a91bf3))
* pricing rule with and without 'apply multiple' and priority ([f3aa885](f3aa885))
* provisional entry for non stock items ([d61dab8](d61dab8))
* Re-open allows SO's to be over credit limit ([7fcb0f5](7fcb0f5))
* refactor Asset Repair and Stock Entry linkage to resolve amendme… (backport [#41919](#41919)) ([#42058](#42058)) ([97c49b9](97c49b9))
* reload asset when creating asset depreciation ([7b5d504](7b5d504))
* reposting file attachment permission issue (backport [#42068](#42068)) ([#42075](#42075)) ([1f3374f](1f3374f))
* resolve gl entries duplication in asset purchase workflow (backport [#41845](#41845)) ([#42120](#42120)) ([58e18e2](58e18e2))
* **Sales Order:** only show permitted actions ([a0011c5](a0011c5))
* show zero stock items filter in the stock balance report (backport [#42147](#42147)) ([#42152](#42152)) ([11ebbf2](11ebbf2))
* stock qty validation in SCR (backport [#42124](#42124)) ([#42133](#42133)) ([d9e62fe](d9e62fe))
* Stock Reservation Entry was not getting created (backport [#42033](#42033)) ([#42035](#42035)) ([e278fc6](e278fc6))
* **test:** incorrect field for customer default billing currency ([3b15708](3b15708))
* this.frm.events.update_cost is not a function (backport [#41960](#41960)) ([#41965](#41965)) ([3b4d397](3b4d397))
* timeout error while submitting JV (backport [#42040](#42040)) ([#42099](#42099)) ([a0e06a4](a0e06a4))
* timeout while cancelling LCV (backport [#42030](#42030)) (backport [#42031](#42031)) ([#42032](#42032)) ([068de08](068de08))
* unhide serial no field (backport [#42045](#42045)) ([#42047](#42047)) ([482832f](482832f))
* valuation rate for the legacy batches (backport [#42011](#42011)) ([#42020](#42020)) ([f6be19c](f6be19c))
* Wrong Delete Batch on Purchase Receipt (backport [#42007](#42007)) ([#42012](#42012)) ([68b318a](68b318a))

### Features

* accounting dimension filters in gp report ([fe9dffb](fe9dffb))
* default account head for operating cost (backport [#41985](#41985)) ([#41987](#41987)) ([44c1671](44c1671))
* **gp:** group by cost center ([068ae87](068ae87))
* Turkish Chart Of Accounts (backport [#41756](#41756)) ([#42028](#42028)) ([63b26e6](63b26e6))

### Performance Improvements

* code optimization to handle large asset creation (backport [#42018](#42018)) ([#42025](#42025)) ([c27f272](c27f272))
* dont run queries unnecessarily, improved filters ([#41993](#41993)) ([b59c91a](b59c91a))
* Performance optmization for Purchase Invoice submission (backport [#40263](#40263)) ([#41946](#41946)) ([d396c18](d396c18))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.29.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 Jul 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r s-aga-r is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

@nabinhait nabinhait Awaiting requested review from nabinhait

Assignees

@khushi8112 khushi8112

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@frappe-pr-bot @nabinhait @khushi8112