Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion report_aeroo/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"views/report_view.xml",
"data/report_aeroo_data.xml",
"views/webclient_report_action.xml",
"views/report_print_by_action.xml",
#"wizard/add_print_button_view.xml",
#"wizard/remove_print_button_view.xml",
"views/installer.xml",
Expand Down
5 changes: 2 additions & 3 deletions report_aeroo/models/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

_url = 'xhttp://www.alistek.com/aeroo_banner/v11_1_report_aeroo.png'

class docs_config_installer(models.TransientModel):
class Docs_configInstaller(models.TransientModel):
_name = 'docs_config.installer'
_inherit = 'res.config.installer'
_rec_name = 'host'
Expand Down Expand Up @@ -122,5 +122,4 @@ def check(self):
act_id = result and result[1] or False
result = act_obj.search([('id','=',act_id)]).read()[0]
result['res_id'] = self.id
return result

return result
11 changes: 5 additions & 6 deletions report_aeroo/models/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
_logger = logging.getLogger(__name__)

# ------------------------------------------------------------------------------
class report_stylesheets(models.Model):
class ReportStylesheets(models.Model):
'''
Aeroo Report Stylesheets
'''
Expand All @@ -38,7 +38,7 @@ class report_stylesheets(models.Model):
### ends Fields

# ------------------------------------------------------------------------------
class res_company(models.Model):
class ResCompany(models.Model):
_name = 'res.company'
_inherit = 'res.company'

Expand All @@ -48,7 +48,7 @@ class res_company(models.Model):
### ends Fields

# ------------------------------------------------------------------------------
class report_mimetypes(models.Model):
class ReportMimetypes(models.Model):
'''
Aeroo Report Mime-Type
'''
Expand All @@ -64,7 +64,7 @@ class report_mimetypes(models.Model):
### ends Fields

# ------------------------------------------------------------------------------
class report_aeroo(models.Model):
class ReportAeroo(models.Model):
_name = 'ir.actions.report'
_inherit = 'ir.actions.report'

Expand Down Expand Up @@ -342,5 +342,4 @@ def write(rec, vals):

parser._build_model(rec.pool, rec.env.cr)

return res

return res
33 changes: 0 additions & 33 deletions report_aeroo/views/report_print_by_action.xml

This file was deleted.

29 changes: 28 additions & 1 deletion report_aeroo/views/report_view.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<!--========================-->
<record id="act_aeroo_print_by_action_view_form" model="ir.ui.view">
<field name="name">aeroo.print_by_action.form</field>
<field name="model">aeroo.print_by_action</field>
<field name="arch" type="xml">
<form string="Test the Report">
<group>
<field name="name"/>
<field name="object_ids" default_focus="1"/>
</group>
<footer>
<button icon="fa-file-text" name="to_print" string="_Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button special="cancel" string="Close" type="object" class="oe_link"/>
</footer>
</form>
</field>
</record>
<!--========================-->
<act_window name="Test the Report"
res_model="aeroo.print_by_action"
src_model="ir.actions.report"
view_mode="form"
target="new"
key2="client_action_multi"
id="action_aeroo_print_by_action_window"/>
<!--========================-->
<!--========================-->
<record model="ir.ui.view" id="act_aeroo_report_xml_view">
<field name="name">ir.actions.report.aeroo.form</field>
Expand All @@ -11,7 +38,7 @@
<field name="binding_model_id" invisible="1"/>
<sheet modifiers="{}">
<div class="oe_button_box" name="button_box">
<button name="%(action_aeroo_print_by_action_window)d" string="Test the Report!" type="action"
<button name="%(act_aeroo_print_by_action_view_form)d" string="Test the Report!" type="action"
icon="fa-file-text"
help="Test report without leaving this form." class="oe_stat_button"/>
<button name="create_action" string="Add in the 'Print' menu" type="object"
Expand Down
5 changes: 2 additions & 3 deletions report_aeroo/wizard/report_print_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from odoo.report import interface
import re

class report_print_actions(models.TransientModel):
class ReportPrintActions(models.TransientModel):
_name = 'aeroo.print_actions'
_description = 'Aeroo reports print wizard'

Expand Down Expand Up @@ -169,5 +169,4 @@ def default_get(self, allfields):

_defaults = {
'state': 'draft',
}

}
5 changes: 2 additions & 3 deletions report_aeroo/wizard/report_print_by_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import logging
_logger = logging.getLogger(__name__)

class report_print_by_action(models.TransientModel):
class ReportPrintByAction(models.TransientModel):
_name = 'aeroo.print_by_action'

@api.multi
Expand Down Expand Up @@ -77,5 +77,4 @@ def fields_view_get(self, view_id=None, view_type='form', toolbar=False,
_("Print Screen report does not support this functionality!"))
res = super(report_print_by_action, self).fields_view_get(view_id,
view_type, toolbar=toolbar, submenu=submenu)
return res

return res