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

[FIX] account.invoice: leftovers of the state / invoice_payment_state

Browse Source 
refactoring

this fixes bugs introduced by
https://github.com/odoo/odoo/commit/beaa30a3d1843de43a45f419bfbc1bfa7613a920

in saas-13.2, the field invoice_payment_state was renamed into payment_state by
https://github.com/odoo/odoo/commit/8e4158af810bcf475214946fa64d3b0ce4d3b26d

in saas-13.4, the feature post_at of journal have been removed by
https://github.com/odoo/odoo/commit/caeb782841fc5a7ad71a196e2c9ee67644ef9074

closes odoo/odoo#49569

X-original-commit: 2001c413ee142c50ca6549cd5dff9fc0f9f1637b
Signed-off-by: Csaba Tóth <csaba.toth@i3rendszerhaz.hu>
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
This commit is contained in:
Csaba Tóth
2020-04-15 13:35:16 +00:00
committed by qdp-odoo
parent a6026eb71d
commit dff06e82b3
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/account_portal_templates.xml
+5 -5
View File
@@ -6,7 +6,7 @@
<t t-else="">Invoices &amp; Bills</t>
</li>
<li t-if="invoice" class="breadcrumb-item active">
<t t-esc="invoice.name" t-if="invoice.name"/>
<t t-esc="invoice.name" t-if="invoice.name != '/'"/>
<t t-else=""><em>Draft Invoice</em></t>
</li>
</xpath>
@@ -47,17 +47,17 @@
<tr>
<td>
<a t-att-href="invoice.get_portal_url()" t-att-title="invoice.name">
<t t-esc="invoice.name" t-if="invoice.name"/>
<t t-esc="invoice.name" t-if="invoice.name != '/'"/>
<em t-else="">Draft Invoice</em>
</a>
</td>
<td><span t-field="invoice.invoice_date"/></td>
<td class='d-none d-md-table-cell'><span t-field="invoice.invoice_date_due"/></td>
<td class="tx_status">
<t t-if="invoice.state == 'open'">
<t t-if="invoice.state == 'posted' and invoice.payment_state != 'paid'">
<span class="badge badge-pill badge-info"><i class="fa fa-fw fa-clock-o" aria-label="Opened" title="Opened" role="img"></i><span class="d-none d-md-inline"> Waiting for Payment</span></span>
</t>
<t t-if="invoice.state == 'paid'">
<t t-if="invoice.state == 'posted' and invoice.payment_state == 'paid'">
<span class="badge badge-pill badge-success"><i class="fa fa-fw fa-check" aria-label="Paid" title="Paid" role="img"></i><span class="d-none d-md-inline"> Paid</span></span>
</t>
<t t-if="invoice.state == 'cancel'">
@@ -89,7 +89,7 @@
<b t-if="invoice.amount_residual > 0" t-field="invoice.amount_residual"/>
<b t-else="1" t-field="invoice.amount_total"/>
</h2>
<div class="small" t-if="invoice.state != 'paid' and invoice.move_type == 'out_invoice'"><i class="fa fa-clock-o"/><span class="o_portal_sidebar_timeago ml4" t-att-datetime="invoice.invoice_date_due"/></div>
<div class="small" t-if="invoice.payment_state != 'paid' and invoice.move_type == 'out_invoice'"><i class="fa fa-clock-o"/><span class="o_portal_sidebar_timeago ml4" t-att-datetime="invoice.invoice_date_due"/></div>
</t>
<t t-set="entries">
addons/gamification_sale_crm/data/gamification_sale_crm_data.xml
+2 -2
View File
@@ -76,7 +76,7 @@
<field name="suffix">orders</field>
<field name="model_id" ref="account.model_account_invoice_report"/>
<field name="field_date_id" ref="account.field_account_invoice_report__invoice_date"/>
<field name="domain">[('state','=','paid'),('invoice_user_id','=',user.id),('move_type','=','out_invoice')]</field>
<field name="domain">[('payment_state','=','paid'),('invoice_user_id','=',user.id),('move_type','=','out_invoice')]</field>
</record>
<record model="gamification.goal.definition" id="definition_crm_tot_paid_sale_order">
<field name="name">Total Paid Sales Orders</field>
@@ -86,7 +86,7 @@
<field name="model_id" ref="account.model_account_invoice_report"/>
<field name="field_id" ref="account.field_account_invoice_report__price_subtotal"/>
<field name="field_date_id" ref="account.field_account_invoice_report__invoice_date"/>
<field name="domain">[('state','=','paid'),('invoice_user_id','=',user.id),('move_type','=','out_invoice')]</field>
<field name="domain">[('payment_state','=','paid'),('invoice_user_id','=',user.id),('move_type','=','out_invoice')]</field>
</record>
addons/l10n_in/views/report_invoice.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<xpath expr="//h2" position="replace">
<h2>
<span t-if="o.move_type == 'out_invoice' and o.state in ('open', 'in_payment', 'paid')" t-field="o.journal_id.name"/>
<span t-if="o.move_type == 'out_invoice' and o.state == 'open'" t-field="o.journal_id.name"/>
<span t-if="o.move_type == 'out_invoice' and o.state == 'draft'">Draft <span t-field="o.journal_id.name"/></span>
<span t-if="o.move_type == 'out_invoice' and o.state == 'cancel'">Cancelled <span t-field="o.journal_id.name"/></span>
<span t-if="o.move_type == 'out_refund'">Credit Note</span>
addons/website_crm_partner_assign/report/crm_partner_report.py
+1 -1
View File
@@ -54,5 +54,5 @@ class CrmPartnerReportAssign(models.Model):
FROM
res_partner p
left join account_invoice_report i
on (i.partner_id=p.id and i.move_type in ('out_invoice','out_refund') and i.state in ('open','in_payment','paid'))
on (i.partner_id=p.id and i.move_type in ('out_invoice','out_refund') and i.state='open')
)""")