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][MIG][11.0] Hotel Improvements + Hotel Calendar

Browse Source
This commit is contained in:
QS5ELkMu
2018-09-06 00:06:37 +02:00
parent 0c7b3edd77
commit 52562f7341
70 changed files with 509 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hotel/views/hotel_folio.xml
View File

@@ -194,7 +194,7 @@
<field name="partner_id"/>
<field name="splitted" invisible="1" />
<field name="parent_reservation" invisible="1" />
<!-- <field name="virtual_room_id" string="Reserved Room Type"/> -->
<!-- <field name="room_type_id" string="Reserved Room Type"/> -->
<field name="room_type_id" string="Reserved Room Type"/>
<field name="nights" />
<field name="adults" string="Persons"/>
@@ -307,7 +307,7 @@
<field name="name"/>
<field name="adults"/>
<field name="children"/>
<!-- <field name="virtual_room_id" on_change="1" options="{'no_create': True,'no_open': True}"
<!-- <field name="room_type_id" on_change="1" options="{'no_create': True,'no_open': True}"
attrs="{'readonly':[('state','not in',('draft'))]}"/> -->
<field name="channel_type" attrs="{'required':[('reservation_type','not in',('staff','out'))]}"/>
</group>

6
hotel/views/hotel_reservation.xml
View File

@@ -186,7 +186,7 @@
<field name="name"/>
<field name="adults"/>
<field name="children"/>
<!-- <field name="virtual_room_id" on_change="1" options="{'no_create': True,'no_open': True}"
<!-- <field name="room_type_id" on_change="1" options="{'no_create': True,'no_open': True}"
attrs="{'readonly':[('state','not in',('draft'))]}"/> -->
<field name="room_type_id" on_change="1" options="{'no_create': True,'no_open': True}"
attrs="{'readonly':[('state','not in',('draft'))]}"/>
@@ -335,7 +335,7 @@
/>
<field name="partner_id"/>
<field name="parent_reservation" invisible="1" />
<!-- <field name="virtual_room_id" string="Reserved Room Type"/> -->
<!-- <field name="room_type_id" string="Reserved Room Type"/> -->
<field name="room_type_id" string="Reserved Unit Type" />
<field name="nights" />
<field name="adults" string="Persons"/>
@@ -432,7 +432,7 @@
/>
<group expand="0" string="Group By">
<!-- <filter string="Room Type" domain="[]"
context="{'group_by':'virtual_room_id'}"/> -->
context="{'group_by':'room_type_id'}"/> -->
<filter string="Room Type" domain="[]"
context="{'group_by':'room_type_id'}"/>
<filter string="Creation Date" domain="[]"

6
hotel/views/hotel_room.xml
View File

@@ -38,9 +38,9 @@
</group>
<group>
<!-- <field name="sale_price_type" /> -->
<!--field name="price_virtual_room_domain" invisible="1" /-->
<!-- <field name="price_virtual_room" domain="[('room_ids.id', '=', active_id)]" attrs="{'invisible':[('sale_price_type', '!=', 'vroom')], 'required': [('sale_price_type', '=', 'vroom')]}" /> -->
<!-- <field name="price_room_type" domain="[('room_ids.id', '=', active_id)]" attrs="{'invisible':[('sale_price_type', '!=', 'vroom')], 'required': [('sale_price_type', '=', 'vroom')]}" /> -->
<!--field name="price_room_type_domain" invisible="1" /-->
<!-- <field name="price_room_type" domain="[('room_ids.id', '=', active_id)]" attrs="{'invisible':[('sale_price_type', '!=', 'room_type')], 'required': [('sale_price_type', '=', 'room_type')]}" /> -->
<!-- <field name="price_room_type" domain="[('room_ids.id', '=', active_id)]" attrs="{'invisible':[('sale_price_type', '!=', 'room_type')], 'required': [('sale_price_type', '=', 'room_type')]}" /> -->
</group>
<newline />
<!-- <separator colspan='4' string="Customer Taxes" /> -->

4
hotel/views/reservation_restriction_item_views.xml
View File

@@ -9,7 +9,7 @@
<form string="Restrictions">
<group>
<field name="applied_on" widget="radio"/>
<!-- <field name="virtual_room_id" attrs="{'invisible':[['applied_on', '=', '1_global']]}" required="True"/> -->
<!-- <field name="room_type_id" attrs="{'invisible':[['applied_on', '=', '1_global']]}" required="True"/> -->
<field name="room_type_id" attrs="{'invisible':[['applied_on', '=', '1_global']]}" required="True"/>
</group>
<group>
@@ -43,7 +43,7 @@
<field name="arch" type="xml">
<tree string="Restrictions">
<field name="applied_on"/>
<!-- <field name="virtual_room_id" attrs="{'invisible':[['applied_on', '=', '1_virtual_room']]}"/> -->
<!-- <field name="room_type_id" attrs="{'invisible':[['applied_on', '=', '1_room_type']]}"/> -->
<field name="room_type_id" attrs="{'invisible':[['applied_on', '=', '0_room_type']]}"/>
<field name="date_start"/>
<field name="date_end"/>

2
hotel/views/reservation_restriction_views.xml
View File

@@ -19,7 +19,7 @@
<field name="item_ids" nolabel="1">
<tree string="Restriction Items">
<field name="applied_on"/>
<!-- <field name="virtual_room_id" attr="{'invisible':[['applied_on', '=', '1_virtual_room']]}"/> -->
<!-- <field name="room_type_id" attr="{'invisible':[['applied_on', '=', '1_room_type']]}"/> -->
<field name="room_type_id" attr="{'invisible':[['applied_on', '=', '0_room_type']]}"/>
<field name="date_start"/>
<field name="date_end"/>

14
hotel/views/virtual_room_availability.xml → hotel/views/room_type_availability.xml
View File

@@ -2,14 +2,14 @@
<odoo>
<!-- FORM availability -->
<record id="virtual_room_availability_view_form" model="ir.ui.view">
<record id="room_type_availability_view_form" model="ir.ui.view">
<field name="name">hotel.room.type.availability.form</field>
<field name="model">hotel.room.type.availability</field>
<field name="arch" type="xml">
<form string="Availability">
<sheet>
<group>
<!-- <h1><field name="virtual_room_id" required="1"/></h1> -->
<!-- <h1><field name="room_type_id" required="1"/></h1> -->
<h1><field name="room_type_id" required="1"/></h1>
</group>
<group>
@@ -28,12 +28,12 @@
</record>
<!-- TREE restriction -->
<record id="virtual_room_availability_view_tree" model="ir.ui.view">
<record id="room_type_availability_view_tree" model="ir.ui.view">
<field name="name">hotel.room.type.availability.tree</field>
<field name="model">hotel.room.type.availability</field>
<field name="arch" type="xml">
<tree string="Restrictions">
<!-- <field name="virtual_room_id" required="1"/> -->
<!-- <field name="room_type_id" required="1"/> -->
<field name="room_type_id" required="1"/>
<field name="date" required="1"/>
<field name="avail"/>
@@ -44,7 +44,7 @@
</record>
<!-- Action of reservation restriction -->
<record model="ir.actions.act_window" id="virtual_room_availability_action">
<record model="ir.actions.act_window" id="room_type_availability_action">
<field name="name">Virtual Room Availability</field>
<field name="res_model">hotel.room.type.availability</field>
<field name="view_type">form</field>
@@ -52,8 +52,8 @@
</record>
<!-- MENUS -->
<menuitem name="Availability" id="virtual_room_availability_menu"
action="virtual_room_availability_action" sequence="22"
<menuitem name="Availability" id="room_type_availability_menu"
action="room_type_availability_action" sequence="22"
parent="hotel.configuration_others"/>
</odoo>

20
hotel/views/virtual_room_views.xml → hotel/views/room_type_views.xml
View File

@@ -2,9 +2,9 @@
<odoo>
<!-- FORM Virtual Room -->
<record id="virtual_room_view_form" model="ir.ui.view">
<field name="name">virtual.room.view.form</field>
<field name="model">hotel.virtual.room</field>
<record id="room_type_view_form" model="ir.ui.view">
<field name="name">room.type.view.form</field>
<field name="model">hotel.room.type</field>
<field name="arch" type="xml">
<form string="Virtual Room">
<sheet>
@@ -41,9 +41,9 @@
</record>
<!-- TREE Virtual Room -->
<record id="virtual_room_view_tree" model="ir.ui.view">
<field name="name">virtual.room.view.tree</field>
<field name="model">hotel.virtual.room</field>
<record id="room_type_view_tree" model="ir.ui.view">
<field name="name">room.type.view.tree</field>
<field name="model">hotel.room.type</field>
<field name="arch" type="xml">
<tree string="Virtual Rooms">
<field name="name"/>
@@ -57,16 +57,16 @@
</field>
</record>
<record model="ir.actions.act_window" id="virtual_room_action_form">
<record model="ir.actions.act_window" id="room_type_action_form">
<field name="name">Virtual Rooms</field>
<field name="res_model">hotel.virtual.room</field>
<field name="res_model">hotel.room.type</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<!-- MENUS -->
<menuitem name="Virtual rooms" id="virtual_room_menu"
action="virtual_room_action_form" sequence="40"
<menuitem name="Virtual rooms" id="room_type_menu"
action="room_type_action_form" sequence="40"
parent="hotel.menu_hotel_room"/>
</odoo>