8000 [FW][ADD] payment_xendit: new payment provider for Indonesia and Philippines by fw-bot · Pull Request #150657 · odoo/odoo · GitHub
[go: up one dir, main page]
Skip to content

[FW][ADD] payment_xendit: new payment provider for Indonesia and Philippines #150657

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
Closed
wants to merge 1 commit into from
Closed

[FW][ADD] payment_xendit: new payment provider for Indonesia and Philippines #150657

wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Contributor
@fw-bot fw-bot commented Jan 23, 2024

See the README.md file for more details.

task-2946329

See also:

Forward-Port-Of: #150521
Forward-Port-Of: #141661

@robodoo
Copy link
Contributor
robodoo commented Jan 23, 2024 •
edited
Loading

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author
fw-bot commented Jan 23, 2024

@nni-odoo @AntoineVDV cherrypicking of pull request #141661 failed.

stdout:

Auto-merging .tx/config
CONFLICT (content): Merge conflict in .tx/config

stderr:

14:16:23.143683 git.c:463               trace: built-in: git cherry-pick bcf42aa21de2200cd39b60b17be02315dc23b14c
error: could not apply bcf42aa21de2... [ADD] payment_xendit: new payment provider for Indonesia and Philippines
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.

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 Jan 23, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Jan 23, 2024
@nni-odoo
[ADD] payment_xendit: new payment provider for Indonesia and Philippines
838baa8 
See the README.md file for more details.

2946329

X-original-commit: 8164b7c
@nni-odoo nni-odoo force-pushed the master-17.0-payment_xendit-nni-_Kbc-fw branch from c34eece to 838baa8 Compare January 24, 2024 01:43
@nni-odoo
Copy link
Contributor

Hello @odoo/rd-security , fixed the .tx/config conflict again on this fwp. Could you kindly override security here too?
Thanks!

@C3POdoo C3POdoo requested a review from a team January 24, 2024 01:46
@xmo-odoo
Copy link
Collaborator

@robodoo override=ci/security

@nni-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Jan 24, 2024
@nni-odoo
[ADD] payment_xendit: new payment provider for Indonesia and Philippines
377878d 
See the README.md file for more details.

2946329

closes #150657

X-original-commit: 8164b7c
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Nigel Nicholas (nni) <nni@odoo.com>
@robodoo robodoo closed this Jan 24, 2024
@robodoo robodoo added the 17.2 label Jan 24, 2024
@fw-bot fw-bot deleted the master-17.0-payment_xendit-nni-_Kbc-fw branch February 7, 2024 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
17.2 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@fw-bot @robodoo @nni-odoo @xmo-odoo @C3POdoo
0