ingadhoc/website#361

Created by fw-bot-adhoc

label

adhoc-dev:18.0-16.0-h-88539-lav2-WgAx-fw

head

bebb7e760d6f7bc61d5897e6493f073d8e73a969

target

18.0

merged

hace 3 meses by matiasperalta1

forward-port of

ingadhoc/website#356 DETACHED (conflicts: ('47ed617a444cecdf51761e837f7b00588cb96c8a', 'Auto-merging website_sale_cancel_quotations/models/sale_order.py\nCONFLICT (content): Merge conflict in website_sale_cancel_quotations/models/sale_order.py\n', "19:36:51.327638 git.c:444 trace: built-in: git cherry-pick 47ed617a444cecdf51761e837f7b00588cb96c8a\nerror: could not apply 47ed617... [FIX] website_sale_cancel_quotations: add a context\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['47ed617a444cecdf51761e837f7b00588cb96c8a']) ('47ed617a444cecdf51761e837f7b00588cb96c8a', 'Auto-merging website_sale_cancel_quotations/models/sale_order.py\nCONFLICT (content): Merge conflict in website_sale_cancel_quotations/models/sale_order.py\n', "19:36:51.327638 git.c:444 trace: built-in: git cherry-pick 47ed617a444cecdf51761e837f7b00588cb96c8a\nerror: could not apply 47ed617... [FIX] website_sale_cancel_quotations: add a context\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['47ed617a444cecdf51761e837f7b00588cb96c8a']))

[FW][FIX] website_sale_cancel_quotations: add a context

send a contex beacause if website isn't installed and we add in the domain website_id = or != False is a bug baceuse the field don't exist in the so

Forward-Port-Of: ingadhoc/website#357
Forward-Port-Of: ingadhoc/website#356