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

Change parity by default pricelist and restriction

Browse Source
This commit is contained in:
Dario Lodeiros
2018-11-07 17:56:08 +01:00
parent a495caa38b
commit e9c54172e9
8 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
hotel/i18n/es.mo
View File

Binary file not shown.

6
hotel/i18n/es.po
View File

@@ -4444,7 +4444,7 @@ msgstr "Nombre del Hotel"
#. module: hotel
#: model:ir.ui.view,arch_db:hotel.view_hotel_config_settings
msgid "Hotel Parity"
msgid "Hotel Default"
msgstr "Emparejado"
#. module: hotel
@@ -5831,7 +5831,7 @@ msgid "Product Category"
msgstr "Categoría de producto"
#. module: hotel
#: model:ir.model.fields,field_description:hotel.field_hotel_config_settings_parity_pricelist_id
#: model:ir.model.fields,field_description:hotel.field_hotel_config_settings_default_pricelist_id
msgid "Product Pricelist"
msgstr "Lista de precios del producto"
@@ -6163,7 +6163,7 @@ msgstr "Nombre del Plan de Restricciones"
#. module: hotel
#: selection:hotel.wizard.massive.changes,section:0
#: model:ir.model.fields,field_description:hotel.field_hotel_config_settings_parity_restrictions_id
#: model:ir.model.fields,field_description:hotel.field_hotel_config_settings_default_restrictions_id
#: model:ir.ui.menu,name:hotel.reservation_restriction_menu
#: model:ir.ui.view,arch_db:hotel.reservation_restriction_item_view_form
#: model:ir.ui.view,arch_db:hotel.reservation_restriction_item_view_tree

2
hotel/models/hotel_folio.py
View File

@@ -353,7 +353,7 @@ class HotelFolio(models.Model):
addr = self.partner_id.address_get(['invoice'])
pricelist = self.partner_id.property_product_pricelist and \
self.partner_id.property_product_pricelist.id or \
self.env['ir.default'].sudo().get('res.config.settings', 'parity_pricelist_id')
self.env['ir.default'].sudo().get('res.config.settings', 'default_pricelist_id')
values = {'user_id': self.partner_id.user_id.id or self.env.uid,
'pricelist_id': pricelist
}

5
hotel/models/hotel_reservation.py
View File

@@ -443,10 +443,9 @@ class HotelReservation(models.Model):
@api.onchange('partner_id')
def onchange_partner_id(self):
#TODO: Change parity pricelist by default pricelist
pricelist = self.partner_id.property_product_pricelist and \
self.partner_id.property_product_pricelist.id or \
self.env['ir.default'].sudo().get('res.config.settings', 'parity_pricelist_id')
self.env['ir.default'].sudo().get('res.config.settings', 'default_pricelist_id')
values = {
'pricelist_id': pricelist,
}
@@ -745,7 +744,7 @@ class HotelReservation(models.Model):
if not vals:
vals = {}
pricelist_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'parity_pricelist_id')
'res.config.settings', 'default_pricelist_id')
#~ pricelist_id = vals.get('pricelist_id') or self.pricelist_id.id
room_type_id = vals.get('room_type_id') or self.room_type_id.id
product = self.env['hotel.room.type'].browse(room_type_id).product_id

24
hotel/models/res_config.py
View File

@@ -19,9 +19,9 @@ def _tz_get(self):
class HotelConfiguration(models.TransientModel):
_inherit = 'res.config.settings'
parity_pricelist_id = fields.Many2one('product.pricelist',
default_pricelist_id = fields.Many2one('product.pricelist',
'Product Pricelist')
parity_restrictions_id = fields.Many2one('hotel.room.type.restriction',
default_restrictions_id = fields.Many2one('hotel.room.type.restriction',
'Restrictions')
default_arrival_hour = fields.Char('Default Arrival Hour (GMT)',
help="HH:mm Format", default="14:00")
@@ -39,11 +39,11 @@ class HotelConfiguration(models.TransientModel):
super(HotelConfiguration, self).set_values()
self.env['ir.default'].sudo().set(
'res.config.settings', 'parity_pricelist_id',
self.parity_pricelist_id.id)
'res.config.settings', 'default_pricelist_id',
self.default_pricelist_id.id)
self.env['ir.default'].sudo().set(
'res.config.settings', 'parity_restrictions_id',
self.parity_restrictions_id.id)
'res.config.settings', 'default_restrictions_id',
self.default_restrictions_id.id)
self.env['ir.default'].sudo().set(
'res.config.settings', 'tz_hotel', self.tz_hotel)
self.env['ir.default'].sudo().set(
@@ -58,10 +58,10 @@ class HotelConfiguration(models.TransientModel):
res = super(HotelConfiguration, self).get_values()
# ONLY FOR v11. DO NOT FORWARD-PORT
parity_pricelist_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'parity_pricelist_id')
parity_restrictions_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'parity_restrictions_id')
default_pricelist_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'default_pricelist_id')
default_restrictions_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'default_restrictions_id')
tz_hotel = self.env['ir.default'].sudo().get(
'res.config.settings', 'tz_hotel')
default_arrival_hour = self.env['ir.default'].sudo().get(
@@ -69,8 +69,8 @@ class HotelConfiguration(models.TransientModel):
default_departure_hour = self.env['ir.default'].sudo().get(
'res.config.settings', 'default_departure_hour')
res.update(
parity_pricelist_id=parity_pricelist_id,
parity_restrictions_id=parity_restrictions_id,
default_pricelist_id=default_pricelist_id,
default_restrictions_id=default_restrictions_id,
tz_hotel=tz_hotel,
default_arrival_hour=default_arrival_hour,
default_departure_hour=default_departure_hour,

16
hotel/tests/common.py
View File

@@ -96,16 +96,16 @@ class TestHotel(TestMail):
# Minimal Hotel Configuration
cls.tz_hotel = 'Europe/Madrid'
cls.parity_pricelist_id = cls.pricelist_1.id
cls.parity_restrictions_id = cls.restriction_1.id
cls.default_pricelist_id = cls.pricelist_1.id
cls.default_restrictions_id = cls.restriction_1.id
cls.env['ir.values'].sudo().set_default('res.config.settings',
'tz_hotel', cls.tz_hotel)
cls.env['ir.values'].sudo().set_default('res.config.settings',
'parity_pricelist_id',
cls.parity_pricelist_id)
'default_pricelist_id',
cls.default_pricelist_id)
cls.env['ir.values'].sudo().set_default('res.config.settings',
'parity_restrictions_id',
cls.parity_restrictions_id)
'default_restrictions_id',
cls.default_restrictions_id)
# User Groups
user_group_hotel_manager = cls.env.ref('hotel.group_hotel_manager')
@@ -234,14 +234,14 @@ class TestHotel(TestMail):
})
room_type_rest_item_obj.create({
'room_type_id': k_vr,
'restriction_id': cls.parity_restrictions_id,
'restriction_id': cls.default_restrictions_id,
'date_start': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'date_end': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'applied_on': '0_room_type',
'min_stay': cls.restrictions_min_stay_tmp[k_vr][i],
})
pricelist_item_obj.create({
'pricelist_id': cls.parity_pricelist_id,
'pricelist_id': cls.default_pricelist_id,
'date_start': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'date_end': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'compute_price': 'fixed',

14
hotel/views/res_config.xml
View File

@@ -10,27 +10,27 @@
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]" position="inside">
<div class="app_settings_block" data-string="Hotel" string="Hotel" data-key="hotel" groups="hotel.group_hotel_manager">
<h2>Hotel Parity</h2>
<h2>Hotel Default</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box">
<label for="parity_pricelist_id"/>
<label for="default_pricelist_id"/>
<div class="text-muted">
Set pricelist parity
Set pricelist default
</div>
<div class="content-group">
<div class="mt16">
<field name="parity_pricelist_id" required="True" />
<field name="default_pricelist_id" required="True" />
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<label for="parity_restrictions_id"/>
<label for="default_restrictions_id"/>
<div class="text-muted">
Set restrictions parity
Set restrictions default
</div>
<div class="content-group">
<div class="mt16">
<field name="parity_restrictions_id" required="True" />
<field name="default_restrictions_id" required="True" />
</div>
</div>
</div>

8
hotel/wizard/wizard_reservation.py
View File

@@ -103,7 +103,7 @@ class FolioWizard(models.TransientModel):
nights = abs((checkout_dt - checkin_dt).days)
for room in product_list:
pricelist_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'parity_pricelist_id')
'res.config.settings', 'default_pricelist_id')
if pricelist_id:
pricelist_id = int(pricelist_id)
res_price = 0
@@ -331,7 +331,7 @@ class HotelRoomTypeWizards(models.TransientModel):
nights = abs((chkout_utc_dt - chkin_utc_dt).days)
pricelist_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'parity_pricelist_id')
'res.config.settings', 'default_pricelist_id')
if pricelist_id:
pricelist_id = int(pricelist_id)
@@ -426,7 +426,7 @@ class ReservationWizard(models.TransientModel):
if line.room_type_id:
pricelist_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'parity_pricelist_id')
'res.config.settings', 'default_pricelist_id')
if pricelist_id:
pricelist_id = int(pricelist_id)
nights = abs((end_date_utc_dt - start_date_utc_dt).days)
@@ -479,7 +479,7 @@ class ServiceWizard(models.TransientModel):
if self.product_id:
#TODO change pricelist for partner
pricelist_id = self.env['ir.default'].sudo().get(
'res.config.settings', 'parity_pricelist_id')
'res.config.settings', 'default_pricelist_id')
prod = self.product_id.with_context(
lang=self.folio_wizard_id.partner_id.lang,
partner=self.folio_wizard_id.partner_id.id,