pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account: small UX imp in 'Journal Entries' form view

Browse Source 
don't show the 'Reconclied Entries' stat button if no reconciliation are linked to the move

task-1935597

closes odoo/odoo#31149

Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
This commit is contained in:
ppr-odoo
2019-07-08 10:26:52 +00:00
committed by qdp-odoo
parent 341a9921e0
commit 1520547ca3
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_move.py
+16 -6
View File
@@ -244,6 +244,8 @@ class AccountMove(models.Model):
invoice_has_matching_supsense_amount = fields.Boolean(compute='_compute_has_matching_suspense_amount',
groups='account.group_account_invoice',
help="Technical field used to display an alert on invoices if there is at least a matching amount in any supsense account.")
# Technical field to hide Reconciled Entries stat button
has_reconciled_entries = fields.Boolean(compute="_compute_has_reconciled_entries")
# -------------------------------------------------------------------------
# ONCHANGE METHODS
@@ -2048,6 +2050,11 @@ class AccountMove(models.Model):
for move in self.filtered(lambda move: move.is_invoice()):
move.access_url = '/my/invoices/%s' % (move.id)
@api.depends('line_ids')
def _compute_has_reconciled_entries(self):
for move in self:
move.has_reconciled_entries = len(move.line_ids._reconciled_lines()) > 1
@api.multi
def action_view_reverse_entry(self):
self.ensure_one()
@@ -3543,14 +3550,17 @@ class AccountMoveLine(models.Model):
action['res_id'] = self.copy().id
return action
def _reconciled_lines(self):
ids = []
for aml in self.filtered('account_id.reconcile'):
ids.extend([r.debit_move_id.id for r in aml.matched_debit_ids] if aml.credit > 0 else [r.credit_move_id.id for r in aml.matched_credit_ids])
ids.append(aml.id)
return ids
@api.multi
def open_reconcile_view(self):
[action] = self.env.ref('account.action_account_moves_all').read()
ids = []
for aml in self:
if aml.account_id.reconcile:
ids.extend([r.debit_move_id.id for r in aml.matched_debit_ids] if aml.credit > 0 else [r.credit_move_id.id for r in aml.matched_credit_ids])
ids.append(aml.id)
[action] = self.env.ref('account.action_account_moves_all_a').read()
ids = self._reconciled_lines()
action['domain'] = [('id', 'in', ids)]
return action
addons/account/views/account_move_views.xml
+2 -1
View File
@@ -488,7 +488,7 @@
class="oe_stat_button"
icon="fa-bars"
type="object"
attrs="{'invisible': ['|', ('type', '!=', 'entry'), ('id', '=', False)]}"
attrs="{'invisible': ['|', '|', ('type', '!=', 'entry'), ('id', '=', False), ('has_reconciled_entries', '=', False)]}"
string="Reconciled entries">
</button>
</div>
@@ -515,6 +515,7 @@
<field name="invoice_sequence_number_next_prefix" invisible="1"/>
<field name="invoice_sequence_number_next" invisible="1"/>
<field name="invoice_has_matching_supsense_amount" invisible="1"/>
<field name="has_reconciled_entries" invisible="1"/>
<div>
<!-- Invoice draft header -->