odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] report_webkit: usability/views improvements 

bzr revid: odo@openerp.com-20111027144530-g0moe49ek3q3qf7e
This commit is contained in:
Olivier Dony 2011-10-27 16:45:30 +02:00
parent 0e65302e17
commit 5136b88771
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/report_webkit/header.py
View File

@ -33,7 +33,7 @@ from osv import fields, osv
class HeaderHTML(osv.osv):
"""HTML Header allows you to define HTML CSS and Page format"""
_name = "ir.header_webkit"
_columns = {
'company_id' : fields.many2one('res.company', 'Company'),
@ -86,7 +86,7 @@ class HeaderHTML(osv.osv):
required=True,
help="Select Proper Paper size"
)
}
}
HeaderHTML()
class HeaderImage(osv.osv):
@ -97,5 +97,5 @@ class HeaderImage(osv.osv):
'img' : fields.binary('Image'),
'name' : fields.char('Name', size=128, required =True, help="Name of Image"),
'type' : fields.char('Type', size=32, required =True, help="Image type(png,gif,jpeg)")
}
HeaderImage()
}
HeaderImage()

39
addons/report_webkit/header_view.xml
View File

@ -6,24 +6,24 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form>
<field name='company_id' />
<newline />
<field name="name"/>
<field name="type"/>
<group col="6" colspan="4">
<field name="name"/>
<field name="type"/>
<field name='company_id' />
</group>
<field name="img" widget="image" colspan="4"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="header_webkit">
<field name="name">res.company.header.html</field>
<field name="model">ir.header_webkit</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form>
<field name="name"/>
<newline/>
<notebook>
<field name="name" colspan="4"/>
<notebook colspan="4">
<page string="Company and Page Setup" >
<field name='company_id' colspan="4"/>
<field name="orientation" />
@ -33,36 +33,35 @@
<field name="margin_left" />
<field name="margin_right" />
</page>
<page string="css Styling" >
<field name="css" colspan="4"/>
<page string="CSS Style" >
<field name="css" colspan="4" nolabel="1"/>
</page>
<page string="Webkit Header" >
<field name="html" colspan="4"/>
<page string="Header" >
<field name="html" colspan="4" nolabel="1"/>
</page>
<page string="Webkit Footer" >
<field name="footer_html" colspan="4" />
<page string="Footer" >
<field name="footer_html" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>
<record id="action_header_img" model="ir.actions.act_window">
<field name="name">Header IMG</field>
<field name="name">Webkit Logos</field>
<field name="res_model">ir.header_img</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_header_img" id="menu_header_img" parent="base.menu_res_company_global" sequence="14"/>
<record id="action_header_webkit" model="ir.actions.act_window">
<field name="name">Header HTML</field>
<field name="name">Webkit Headers/Footers</field>
<field name="res_model">ir.header_webkit</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_header_webkit" id="menu_header_webkit" parent="base.menu_res_company_global" sequence="14"/>
</data>
</openerp>

2
addons/report_webkit/ir_report.py
View File

@ -123,7 +123,7 @@ class ReportXML(osv.osv):
'ir.header_webkit',
type='many2one',
relation='ir.header_webkit',
string='WebKit Header',
string='Webkit Header',
help="The header linked to the report",
view_load=True,
required=True