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 #156215

Closed

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: #156097
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:

23:14:15.017020 git.c:463               trace: built-in: git cherry-pick 0d5d64c20bd59e197690559029532d4dc740b6dd
error: could not apply 0d5d64c20bd5... [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
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 1, 2024
@smetl smetl force-pushed the saas-16.2-15.0-fix-mx-edi-las-xs8s-fw branch from 55f39f9 to 298a83d Compare March 3, 2024 09:38
@smetl
Copy link
Contributor

smetl commented Mar 3, 2024

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Mar 3, 2024

@smetl @jco-odoo linked pull request(s) odoo/enterprise#57952 not ready. Linked PRs are not staged until all of them are ready.

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: 454ab2a
@smetl smetl force-pushed the saas-16.2-15.0-fix-mx-edi-las-xs8s-fw branch from 298a83d to 57b4eec Compare March 3, 2024 15:45
@smetl
Copy link
Contributor

smetl commented Mar 3, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 4, 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 #156215

X-original-commit: 454ab2a
Related: odoo/enterprise#57952
Signed-off-by: Josse Colpaert <jco@odoo.com>
Signed-off-by: Laurent Smet (las) <las@odoo.com>
@robodoo robodoo closed this Mar 4, 2024
@fw-bot fw-bot deleted the saas-16.2-15.0-fix-mx-edi-las-xs8s-fw branch March 18, 2024 11:47
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

4 participants