Skip to content
Snippets Groups Projects
Commit bc642f7c3c3e authored by Houzefa Abbasbhay's avatar Houzefa Abbasbhay :slight_smile:
Browse files

Re-order views; still stuff to fix (see #4)

parent 12043d8e2b13
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
__openerp__.py
+ 1
− 1
View file @ bc642f7c
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
'security/security.xml', 'security/security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'security/record_rules.xml', 'security/record_rules.xml',
'analytic_dimension.xml', 'analytic_views.xml',
], ],
# 'demo_xml': [], # 'demo_xml': [],
'css': [ 'css': [
......
analytic_views.xml
+ 98
− 81
View file @ bc642f7c
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="view_analytic_search_global" model="ir.ui.view">
<field name="name"> view.analytic.search.global </field> <!-- This file contains views for the analytic.code, analytic.structure,
analytic.dimension models. -->
<!-- Views for the analytic.code model. -->
<record id="view_analytic_search_global" model="ir.ui.view">
<field name="name"> view.analytic.search.global</field>
<field name="model">analytic.code</field> <field name="model">analytic.code</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
...@@ -6,6 +12,7 @@ ...@@ -6,6 +12,7 @@
<field name="model">analytic.code</field> <field name="model">analytic.code</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Analytic Codes"> <search string="Analytic Codes">
<field name="name" filter_domain="['|',('name', 'ilike', self), ('description', 'ilike', self)]"/> <field name="name"
<field name="nd_name" filter_domain="[('nd_name', 'ilike', self)]"/> filter_domain="['|',('name', 'ilike', self), ('description', 'ilike', self)]" />
<field name="nd_name" filter_domain="[('nd_name', 'ilike', self)]" />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
...@@ -11,6 +18,7 @@ ...@@ -11,6 +18,7 @@
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Code Dimension" domain="" context="{'group_by':'nd_id'}"/> <filter string="Code Dimension" domain=""
context="{'group_by':'nd_id'}" />
</group> </group>
</search> </search>
</field> </field>
</record> </record>
...@@ -13,28 +21,5 @@ ...@@ -13,28 +21,5 @@
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<!-- if nd_id is not filled the analytic code won't appear in the dimension list-->
<record id="analytic_dimension_form" model="ir.ui.view">
<field name="name">analytic.dimension.form</field>
<field name="model">analytic.code</field>
<field name="arch" type="xml">
<form string="Analytic Code">
<field name="id" invisible="1"/>
<field name="active"/>
<field name="usable"/>
<field name="name"/>
<field name="description"/>
<field name="nd_id"
invisible="context.get('default_nd_id', None) is not None"
required="context.get('default_nd_id', None) is not False"
/>
<field name="code_parent_id"
attrs="{'readonly': [('nd_id', '=', False)]}"
domain="[('id', '!=', id), ('nd_id', '=', nd_id)]"
/>
</form>
</field>
</record>
...@@ -40,7 +25,8 @@ ...@@ -40,7 +25,8 @@
<!-- TODO WTF with the view ID and name? -->
<record id="view_analytic_code" model="ir.ui.view"> <record id="view_analytic_code" model="ir.ui.view">
<field name="name">analytic.code.view.form</field> <field name="name">analytic.code.view.form</field>
<field name="model">analytic.code</field> <field name="model">analytic.code</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Analytic Codes" version="7.0" editable="bottom"> <tree string="Analytic Codes" version="7.0" editable="bottom">
...@@ -41,13 +27,13 @@ ...@@ -41,13 +27,13 @@
<record id="view_analytic_code" model="ir.ui.view"> <record id="view_analytic_code" model="ir.ui.view">
<field name="name">analytic.code.view.form</field> <field name="name">analytic.code.view.form</field>
<field name="model">analytic.code</field> <field name="model">analytic.code</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Analytic Codes" version="7.0" editable="bottom"> <tree string="Analytic Codes" version="7.0" editable="bottom">
<field name="id" invisible="1"/> <field name="id" invisible="1" />
<field name="active"/> <field name="active" />
<field name="usable"/> <field name="usable" />
<field name="name"/> <field name="name" />
<field name="description"/> <field name="description" />
<field name="nd_id" <field name="nd_id"
invisible="context.get('default_nd_id', None) is not None" invisible="context.get('default_nd_id', None) is not None"
...@@ -52,12 +38,9 @@ ...@@ -52,12 +38,9 @@
<field name="nd_id" <field name="nd_id"
invisible="context.get('default_nd_id', None) is not None" invisible="context.get('default_nd_id', None) is not None"
required="context.get('default_nd_id', None) is not False" required="context.get('default_nd_id', None) is not False" />
/> <field name="code_parent_id" attrs="{'readonly': [('nd_id', '=', False)]}"
<field name="code_parent_id" domain="[('id', '!=', id), ('nd_id', '=', nd_id)]" />
attrs="{'readonly': [('nd_id', '=', False)]}"
domain="[('id', '!=', id), ('nd_id', '=', nd_id)]"
/>
</tree> </tree>
</field> </field>
</record> </record>
...@@ -60,13 +43,26 @@ ...@@ -60,13 +43,26 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="action_analytic_code" model="ir.actions.act_window"> <!-- if nd_id is not filled the analytic code won't appear in the dimension
<field name="name">Analytic Code</field> list -->
<field name="res_model">analytic.code</field> <!-- TODO WTF with the view ID and name? -->
<field name="search_view_id" ref="view_analytic_search_global"/> <record id="analytic_dimension_form" model="ir.ui.view">
<field name="view_type">form</field> <field name="name">analytic.dimension.form</field>
<field name="view_id" ref="view_analytic_code"/> <field name="model">analytic.code</field>
<field name="view_mode">tree,form</field> <field name="arch" type="xml">
<form string="Analytic Code">
<field name="id" invisible="1" />
<field name="active" />
<field name="usable" />
<field name="name" />
<field name="description" />
<field name="nd_id"
invisible="context.get('default_nd_id', None) is not None"
required="context.get('default_nd_id', None) is not False" />
<field name="code_parent_id" attrs="{'readonly': [('nd_id', '=', False)]}"
domain="[('id', '!=', id), ('nd_id', '=', nd_id)]" />
</form>
</field>
</record> </record>
...@@ -71,8 +67,10 @@ ...@@ -71,8 +67,10 @@
</record> </record>
<!-- Views for the analytic.dimension model. -->
<record id="view_analytic_dimension" model="ir.ui.view"> <record id="view_analytic_dimension" model="ir.ui.view">
<field name="name">analytic.dimension.view.form</field> <field name="name">analytic.dimension.view.form</field>
<field name="model">analytic.dimension</field> <field name="model">analytic.dimension</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Dimension" version="7.0"> <form string="Analytic Dimension" version="7.0">
<field name="id" invisible="1" /> <field name="id" invisible="1" />
...@@ -73,8 +71,8 @@ ...@@ -73,8 +71,8 @@
<record id="view_analytic_dimension" model="ir.ui.view"> <record id="view_analytic_dimension" model="ir.ui.view">
<field name="name">analytic.dimension.view.form</field> <field name="name">analytic.dimension.view.form</field>
<field name="model">analytic.dimension</field> <field name="model">analytic.dimension</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Dimension" version="7.0"> <form string="Analytic Dimension" version="7.0">
<field name="id" invisible="1" /> <field name="id" invisible="1" />
<label for="name" class="oe_edit_only" string="Dimension Name"/> <label for="name" class="oe_edit_only" string="Dimension Name" />
<h1> <h1>
...@@ -80,4 +78,5 @@ ...@@ -80,4 +78,5 @@
<h1> <h1>
<field name="name" class="oe_inline" placeholder="Dimension Name" style="width: 6em"/> <field name="name" class="oe_inline" placeholder="Dimension Name"
style="width: 6em" />
</h1> </h1>
<group colspan="4" col="4"> <group colspan="4" col="4">
...@@ -82,4 +81,4 @@ ...@@ -82,4 +81,4 @@
</h1> </h1>
<group colspan="4" col="4"> <group colspan="4" col="4">
<field name="validated"/> <field name="validated" />
<newline /> <newline />
...@@ -85,7 +84,8 @@ ...@@ -85,7 +84,8 @@
<newline /> <newline />
<field name="nc_ids" string="ANCs" context="{'default_nd_id': id}" /> <field name="nc_ids" string="ANCs"
context="{'default_nd_id': id}" />
</group> </group>
</form> </form>
</field> </field>
</record> </record>
...@@ -87,17 +87,19 @@ ...@@ -87,17 +87,19 @@
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_analytic_dimension" model="ir.actions.act_window"> <!-- Views for the analytic.structure model. -->
<field name="name">Analytic Dimension</field>
<field name="res_model">analytic.dimension</field> <record id="tree_analytic_structure" model="ir.ui.view">
<field name="view_type">form</field> <field name="name">analytic.structure.view.tree</field>
<field name="view_mode">tree,form</field> <field name="model">analytic.structure</field>
<field name="help" type="html"> <field name="arch" type="xml">
<p class="oe_view_nocontent_create"> <tree string="Analytic Structure" version="7.0">
Create Analytical Dimensions (AND) for your system. <field name="model_name" placeholder="Target Model Name" />
</p> <field name="nd_id" />
<field name="ordering" />
</tree>
</field> </field>
</record> </record>
...@@ -106,5 +108,5 @@ ...@@ -106,5 +108,5 @@
<field name="model">analytic.structure</field> <field name="model">analytic.structure</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Structure" version="7.0"> <form string="Analytic Structure" version="7.0">
<label for="model_name" class="oe_edit_only" string="Target Model Name"/> <label for="model_name" class="oe_edit_only" string="Target Model Name" />
<h1> <h1>
...@@ -110,4 +112,5 @@ ...@@ -110,4 +112,5 @@
<h1> <h1>
<field name="model_name" class="oe_inline" placeholder="Target Model Name" style="width: 6em"/> <field name="model_name" class="oe_inline"
placeholder="Target Model Name" style="width: 6em" />
</h1> </h1>
<group colspan="4" col="4"> <group colspan="4" col="4">
...@@ -112,4 +115,4 @@ ...@@ -112,4 +115,4 @@
</h1> </h1>
<group colspan="4" col="4"> <group colspan="4" col="4">
<field name="nd_id"/> <field name="nd_id" />
<newline /> <newline />
...@@ -115,5 +118,5 @@ ...@@ -115,5 +118,5 @@
<newline /> <newline />
<field name="ordering"/> <field name="ordering" />
<newline /> <newline />
<field name="company_id" placeholder="All" /> <field name="company_id" placeholder="All" />
</group> </group>
...@@ -121,14 +124,22 @@ ...@@ -121,14 +124,22 @@
</field> </field>
</record> </record>
<record id="tree_analytic_structure" model="ir.ui.view"> <record id="action_analytic_code" model="ir.actions.act_window">
<field name="name">analytic.structure.view.tree</field> <field name="name">Analytic Code</field>
<field name="model">analytic.structure</field> <field name="res_model">analytic.code</field>
<field name="arch" type="xml"> <field name="search_view_id" ref="view_analytic_search_global" />
<tree string="Analytic Structure" version="7.0"> <field name="view_type">form</field>
<field name="model_name" placeholder="Target Model Name"/> <field name="view_id" ref="view_analytic_code" />
<field name="nd_id"/> <field name="view_mode">tree,form</field>
<field name="ordering"/> </record>
</tree> <record id="action_analytic_dimension" model="ir.actions.act_window">
<field name="name">Analytic Dimension</field>
<field name="res_model">analytic.dimension</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Create Analytical Dimensions (AND) for your system.
</p>
</field> </field>
</record> </record>
...@@ -133,9 +144,8 @@ ...@@ -133,9 +144,8 @@
</field> </field>
</record> </record>
<record id="action_analytic_structure" model="ir.actions.act_window"> <record id="action_analytic_structure" model="ir.actions.act_window">
<field name="name">Analytic Structure</field> <field name="name">Analytic Structure</field>
<field name="res_model">analytic.structure</field> <field name="res_model">analytic.structure</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>
<field name="help" type="html"> <field name="help" type="html">
...@@ -136,13 +146,14 @@ ...@@ -136,13 +146,14 @@
<record id="action_analytic_structure" model="ir.actions.act_window"> <record id="action_analytic_structure" model="ir.actions.act_window">
<field name="name">Analytic Structure</field> <field name="name">Analytic Structure</field>
<field name="res_model">analytic.structure</field> <field name="res_model">analytic.structure</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>
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_view_nocontent_create"> <p class="oe_view_nocontent_create">
Define Analytical Structure (ANS) for objects in your system. Define Analytical Structure (ANS) for objects in your
</p> system.
</p>
</field> </field>
</record> </record>
<!-- we add our config entries to the accounting configuration menu --> <!-- we add our config entries to the accounting configuration menu -->
...@@ -145,11 +156,17 @@ ...@@ -145,11 +156,17 @@
</field> </field>
</record> </record>
<!-- we add our config entries to the accounting configuration menu --> <!-- we add our config entries to the accounting configuration menu -->
<menuitem id="menu_analytic_config_root" name="Analytic" parent="base.menu_custom" sequence="5" /> <menuitem id="menu_analytic_config_root" name="Analytic"
<menuitem id="menu_analytic_dimension" name="Dimensions" parent="menu_analytic_config_root" sequence="10" action="action_analytic_dimension" /> parent="base.menu_custom" sequence="5" />
<menuitem id="menu_analytic_structure" name="Structure" parent="menu_analytic_config_root" sequence="15" action="action_analytic_structure" /> <menuitem id="menu_analytic_dimension" name="Dimensions"
<menuitem id="menu_analytic_code" name="Codes" parent="menu_analytic_config_root" sequence="20" action="action_analytic_code"/> parent="menu_analytic_config_root" sequence="10"
action="action_analytic_dimension" />
<menuitem id="menu_analytic_structure" name="Structure"
parent="menu_analytic_config_root" sequence="15"
action="action_analytic_structure" />
<menuitem id="menu_analytic_code" name="Codes"
parent="menu_analytic_config_root" sequence="20" action="action_analytic_code" />
</data> </data>
</openerp> </openerp>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment