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

Merge branch '11.0' of https://github.com/hootel/hootel into 11.0

Browse Source
This commit is contained in:
Pablo
2019-05-16 09:34:41 +02:00
parent d93d59137a efbb2f8920
commit 34cee2222e
5 changed files with 48 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
hotel_data_bi/models/data_bi.py
View File

@@ -121,7 +121,8 @@ class Data_Bi(models.Model):
dic_export.append({'Segmentos': dic_segmentos}) dic_export.append({'Segmentos': dic_segmentos})
if (archivo == 0) or (archivo == 13) or (archivo == 6): if (archivo == 0) or (archivo == 13) or (archivo == 6):
dic_clientes = self.data_bi_client(compan.id_hotel) dic_clientes = self.data_bi_client(compan.id_hotel)
dic_export.append({'Clientes': dic_clientes}) if (archivo == 0) or (archivo == 13):
dic_export.append({'Clientes': dic_clientes})
if (archivo == 0) or (archivo == 14): if (archivo == 0) or (archivo == 14):
dic_estados = self.data_bi_estados(compan.id_hotel, estado_array) dic_estados = self.data_bi_estados(compan.id_hotel, estado_array)
dic_export.append({'Estado Reservas': dic_estados}) dic_export.append({'Estado Reservas': dic_estados})
@@ -142,9 +143,9 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_tarifa(self, compan): def data_bi_tarifa(self, compan):
_logger.info("DataBi: Calculating all fees")
dic_tarifa = [] # Diccionario con las tarifas dic_tarifa = [] # Diccionario con las tarifas
tarifas = self.env['product.pricelist'].search_read([], ['name']) tarifas = self.env['product.pricelist'].search_read([], ['name'])
_logger.info("DataBi: Calculating %s fees", str(len(tarifas)))
for tarifa in tarifas: for tarifa in tarifas:
dic_tarifa.append({'ID_Hotel': compan, dic_tarifa.append({'ID_Hotel': compan,
'ID_Tarifa': tarifa['id'], 'ID_Tarifa': tarifa['id'],
@@ -173,13 +174,13 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_pais(self, compan): def data_bi_pais(self, compan):
_logger.info("DataBi: Calculating all countries")
dic_pais = [] dic_pais = []
# Diccionario con los nombre de los Paises usando los del INE # Diccionario con los nombre de los Paises usando los del INE
dic_pais.append({'ID_Hotel': compan, dic_pais.append({'ID_Hotel': compan,
'ID_Pais': 'NONE', 'ID_Pais': 'NONE',
'Descripcion': 'No Asignado'}) 'Descripcion': 'No Asignado'})
paises = self.env['code.ine'].search_read([], ['code', 'name']) paises = self.env['code.ine'].search_read([], ['code', 'name'])
_logger.info("DataBi: Calculating %s countries", str(len(paises)))
for pais in paises: for pais in paises:
dic_pais.append({'ID_Hotel': compan, dic_pais.append({'ID_Hotel': compan,
'ID_Pais': pais['code'], 'ID_Pais': pais['code'],
@@ -188,9 +189,10 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_regimen(self, compan): def data_bi_regimen(self, compan):
_logger.info("DataBi: Calculating all board services")
dic_regimen = [] # Diccionario con los Board Services dic_regimen = [] # Diccionario con los Board Services
board_services = self.env['hotel.board.service'].search_read([]) board_services = self.env['hotel.board.service'].search_read([])
_logger.info("DataBi: Calculating %s board services", str(
len(board_services)))
dic_regimen.append({'ID_Hotel': compan, dic_regimen.append({'ID_Hotel': compan,
'ID_Regimen': 0, 'ID_Regimen': 0,
'Descripcion': 'Sin régimen'}) 'Descripcion': 'Sin régimen'})
@@ -215,7 +217,7 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_habitacione(self, compan, rooms): def data_bi_habitacione(self, compan, rooms):
_logger.info("DataBi: Calculating all room types") _logger.info("DataBi: Calculating %s room types", str(len(rooms)))
dic_tipo_habitacion = [] # Diccionario con Rooms types dic_tipo_habitacion = [] # Diccionario con Rooms types
for room in rooms: for room in rooms:
dic_tipo_habitacion.append({ dic_tipo_habitacion.append({
@@ -227,7 +229,7 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_capacidad(self, compan, rooms): def data_bi_capacidad(self, compan, rooms):
_logger.info("DataBi: Calculating all the capacitys") _logger.info("DataBi: Calculating %s room capacity", str(len(rooms)))
dic_capacidad = [] # Diccionario con las capacidades dic_capacidad = [] # Diccionario con las capacidades
for room in rooms: for room in rooms:
dic_capacidad.append({ dic_capacidad.append({
@@ -240,8 +242,8 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_budget(self, compan): def data_bi_budget(self, compan):
_logger.info("DataBi: Calculating budget")
budgets = self.env['budget'].search([]) budgets = self.env['budget'].search([])
_logger.info("DataBi: Calculating %s budget", str(len(budgets)))
dic_budget = [] # Diccionario con las previsiones Budget dic_budget = [] # Diccionario con las previsiones Budget
for budget in budgets: for budget in budgets:
dic_budget.append({'ID_Hotel': compan, dic_budget.append({'ID_Hotel': compan,
@@ -281,9 +283,9 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_segment(self, compan): def data_bi_segment(self, compan):
_logger.info("DataBi: Calculating all the segmentations")
dic_segmentos = [] # Diccionario con Segmentación dic_segmentos = [] # Diccionario con Segmentación
lineas = self.env['res.partner.category'].search([]) lineas = self.env['res.partner.category'].search([])
_logger.info("DataBi: Calculating %s segmentations", str(len(lineas)))
for linea in lineas: for linea in lineas:
if linea.parent_id.name: if linea.parent_id.name:
seg_desc = linea.parent_id.name + " / " + linea.name seg_desc = linea.parent_id.name + " / " + linea.name
@@ -299,6 +301,7 @@ class Data_Bi(models.Model):
'ID_Cliente': 0, 'ID_Cliente': 0,
'Descripcion': u'Ninguno'}) 'Descripcion': u'Ninguno'})
lineas = self.env['channel.ota.info'].search([]) lineas = self.env['channel.ota.info'].search([])
_logger.info("DataBi: Calculating %s otas", str(len(lineas)))
for linea in lineas: for linea in lineas:
dic_clientes.append({'ID_Hotel': compan, dic_clientes.append({'ID_Hotel': compan,
@@ -308,6 +311,7 @@ class Data_Bi(models.Model):
lineas = self.env['res.partner'].search([('is_tour_operator', lineas = self.env['res.partner'].search([('is_tour_operator',
'=', True)]) '=', True)])
id_cli_count = 700 id_cli_count = 700
_logger.info("DataBi: Calculating %s Operators", str(len(lineas)))
for linea in lineas: for linea in lineas:
dic_clientes.append({'ID_Hotel': compan, dic_clientes.append({'ID_Hotel': compan,
'ID_Cliente': id_cli_count, 'ID_Cliente': id_cli_count,
@@ -348,11 +352,11 @@ class Data_Bi(models.Model):
@api.model @api.model
def data_bi_bloqueos(self, compan, lines): def data_bi_bloqueos(self, compan, lines):
_logger.info("DataBi: Calculating all reservations blocked")
dic_bloqueos = [] # Diccionario con Bloqueos dic_bloqueos = [] # Diccionario con Bloqueos
lines = lines.filtered( lines = lines.filtered(
lambda n: (n.reservation_id.reservation_type != 'normal') and ( lambda n: (n.reservation_id.reservation_type != 'normal') and (
n.reservation_id.state != 'cancelled')) n.reservation_id.state != 'cancelled'))
_logger.info("DataBi: Calculating %s Bloqued", str(len(lines)))
for line in lines: for line in lines:
# if linea.reservation_id.state != 'cancelled': # if linea.reservation_id.state != 'cancelled':
if line.reservation_id.reservation_type == 'out': if line.reservation_id.reservation_type == 'out':
@@ -370,11 +374,12 @@ class Data_Bi(models.Model):
return dic_bloqueos return dic_bloqueos
@api.model @api.model
def data_bi_reservas(self, compan, lineas, estado_array, dic_clientes): def data_bi_reservas(self, compan, lines, estado_array, dic_clientes):
dic_reservas = [] dic_reservas = []
lineas = lineas.filtered( lineas = lines.filtered(
lambda n: (n.reservation_id.reservation_type == 'normal') and ( lambda n: (n.reservation_id.reservation_type == 'normal') and (
n.price > 0)) n.price > 0))
_logger.info("DataBi: Calculating %s reservations", str(len(lineas)))
channels = {'door': 0, channels = {'door': 0,
'mail': 1, 'mail': 1,
'phone': 2, 'phone': 2,
@@ -385,6 +390,8 @@ class Data_Bi(models.Model):
'virtualdoor': 7} 'virtualdoor': 7}
for linea in lineas: for linea in lineas:
# _logger.info("DataBi: %s", linea.reservation_id.folio_id.name)
id_segmen = 0 id_segmen = 0
if len(linea.reservation_id.segmentation_ids) > 0: if len(linea.reservation_id.segmentation_ids) > 0:
id_segmen = linea.reservation_id.segmentation_ids[0].id id_segmen = linea.reservation_id.segmentation_ids[0].id
@@ -462,19 +469,14 @@ class Data_Bi(models.Model):
if reserva.reservation_id.channel_type == "door": if reserva.reservation_id.channel_type == "door":
response = 903 response = 903
elif reserva.reservation_id.channel_type == "mail": elif reserva.reservation_id.channel_type == "mail":
response = 904 response = 904
elif reserva.reservation_id.channel_type == "phone": elif reserva.reservation_id.channel_type == "phone":
response = 905 response = 905
elif reserva.reservation_id.channel_type == "call": elif reserva.reservation_id.channel_type == "call":
response = 906 response = 906
elif reserva.reservation_id.channel_type == "virtualdoor": elif reserva.reservation_id.channel_type == "virtualdoor":
response = 909 response = 909
elif reserva.reservation_id.channel_type == "web": elif reserva.reservation_id.channel_type == "web":
if reserva.reservation_id.ota_id.id: if reserva.reservation_id.ota_id.id:
# OTA # OTA
@@ -482,7 +484,6 @@ class Data_Bi(models.Model):
else: else:
# Web Propia # Web Propia
response = 999 response = 999
elif reserva.reservation_id.channel_type == "agency": elif reserva.reservation_id.channel_type == "agency":
tour = reserva.reservation_id.tour_operator_id tour = reserva.reservation_id.tour_operator_id
if tour.name: if tour.name:
@@ -492,7 +493,6 @@ class Data_Bi(models.Model):
response = mach['ID_Cliente'] response = mach['ID_Cliente']
else: else:
response = 907 response = 907
elif reserva.reservation_id.channel_type == "operator": elif reserva.reservation_id.channel_type == "operator":
tour = reserva.reservation_id.tour_operator_id tour = reserva.reservation_id.tour_operator_id
if tour.name: if tour.name:

2
hotel_l10n_es/models/inherit_hotel_checkin_partner.py
View File

@@ -107,8 +107,6 @@ class HotelCheckinPartner(models.Model):
if partner: if partner:
record.update({'partner_id': partner}) record.update({'partner_id': partner})
@api.multi @api.multi
def check_required_fields(self): def check_required_fields(self):
for record in self: for record in self:

3
hotel_l10n_es/models/inherit_res_partner.py
View File

@@ -42,7 +42,6 @@ class ResPartner(models.Model):
('N', 'Permiso Residencia Español'), ('N', 'Permiso Residencia Español'),
('X', 'Permiso Residencia Europeo')], ('X', 'Permiso Residencia Europeo')],
help=_('Select a valid document type'), help=_('Select a valid document type'),
default='D',
string='Doc. type', string='Doc. type',
) )
document_number = fields.Char('Document number', index=True) document_number = fields.Char('Document number', index=True)
@@ -157,7 +156,7 @@ class ResPartner(models.Model):
return super(ResPartner, self)._check_vat_unique() return super(ResPartner, self)._check_vat_unique()
return True return True
@api.constrains('document_number') @api.constrains('document_number', 'document_type')
def _check_document_number_unique(self): def _check_document_number_unique(self):
for record in self: for record in self:
if not record.document_number: if not record.document_number:

35
kellys_daily_report/report/report_kellys.xml
View File

@@ -40,7 +40,7 @@
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.pie { .pie {
font-size: 0.95em; font-size: 1.95em;
margin: 2em 0 4em 0; margin: 2em 0 4em 0;
} }
.tipo { .tipo {
@@ -135,7 +135,13 @@
<div class="tipo col span_1_of_2">SALIDA</div> <div class="tipo col span_1_of_2">SALIDA</div>
<t t-if="o.checkin != ''"> <t t-if="o.checkin != ''">
<div class="datos col span_2_of_2">Entrada <div class="datos col span_2_of_2">Entrada
<span t-field="o.checkin" t-options='{"format": "d MMMM"}'/></div> <t t-if="o.checkin == 'no prevista'">
<span t-field="o.checkin"/>
</t>
<t t-else="">
<span t-esc="datetime.datetime.strptime(o.checkin, '%Y-%m-%d').strftime('%d de %B')"/>
</t>
</div>
</t> </t>
<div class="notas col span_2_of_2" align="left"> <div class="notas col span_2_of_2" align="left">
<span t-field="o.notas"/> <span t-field="o.notas"/>
@@ -148,9 +154,10 @@
</div> </div>
<div class="tipo col span_1_of_2">CLIENTE</div> <div class="tipo col span_1_of_2">CLIENTE</div>
<div class="datos col span_2_of_2">Del <div class="datos col span_2_of_2">Del
<span t-field="o.checkin" t-options='{"format": "d MMMM"}'/> <span t-esc="datetime.datetime.strptime(o.checkin, '%Y-%m-%d').strftime('%d de %b')"/>
al al
<span t-field="o.checkout" t-options='{"format": "d MMMM"}'/></div> <span t-esc="datetime.datetime.strptime(o.checkout, '%Y-%m-%d').strftime('%d de %b')"/>
</div>
<div class="notas col span_2_of_2" align="left"> <div class="notas col span_2_of_2" align="left">
<span t-field="o.notas"/> <span t-field="o.notas"/>
</div> </div>
@@ -162,9 +169,10 @@
</div> </div>
<div class="tipo col span_1_of_2">REVISAR</div> <div class="tipo col span_1_of_2">REVISAR</div>
<div class="datos col span_2_of_2">Entrada <div class="datos col span_2_of_2">Entrada
<span t-field="o.checkin" t-options='{"format": "d MMMM"}'/> <span t-esc="datetime.datetime.strptime(o.checkin, '%Y-%m-%d').strftime('%d de %b')"/>
al al
<span t-field="o.checkout" t-options='{"format": "d MMMM"}'/></div> <span t-esc="datetime.datetime.strptime(o.checkout, '%Y-%m-%d').strftime('%d de %b')"/>
</div>
<div class="notas col span_2_of_2" align="left"> <div class="notas col span_2_of_2" align="left">
<span t-field="o.notas"/> <span t-field="o.notas"/>
</div> </div>
@@ -176,18 +184,21 @@
</div> </div>
<div class="tipo col span_1_of_2">STAFF</div> <div class="tipo col span_1_of_2">STAFF</div>
<div class="datos col span_2_of_2">Del <div class="datos col span_2_of_2">Del
<span t-field="o.checkin" t-options='{"format": "d MMMM"}'/> <span t-esc="datetime.datetime.strptime(o.checkin, '%Y-%m-%d').strftime('%d de %b')"/>
al al
<span t-field="o.checkout" t-options='{"format": "d MMMM"}'/></div> <span t-esc="datetime.datetime.strptime(o.checkout, '%Y-%m-%d').strftime('%d de %b')"/>
</div>
<div class="notas col span_2_of_2" align="left"> <div class="notas col span_2_of_2" align="left">
<span t-field="o.notas"/> <span t-field="o.notas"/>
</div> </div>
</div> </div>
</t> </t>
<div class="pie">Impreso el <div class="pie">
<span t-esc="context_timestamp(datetime.datetime.now()).strftime('%d-%m-%Y a las %H:%M')"/> <p>Impreso el
Habitaciones: <span t-esc="context_timestamp(datetime.datetime.now()).strftime('%d %B %Y a las %H:%M')"/>
<t t-esc="totalkelly"/></div> </p>
<p>Habitaciones:
<t t-esc="totalkelly"/></p></div>
</div> </div>
</t> </t>
</template> </template>

43
kellys_daily_report/wizard/kellys_daily_pdf.py
View File

@@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# Odoo, Open Source Management Solution # Odoo, Open Source Management Solution
# Copyright (C) 2018 Jose Luis Algara Toledo <osotranquilo@gmail.com> # Copyright (C) 2018-2019 Jose Luis Algara Toledo <osotranquilo@gmail.com>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
import datetime from datetime import datetime, date
from datetime import datetime, date, time from odoo import api, fields, models
from odoo import api, fields, models, _
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
# from odoo.tools import report
class KellysWizard(models.TransientModel): class KellysWizard(models.TransientModel):
_name = 'kellysreport' _name = 'kellysreport'
@@ -112,40 +110,11 @@ class KellysWizard(models.TransientModel):
}).id) }).id)
return self.env['kellysrooms'].search([('id', 'in', listid)]) return self.env['kellysrooms'].search([('id', 'in', listid)])
# class ParticularReport(models.AbstractModel):
# _name = 'report.module.report_name'
# @api.model
# def render_html(self, docids, data=None):
# report_obj = self.env['report']
# report = report_obj._get_report_from_name('module.report_name')
# docargs = {
# 'doc_ids': docids,
# 'doc_model': report.model,
# 'docs': self,
# }
# return report_obj.render('module.report_name', docargs)
@api.multi @api.multi
def print_rooms_report(self): def print_rooms_report(self):
rooms = self.env['kellysrooms'].search([('id', 'in', rooms = self.env['kellysrooms'].search([('id', 'in',
self.habitaciones.ids)], self.habitaciones.ids)],
order=self.order) order=self.order)
docargs = {
'doc_ids': rooms.ids,
'doc_model': 'kellysrooms',
'docs': self,
}
# Debug Stop -------------------
#import wdb; wdb.set_trace()
# Debug Stop -------------------
# return self.env['report'].get_action(rooms, 'action_report_kellys') return self.env.ref(
# return self.env['report'].get_action(rooms, 'report_action_kellysrooms') 'kellys_daily_report.report_kellysrooms').report_action(rooms)
# return self.env.ref('kellys_daily_report.report_kellysrooms').report_action(self, rooms)
# return self.env.ref('kellys_daily_report.report_kellysrooms').report_action(self, docargs)
# return self.env.ref('kellys_daily_report.report_kellysrooms').report_action(rooms, docargs)
return self.env.ref('kellys_daily_report.report_kellysrooms').report_action(rooms)
# return {'type': 'ir.actions.report','report_kellysrooms': 'kellys_daily_report.template_kellysrooms','report_type':"qweb-pdf",'data': rooms,}