mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-17 08:28:44 +00:00
* fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (#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 ba79e68190)
# 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
* chore: fixed conflicts
* fix: removed unmerged patches
* fix: use f-string instead of format call
---------
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>