diff options
| author | celm1990 <celm1990@hotmail.com> | 2018-01-09 18:06:03 -0500 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2018-01-12 15:47:39 +0100 |
| commit | c3e3770f06db6b427118a3a2c5629d3aa9efaaa8 (patch) | |
| tree | 58d3d6be577cdd4685197d79e5605e8328f69510 | |
| parent | e9b09d47789c1c5b0f07c6e7c6cbbaf3aa50fad8 (diff) | |
[FIX] account: state cancelled not exist on invoice
The domain was using a wrong 'cancelled' state
Bonus: avoid code redundency
Closes #22121
| -rw-r--r-- | addons/account/controllers/portal.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/addons/account/controllers/portal.py b/addons/account/controllers/portal.py index f67ae00286e..4303f972f93 100644 --- a/addons/account/controllers/portal.py +++ b/addons/account/controllers/portal.py @@ -9,17 +9,19 @@ from odoo.tools import consteq class PortalAccount(CustomerPortal): - - def _prepare_portal_layout_values(self): - values = super(PortalAccount, self)._prepare_portal_layout_values() + + def _get_account_invoice_domain(self): partner = request.env.user.partner_id - - invoice_count = request.env['account.invoice'].search_count([ + domain = [ ('type', 'in', ['out_invoice', 'out_refund']), ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]), ('state', 'in', ['open', 'paid', 'cancel']) - ]) + ] + return domain + def _prepare_portal_layout_values(self): + values = super(PortalAccount, self)._prepare_portal_layout_values() + invoice_count = request.env['account.invoice'].search_count(self._get_account_invoice_domain()) values['invoice_count'] = invoice_count return values @@ -62,11 +64,7 @@ class PortalAccount(CustomerPortal): partner = request.env.user.partner_id AccountInvoice = request.env['account.invoice'] - domain = [ - ('type', 'in', ['out_invoice', 'out_refund']), - ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]), - ('state', 'in', ['open', 'paid', 'cancelled']) - ] + domain = self._get_account_invoice_domain() searchbar_sortings = { 'date': {'label': _('Invoice Date'), 'order': 'date_invoice desc'}, |
