Merge branch '2.0-jayank-account_warnings' into 'master'

[FIX][2.0] account field label warning fixed

See merge request flectra-hq/flectra!405
This commit is contained in:
Parthiv Patel committed 2021-07-07 08:37:12 +00:00
commit df60e3f195
6 files changed
+11 -11

No files matched your search

+1 -1
View File
@@ -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,
@@ -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):
@@ -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,
@@ -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):
@@ -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)
@@ -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):