[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
This commit is contained in:
RomainLibert
2018-04-20 17:09:36 +02:00
parent 3fd24cba2a
commit 6941de185c
3 changed files with 13 additions and 10 deletions
+7 -1
View File
@@ -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 ""
@@ -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")
@@ -164,17 +164,9 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//button[@name='action_quotation_send']" position="after">
<button name="action_mark_as_paid" type="object"
string="Mark as Paid" class="btn-primary"
attrs="{'invisible': ['|', ('can_directly_mark_as_paid', '=', False), ('state', 'not in', ['sent', 'sale'])]}"/>
</xpath>
<field name="partner_id" position="after">
<field name="can_directly_mark_as_paid" invisible="1"/>
</field>
<xpath expr="//button[@id='action_confirm']" position="attributes">
<attribute name="attrs">{'invisible': ['|',('can_directly_mark_as_paid', '=', True), ('state', 'not in', ['sent'])]}</attribute>
</xpath>
</field>
</record>