audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP]pms: Improvemente relation amount pending folio and payments with invoices linked

Browse Source
This commit is contained in:
Darío Lodeiros
2022-04-15 18:55:27 +02:00
parent ed9bdf4da2
commit e111302f9f
5 changed files with 156 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pms/views/folio_portal_templates.xml
View File

@@ -157,13 +157,13 @@
<i class="fa fa-fw fa-arrow-circle-right" /> Pay Now
</a>
<div
t-if="tx_ids and not pending_manual_txs and folio.payment_state not in ('paid', 'in_payment')"
t-if="tx_ids and not pending_manual_txs and folio.payment_state in ('not_paid', 'partial')"
class="alert alert-info py-1 mb-2"
>
<i class="fa fa-fw fa-check-circle" /> Pending
</div>
<div
t-if="folio.payment_state in ('paid', 'in_payment')"
t-if="folio.payment_state in ('paid', 'overpayment')"
class="alert alert-success py-1 mb-2"
>
<i class="fa fa-fw fa-check-circle" /> Paid

31
pms/views/pms_folio_views.xml
View File

@@ -55,6 +55,17 @@
/>
</bold>
</div>
<div
class="alert alert-warning"
role="alert"
style="margin-bottom:0px;"
attrs="{'invisible': [('payment_multi','=',False)]}"
>
This folio has payments assigned to multiple folios (through an invoice or directly).
The Folio will only be considered paid if all the folios with the same associated
payment are paid, or if a specific payment is assigned to this folio.
<field name="payment_multi" invisible="1" />
</div>
<div
class="alert alert-warning"
role="alert"
@@ -209,6 +220,12 @@
bg_color="bg-warning"
attrs="{'invisible': [('payment_state', '!=', 'partial')]}"
/>
<widget
name="web_ribbon"
title="Overpayment!"
bg_color="bg-info"
attrs="{'invisible': [('payment_state', '!=', 'overpayment')]}"
/>
<widget
name="web_ribbon"
title="Staff"
@@ -549,7 +566,13 @@
<field name="payment_type" />
<field name="amount" />
<field name="partner_id" invisible="1" />
<field name="state" invisible="1" />
<field
name="state"
decoration-success="state == 'posted'"
decoration-danger="state == 'cancel'"
decoration-warning="state == 'draft'"
widget="badge"
/>
</tree>
</field>
<!-- REVIEW: transations has a payment related -->
@@ -659,9 +682,9 @@
/>
<field
name="payment_state"
decoration-success="payment_state == 'paid'"
decoration-danger="payment_state == 'not_paid' and state in ['cancel','onboard','done','arrival_delayed','departure_delayed']"
decoration-info="payment_state == 'not_paid' and state in ['draft','confirm',]"
decoration-success="payment_state in ['paid', 'nothing_to_pay']"
decoration-danger="payment_state == 'not_paid'"
decoration-info="payment_state == 'overpayment'"
decoration-warning="payment_state == 'partial'"
widget="badge"
optional="show"