From 4b60d5c1bd50bfab74233d2a50e58cd08d80eed5 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Thu, 25 Aug 2016 10:39:50 +0200 Subject: [PATCH] [IMP] account,sale,purchase: typo 'Payment Term' -> 'Payment Terms' --- addons/account/data/account_data.xml | 2 +- addons/account/models/account_invoice.py | 8 ++++---- addons/account/models/partner.py | 4 ++-- addons/account/report/account_invoice_report.py | 2 +- addons/account/views/account_view.xml | 10 +++++----- addons/purchase/models/purchase.py | 2 +- .../report/report_intrastat_invoice_template.xml | 2 +- addons/sale/models/sale.py | 2 +- addons/sale/report/sale_report_templates.xml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml index 5736f59ddcd..fc1d1bae318 100644 --- a/addons/account/data/account_data.xml +++ b/addons/account/data/account_data.xml @@ -32,7 +32,7 @@ - Payment Term + Payment Terms 6 diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index c52bd4a2713..87be174486f 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -244,7 +244,7 @@ class AccountInvoice(models.Model): partner_id = fields.Many2one('res.partner', string='Partner', change_default=True, required=True, readonly=True, states={'draft': [('readonly', False)]}, track_visibility='always') - payment_term_id = fields.Many2one('account.payment.term', string='Payment Term', oldname='payment_term', + payment_term_id = fields.Many2one('account.payment.term', string='Payment Terms', oldname='payment_term', readonly=True, states={'draft': [('readonly', False)]}, help="If you use payment terms, the due date will be computed automatically at the generation " "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. " @@ -1324,7 +1324,7 @@ class AccountPaymentTerm(models.Model): def _default_line_ids(self): return [(0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 9, 'days': 0, 'option': 'day_after_invoice_date'})] - name = fields.Char(string='Payment Term', translate=True, required=True) + name = fields.Char(string='Payment Terms', translate=True, required=True) active = fields.Boolean(default=True, help="If the active field is set to False, it will allow you to hide the payment term without removing it.") note = fields.Text(string='Description on the Invoice', translate=True) line_ids = fields.One2many('account.payment.term.line', 'payment_id', string='Terms', copy=True, default=_default_line_ids) @@ -1399,14 +1399,14 @@ class AccountPaymentTermLine(models.Model): ], default='day_after_invoice_date', required=True, string='Options' ) - payment_id = fields.Many2one('account.payment.term', string='Payment Term', required=True, index=True, ondelete='cascade') + payment_id = fields.Many2one('account.payment.term', string='Payment Terms', required=True, index=True, ondelete='cascade') sequence = fields.Integer(default=10, help="Gives the sequence order when displaying a list of payment term lines.") @api.one @api.constrains('value', 'value_amount') def _check_percent(self): if self.value == 'percent' and (self.value_amount < 0.0 or self.value_amount > 100.0): - raise ValidationError(_('Percentages for Payment Term Line must be between 0 and 100.')) + raise ValidationError(_('Percentages for Payment Terms Line must be between 0 and 100.')) @api.onchange('option') def _onchange_option(self): diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py index f81e9715ab9..17a8b70d63e 100644 --- a/addons/account/models/partner.py +++ b/addons/account/models/partner.py @@ -401,10 +401,10 @@ class ResPartner(models.Model): string="Fiscal Position", help="The fiscal position will determine taxes and accounts used for the partner.", oldname="property_account_position") property_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True, - string ='Customer Payment Term', + string='Customer Payment Terms', help="This payment term will be used instead of the default one for sale orders and customer invoices", oldname="property_payment_term") property_supplier_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True, - string ='Vendor Payment Term', + string='Vendor Payment Terms', help="This payment term will be used instead of the default one for purchase orders and vendor bills", oldname="property_supplier_payment_term") ref_company_ids = fields.One2many('res.company', 'partner_id', string='Companies that refers to partner', oldname="ref_companies") diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 81c40a436cd..9d0b3d3da27 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -32,7 +32,7 @@ class AccountInvoiceReport(models.Model): product_id = fields.Many2one('product.product', string='Product', readonly=True) product_qty = fields.Float(string='Product Quantity', readonly=True) uom_name = fields.Char(string='Reference Unit of Measure', readonly=True) - payment_term_id = fields.Many2one('account.payment.term', string='Payment Term', oldname='payment_term', readonly=True) + payment_term_id = fields.Many2one('account.payment.term', string='Payment Terms', oldname='payment_term', readonly=True) fiscal_position_id = fields.Many2one('account.fiscal.position', oldname='fiscal_position', string='Fiscal Position', readonly=True) currency_id = fields.Many2one('res.currency', string='Currency', readonly=True) categ_id = fields.Many2one('product.category', string='Product Category', readonly=True) diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index bde3c8071e0..ac3a3cb2114 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -1446,7 +1446,7 @@ account.payment.term.line.tree account.payment.term.line - + @@ -1459,7 +1459,7 @@ account.payment.term.line.form account.payment.term.line -
+ @@ -1488,8 +1488,8 @@ account.payment.term.search account.payment.term - - + + @@ -1498,7 +1498,7 @@ account.payment.term.form account.payment.term - + diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index 33bbb4aac94..eacd6249373 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -145,7 +145,7 @@ class PurchaseOrder(models.Model): amount_total = fields.Monetary(string='Total', store=True, readonly=True, compute='_amount_all') fiscal_position_id = fields.Many2one('account.fiscal.position', string='Fiscal Position', oldname='fiscal_position') - payment_term_id = fields.Many2one('account.payment.term', 'Payment Term') + payment_term_id = fields.Many2one('account.payment.term', 'Payment Terms') incoterm_id = fields.Many2one('stock.incoterms', 'Incoterm', states={'done': [('readonly', True)]}, help="International Commercial Terms are a series of predefined commercial terms used in international transactions.") product_id = fields.Many2one('product.product', related='order_line.product_id', string='Product') diff --git a/addons/report_intrastat/report/report_intrastat_invoice_template.xml b/addons/report_intrastat/report/report_intrastat_invoice_template.xml index 5660ad8f816..d177f2ef724 100644 --- a/addons/report_intrastat/report/report_intrastat_invoice_template.xml +++ b/addons/report_intrastat/report/report_intrastat_invoice_template.xml @@ -125,7 +125,7 @@

- Payment Term: + Payment Terms:

diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index bd3a8de2223..a26b64eae66 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -142,7 +142,7 @@ class SaleOrder(models.Model): amount_tax = fields.Monetary(string='Taxes', store=True, readonly=True, compute='_amount_all', track_visibility='always') amount_total = fields.Monetary(string='Total', store=True, readonly=True, compute='_amount_all', track_visibility='always') - payment_term_id = fields.Many2one('account.payment.term', string='Payment Term', oldname='payment_term') + payment_term_id = fields.Many2one('account.payment.term', string='Payment Terms', oldname='payment_term') fiscal_position_id = fields.Many2one('account.fiscal.position', oldname='fiscal_position', string='Fiscal Position') company_id = fields.Many2one('res.company', 'Company', default=lambda self: self.env['res.company']._company_default_get('sale.order')) team_id = fields.Many2one('crm.team', 'Sales Team', change_default=True, default=_get_default_team, oldname='section_id') diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml index 158aaef4403..7f251f798df 100644 --- a/addons/sale/report/sale_report_templates.xml +++ b/addons/sale/report/sale_report_templates.xml @@ -46,7 +46,7 @@

- Payment Term: + Payment Terms: