diff --git a/kellys_daily_report/__manifest__.py b/kellys_daily_report/__manifest__.py
index e500e6606..d5e5d915d 100644
--- a/kellys_daily_report/__manifest__.py
+++ b/kellys_daily_report/__manifest__.py
@@ -32,15 +32,16 @@
],
'data': [
'data/report_kellys_paperformat.xml',
- 'views/kellys.xml',
+ 'wizard/kellys_daily_rooms.xml',
'wizard/kellys_daily_report.xml',
+ 'views/kellys.xml',
'data/menus.xml',
'security/ir.model.access.csv',
],
'qweb': [],
'test': [
],
- 'css': ['static/src/css/kellys_daily_report.css'],
+ # 'css': ['static/src/css/kellys_daily_report.css'],
'installable': True,
'auto_install': False,
diff --git a/kellys_daily_report/views/kellys.xml b/kellys_daily_report/views/kellys.xml
index 29fed54c8..3676787f5 100644
--- a/kellys_daily_report/views/kellys.xml
+++ b/kellys_daily_report/views/kellys.xml
@@ -1,28 +1,16 @@
-
-
-
-
- kellysnames
- kellysnames.tree.view
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ kellysnames
+ kellysnames.tree.view
+
+
+
+
+
+
+
+
+
+
diff --git a/kellys_daily_report/wizard/__init__.py b/kellys_daily_report/wizard/__init__.py
index f9c37ed42..beb3b3b89 100644
--- a/kellys_daily_report/wizard/__init__.py
+++ b/kellys_daily_report/wizard/__init__.py
@@ -18,4 +18,5 @@
# along with this program. If not, see .
#
##############################################################################
+from . import kellys_daily_rooms
from . import kellys_daily_report
diff --git a/kellys_daily_report/wizard/kellys_daily_report.py b/kellys_daily_report/wizard/kellys_daily_report.py
index aa4950b2a..6fd12cb70 100644
--- a/kellys_daily_report/wizard/kellys_daily_report.py
+++ b/kellys_daily_report/wizard/kellys_daily_report.py
@@ -22,7 +22,7 @@ import datetime
from datetime import datetime, date, time
from odoo import api, fields, models, _
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
-
+# from odoo.tools import report
class KellysWizard(models.TransientModel):
_name = 'kellys'
@@ -63,12 +63,7 @@ class KellysWizard(models.TransientModel):
('state', '<>', 'cancelled'),
('room_id', '=', x.id)
], order='checkin ASC')
- # rooms = self.env['hotel.reservation'].search(
- # ['&', '&', ('checkin', '<=', dates),
- # ('checkout', '>=', dates),
- # ('state', '<>', 'cancelled'),
- # ('product_id', '=', x.product_id.id)
- # ], order='checkin ASC')
+
tipos = False
if len(rooms) != 0:
if len(rooms) == 2:
@@ -122,19 +117,6 @@ class KellysWizard(models.TransientModel):
rooms = self.env['kellysrooms'].search([('id', 'in',
self.habitaciones.ids)],
order=self.order)
- return self.env['report'].get_action(rooms, 'report.kellys')
-
-
-class KellysRooms(models.TransientModel):
- _name = 'kellysrooms'
-
- habitacion = fields.Char('Habitacion')
- habitacionid = fields.Integer('Habitacion ID')
- tipo = fields.Selection([(1, 'Salida'), (2, 'Cliente'), (3, 'Revisar'),
- (4, 'Staff'), (5, 'Averia')],
- string='Limpiar como')
- notas = fields.Char('Notas limpieza')
- checkin = fields.Char('Entrada')
- checkout = fields.Char('Salida')
- kelly = fields.Many2one('kellysnames', string='Asignado a:')
- clean_date = fields.Date('Clean Date')
+ # return self.env['report'].get_action(rooms, 'action_report_kellys')
+ # return self.env['report'].get_action(rooms, 'report_action_kellysrooms')
+ return self.env.ref('kellys_daily_report.report_action_kellysrooms').report_action(self, data=rooms)
diff --git a/kellys_daily_report/wizard/kellys_daily_report.xml b/kellys_daily_report/wizard/kellys_daily_report.xml
index b2647842b..95da76aae 100644
--- a/kellys_daily_report/wizard/kellys_daily_report.xml
+++ b/kellys_daily_report/wizard/kellys_daily_report.xml
@@ -1,236 +1,51 @@
-
- kellysrooms
- kellysrooms.tree.view
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ kellys_daily_report_view
+ kellys
+
+
+
+
+
+
+
+
+
+
Report title
+
This object's name is
+
+
+
+
+
+
+
diff --git a/kellys_daily_report/wizard/kellys_daily_rooms.py b/kellys_daily_report/wizard/kellys_daily_rooms.py
new file mode 100644
index 000000000..7e1adf8e6
--- /dev/null
+++ b/kellys_daily_report/wizard/kellys_daily_rooms.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Odoo, Open Source Management Solution
+# Copyright (C) 2019 Jose Luis Algara Toledo
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from odoo import fields, models
+
+
+class KellysRooms(models.TransientModel):
+ _name = 'kellysrooms'
+
+ habitacion = fields.Char('Habitacion')
+ habitacionid = fields.Integer('Habitacion ID')
+ tipo = fields.Selection([(1, 'Salida'), (2, 'Cliente'), (3, 'Revisar'),
+ (4, 'Staff'), (5, 'Averia')],
+ string='Limpiar como')
+ notas = fields.Char('Notas limpieza')
+ checkin = fields.Char('Entrada')
+ checkout = fields.Char('Salida')
+ kelly = fields.Many2one('kellysnames', string='Asignado a:')
+ clean_date = fields.Date('Clean Date')
diff --git a/kellys_daily_report/wizard/kellys_daily_rooms.xml b/kellys_daily_report/wizard/kellys_daily_rooms.xml
new file mode 100644
index 000000000..eb76128cc
--- /dev/null
+++ b/kellys_daily_report/wizard/kellys_daily_rooms.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ kellysrooms.tree.view
+ kellysrooms
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Hola Mundo
+
+
+
+
+