From 6941de185c5702160723e833f6552cfb2ac3845f Mon Sep 17 00:00:00 2001 From: RomainLibert Date: Fri, 20 Apr 2018 11:48:31 +0200 Subject: [PATCH] [FIX] website_sale: make automatic invoicing more usable In V11 with automatic invoicing set in website settings, it's no longer possible to confirm an online order paid with wire transfer without registering the payment. A user might want to confirm the order and then register the payment. Deactivates the `Mark As Paid` button on the order. (by removing the xpath) Task #1819491 Closes #24347 --- addons/website_sale/i18n/website_sale.pot | 8 +++++++- addons/website_sale/models/res_config_settings.py | 7 ++++++- addons/website_sale/views/sale_order_views.xml | 8 -------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot index 420441be467..d41b8b0449d 100644 --- a/addons/website_sale/i18n/website_sale.pot +++ b/addons/website_sale/i18n/website_sale.pot @@ -2871,6 +2871,13 @@ msgid "The incredibly thin Apple Wireless Keyboard uses Bluetooth technology,\n" " you like — with the keyboard in front of your iPad or on your lap." msgstr "" +#. module: website_sale +#: model:ir.model.fields,help:website_sale.field_res_config_settings_automatic_invoice +msgid "The invoice is generated automatically and available in the customer portal when the transaction is confirmed by the payment acquirer.\n" +"The invoice is marked as paid and the payment is registered in the payment journal defined in the configuration of the payment acquirer.\n" +"This mode is advised if you issue the final invoice at the order and not after the delivery." +msgstr "" + #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form msgid "The mode selected here applies as invoicing policy of any new product created but not of products already existing." @@ -3342,4 +3349,3 @@ msgstr "" #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "what do the customers think of the product" msgstr "" - diff --git a/addons/website_sale/models/res_config_settings.py b/addons/website_sale/models/res_config_settings.py index b8d64f40382..9dbe7062ed4 100644 --- a/addons/website_sale/models/res_config_settings.py +++ b/addons/website_sale/models/res_config_settings.py @@ -45,7 +45,12 @@ class ResConfigSettings(models.TransientModel): default=_default_order_mail_template, domain="[('model', '=', 'sale.order')]", help="Email sent to customer at the end of the checkout process") - automatic_invoice = fields.Boolean("Automatic Invoice") + automatic_invoice = fields.Boolean("Automatic Invoice", + help="The invoice is generated automatically and available in the customer portal " + "when the transaction is confirmed by the payment acquirer.\n" + "The invoice is marked as paid and the payment is registered in the payment journal " + "defined in the configuration of the payment acquirer.\n" + "This mode is advised if you issue the final invoice at the order and not after the delivery.") module_l10n_eu_service = fields.Boolean(string="EU Digital Goods VAT") diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml index 1d051ed2a2d..19c42dcd302 100644 --- a/addons/website_sale/views/sale_order_views.xml +++ b/addons/website_sale/views/sale_order_views.xml @@ -164,17 +164,9 @@ sale.order - -