diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml index 5970e897acb..901896d28f7 100644 --- a/addons/sale/data/mail_template_data.xml +++ b/addons/sale/data/mail_template_data.xml @@ -28,7 +28,7 @@

Here is % if ctx.get('proforma') -in attachment, your pro-forma +in attachment, your pro-forma invoice % else the ${doc_name} ${object.name} % endif diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py index f84973e5226..9402d5abb2b 100644 --- a/addons/sale/models/sale_config_settings.py +++ b/addons/sale/models/sale_config_settings.py @@ -50,8 +50,8 @@ class SaleConfigSettings(models.TransientModel): "Show total", implied_group='sale.group_show_price_total', group='base.group_portal,base.group_user,base.group_public') - group_proforma_sales = fields.Boolean(string="Pro-Forma", implied_group='sale.group_proforma_sales', - help="Allows you to send pro-forma.") + group_proforma_sales = fields.Boolean(string="Pro-Forma Invoice", implied_group='sale.group_proforma_sales', + help="Allows you to send pro-forma invoice.") sale_show_tax = fields.Selection([ ('subtotal', 'Tax-Excluded Prices'), ('total', 'Tax-Included Prices')], string="Tax Display", diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml index 4a41add611c..7fe2693ef60 100644 --- a/addons/sale/report/sale_report_templates.xml +++ b/addons/sale/report/sale_report_templates.xml @@ -34,7 +34,7 @@ Quotation # - Pro-Forma # + Pro-Forma Invoice # diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml index fd8c087deaf..fa616c5a898 100644 --- a/addons/sale/views/sale_config_settings_views.xml +++ b/addons/sale/views/sale_config_settings_views.xml @@ -250,7 +250,7 @@

diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 2704cdb146e..c788f449503 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -155,11 +155,11 @@ type="action" context="{'default_advance_payment_method': 'percentage'}" attrs="{'invisible': ['|',('invoice_status', '!=', 'no'), ('state', '!=', 'sale')]}"/>