diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py index d087388cfd2..1ed9b16669c 100644 --- a/addons/account/models/account_bank_statement.py +++ b/addons/account/models/account_bank_statement.py @@ -352,7 +352,7 @@ class AccountBankStatementLine(models.Model): name = fields.Char(string='Label', required=True) date = fields.Date(required=True, default=lambda self: self._context.get('date', fields.Date.context_today(self))) amount = fields.Monetary(digits=0, currency_field='journal_currency_id') - journal_currency_id = fields.Many2one('res.currency', related='statement_id.currency_id', + journal_currency_id = fields.Many2one('res.currency', string="Journal's Currency", related='statement_id.currency_id', help='Utility field to express amount currency', readonly=True) partner_id = fields.Many2one('res.partner', string='Partner') bank_account_id = fields.Many2one('res.partner.bank', string='Bank Account') diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index 4e538b8e21d..0dc6fc9a69a 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -366,7 +366,7 @@ class AccountInvoice(models.Model): #fields use to set the sequence, on the first invoice of the journal sequence_number_next = fields.Char(string='Next Number', compute="_get_sequence_number_next", inverse="_set_sequence_next") - sequence_number_next_prefix = fields.Char(string='Next Number', compute="_get_sequence_prefix") + sequence_number_next_prefix = fields.Char(string='Next Number Prefix', compute="_get_sequence_prefix") _sql_constraints = [ ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'), @@ -1500,9 +1500,9 @@ class AccountInvoiceLine(models.Model): default=_default_account, help="The income or expense account related to the selected product.") price_unit = fields.Float(string='Unit Price', required=True, digits=dp.get_precision('Product Price')) - price_subtotal = fields.Monetary(string='Amount', + price_subtotal = fields.Monetary(string='Amount (without Taxes)', store=True, readonly=True, compute='_compute_price', help="Total amount without taxes") - price_total = fields.Monetary(string='Amount', + price_total = fields.Monetary(string='Amount (with Taxes)', store=True, readonly=True, compute='_compute_price', help="Total amount with taxes") price_subtotal_signed = fields.Monetary(string='Amount Signed', currency_field='company_currency_id', store=True, readonly=True, compute='_compute_price', @@ -1696,9 +1696,9 @@ class AccountInvoiceTax(models.Model): tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict') account_id = fields.Many2one('account.account', string='Tax Account', required=True, domain=[('deprecated', '=', False)]) account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic account') - amount = fields.Monetary() - amount_rounding = fields.Monetary() - amount_total = fields.Monetary(string="Amount", compute='_compute_amount_total') + amount = fields.Monetary('Tax Amount') + amount_rounding = fields.Monetary('Amount Delta') + amount_total = fields.Monetary(string="Amount Total", compute='_compute_amount_total') manual = fields.Boolean(default=True) sequence = fields.Integer(help="Gives the sequence order when displaying a list of invoice tax.") company_id = fields.Many2one('res.company', string='Company', related='account_id.company_id', store=True, readonly=True) diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 5018b1e28e2..76641cdeb74 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1562,9 +1562,9 @@ class AccountPartialReconcile(models.Model): amount = fields.Monetary(currency_field='company_currency_id', help="Amount concerned by this matching. Assumed to be always positive") amount_currency = fields.Monetary(string="Amount in Currency") currency_id = fields.Many2one('res.currency', string='Currency') - company_currency_id = fields.Many2one('res.currency', related='company_id.currency_id', readonly=True, + company_currency_id = fields.Many2one('res.currency', string="Company Currency", related='company_id.currency_id', readonly=True, help='Utility field to express amount currency') - company_id = fields.Many2one('res.company', related='debit_move_id.company_id', store=True, string='Currency') + company_id = fields.Many2one('res.company', related='debit_move_id.company_id', store=True, string='Company') full_reconcile_id = fields.Many2one('account.full.reconcile', string="Full Reconcile", copy=False) max_date = fields.Date(string='Max Date of Matched Lines', compute='_compute_max_date', readonly=True, copy=False, store=True, diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py index b6bc2732231..e17e48165a5 100644 --- a/addons/account/models/account_payment.py +++ b/addons/account/models/account_payment.py @@ -290,7 +290,7 @@ class account_payment(models.Model): invoice_ids = fields.Many2many('account.invoice', 'account_invoice_payment_rel', 'payment_id', 'invoice_id', string="Invoices", copy=False, readonly=True) has_invoices = fields.Boolean(compute="_get_has_invoices", help="Technical field used for usability purposes") payment_difference = fields.Monetary(compute='_compute_payment_difference', readonly=True) - payment_difference_handling = fields.Selection([('open', 'Keep open'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference", copy=False) + payment_difference_handling = fields.Selection([('open', 'Keep open'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference Handling", copy=False) writeoff_account_id = fields.Many2one('account.account', string="Difference Account", domain=[('deprecated', '=', False)], copy=False) writeoff_label = fields.Char( string='Journal Item Label', diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py index 246c402a23c..a1fa22a824c 100644 --- a/addons/account/models/partner.py +++ b/addons/account/models/partner.py @@ -380,7 +380,7 @@ class ResPartner(models.Model): groups='account.group_account_invoice') currency_id = fields.Many2one('res.currency', compute='_get_company_currency', readonly=True, string="Currency", help='Utility field to express amount currency') - contracts_count = fields.Integer(compute='_compute_contracts_count', string="Contracts", type='integer') + contracts_count = fields.Integer(compute='_compute_contracts_count', string="Contracts Count", type='integer') journal_item_count = fields.Integer(compute='_compute_journal_item_count', string="Journal Items", type="integer") property_account_payable_id = fields.Many2one('account.account', company_dependent=True, string="Account Payable", oldname="property_account_payable", diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index 304fc0d54a3..6af82ed04b0 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -28,7 +28,7 @@ class ResConfigSettings(models.TransientModel): module_account_accountant = fields.Boolean(string='Accounting') group_analytic_accounting = fields.Boolean(string='Analytic Accounting', implied_group='analytic.group_analytic_accounting') - group_warning_account = fields.Boolean(string="Warnings", implied_group='account.group_warning_account') + group_warning_account = fields.Boolean(string="Warnings in Invoices", implied_group='account.group_warning_account') group_cash_rounding = fields.Boolean(string="Cash Rounding", implied_group='account.group_cash_rounding') module_account_asset = fields.Boolean(string='Assets Management') module_account_deferred_revenue = fields.Boolean(string="Revenue Recognition") diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 62c2fe786a1..9ef150f2eba 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -42,11 +42,11 @@ class AccountInvoiceReport(models.Model): company_id = fields.Many2one('res.company', string='Company', readonly=True) user_id = fields.Many2one('res.users', string='Salesperson', readonly=True) price_total = fields.Float(string='Total Without Tax', readonly=True) - user_currency_price_total = fields.Float(string="Total Without Tax", compute='_compute_amounts_in_user_currency', digits=0) + user_currency_price_total = fields.Float(string="Total Without Tax in Currency", compute='_compute_amounts_in_user_currency', digits=0) price_average = fields.Float(string='Average Price', readonly=True, group_operator="avg") - user_currency_price_average = fields.Float(string="Average Price", compute='_compute_amounts_in_user_currency', digits=0) + user_currency_price_average = fields.Float(string="Average Price in Currency", compute='_compute_amounts_in_user_currency', digits=0) currency_rate = fields.Float(string='Currency Rate', readonly=True, group_operator="avg", groups="base.group_multi_currency") - nbr = fields.Integer(string='# of Lines', readonly=True) # TDE FIXME master: rename into nbr_lines + nbr = fields.Integer(string='Line Count', readonly=True) # TDE FIXME master: rename into nbr_lines type = fields.Selection([ ('out_invoice', 'Customer Invoice'), ('in_invoice', 'Vendor Bill'), diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index 92c5e5db026..c0a618f2462 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -95,7 +95,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -429,7 +429,7 @@ - + diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml index 22726578d1b..748d7c5a3c7 100644 --- a/addons/account/views/res_config_settings_views.xml +++ b/addons/account/views/res_config_settings_views.xml @@ -396,7 +396,7 @@
-
-
-
-
-