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] Refactoring hotel reservation

Browse Source
This commit is contained in:
Dario Lodeiros
2018-08-14 19:25:59 +02:00
parent 27d314eac1
commit b341e39760
8 changed files with 939 additions and 1203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hotel/views/hotel_folio.xml
View File

@@ -84,10 +84,10 @@
id="payment_smart_button"
icon="fa-money"
name="action_pay"
attrs="{'invisible': ['|',('invoices_amount','<=',0)]}">
attrs="{'invisible': ['|',('pending_amount','<=',0)]}">
<div class="o_form_field o_stat_info">
<span class="o_stat_value">
<field name="invoices_amount" nolabel="1"
<field name="pending_amount" nolabel="1"
widget="monetary" options="{'currency_field': 'currency_id'}"/>
</span>
<span class="o_stat_text">Pending Payment</span>
@@ -221,8 +221,8 @@
<!-- <field name="customer_lead" invisible="1"/> -->
<!-- <field name="currency_id" invisible="1"/> -->
<!-- <field name="price_unit" invisible="1"/> -->
<field name="amount_room" string="Reservation Price" readonly="1"/>
<field name="amount_discount" string="Final Price"/>
<!-- <field name="amount_room" string="Reservation Price" readonly="1"/>-->
<!-- <field name="amount_discount" string="Final Price"/> -->
<button type="object" class="oe_stat_button"
id="go_reservation" icon="fa fa-2x fa-bars"
name="open_reservation_form"/>
@@ -277,6 +277,16 @@
</header>
<span class="label label-danger" attrs="{'invisible': [('state', 'not in', ('cancelled'))]}">Cancelled Reservation!</span>
<span class="label label-warning" attrs="{'invisible': [('overbooking', '=', False)]}">OverBooking!</span>
<h1>
<field name="room_id" select="1"
nolabel="1" options="{'no_create': True,'no_open': True}" placeholder="Room"
style="margin-right: 30px;" required='1'/>
<field name="partner_id" default_focus="1"
placeholder="Lastname, Firstname"
attrs="{'readonly':[('folio_id','!=',False)]}"
required="1"/>
<span class="fa fa-user" style="margin-left:20px;"/>
</h1>
<h3>
<!-- <field name="room_id" select="1" domain="[('isroom','=',True)]"
nolabel="1" options="{'no_create': True,'no_open': True}" placeholder="Room"
@@ -304,17 +314,17 @@
<group class="oe_subtotal_footer" style="margin-right: 20px; !important" colspan="2" name="reservation_total" string="Amounts">
<!-- <field name="amount_room" widget="monetary" options="{'currency_field': 'currency_id'}"/> -->
<!-- <field name="discount" string="Room Discount" attrs="{'invisible': [('discount_type','=','fixed')]}" /> -->
<field name="discount_fixed" string="Room Discount" attrs="{'invisible': [('discount_type','=','percent')]}" />
<!-- <field name="discount_fixed" string="Room Discount" attrs="{'invisible': [('discount_type','=','percent')]}" />
<field name="discount_type" widget="radio" options="{'horizontal': true}" nolabel="1" colspan="2"/>
<div class="oe_subtotal_footer_separator oe_inline o_td_label">
<label for="amount_discount" />
<button name="%(action_hotel_massive_price_change_reservation_days)d" string="Massive Day Prices"
type="action" class="oe_edit_only oe_link" icon="fa-bolt"/>
</div>
</div>-->
<!-- <field name="amount_discount" nolabel="1" widget='monetary' class="oe_subtotal_footer_separator" options="{'currency_field': 'currency_id'}"/> -->
<div class="oe_subtotal_footer_separator oe_inline o_td_label">
<!--<div class="oe_subtotal_footer_separator oe_inline o_td_label">
<label for="amount_reservation_services" />
</div>
</div>-->
<!-- <field name="amount_reservation_services" nolabel="1" widget='monetary' class="oe_subtotal_footer_separator" options="{'currency_field': 'currency_id'}"/> -->
<field name="price_total" invisible="1"/>
<!-- <field name="qty_delivered_updateable" invisible="1"/> -->
@@ -509,7 +519,7 @@
<field name="partner_id"/>
<field name="room_lines"/>
<field name="service_line_ids"/>
<field name="invoices_amount"/>
<field name="pending_amount"/>
<field name="refund_amount"/>
<field name="invoices_paid"/>
<field name="booking_pending"/>

28
hotel/views/hotel_reservation.xml
View File

@@ -193,30 +193,30 @@
<field name="channel_type" attrs="{'required':[('reservation_type','not in',('staff','out'))]}"/>
</group>
<group class="oe_subtotal_footer" style="margin-right: 20px; !important" colspan="2" name="reservation_total" string="Amounts" attrs="{'invisible':[('folio_id','=', False)]}">
<!-- <field name="amount_room" widget="monetary" options="{'currency_field': 'currency_id'}"/> -->
<!-- <field name="discount" string="Room Discount" attrs="{'invisible': [('discount_type','=','fixed')]}" /> -->
<field name="discount_fixed" string="Room Discount" attrs="{'invisible': [('discount_type','=','percent')]}" />
<field name="discount_type" widget="radio" options="{'horizontal': true}" nolabel="1" colspan="2"/>
<!--
<field name="discount" string="Room Discount" attrs="{'invisible': [('discount_type','=','fixed')]}" />
-->
<div class="oe_subtotal_footer_separator oe_inline o_td_label">
<!--
<label for="amount_discount" />
-->
<button name="%(action_hotel_massive_price_change_reservation_days)d" string="Massive Day Prices"
type="action" class="oe_edit_only oe_link" icon="fa-bolt"/>
</div>
</div>
<!-- <field name="amount_discount" nolabel="1" widget='monetary' class="oe_subtotal_footer_separator" options="{'currency_field': 'currency_id'}"/> -->
<!--
<div class="oe_subtotal_footer_separator oe_inline o_td_label">
<label for="amount_reservation_services" />
</div>
-->
<!-- <field name="amount_reservation_services" nolabel="1" widget='monetary' class="oe_subtotal_footer_separator" options="{'currency_field': 'currency_id'}"/> -->
<field name="price_total" invisible="1"/>
<field name="price_total" />
<!-- <field name="qty_delivered_updateable" invisible="1"/> -->
<field name="state" invisible="1"/>
<!-- <field name="invoice_status" invisible="1"/> -->
<!-- <field name="customer_lead" invisible="1"/> -->
<!-- <field name="currency_id" invisible="1"/> -->
<field name="price_subtotal" widget="monetary" invisible="1"/>
<!-- <field name="price_unit" invisible="1"/> -->
<!-- <field name="fix_total" invisible="1" /> -->
<!-- <field name="fix_folio_pending" invisible="1" /> -->
<field name="currency_id" invisible="1"/>
<field name="price_subtotal" widget="monetary"/>
</group>
</group>
<field name="folio_internal_comment" nolabel="1" placeholder="Reservation Notes"/>
@@ -265,7 +265,7 @@
<group colspan="4" string="Days" name="days">
<field name="reservation_line_ids" nolabel="1">
<tree create="false" delete="false" editable="bottom">
<field name="date" readonly="True" />
<field name="date" />
<field name="price" />
<field name="discount" />
</tree>
@@ -415,10 +415,10 @@
/>
<separator/>
<filter string="Still to be paid"
domain="[('folio_id.invoices_amount','&gt;',0)]"
domain="[('folio_id.pending_amount','&gt;',0)]"
/>
<filter string="Late Payment"
domain="[('folio_id.invoices_amount','&gt;',0),('state','in',['done'])]"
domain="[('folio_id.pending_amount','&gt;',0),('state','in',['done'])]"
/>
<filter string="Lates and NoShows"
domain="[('cancelled_reason','in',['late','noshow'])]"