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_attributes_on_top: add new module #313

Closed fw-bot-adhoc closed 2 months ago

fw-bot-adhoc commented 2 months ago

closes ingadhoc/website#306

Forward-Port-Of: ingadhoc/website#312

roboadhoc commented 2 months ago

Pull request status dashboard.

fw-bot-adhoc commented 2 months ago

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

stdout:

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

stderr:

16:34:41.169335 git.c:444               trace: built-in: git cherry-pick 5a6c90829646bc44966af973c1674deeba47c8ca
error: could not apply 5a6c908... [ADD] website_sale_attributes_on_top: 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

lef-adhoc commented 2 months ago

Es un backport por eso cierro