From bc19a83d5a5124c45475f5d35c0e0e3278710aa2 Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Sun, 8 Sep 2019 18:02:58 +0200 Subject: [PATCH 1/5] [IMP] Country from zip checkin roommatik --- hotel_roommatik/__manifest__.py | 3 ++- hotel_roommatik/models/inherited_res_partner.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hotel_roommatik/__manifest__.py b/hotel_roommatik/__manifest__.py index 72dfa5e6e..ecef87a06 100755 --- a/hotel_roommatik/__manifest__.py +++ b/hotel_roommatik/__manifest__.py @@ -19,7 +19,8 @@ 'partner_contact_gender', 'partner_second_lastname', 'partner_contact_birthdate', - 'base_iso3166' + 'base_iso3166', + 'base_location', ], 'data': [ 'data/res_users_data.xml' diff --git a/hotel_roommatik/models/inherited_res_partner.py b/hotel_roommatik/models/inherited_res_partner.py index e8a48b0bf..db8caaf2f 100755 --- a/hotel_roommatik/models/inherited_res_partner.py +++ b/hotel_roommatik/models/inherited_res_partner.py @@ -68,14 +68,20 @@ class ResPartner(models.Model): return [False, error_name] def rm_prepare_customer(self, customer): + zip = self.env['res.better.zip'].search([ + ('name', 'ilike', customer['Address']['ZipCode'])]) # Check Sex string if customer['Sex'] not in {'male', 'female'}: customer['Sex'] = '' # Check state_id state = self.env['res.country.state'].search([ ('name', 'ilike', customer['Address']['Province'])]) + if not state and zip: + state = zip.state_id country = self.env['res.country'].search([ ('code_alpha3', '=', customer['Address']['Country'])]) + if not country and zip: + country = zip.country_id # Create Street2s street_2 = customer['Address']['House'] street_2 += ' ' + customer['Address']['Flat'] @@ -87,7 +93,7 @@ class ResPartner(models.Model): 'birthdate_date': datetime.strptime( customer['Birthday'], DEFAULT_ROOMMATIK_DATE_FORMAT).date(), 'gender': customer['Sex'], - 'zip': customer['Address']['ZipCode'], + 'zip': zip, 'city': customer['Address']['City'], 'street': customer['Address']['Street'], 'street2': street_2, From 2abf374052ad028c29e9fb87c64b1b8e1f9d9d0a Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Sun, 8 Sep 2019 18:29:44 +0200 Subject: [PATCH 2/5] [FIX] datetime now --- cash_daily_report/wizard/cash_daily_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash_daily_report/wizard/cash_daily_report.py b/cash_daily_report/wizard/cash_daily_report.py index 4bcc6c2f8..23662b940 100644 --- a/cash_daily_report/wizard/cash_daily_report.py +++ b/cash_daily_report/wizard/cash_daily_report.py @@ -49,11 +49,11 @@ class CashDailyReportWizard(models.TransientModel): @api.model @api.model def _get_default_date_start(self): - return datetime.now().strftime(DEFAULT_SERVER_DATE_FORMAT) + return datetime.datetime.now().strftime(DEFAULT_SERVER_DATE_FORMAT) @api.model def _get_default_date_end(self): - return datetime.now().strftime(DEFAULT_SERVER_DATE_FORMAT) + return datetime.datetime.now().strftime(DEFAULT_SERVER_DATE_FORMAT) date_start = fields.Date("Start Date", default=_get_default_date_start) date_end = fields.Date("End Date", default=_get_default_date_end) From 3befa59ae8da9651c07cc169f761f0e45240ffbd Mon Sep 17 00:00:00 2001 From: Jose Luis Date: Wed, 18 Sep 2019 18:28:50 +0200 Subject: [PATCH 3/5] [FIX] wrong dependence on module partner_second_lastname --- hotel_roommatik/__manifest__.py | 1 - hotel_roommatik/models/inherited_res_partner.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hotel_roommatik/__manifest__.py b/hotel_roommatik/__manifest__.py index ecef87a06..30719f197 100755 --- a/hotel_roommatik/__manifest__.py +++ b/hotel_roommatik/__manifest__.py @@ -17,7 +17,6 @@ 'depends': [ 'hotel', 'partner_contact_gender', - 'partner_second_lastname', 'partner_contact_birthdate', 'base_iso3166', 'base_location', diff --git a/hotel_roommatik/models/inherited_res_partner.py b/hotel_roommatik/models/inherited_res_partner.py index db8caaf2f..c806401da 100755 --- a/hotel_roommatik/models/inherited_res_partner.py +++ b/hotel_roommatik/models/inherited_res_partner.py @@ -88,8 +88,8 @@ class ResPartner(models.Model): street_2 += ' ' + customer['Address']['Number'] metadata = { 'firstname': customer['FirstName'], - 'lastname': customer['LastName1'], - 'lastname2': customer['LastName2'], + 'lastname': customer['LastName1'] + ' ' + customer['LastName2'], + 'lastname2': '', 'birthdate_date': datetime.strptime( customer['Birthday'], DEFAULT_ROOMMATIK_DATE_FORMAT).date(), 'gender': customer['Sex'], @@ -117,7 +117,7 @@ class ResPartner(models.Model): response['Id'] = partner.id response['FirstName'] = partner.firstname response['LastName1'] = partner.lastname - response['LastName2'] = partner.lastname2 + response['LastName2'] = '' response['Birthday'] = partner.birthdate_date response['Sex'] = partner.gender response['Address'] = { From f60dec1f2446769843e2b3cac40c21f1e6e83900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Fri, 20 Sep 2019 11:59:08 +0200 Subject: [PATCH 4/5] [FIX] Allow change price on rooms without binding --- .../models/product_pricelist_item/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hotel_channel_connector/models/product_pricelist_item/common.py b/hotel_channel_connector/models/product_pricelist_item/common.py index 27741959d..8136414df 100644 --- a/hotel_channel_connector/models/product_pricelist_item/common.py +++ b/hotel_channel_connector/models/product_pricelist_item/common.py @@ -55,8 +55,8 @@ class ProductPricelistItem(models.Model): for record in self: channel_room_type = self.env['channel.hotel.room.type'].search( [('product_tmpl_id', '=', record.product_tmpl_id.id)]) - if record.fixed_price < channel_room_type.min_price or \ - record.fixed_price > channel_room_type.max_price: + if channel_room_type and (record.fixed_price < channel_room_type.min_price or \ + record.fixed_price > channel_room_type.max_price): msg = _("The room type '%s' limits the price between '%s' and '%s'.") \ % (record.name, channel_room_type.min_price, channel_room_type.max_price) raise ValidationError(msg) From 0b1a2eae6ad9058e23d4408e2070311e0d73ee59 Mon Sep 17 00:00:00 2001 From: Pablo Date: Mon, 23 Sep 2019 18:49:18 +0200 Subject: [PATCH 5/5] [FIX] HOT FIX guests in Booking.com reservations --- .../models/hotel_reservation/importer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotel_channel_connector_wubook/models/hotel_reservation/importer.py b/hotel_channel_connector_wubook/models/hotel_reservation/importer.py index 1f6b48ef6..e507f62bb 100644 --- a/hotel_channel_connector_wubook/models/hotel_reservation/importer.py +++ b/hotel_channel_connector_wubook/models/hotel_reservation/importer.py @@ -148,7 +148,7 @@ class HotelReservationImporter(Component): # Parse 'ancyllary' info if 'ancillary' in broom: if 'guests' in broom['ancillary']: - persons = broom['ancillary']['guests'] + persons = min(broom['ancillary']['guests'], persons) if 'tax_inclusive' in broom['ancillary'] and not broom['ancillary']['tax_inclusive']: _logger.info("--- Incoming Reservation without taxes included!") tax_inclusive = False