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

[FW][FIX] account_edi: Simplify payment EDI flow #156097

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 1, 2024

Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #155509

@robodoo
Copy link
Contributor

robodoo commented Mar 1, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 1, 2024

@smetl @jco-odoo cherrypicking of pull request #155509 failed.

stdout:

Auto-merging addons/account_edi/models/account_edi_document.py
Auto-merging addons/account_edi/models/account_move.py
CONFLICT (content): Merge conflict in addons/account_edi/models/account_move.py

stderr:

15:03:42.169429 git.c:463               trace: built-in: git cherry-pick 8988f69b77b6022800d470c59a89da5b28e677ee
error: could not apply 8988f69b77b6... [FIX] account_edi: Simplify payment EDI flow
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 1, 2024
Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.

X-original-commit: d2ccea9
@jco-odoo jco-odoo force-pushed the 16.0-15.0-fix-mx-edi-las-Kc6r-fw branch from 990bb03 to 0d5d64c Compare March 1, 2024 14:15
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 1, 2024
@jco-odoo
Copy link
Contributor

jco-odoo commented Mar 1, 2024

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Mar 1, 2024

@jco-odoo you may want to rebuild or fix this PR as it has failed CI.

robodoo pushed a commit that referenced this pull request Mar 1, 2024
Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.

closes #156097

X-original-commit: d2ccea9
Related: odoo/enterprise#57927
Signed-off-by: Josse Colpaert <jco@odoo.com>
@robodoo robodoo closed this Mar 1, 2024
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Mar 9, 2024
Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.

closes odoo/odoo#156097

X-original-commit: d2ccea9a292c02dc6f4cfdb960d22caa0fd98fd5
Related: odoo/enterprise#57927
Signed-off-by: Josse Colpaert <jco@odoo.com>
@fw-bot fw-bot deleted the 16.0-15.0-fix-mx-edi-las-Kc6r-fw branch March 15, 2024 21:47
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Mar 16, 2024
Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.

closes odoo/odoo#156097

X-original-commit: d2ccea9a292c02dc6f4cfdb960d22caa0fd98fd5
Related: odoo/enterprise#57927
Signed-off-by: Josse Colpaert <jco@odoo.com>
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Mar 28, 2024
Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.

closes odoo/odoo#156097

X-original-commit: d2ccea9a292c02dc6f4cfdb960d22caa0fd98fd5
Related: odoo/enterprise#57927
Signed-off-by: Josse Colpaert <jco@odoo.com>
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Mar 28, 2024
Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.

closes odoo/odoo#156097

X-original-commit: d2ccea9a292c02dc6f4cfdb960d22caa0fd98fd5
Related: odoo/enterprise#57927
Signed-off-by: Josse Colpaert <jco@odoo.com>
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Mar 28, 2024
Since recent changes on account_edi, the Mexican payment flow is quite broken.
Since the payment flow has been made only for the Mexican localization,
this commit is simplifying a lot the flow to only fit the need of this localization
and resolves the introduced bugs.

closes odoo/odoo#156097

X-original-commit: d2ccea9a292c02dc6f4cfdb960d22caa0fd98fd5
Related: odoo/enterprise#57927
Signed-off-by: Josse Colpaert <jco@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants