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

[UPD] update manifest data files ordering

Browse Source
This commit is contained in:
Pablo
2019-09-25 19:12:59 +02:00
parent 22b7ec6626
commit d4fa801fba
7 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
hotel/__manifest__.py
View File

@@ -23,19 +23,23 @@
'account_cancel'
],
'data': [
'security/hotel_security.xml',
'security/ir.model.access.csv',
'data/cron_jobs.xml',
'data/hotel_data.xml',
'data/hotel_sequence.xml',
'data/email_template_cancel.xml',
'data/email_template_reserv.xml',
'data/email_template_exit.xml',
'data/menus.xml',
'data/hotel_data.xml',
'data/hotel_sequence.xml',
'report/hotel_folio.xml'
'report/hotel_folio.xml',
'report/hotel_folio_templates.xml',
'security/hotel_security.xml',
'security/ir.model.access.csv',
'wizard/massive_changes.xml',
'wizard/massive_price_reservation_days.xml',
'wizard/service_on_day.xml',
'wizard/split_reservation.xml',
'wizard/wizard_reservation.xml',
'views/general.xml',
'data/menus.xml',
'views/hotel_amenity_views.xml',
'views/hotel_amenity_type_views.xml',
'views/hotel_board_service_views.xml',
@@ -46,12 +50,12 @@
'views/hotel_folio_views.xml',
'views/hotel_property_views.xml',
'views/hotel_reservation_views.xml',
'views/hotel_room_type_views.xml',
'views/hotel_room_views.xml',
'views/hotel_room_closure_reason_views.xml',
'views/inherited_account_payment_views.xml',
'views/inherited_account_invoice_views.xml',
'views/inherited_res_users_views.xml',
'views/hotel_room_type_views.xml',
'views/hotel_room_type_class_views.xml',
'views/hotel_room_type_restriction_views.xml',
'views/hotel_room_type_restriction_item_views.xml',
@@ -63,16 +67,11 @@
'views/inherited_product_template_views.xml',
'views/inherited_webclient_templates.xml',
'wizard/folio_make_invoice_advance_views.xml',
'wizard/massive_changes.xml',
'wizard/massive_price_reservation_days.xml',
'wizard/service_on_day.xml',
'wizard/split_reservation.xml',
'wizard/wizard_reservation.xml',
],
'demo': [
'demo/hotel_demo.xml'
],
'qweb': [
'static/src/xml/*.xml',
'static/src/xml/hotel_base_templates.xml',
],
}
}

14
hotel/data/hotel_data.xml
View File

@@ -1,7 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
<!-- Basic hotel -->
<!-- hotel.users -->
<record id="base.user_root" model="res.users">
<field name="groups_id" eval="[(4,ref('hotel.group_hotel_manager'))]"/>
</record>
<record id="base.user_demo" model="res.users">
<field name="groups_id" eval="[(4,ref('hotel.group_hotel_user'))]"/>
</record>
<!-- Basic hotel -->
<record id="main_hotel_room_type_restriction" model="hotel.room.type.restriction">
<field name="name">Restriction Plan</field>
</record>

10
hotel/demo/hotel_demo.xml
View File

@@ -2,16 +2,6 @@
<odoo>
<data noupdate="1">
<!-- hotel.users -->
<record id="base.user_root" model="res.users">
<field name="groups_id" eval="[(4,ref('hotel.group_hotel_manager'))]"/>
</record>
<record id="base.user_demo" model="res.users">
<field name="groups_id" eval="[(4,ref('hotel.group_hotel_user'))]"/>
</record>
<!-- hotel.floor -->
<record id="hotel_floor_0" model="hotel.floor">

4
hotel/models/hotel_room_type_restriction.py
View File

@@ -11,11 +11,11 @@ class HotelRoomTypeRestriction(models.Model):
# Default methods
@api.model
def _get_default_hotel(self):
return self.env.user.hotel_id
return self.env.user.hotel_id or None
# Fields declaration
name = fields.Char('Restriction Plan Name', required=True)
hotel_id = fields.Many2one('hotel.property', 'Hotel', required=True, ondelete='restrict',
hotel_id = fields.Many2one('hotel.property', 'Hotel', ondelete='restrict',
default=_get_default_hotel)
item_ids = fields.One2many('hotel.room.type.restriction.item',
'restriction_id', string='Restriction Items',

2
hotel/views/hotel_amenity_type_views.xml
View File

@@ -40,8 +40,6 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_amenity" name="Amenity"
parent="hotel.hotel_configuration_menu" sequence="2" />
<menuitem name="Amenity Types"
id="menu_action_hotel_room_amenity_type_view_form" action="action_hotel_room_amenity_type_view_form"
sequence="3" parent="hotel.menu_amenity" />

4
hotel/views/hotel_amenity_views.xml
View File

@@ -104,6 +104,10 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="hotel_amenity_view_list" />
</record>
<menuitem id="menu_amenity" name="Amenity"
parent="hotel.hotel_configuration_menu" sequence="2" />
<menuitem name="Amenities" id="menu_action_hotel_room_amenity_view_form"
action="action_hotel_room_amenity_view_form" sequence="2"
parent="hotel.menu_amenity" />

14
hotel/views/hotel_folio_views.xml
View File

@@ -2,6 +2,13 @@
<odoo>
<!--=== Hotel Folio ==== -->
<act_window id="action_view_folio_advance_payment_inv"
name="Invoice Folio"
src_model="hotel.folio"
res_model="folio.advance.payment.inv"
key2="client_action_multi" target="new"
view_mode="form" multi="True"/>
<!-- Form view of hotel folio -->
<record model="ir.ui.view" id="hotel_folio_view_form">
<field name="name">hotel.folio.form</field>
@@ -319,13 +326,6 @@
<!-- Add create invoice merge folio -->
<act_window id="action_view_folio_advance_payment_inv"
name="Invoice Folio"
src_model="hotel.folio"
res_model="folio.advance.payment.inv"
key2="client_action_multi" target="new"
view_mode="form" multi="True"/>
<act_window name="Send Confirm Mail"
res_model="mail.compose.message"
src_model="hotel.folio"