diff --git a/kellys_daily_report/README.rst b/kellys_daily_report/README.rst index 5c4c4d7c7..7bf0177f1 100644 --- a/kellys_daily_report/README.rst +++ b/kellys_daily_report/README.rst @@ -1,7 +1,7 @@ KELLYS DAILY REPORT ============= -Export KELLYS REPORT +Export PDF KELLYS REPORT Credits diff --git a/kellys_daily_report/__manifest__.py b/kellys_daily_report/__manifest__.py index d5e5d915d..1bb6cf00a 100644 --- a/kellys_daily_report/__manifest__.py +++ b/kellys_daily_report/__manifest__.py @@ -32,16 +32,17 @@ ], 'data': [ 'data/report_kellys_paperformat.xml', + 'views/kellysnames.xml', 'wizard/kellys_daily_rooms.xml', - 'wizard/kellys_daily_report.xml', - 'views/kellys.xml', + 'wizard/kellys_daily_pdf.xml', 'data/menus.xml', + 'report/report_kellys.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/models/__init__.py b/kellys_daily_report/models/__init__.py index f7fce2413..9bba13048 100644 --- a/kellys_daily_report/models/__init__.py +++ b/kellys_daily_report/models/__init__.py @@ -20,4 +20,4 @@ # ############################################################################## -from . import kellys +from . import kellysnames diff --git a/kellys_daily_report/models/kellys.py b/kellys_daily_report/models/kellysnames.py similarity index 100% rename from kellys_daily_report/models/kellys.py rename to kellys_daily_report/models/kellysnames.py diff --git a/kellys_daily_report/report/report_kellys.xml b/kellys_daily_report/report/report_kellys.xml new file mode 100644 index 000000000..902bc2083 --- /dev/null +++ b/kellys_daily_report/report/report_kellys.xml @@ -0,0 +1,194 @@ + + + + + + + + diff --git a/kellys_daily_report/views/kellys.xml b/kellys_daily_report/views/kellysnames.xml similarity index 100% rename from kellys_daily_report/views/kellys.xml rename to kellys_daily_report/views/kellysnames.xml diff --git a/kellys_daily_report/wizard/__init__.py b/kellys_daily_report/wizard/__init__.py index beb3b3b89..a3dfd1cbe 100644 --- a/kellys_daily_report/wizard/__init__.py +++ b/kellys_daily_report/wizard/__init__.py @@ -18,5 +18,5 @@ # along with this program. If not, see . # ############################################################################## +from . import kellys_daily_pdf 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_pdf.py similarity index 79% rename from kellys_daily_report/wizard/kellys_daily_report.py rename to kellys_daily_report/wizard/kellys_daily_pdf.py index 6fd12cb70..86a4e9b7b 100644 --- a/kellys_daily_report/wizard/kellys_daily_report.py +++ b/kellys_daily_report/wizard/kellys_daily_pdf.py @@ -25,7 +25,7 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT # from odoo.tools import report class KellysWizard(models.TransientModel): - _name = 'kellys' + _name = 'kellysreport' @api.model def _get_default_habitaciones(self): @@ -112,11 +112,40 @@ class KellysWizard(models.TransientModel): }).id) 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 - def check_report(self): + def print_rooms_report(self): rooms = self.env['kellysrooms'].search([('id', 'in', self.habitaciones.ids)], 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['report'].get_action(rooms, 'report_action_kellysrooms') - return self.env.ref('kellys_daily_report.report_action_kellysrooms').report_action(self, data=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,} diff --git a/kellys_daily_report/wizard/kellys_daily_pdf.xml b/kellys_daily_report/wizard/kellys_daily_pdf.xml new file mode 100644 index 000000000..458fcc17b --- /dev/null +++ b/kellys_daily_report/wizard/kellys_daily_pdf.xml @@ -0,0 +1,31 @@ + + + + + + + kellys_daily_report_view + kellysreport + +
+ + + +