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

refactor: readd remarks field to payment ledger (backport #32009) #32013

Merged
merged 3 commits into from
Aug 29, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2022

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

On branch mergify/bp/version-14-hotfix/pr-32009
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 d522f13d55.
  (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/patches.txt

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/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 ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-32009 branch from 6683c32 to 0aaf9c4 Compare August 29, 2022 14:22
@codecov
Copy link

codecov bot commented Aug 29, 2022

Codecov Report

Merging #32013 (0aaf9c4) into version-14-hotfix (6c4fcd8) will decrease coverage by 0.05%.
The diff coverage is 9.09%.

@@                  Coverage Diff                  @@
##           version-14-hotfix   #32013      +/-   ##
=====================================================
- Coverage              63.30%   63.25%   -0.06%     
=====================================================
  Files                    813      813              
  Lines                  57593    57595       +2     
=====================================================
- Hits                   36460    36430      -30     
- Misses                 21133    21165      +32     
Impacted Files Coverage Δ
erpnext/accounts/utils.py 72.63% <ø> (ø)
erpnext/stock/doctype/stock_entry/stock_entry.py 81.07% <0.00%> (ø)
.../report/accounts_receivable/accounts_receivable.py 71.20% <50.00%> (-0.32%) ⬇️
...em_wise_sales_register/item_wise_sales_register.py 50.90% <0.00%> (-10.91%) ⬇️
...saction/incorrect_balance_qty_after_transaction.py 88.37% <0.00%> (-9.31%) ⬇️
...t/accounts/report/sales_register/sales_register.py 75.43% <0.00%> (-6.44%) ⬇️
...pnext/setup/doctype/sales_partner/sales_partner.py 65.21% <0.00%> (-4.35%) ⬇️
...it_and_loss_statement/profit_and_loss_statement.py 71.42% <0.00%> (-3.90%) ⬇️
...pnext/accounts/report/gross_profit/gross_profit.py 75.64% <0.00%> (-2.96%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 89.02% <0.00%> (-2.44%) ⬇️
... and 16 more

@ruthra-kumar ruthra-kumar merged commit c660db1 into version-14-hotfix Aug 29, 2022
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-32009 branch August 29, 2022 14:51
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.0.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
accounts conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants