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

refactor: checkbox to toggle standalone Credit/Debit note behaviour (backport #40372) #40426

Merged
merged 10 commits into from
Mar 13, 2024
Merged

refactor: checkbox to toggle standalone Credit/Debit note behaviour (backport #40372) #40426

merged 10 commits into from
Mar 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 13, 2024

This is an automatic backport of pull request #40372 done by Mergify.
Cherry-pick of 2cefe2a has failed:

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

You are currently cherry-picking commit 2cefe2a20e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	both modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of adf13a1 has failed:

On branch mergify/bp/version-14-hotfix/pr-40372
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit adf13a19c4.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/controllers/accounts_controller.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 767f215 has failed:

On branch mergify/bp/version-14-hotfix/pr-40372
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 767f2157e6.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
	both modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 445d2ac has failed:

On branch mergify/bp/version-14-hotfix/pr-40372
Your branch is ahead of 'origin/version-14-hotfix' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 445d2acf50.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/controllers/accounts_controller.py

no changes added to commit (use "git add" and/or "git commit -a")

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 commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@ruthra-kumar @mergify
refactor: checkbox to toggle always standalone credit note
4d6b56e 
(cherry picked from commit 2cefe2a)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@ruthra-kumar @mergify
chore: update popup message
1ddb162 
(cherry picked from commit adf13a1)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
@ruthra-kumar @mergify
refactor: checkbox in purchase invoice
6d5e595 
(cherry picked from commit 767f215)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@ruthra-kumar @mergify
refactor: post ledger entries based on toggle
d1e3b2a 
(cherry picked from commit 77aac6f)
@ruthra-kumar @mergify
chore: patch for updating flag in Cr/Dr notes
adbc207 
(cherry picked from commit 849f478)
@ruthra-kumar @mergify
refactor: make AR/AP report aware of always standalone cr/dr notes
34053ec 
(cherry picked from commit 4d0c2d8)
@ruthra-kumar @mergify
test: cr note flag to update self
b746493 
(cherry picked from commit ce3b1f0)
@ruthra-kumar @mergify
chore: better popup message
ae6d1c1 
(cherry picked from commit 445d2ac)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
@mergify mergify bot added the conflicts label Mar 13, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Mar 13, 2024

Cherry-pick of 2cefe2a has failed:

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

You are currently cherry-picking commit 2cefe2a20e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	both modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of adf13a1 has failed:

On branch mergify/bp/version-14-hotfix/pr-40372
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit adf13a19c4.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/controllers/accounts_controller.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 767f215 has failed:

On branch mergify/bp/version-14-hotfix/pr-40372
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 767f2157e6.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
	both modified:   erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 445d2ac has failed:

On branch mergify/bp/version-14-hotfix/pr-40372
Your branch is ahead of 'origin/version-14-hotfix' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 445d2acf50.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/controllers/accounts_controller.py

no changes added to commit (use "git add" and/or "git commit -a")

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

@ruthra-kumar ruthra-kumar merged commit fa0a60c into version-14-hotfix Mar 13, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-40372 branch March 13, 2024 10:58
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.65.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 30, 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

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

Assignees

@ruthra-kumar ruthra-kumar

Labels
accounts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ruthra-kumar