diff options
Diffstat (limited to 'addons')
4 files changed, 9 insertions, 9 deletions
diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml index 620c4ff33e5..d119735e37a 100644 --- a/addons/account/views/account_portal_templates.xml +++ b/addons/account/views/account_portal_templates.xml @@ -6,7 +6,7 @@ <t t-else="">Invoices & 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"> diff --git a/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml b/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml index 791d862726c..1130417b66e 100644 --- a/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml +++ b/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml @@ -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> diff --git a/addons/l10n_in/views/report_invoice.xml b/addons/l10n_in/views/report_invoice.xml index 0856519ad66..15aa1e270dd 100644 --- a/addons/l10n_in/views/report_invoice.xml +++ b/addons/l10n_in/views/report_invoice.xml @@ -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> diff --git a/addons/website_crm_partner_assign/report/crm_partner_report.py b/addons/website_crm_partner_assign/report/crm_partner_report.py index 1d7fdb67b41..653a0d5db13 100644 --- a/addons/website_crm_partner_assign/report/crm_partner_report.py +++ b/addons/website_crm_partner_assign/report/crm_partner_report.py @@ -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') )""") |