alyf-de / banking

An Open Banking Integration with ERPNext
GNU General Public License v3.0
37 stars 18 forks source link

feat: Create single PE to reconcile multiple unpaid invoices (backport #75) #98

Closed mergify[bot] closed 1 month ago

mergify[bot] commented 1 month ago

Depends on https://github.com/frappe/erpnext/pull/38074

Closes https://github.com/alyf-de/banking/issues/73, https://github.com/alyf-de/banking/issues/81, https://github.com/alyf-de/banking/issues/72 and https://github.com/alyf-de/banking/issues/84

mergify[bot] commented 1 month ago

Cherry-pick of 5e03cab5ce039e14041ab4e685f171f9270c2a08 has failed:

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

You are currently cherry-picking commit 5e03cab.
  (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:   banking/klarna_kosma_integration/doctype/banking_settings/banking_settings.json
    both modified:   banking/overrides/bank_transaction.py

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

Cherry-pick of 6e5f3be8402a6f55827cbf7edf55632bed2ba24d has failed:

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

You are currently cherry-picking commit 6e5f3be.
  (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:   banking/public/js/bank_reconciliation_beta/actions_panel/match_tab.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   banking/overrides/bank_transaction.py

Cherry-pick of bd0628a4db8cbedaa89cfb0c777fec400585b0a1 has failed:

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

You are currently cherry-picking commit bd0628a.
  (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:   banking/klarna_kosma_integration/doctype/bank_reconciliation_tool_beta/test_bank_reconciliation_tool_beta.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   banking/overrides/bank_transaction.py

Cherry-pick of 907e35a1a30fd5b42f7bf7c3c073d5252f67f15c has failed:

On branch mergify/bp/version-15/pr-75
Your branch is ahead of 'origin/version-15' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 907e35a.
  (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:   banking/klarna_kosma_integration/doctype/bank_reconciliation_tool_beta/test_bank_reconciliation_tool_beta.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   banking/overrides/bank_transaction.py

Cherry-pick of e98a265065032c095fe7d5995f3ecb047417ead3 has failed:

On branch mergify/bp/version-15/pr-75
Your branch is ahead of 'origin/version-15' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e98a265.
  (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:   banking/hooks.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   banking/overrides/bank_transaction.py

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