[IMP] report form view move inherited view, restore and refactor test case (kept commented atm) from non merged branch qweb-report
bzr revid: al@openerp.com-20140307000620-kqxm55smy34nc0zz
This commit is contained in:
parent
cfb50cf7a9
commit
cb82d93796
|
@ -1,3 +1,4 @@
|
||||||
import controllers
|
import controllers
|
||||||
import models
|
import models
|
||||||
|
import tests
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,7 @@ Report
|
||||||
'depends': ['base'],
|
'depends': ['base'],
|
||||||
'data': [
|
'data': [
|
||||||
'views/layouts.xml',
|
'views/layouts.xml',
|
||||||
'views/paperformat_view.xml',
|
'views/views.xml',
|
||||||
'views/res_company_view.xml',
|
|
||||||
'data/report_paperformat.xml',
|
'data/report_paperformat.xml',
|
||||||
'security/ir.model.access.csv',
|
'security/ir.model.access.csv',
|
||||||
],
|
],
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
import test_reports
|
|
@ -0,0 +1,26 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
import logging
|
||||||
|
|
||||||
|
import openerp
|
||||||
|
import urllib2
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
class TestReports(openerp.tests.HttpCase):
|
||||||
|
def test_reports(self):
|
||||||
|
registry, cr, uid = self.registry, self.cr, self.uid
|
||||||
|
r_model = registry('ir.actions.report.xml')
|
||||||
|
domain = [('report_type','like','qweb')]
|
||||||
|
for r in r_model.browse(cr, uid, r_model.search(cr, uid, domain)):
|
||||||
|
report_model = registry(r.model)
|
||||||
|
report_model_ids = report_model.search(cr, uid, [], limit=10)
|
||||||
|
if not report_model_ids:
|
||||||
|
_logger.info("no record found skipping report %s", r.report_name)
|
||||||
|
continue
|
||||||
|
if not r.multi:
|
||||||
|
report_model_ids = report_model_ids[:1]
|
||||||
|
url = "/report/%s/%s" % (r.report_name, ','.join(str(i) for i in report_model_ids))
|
||||||
|
_logger.info("testing report %s", url)
|
||||||
|
# TODO sle: uncomment this
|
||||||
|
#content = self.url_open(url)
|
||||||
|
|
|
@ -2,27 +2,7 @@
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<!-- Adding a paperformat field inside the report form view -->
|
<!-- report.paperformat -->
|
||||||
<record id="act_report_xml_view_inherit" model="ir.ui.view">
|
|
||||||
<field name="name">act_report_xml_view_inherit</field>
|
|
||||||
<field name="inherit_id" ref="base.act_report_xml_view" />
|
|
||||||
<field name="model">ir.actions.report.xml</field>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<data>
|
|
||||||
<xpath expr="//field[@name='report_file']" position="after">
|
|
||||||
<field name="paperformat_id"/>
|
|
||||||
<button
|
|
||||||
type="object"
|
|
||||||
class="oe_link"
|
|
||||||
string="Search associated QWeb views"
|
|
||||||
name="associated_view"
|
|
||||||
/>
|
|
||||||
</xpath>
|
|
||||||
</data>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
|
|
||||||
<record id="paperformat_view_tree" model="ir.ui.view">
|
<record id="paperformat_view_tree" model="ir.ui.view">
|
||||||
<field name="name">paper_format_view_tree</field>
|
<field name="name">paper_format_view_tree</field>
|
||||||
<field name="model">report.paperformat</field>
|
<field name="model">report.paperformat</field>
|
||||||
|
@ -32,7 +12,6 @@
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="paperformat_view_form" model="ir.ui.view">
|
<record id="paperformat_view_form" model="ir.ui.view">
|
||||||
<field name="name">paper_format_view_form</field>
|
<field name="name">paper_format_view_form</field>
|
||||||
<field name="model">report.paperformat</field>
|
<field name="model">report.paperformat</field>
|
||||||
|
@ -56,47 +35,77 @@
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<record id="paper_format_action" model="ir.actions.act_window">
|
<record id="paper_format_action" model="ir.actions.act_window">
|
||||||
<field name="name">Paper Format General Configuration</field>
|
<field name="name">Paper Format General Configuration</field>
|
||||||
<field name="res_model">report.paperformat</field>
|
<field name="res_model">report.paperformat</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id='reports_action' model='ir.actions.act_window'>
|
<record id='reports_action' model='ir.actions.act_window'>
|
||||||
<field name="name">Reports</field>
|
<field name="name">Reports</field>
|
||||||
<field name="res_model">ir.actions.report.xml</field>
|
<field name="res_model">ir.actions.report.xml</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
</record>
|
</record>
|
||||||
|
<menuitem
|
||||||
|
id="reporting_menuitem"
|
||||||
<menuitem
|
name="Reports"
|
||||||
id="reporting_menuitem"
|
parent="base.menu_custom"
|
||||||
name="Reporting"
|
sequence="15"
|
||||||
parent="base.menu_custom"
|
|
||||||
sequence="0"
|
|
||||||
groups="base.group_no_one"
|
groups="base.group_no_one"
|
||||||
/>
|
/>
|
||||||
|
<menuitem
|
||||||
<menuitem
|
id="paper_format_menuitem"
|
||||||
id="paper_format_menuitem"
|
name="Paper Format"
|
||||||
name="Paper Format"
|
parent="reporting_menuitem"
|
||||||
parent="reporting_menuitem"
|
action="paper_format_action"
|
||||||
action="paper_format_action"
|
sequence="2"
|
||||||
sequence="2"
|
|
||||||
groups="base.group_no_one"
|
groups="base.group_no_one"
|
||||||
/>
|
/>
|
||||||
|
<menuitem
|
||||||
<menuitem
|
|
||||||
id="reports_menuitem"
|
id="reports_menuitem"
|
||||||
name="Reports"
|
name="Reports"
|
||||||
parent="reporting_menuitem"
|
parent="reporting_menuitem"
|
||||||
action="reports_action"
|
action="reports_action"
|
||||||
sequence="3"
|
sequence="3"
|
||||||
groups="base.group_no_one"
|
groups="base.group_no_one"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<!-- Add a paperformat and web button to the report form view -->
|
||||||
|
<record id="act_report_xml_view_inherit" model="ir.ui.view">
|
||||||
|
<field name="name">act_report_xml_view_inherit</field>
|
||||||
|
<field name="inherit_id" ref="base.act_report_xml_view" />
|
||||||
|
<field name="model">ir.actions.report.xml</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<data>
|
||||||
|
<xpath expr="//field[@name='multi']" position="after">
|
||||||
|
<field name="paperformat_id"/>
|
||||||
|
<button
|
||||||
|
type="object"
|
||||||
|
class="oe_link"
|
||||||
|
string="Search associated QWeb views"
|
||||||
|
name="associated_view"
|
||||||
|
/>
|
||||||
|
</xpath>
|
||||||
|
</data>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<!-- Adding a paperformat field inside to the company form view -->
|
||||||
|
<record id="reporting_settings_form_inherited" model="ir.ui.view">
|
||||||
|
<field name="name">view_company_form_inherited</field>
|
||||||
|
<field name="inherit_id" ref="base.view_company_form" />
|
||||||
|
<field name="model">res.company</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<data>
|
||||||
|
<xpath expr="//group[@string='Footer Configuration']" position="after">
|
||||||
|
<group string="QWeb PDF Configuration">
|
||||||
|
<field name="paperformat_id" />
|
||||||
|
</group>
|
||||||
|
</xpath>
|
||||||
|
</data>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
Loading…
Reference in New Issue