search

ingadhoc / website

ADHOC Odoo Website related Addons
GNU Affero General Public License v3.0
20 stars 31 forks source link

[FW][ADD] website_sale_force_confirmation: add new module #304

Closed fw-bot-adhoc closed 1 month ago

fw-bot-adhoc commented 1 month ago

closes ingadhoc/website#299

Forward-Port-Of: ingadhoc/website#302

lef-adhoc commented 1 month ago

Este módulo empezó en 17 por lo tanto no hace falta el FW

roboadhoc commented 1 month ago

Pull request status dashboard.

fw-bot-adhoc commented 1 month ago

@lef-adhoc @JrAdhoc cherrypicking of pull request ingadhoc/website#302 failed.

stdout:

CONFLICT (add/add): Merge conflict in website_sale_force_confirmation/views/res_config_settings_views.xml
Auto-merging website_sale_force_confirmation/views/res_config_settings_views.xml
CONFLICT (rename/add): Rename website_sale_three_discounts/__manifest__.py->website_sale_force_confirmation/__manifest__.py in HEAD.  Added website_sale_force_confirmation/__manifest__.py in fe323b7 ([ADD] website_sale_force_confirmation: add new module)
Auto-merging website_sale_force_confirmation/__manifest__.py

stderr:

13:32:24.920081 git.c:444               trace: built-in: git cherry-pick fe323b7cb5e532dcf5fb4840300656dfa0f6738d
error: could not apply fe323b7... [ADD] website_sale_force_confirmation: add new module
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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