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

fix: Multiple fixes in Bank Statement Import (backport #42026) #42240

Merged
merged 8 commits into from
Jul 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2024

Fixes for consistency with data import tool in frappe

  • Custom Delimitor (consistency with frappe)
  • Deprecated statement_import_log
  • Use Data Import Log for import_status, Import Log preview

Backport:

  • version-15
  • version-14

Closes: #42017
Frappe Support Issue: https://support.frappe.io/helpdesk/tickets/17549

Before:
image
After:
image


This is an automatic backport of pull request #42026 done by [Mergify](https://mergify.com).

(cherry picked from commit 13fb560)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
(cherry picked from commit b202409)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
(cherry picked from commit 07f6888)
(cherry picked from commit 1ad264d)
(cherry picked from commit 98ad01c)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
(cherry picked from commit ba08b2e)
Copy link
Contributor Author

mergify bot commented Jul 9, 2024

Cherry-pick of 13fb560 has failed:

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

You are currently cherry-picking commit 13fb560401.
  (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/bank_statement_import/bank_statement_import.py

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

Cherry-pick of b202409 has failed:

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

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

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

Cherry-pick of 98ad01c has failed:

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

You are currently cherry-picking commit 98ad01c736.
  (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/bank_statement_import/bank_statement_import.json

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jul 9, 2024
@ruthra-kumar ruthra-kumar merged commit 759781e into version-15-hotfix Jul 10, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-42026 branch July 10, 2024 04:54
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.29.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants