From b7adc7149f55ad31a81c2c82f0d70c3a8122bc89 Mon Sep 17 00:00:00 2001 From: jayankaghara Date: Wed, 7 Jul 2021 13:54:16 +0530 Subject: [PATCH] [FIX][2.0] account field label warning fixed --- addons/account/models/account_move.py | 2 +- addons/account_asset/models/account_invoice.py | 10 +++++----- .../models/account_bank_statement_line.py | 2 +- .../models/account_move.py | 2 +- .../models/account_payment.py | 2 +- .../accounting_pdf_reports/wizards/account_report.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index e0f2c0f5b3..5f15f91662 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -151,7 +151,7 @@ class AccountMove(models.Model): ('in_refund', 'Vendor Credit Note'), ('out_receipt', 'Sales Receipt'), ('in_receipt', 'Purchase Receipt'), - ], string='Type', required=True, store=True, index=True, readonly=True, tracking=True, + ], string='Move Type', required=True, store=True, index=True, readonly=True, tracking=True, default="entry", change_default=True) type_name = fields.Char('Type Name', compute='_compute_type_name') to_check = fields.Boolean(string='To Check', default=False, diff --git a/addons/account_asset/models/account_invoice.py b/addons/account_asset/models/account_invoice.py index 6e5b649f10..639f88c6b3 100644 --- a/addons/account_asset/models/account_invoice.py +++ b/addons/account_asset/models/account_invoice.py @@ -90,11 +90,11 @@ class AccountInvoiceLine(models.Model): elif self.move_id.move_type == 'in_invoice' and self.asset_category_id: self.account_id = self.asset_category_id.account_asset_id.id - @api.onchange('uom_id') - def _onchange_uom_id(self): - result = super(AccountInvoiceLine, self)._onchange_uom_id() - self.onchange_asset_category_id() - return result + # @api.onchange('uom_id') + # def _onchange_uom_id(self): + # result = super(AccountInvoiceLine, self)._onchange_uom_id() + # self.onchange_asset_category_id() + # return result @api.onchange('product_id') def _onchange_product_id(self): diff --git a/addons/account_bank_statement_import/models/account_bank_statement_line.py b/addons/account_bank_statement_import/models/account_bank_statement_line.py index 159de4e74a..3e04bef8b6 100644 --- a/addons/account_bank_statement_import/models/account_bank_statement_line.py +++ b/addons/account_bank_statement_import/models/account_bank_statement_line.py @@ -14,7 +14,7 @@ class AccountBankStatementLine(models.Model): help="This technical field can be used at the statement line creation/import time in order to avoid the reconciliation" " process on it later on. The statement line will simply create a counterpart on this account") note = fields.Text(string='Notes') - journal_entry_ids = fields.One2many('account.move.line', 'statement_line_id', 'Journal Items', copy=False, + journal_entry_ids = fields.One2many('account.move.line', 'statement_line_id', 'Journals', copy=False, readonly=True) move_name = fields.Char(string='Journal Entry Name', readonly=True, default=False, copy=False, diff --git a/addons/account_bank_statement_import/models/account_move.py b/addons/account_bank_statement_import/models/account_move.py index b320aa45d9..acbac532bf 100644 --- a/addons/account_bank_statement_import/models/account_move.py +++ b/addons/account_bank_statement_import/models/account_move.py @@ -26,7 +26,7 @@ class AccountMove(models.Model): ('not_paid', 'Not Paid'), ('in_payment', 'In Payment'), ('paid', 'Paid')], - string='Payment', store=True, readonly=True, copy=False, tracking=True, + string='Status of Payment', store=True, readonly=True, copy=False, tracking=True, compute='_compute_amount') def action_open_reconcile(self): diff --git a/addons/account_bank_statement_import/models/account_payment.py b/addons/account_bank_statement_import/models/account_payment.py index 603be7e181..f1a25c6fad 100644 --- a/addons/account_bank_statement_import/models/account_payment.py +++ b/addons/account_bank_statement_import/models/account_payment.py @@ -8,7 +8,7 @@ from flectra.exceptions import UserError, ValidationError class AccountPayment(models.Model): _inherit = "account.payment" - payment_date = fields.Date(string='Date', default=fields.Date.context_today, required=True, readonly=True, + payment_date = fields.Date(string='Payment Date', default=fields.Date.context_today, required=True, readonly=True, states={'draft': [('readonly', False)]}, copy=False, tracking=True) communication = fields.Char(string='Memo', readonly=True, states={'draft': [('readonly', False)]}) move_line_ids = fields.One2many('account.move.line', 'payment_id', readonly=True, copy=False) diff --git a/addons/accounting_pdf_reports/wizards/account_report.py b/addons/accounting_pdf_reports/wizards/account_report.py index cdf496b690..3500bee95c 100644 --- a/addons/accounting_pdf_reports/wizards/account_report.py +++ b/addons/accounting_pdf_reports/wizards/account_report.py @@ -20,8 +20,8 @@ class AccountingReport(models.TransientModel): account_report_id = fields.Many2one('account.financial.report', string='Account Reports', required=True, default=_get_account_report) label_filter = fields.Char(string='Column Label', help="This label will be displayed on report to show the balance computed for the given comparison filter.") filter_cmp = fields.Selection([('filter_no', 'No Filters'), ('filter_date', 'Date')], string='Filter by', required=True, default='filter_no') - date_from_cmp = fields.Date(string='Start Date') - date_to_cmp = fields.Date(string='End Date') + date_from_cmp = fields.Date(string='From Date') + date_to_cmp = fields.Date(string='To Date') debit_credit = fields.Boolean(string='Display Debit/Credit Columns', help="This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison.") def _build_comparison_context(self, data):