ingadhoc/website#290

Created by fw-bot-adhoc

label

adhoc-dev:17.0-16.0-t-38123-lef-8VEC-fw

head

7ed0987a3f132ef98df4fdda020de2d4ccede0d5

target

17.0

merged

hace 3 meses by Franco Leyes

forward-port of

ingadhoc/website#289 DETACHED (conflicts: ('ae7f71a7d03556059efc9623ab55ecb7f945ea9f', 'Auto-merging website_sale_order_validity/views/templates.xml\nAuto-merging website_sale_order_validity/i18n/es_AR.po\nCONFLICT (content): Merge conflict in website_sale_order_validity/i18n/es_AR.po\nAuto-merging website_sale_order_validity/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_order_validity/__manifest__.py\n', "14:45:59.058620 git.c:444 trace: built-in: git cherry-pick ae7f71a7d03556059efc9623ab55ecb7f945ea9f\nerror: could not apply ae7f71a... [IMP] website_sale_order_validity: add update cart button in /shop/cart\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", ['ae7f71a7d03556059efc9623ab55ecb7f945ea9f']) ('ae7f71a7d03556059efc9623ab55ecb7f945ea9f', 'Auto-merging website_sale_order_validity/views/templates.xml\nAuto-merging website_sale_order_validity/i18n/es_AR.po\nCONFLICT (content): Merge conflict in website_sale_order_validity/i18n/es_AR.po\nAuto-merging website_sale_order_validity/__manifest__.py\nCONFLICT (content): Merge conflict in website_sale_order_validity/__manifest__.py\n', "14:45:59.058620 git.c:444 trace: built-in: git cherry-pick ae7f71a7d03556059efc9623ab55ecb7f945ea9f\nerror: could not apply ae7f71a... [IMP] website_sale_order_validity: add update cart button in /shop/cart\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", ['ae7f71a7d03556059efc9623ab55ecb7f945ea9f']))

[FW][IMP] website_sale_order_validity: add update cart button in /shop/cart

Forward-Port-Of: ingadhoc/website#289