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

[17.0][FIX] account_reconcile_oca: Fix currency and amount when using reconciliation models #793

Open
wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Open

[17.0][FIX] account_reconcile_oca: Fix currency and amount when using reconciliation models #793

wants to merge 1 commit into from
+7 −0

Conversation

sergiobstoj
Copy link
Member

@sergiobstoj sergiobstoj commented Feb 4, 2025 •
edited by pedrobaeza
Loading

Forward-port of #792

@OCA-git-bot
Copy link
Contributor

Hi @etobella,
some modules you are maintaining are being modified, check this out!

@sergiobstoj sergiobstoj force-pushed the 17.0-fix-account_reconcile_oca-_reconcile_data_by_model branch 2 times, most recently from 3f53d0d to a23c6c8 Compare February 4, 2025 08:44
@sergiobstoj sergiobstoj changed the title [17.0][FIX] account_reconcile_oca: Fix currency and amount when using recon… [17.0][FIX] account_reconcile_oca: Fix currency and amount when using reconciliation models Feb 4, 2025
@sergiobstoj sergiobstoj force-pushed the 17.0-fix-account_reconcile_oca-_reconcile_data_by_model branch from a23c6c8 to 647f819 Compare February 4, 2025 08:48
@pedrobaeza pedrobaeza added this to the 17.0 milestone Mar 4, 2025
pedrobaeza
pedrobaeza approved these changes Mar 4, 2025
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not start, because command `git merge --no-ff -m 'Merge PR #793 into 17.0

Signed-off-by pedrobaeza' tmp-pr-793` failed with output:

Auto-merging account_reconcile_oca/models/account_bank_statement_line.py
CONFLICT (content): Merge conflict in account_reconcile_oca/models/account_bank_statement_line.py
Auto-merging account_reconcile_oca/tests/test_bank_account_reconcile.py
Automatic merge failed; fix conflicts and then commit the result.

@pedrobaeza
Copy link
Member

@sergiobstoj please solve the existing conflicts, and only 18.0 is pending then.

@sergiobstoj sergiobstoj force-pushed the 17.0-fix-account_reconcile_oca-_reconcile_data_by_model branch from 647f819 to 901c05f Compare March 5, 2025 12:46
@sergiobstoj
Copy link
Member Author

@pedrobaeza conflicts solved!

@pedrobaeza
Copy link
Member

I see that the same code you have added is already present. Can you check if anything more is needed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pedrobaeza pedrobaeza pedrobaeza approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
17.0
Development

Successfully merging this pull request may close these issues.
3 participants
@sergiobstoj @OCA-git-bot @pedrobaeza