search

ingadhoc / website

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

[FW]13.0 h 49417 jr #226

Closed fw-bot-adhoc closed 2 years ago

fw-bot-adhoc commented 2 years ago

Unpublished warehouses were being taken into account for stock calculation.

Forward-Port-Of: ingadhoc/website#225

roboadhoc commented 2 years ago

Pull request status dashboard.

fw-bot-adhoc commented 2 years ago

Ping @JrAdhoc, @jjscarafia cherrypicking of pull request ingadhoc/website#225 failed.

stdout:

CONFLICT (modify/delete): website_sale_stock_ux/models/website.py deleted in HEAD and modified in 0dc003c... [13.0][FIX] website_sale_stock_ux: unpublished warehouses. Version 0dc003c... [13.0][FIX] website_sale_stock_ux: unpublished warehouses of website_sale_stock_ux/models/website.py left in tree.

stderr:

10:49:27.785449 git.c:439               trace: built-in: git cherry-pick 0dc003cc812dddb3320014f2155ddafa38d72048
error: could not apply 0dc003c... [13.0][FIX] website_sale_stock_ux: unpublished warehouses
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.

jjscarafia commented 2 years ago

juani te haces rebase de esto y ver si hace falta algo más en v15 así se puede cerrar? @JrAdhoc