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.

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

feat: editable purchase invoice (backport #37194) #37399

Merged
merged 15 commits into from
Oct 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 9, 2023

This is an automatic backport of pull request #37194 done by Mergify.
Cherry-pick of e922ec6 has failed:

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

You are currently cherry-picking commit e922ec60eb.
  (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/purchase_invoice_item/purchase_invoice_item.json
	modified:   erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json

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

Cherry-pick of 68effd9 has failed:

On branch mergify/bp/version-14-hotfix/pr-37194
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 68effd93bd.
  (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/controllers/accounts_controller.py

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

Cherry-pick of c66c438 has failed:

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

You are currently cherry-picking commit c66c438575.
  (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/purchase_invoice/purchase_invoice.js

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

Cherry-pick of a856091 has failed:

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

You are currently cherry-picking commit a856091ff4.
  (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/purchase_invoice/purchase_invoice.py

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

Cherry-pick of ed7f67b has failed:

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

You are currently cherry-picking commit ed7f67b1a8.
  (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/repost_accounting_ledger/repost_accounting_ledger.json
	modified:   erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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
Copy link
Member

Dependant on #37402

@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-37194 branch from dabce54 to e791319 Compare October 10, 2023 05:17
GursheenK and others added 13 commits October 10, 2023 10:58
(cherry picked from commit e922ec6)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
(cherry picked from commit 68effd9)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
(cherry picked from commit e77814f)
(cherry picked from commit 23470bf)
(cherry picked from commit c88f6d1)
(cherry picked from commit c66c438)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
(cherry picked from commit ba7212c)
(cherry picked from commit a856091)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
(cherry picked from commit 61c6ebb)
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-37194 branch from e791319 to debfbc4 Compare October 10, 2023 05:37
@ruthra-kumar ruthra-kumar self-assigned this Oct 10, 2023
@ruthra-kumar ruthra-kumar marked this pull request as ready for review October 10, 2023 15:34
@ruthra-kumar
Copy link
Member

Ignoring unrelated flaky test case failure

@ruthra-kumar ruthra-kumar merged commit 63ff1f1 into version-14-hotfix Oct 10, 2023
8 of 10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37194 branch October 10, 2023 15:36
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.44.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 Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants