erpnext icon indicating copy to clipboard operation
erpnext copied to clipboard

fix: consistent use of "Address & Contact" (backport #41386)

Open mergify[bot] opened this issue 9 months ago • 1 comments

"Address & Contact" is used everywhere, while "Contact & Address" was only used in these three DocTypes.


This is an automatic backport of pull request #41386 done by Mergify.

mergify[bot] avatar May 08 '24 16:05 mergify[bot]

Cherry-pick of 9c3a105f851f6238b4557f20926d7e73c193f81d has failed:

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

You are currently cherry-picking commit 9c3a105f85.
  (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/accounts/doctype/sales_invoice/sales_invoice.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/buying/doctype/supplier/supplier.json
	both modified:   erpnext/selling/doctype/customer/customer.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

mergify[bot] avatar May 08 '24 16:05 mergify[bot]

:tada: This PR is included in version 15.23.2 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

frappe-pr-bot avatar May 15 '24 05:05 frappe-pr-bot