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

[WIP] Views

Browse Source
This commit is contained in:
Dario Lodeiros
2019-03-12 18:02:40 +01:00
parent 20b6de582b
commit 7de29f4d38
3 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hotel/models/inherited_payment_return.py
View File

@@ -10,7 +10,7 @@ class PaymentReturn(models.Model):
@api.multi @api.multi
def action_confirm(self): def action_confirm(self):
pay = super(PaymentReturn,self).action_confirm() pay = super(PaymentReturn, self).action_confirm()
if pay: if pay:
folio_ids = [] folio_ids = []
folios = self.env['hotel.folio'].browse(folio_ids) folios = self.env['hotel.folio'].browse(folio_ids)
@@ -20,6 +20,8 @@ class PaymentReturn(models.Model):
]) ])
folios_line = self.env['hotel.folio'].browse(payments.mapped('folio_id.id')) folios_line = self.env['hotel.folio'].browse(payments.mapped('folio_id.id'))
for folio in folios_line: for folio in folios_line:
if self.id not in folio.return_ids.ids:
folio.update({'return_ids': [(4, self.id)]})
msg = _("Return of %s registered") % (line.amount) msg = _("Return of %s registered") % (line.amount)
folio.message_post(subject=_('Payment Return'), body=msg) folio.message_post(subject=_('Payment Return'), body=msg)
folios += folios_line folios += folios_line

38
hotel/views/hotel_folio_views.xml
View File

@@ -39,20 +39,6 @@
<sheet> <sheet>
<div class=" oe_button_box"> <div class=" oe_button_box">
<button type="object" class="oe_stat_button"
id="invoices_smart_button"
icon="fa-thumbs-up"
name="action_payments"
attrs="{'invisible': [('invoices_paid','&lt;=',0)]}">
<div class="o_form_field o_stat_info">
<span class="o_stat_value">
<field name="invoices_paid" nolabel="1"
widget="monetary" options="{'currency_field': 'currency_id'}"/>
</span>
<span class="o_stat_text">Paid out</span>
</div>
</button>
<button type="object" class="oe_stat_button" <button type="object" class="oe_stat_button"
id="payment_smart_button" id="payment_smart_button"
icon="fa-money" icon="fa-money"
@@ -67,20 +53,6 @@
</div> </div>
</button> </button>
<button type="object" class="oe_stat_button"
id="refunds_smart_button"
icon="fa-undo"
name="action_return_payments"
attrs="{'invisible': [('refund_amount','&lt;=',0)]}">
<div class="o_form_field o_stat_info">
<span class="o_stat_value">
<field name="refund_amount" nolabel="1"
widget="monetary" options="{'currency_field': 'currency_id'}"/>
</span>
<span class="o_stat_text">Refunds</span>
</div>
</button>
<button type="object" class="oe_stat_button" id="invoice_button" <button type="object" class="oe_stat_button" id="invoice_button"
icon="fa-pencil-square-o" name="open_invoices_folio" icon="fa-pencil-square-o" name="open_invoices_folio"
attrs="{'invisible': [('invoice_count', '=', 0)]}" attrs="{'invisible': [('invoice_count', '=', 0)]}"
@@ -140,6 +112,8 @@
<field name="invoice_ids" invisible="1"/> <field name="invoice_ids" invisible="1"/>
<field name="invoice_status" invisible="1" /> <field name="invoice_status" invisible="1" />
<field name="currency_id" invisible="1"/> <field name="currency_id" invisible="1"/>
<field name="refund_amount" invisible="1" />
<field name="invoices_paid" invisible="1" />
</group> </group>
<notebook colspan="4" col="1"> <notebook colspan="4" col="1">
<page string="Reservation Rooms"> <page string="Reservation Rooms">
@@ -194,6 +168,14 @@
</group> </group>
</group> </group>
</page> </page>
<page name="payments" string="Payments" attrs="{'invisible': [('invoices_paid','&lt;=',0)]}">
<field name="payment_ids"
options="{'no_create': True,'no_edit': True}" />
</page>
<page name="returns" string="Retun Payments" attrs="{'invisible': [('refund_amount','&lt;=',0)]}">
<field name="return_ids"
options="{'no_create': True,'no_edit': True}" />
</page>
<page string="Other data" invisible="1"> <page string="Other data" invisible="1">
<group> <group>
<field name="user_id" /> <field name="user_id" />

2
hotel_channel_connector/views/inherited_hotel_reservation_views.xml
View File

@@ -21,7 +21,7 @@
/> --> /> -->
</xpath> </xpath>
<xpath expr="//page[@name='days']" position="after"> <xpath expr="//page[@name='days']" position="after">
<page name="connector" string="Channel Connector"> <page name="connector" string="Channel Connector" groups="connector.group_connector_manager">
<group string="Hotel Channel Bindings"> <group string="Hotel Channel Bindings">
<field name="channel_bind_ids" nolabel="1"> <field name="channel_bind_ids" nolabel="1">
<tree> <tree>