[go: up one dir, main page]

fix: reset location only if there is value in row item location field by khushi8112 [frappe] PR#46022

Bot Dokosrequested to merge
ft-pr-46022 into develop

From: https://github.com/frappe/erpnext/pull/46022
Date: 2025-02-19 16:02:01+05:30

  • fix: reset location only if there is value in row item location field


Diagnostics

pre-commit failed for source commit: 7f8d08c8eb50bc56ed3f051fbaf8eb0e33a91d27
[error] erpnext/assets/doctype/asset/asset.js: SyntaxError: Unexpected token (694:4)
[error]   692 | 				frm.set_value("purchase_invoice_item", item.name);
[error]   693 | 			}
[error] > 694 | 		});
[error]       | 		 ^
[error]   695 | 	},
[error]   696 |
[error]   697 | 	set_depreciation_rate: function (frm, row) {

erpnext/assets/doctype/asset/asset.js
  694:4  error  Parsing error: Unexpected token )

✖ 1 problem (1 error, 0 warnings)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-46022

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-46022

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports