diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index 05be10fd8a5..1725577f7b5 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -1,642 +1,666 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+	<data>
 
-<!-- Wizard view for the load data -->
-
-        <record id="bi_load_db_form" model="ir.ui.view">
-            <field name="name">bi.load.db.form</field>
-            <field name="model">bi.load.db.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Load Database Tables">
-                    <label align="0.0" string="We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs." colspan="4" />
-                    <newline/>
-                    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:" colspan="4"/>
-                    <newline/>
-                    <field name="fact_table" />
-                    <field name="db_name" />
-                    <newline/>
-                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
-                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
-            <field name="name">Load database Structure</field>
-            <field name="res_model">bi.load.db.wizard</field>
-            <field name="src_model">olap.schema</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="auto_refresh" eval="1"/>
-            <field name="target">new</field>
-        </record>
-
-
-<!-- Wizard For Olap Warehouse -->
-
-        <record id="view_warehouse_bi" model="ir.ui.view">
-            <field name="name">Olap Warehouse</field>
-            <field name="model">olap.warehouse.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Warehouse">
-                    <group colspan="16">
-                    <separator string="Query" colspan="16"/>
-                    <field name="query" nolabel="1" colspan="16"/>
-                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_olap_warehouse" model="ir.actions.act_window">
-            <field name="name">Olap Warehouse</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">olap.warehouse.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem
-        name="Olap Warehouse"
-        action="action_olap_warehouse"
-        id="menu_bi_warehouse"
-        sequence="51"
-        parent="base.next_id_50"
-        />
-
-<!-- Wizard View for the parameters wizard -->
-
-        <record id="view_config_bi" model="ir.ui.view">
-            <field name="name">Parameters Configuration</field>
-            <field name="model">olap.parameters.config.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Parameters Configure">
-                    <separator string="BI Web Client." colspan="4"/>
-                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
-                    <field name="host_name" colspan="4"/>
-                    <field name="host_port" colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_config_bi_parameters" model="ir.actions.act_window">
-            <field name="name">Parameters Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">olap.parameters.config.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem
-        name="Server Parameters"
-        action="action_config_bi_parameters"
-        id="menu_bi_server_parameters"
-        sequence="50"
-        parent="base.next_id_50"
-        />
-        <record model="ir.actions.todo" id="config_auto_directory">
-            <field name="name">Server Parameters Configuration</field>
-            <field name="note">This wizard will configure the URL of the web client</field>
-            <field name="action_id" ref="action_config_bi_parameters"/>
-        </record>
-
-
-<!-- Wizard view for the Auto Configuring the data -->
-
-        <record id="bi_auto_configure_form" model="ir.ui.view">
-            <field name="name">bi.auto.configure.form</field>
-            <field name="model">bi.auto.configure.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Auto Congifuring Tables">
-                    <label align="0.0" string="This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option." colspan="4" />
-                    <field name="name" select="1" colspan="4"/>
-                    <newline/>
-                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
-                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_bi_auto_configure" model="ir.actions.act_window">
-            <field name="name">Auto Configuration</field>
-            <field name="res_model">bi.auto.configure.wizard</field>
-            <field name="src_model">olap.schema</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="auto_refresh" eval="1"/>
-            <field name="target">new</field>
-        </record>
-
-
-
-    # ------------------------------------------------------------------
-    # Olap Schema
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_schema_tree">
-        <field name="name">olap.schema.tree</field>
-        <field name="model">olap.schema</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Schema">
-                <field name="name"/>
-                <field name="database_id"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_olap_schema_form">
-        <field name="name">olap.schema.form</field>
-        <field name="model">olap.schema</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap Schema">
-              <field name="name" select="1" colspan="4"/>
-              <field name="database_id" select="2" colspan="4"/>
-              <field name="loaded" colspan="3"/>
-              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
-              <field name="configure" colspan="3"/>
-              <button name="%(bi_load_configuration_table)d"
-              	string="ReConfigure Structure" type="action"
-              	states="done" />
-              <field name="ready" select="2" colspan="3"/>
-              <field name="note" colspan="4"/>
-              <field name="state" select="2" colspan="2" />
-              <group colspan="2">
-                <button string="Connect to Database" name="dbconnect" states="none"/>
-                <button string="Load Database Structure"
-                	name="%(act_bi_load_db_wizard)d" type="action"
-                	states="dbconnect" target="new" />
-                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
-                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
-              </group>
-              <separator string="Auto Application Configuration" colspan="4"/>
-              <field name="app_detect" nolabel="1" colspan="3"/>
-              <button string="Configure Automatically "
-              	name="%(act_bi_auto_configure)d" type="action"
-              	states="dbload" target="new" />
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_schema_form">
-        <field name="name">Olap Schemas</field>
-        <field name="res_model">olap.schema</field>
-        <field name="view_type">form</field>
-
-    </record>
-    <menuitem
-        name="Olap Schema"
-        action="action_olap_schema_form"
-        id="menu_action_olap_schema_form"
-        parent="menu_bi_conf_cubes"/>
-
-    # ------------------------------------------------------------------
-    # Olap Cubes Table
-    # ------------------------------------------------------------------
-    <record model="ir.ui.view" id="view_olap_cube_table_form">
-        <field name="name">olap.cube.table.form</field>
-        <field name="model">olap.cube.table</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap cube_table" >
-                <field name="name" select="2"/>
-                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
-                <newline/>
-                <separator colspan="2" string="Joined Tables"/>
-                <field invisible="True" name="line_ids" nolabel="1">
-                    <form string="Database Tables">
-                        <field name="table_id"/>
-                        <field name="field_id"/>
-                    </form>
-                    <tree string="Database Tables">
-                        <field name="table_id"/>
-                        <field name="field_id"/>
-                    </tree>
-                </field>
-                <field name="available_table_ids" colspan="4"
-                	nolabel="1" readonly="0"
-                	domain="[('available_table_ids','in',available_table_ids)]"
-                	context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
-                	<tree string="Database Tables">
-                		<field name="related_to" string="Joined Table" />
-                		<field name="name" />
-                		<field name="table_id" />
-                		<field name="primary_key" />
-                	</tree>
-                </field>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
-        <field name="name">Olap Cube Tables</field>
-        <field name="res_model">olap.cube.table</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Cubes Table"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_cube_table_form"
-        id="menu_action_olap_cube_table_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Cubes
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_cube_tree">
-        <field name="name">olap.cube.tree</field>
-        <field name="model">olap.cube</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap cube">
-                <field name="name"/>
-                <field name="table_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_cube_form">
-        <field name="name">olap.cube.form</field>
-        <field name="model">olap.cube</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap cube">
-                <field name="name" select="1" colspan="4"/>
-                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
-                <field name="query_log" select="2"/>
-                <field name="table_id"  colspan="4" context="{'parent_schema_id':schema_id}"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_cube_form">
-        <field name="name">Olap Cubes</field>
-        <field name="res_model">olap.cube</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Cubes"
-        parent ="menu_bi_conf_cubes"
-        action="action_olap_cube_form"
-        id="menu_action_olap_cube_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Dimensions
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_dimension_tree">
-        <field name="name">olap.dimension.tree</field>
-        <field name="model">olap.dimension</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap dimension">
-                <field name="name"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_dimension_form">
-        <field name="name">olap.dimension.form</field>
-        <field name="model">olap.dimension</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap dimension">
-                <field name="name" select="1"/>
-                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_dimension_form">
-        <field name="name">Olap Dimensions</field>
-        <field name="res_model">olap.dimension</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Dimension"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_dimension_form"
-        id="menu_action_olap_dimension_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Hierarchies
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
-        <field name="name">olap.hierarchy.tree</field>
-        <field name="model">olap.hierarchy</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap hierarchy">
-                <field name="name"/>
-                <field name="dimension_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_hierarchy_form">
-        <field name="name">olap.hierarchy.form</field>
-        <field name="model">olap.hierarchy</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap hierarchy">
-                <field name="name" select="1" colspan="4"/>
-                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}"/>
-<!--                <field name="field_name" select="2"/>-->
-                <field name="sequence"/>
-                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
-<!--                <separator string="Levels" colspan="4"/>
-                <field name="level_ids" colspan="4" nolabel="1"/>-->
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
-        <field name="name">Olap Hierarchies</field>
-        <field name="res_model">olap.hierarchy</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Hierarchy"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_hierarchy_form"
-        id="menu_action_olap_hierarchy_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Levels
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_level_tree">
-        <field name="name">olap.level.tree</field>
-        <field name="model">olap.level</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Level">
-                <field name="name"/>
-                <field name="column_name"/>
-                <field name="column_id_name" invisible="True"/>
-                <field name="type"/>
-                <field name="table_name" invisible="True"/>
-                <field name="sequence"/>
-                <field name="hierarchy_id"/>
-
-
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_level_form">
-        <field name="name">olap.level.form</field>
-        <field name="model">olap.level</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap level">
-                <field name="name" select="1" colspan="4"/>
-                <field name="column_name" select="1"
-                	on_change="onchange_column_name(column_name)"
-                	context="{'filter_cols_hier':hierarchy_id}" />
-                <field name="column_id_name" select="1"/>
-                <field name="type" select="1"/>
-                <field name="table_name" select="1"/>
-                <field name="sequence"/>
-                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
-            </form>
-       </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_level_form">
-        <field name="name">Olap Level</field>
-        <field name="res_model">olap.level</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Level"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_level_form"
-        id="menu_action_olap_level_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Measure
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_measure_tree">
-        <field name="name">olap.measure.tree</field>
-        <field name="model">olap.measure</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap measure">
-                <field name="name"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_measure_form">
-        <field name="name">olap.measure.form</field>
-        <field name="model">olap.measure</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap measure">
-                <field name="name" select="1"/>
-                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-                <field name="value_column_id_name" invisible="True"/>
-                <field name="table_name" invisible="True"/>
-                <field name="measure_type"/>
-                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
-                    <newline/>
-                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
-                    <field name="agregator" select="2"/>
-                    <field name="formatstring" select="2"/>
-                </group>
-                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
-                    <newline/>
-                    <field name="value_sql" colspan="4" select="2"
-                    	attrs="{'required':[('measure_type','=','sql_expr')]}" />
-                    <field name="datatype" select="2"/>
-                </group>
-            </form>
-
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_measure_form">
-        <field name="name">Olap Measures</field>
-        <field name="res_model">olap.measure</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Measures"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_measure_form"
-        id="menu_action_olap_measure_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Saved Query
-    # ------------------------------------------------------------------
-    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
-        <field name="name">olap.saved.query.tree</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Saved Query">
-            	<field name="name"/>
-                <field name="cube_id"/>
-                <field name="mdx_id"/>
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="time"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
-        <field name="name">olap.saved.query.mdx</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">mdx</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Saved Query">
-            	<field name="name"/>
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-                <field name="mdx_id"/>
-                <field name="axis_keys" readonly="True"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_saved_query_form">
-        <field name="name">olap.saved.query.form</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap Saved Query">
-             	<field name="name" select="1" readonly="True"/>
-                <field name="query" select="1" colspan="4" readonly="True"/>
-                <field name="user_id" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-                <field name="mdx_id" select="2" readonly="True"/>
-                <field name="schema_id" select="2" readonly="True"/>
-                <field name="axis_keys" readonly="True"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
-        <field name="name">Olap Saved Query</field>
-        <field name="res_model">olap.saved.query</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,mdx</field>
-    </record>
-    <menuitem
-        name="Olap Saved Query"
-        parent = "menu_bi_conf_tools"
-        action="action_olap_saved_query_form"
-        id="menu_action_olap_saved_query_form"/>
-
-<!-- All Logs -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="All Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-                <field name="schema_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_query_logs_form">
-        <field name="name">olap.query.logs.form</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="All Logs">
-                <field name="query" colspan="4" select="1" readonly="True"/>
-                <field name="time" select="2" readonly="True"/>
-                <field name="result_size" select="2" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-                <field name="count" readonly="True"/>
-                <field name="schema_id" readonly="True"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
-        <field name="name">All Logs</field>
-        <field name="res_model">olap.query.logs</field>
-        <field name="view_type">form</field>
-    </record>
-
-    <menuitem
-        name="All Logs"
-        action="action_olap_query_logs_form"
-        id="menu_action_olap_query_logs_form"
-        parent="menu_bi_conf_tools"/>
-
-<!-- All Logs / My logs -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="My Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">mdx</field>
-        <field name="arch" type="xml">
-            <tree string="My Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-
-<!-- Query Logs  -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
-        <field name="name">olap.query.logs.form</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="My Logs">
-                <field name="user_id" select="1" readonly="True"/>
-                <field name="query" select="1" readonly="True"/>
-                <field name="time" select="2" readonly="True"/>
-                <field name="result_size" select="2" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-
-            </form>
-        </field>
-
-    </record>
-
-    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
-        <field name="name">My Logs</field>
-        <field name="res_model">olap.query.logs</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,mdx</field>
-        <field name="domain">[('user_id','=',uid)]</field>
-    </record>
-
-    <menuitem
-        name="My Logs"
-        action="action_olap_query_logs_my_form"
-        id="menu_action_olap_query_logs_my_form"
-        parent="menu_action_olap_query_logs_form"/>
-
-</data>
+	<!-- Wizard view for the load data -->
+	
+	        <record id="bi_load_db_form" model="ir.ui.view">
+	            <field name="name">bi.load.db.form</field>
+	            <field name="model">bi.load.db.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Load Database Tables">
+	                    <label align="0.0" string="We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs." colspan="4" />
+	                    <newline/>
+	                    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:" colspan="4"/>
+	                    <newline/>
+	                    <field name="fact_table" />
+	                    <field name="db_name" />
+	                    <newline/>
+	                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+	                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
+	            <field name="name">Load database Structure</field>
+	            <field name="res_model">bi.load.db.wizard</field>
+	            <field name="src_model">olap.schema</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="auto_refresh" eval="1"/>
+	            <field name="target">new</field>
+	        </record>
+	
+	
+	<!-- Wizard For Olap Warehouse -->
+	
+	        <record id="view_warehouse_bi" model="ir.ui.view">
+	            <field name="name">Olap Warehouse</field>
+	            <field name="model">olap.warehouse.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Warehouse">
+	                    <group colspan="16">
+	                    <separator string="Query" colspan="16"/>
+	                    <field name="query" nolabel="1" colspan="16"/>
+	                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
+	                    </group>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="action_olap_warehouse" model="ir.actions.act_window">
+	            <field name="name">Olap Warehouse</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">olap.warehouse.wizard</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	        <menuitem
+	        name="Olap Warehouse"
+	        action="action_olap_warehouse"
+	        id="menu_bi_warehouse"
+	        sequence="51"
+	        parent="base.next_id_50"
+	        />
+	
+	<!-- Wizard View for the parameters wizard -->
+	
+	        <record id="view_config_bi" model="ir.ui.view">
+	            <field name="name">Parameters Configuration</field>
+	            <field name="model">olap.parameters.config.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Parameters Configure">
+	                    <separator string="BI Web Client." colspan="4"/>
+	                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
+	                    <field name="host_name" colspan="4"/>
+	                    <field name="host_port" colspan="4"/>
+	                    <separator string="" colspan="4"/>
+	                    <label string="" colspan="2"/>
+	                    <group col="4" colspan="2">
+	                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
+	                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
+	                    </group>
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="action_config_bi_parameters" model="ir.actions.act_window">
+	            <field name="name">Parameters Configuration</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">olap.parameters.config.wizard</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	        <menuitem
+	        name="Server Parameters"
+	        action="action_config_bi_parameters"
+	        id="menu_bi_server_parameters"
+	        sequence="50"
+	        parent="base.next_id_50"
+	        />
+	        
+	        <record model="ir.actions.todo" id="config_auto_directory">
+	            <field name="name">Server Parameters Configuration</field>
+	            <field name="note">This wizard will configure the URL of the web client</field>
+	            <field name="action_id" ref="action_config_bi_parameters"/>
+	        </record>
+	
+	
+	<!-- Wizard view for the Auto Configuring the data -->
+	
+	        <record id="bi_auto_configure_form" model="ir.ui.view">
+	            <field name="name">bi.auto.configure.form</field>
+	            <field name="model">bi.auto.configure.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Auto Congifuring Tables">
+	                    <label align="0.0" string="This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option." colspan="4" />
+	                    <field name="name" select="1" colspan="4"/>
+	                    <newline/>
+	                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+	                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="act_bi_auto_configure" model="ir.actions.act_window">
+	            <field name="name">Auto Configuration</field>
+	            <field name="res_model">bi.auto.configure.wizard</field>
+	            <field name="src_model">olap.schema</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="auto_refresh" eval="1"/>
+	            <field name="target">new</field>
+	        </record>
+	
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Schema
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_schema_tree">
+	        <field name="name">olap.schema.tree</field>
+	        <field name="model">olap.schema</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Schema">
+	                <field name="name"/>
+	                <field name="database_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	    <record model="ir.ui.view" id="view_olap_schema_form">
+	        <field name="name">olap.schema.form</field>
+	        <field name="model">olap.schema</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap Schema">
+	              <field name="name" select="1" colspan="4"/>
+	              <field name="database_id" select="2" colspan="4"/>
+	              <field name="loaded" colspan="3"/>
+	              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
+	              <field name="configure" colspan="3"/>
+	              <button name="%(bi_load_configuration_table)d"
+	              	string="ReConfigure Structure" type="action"
+	              	states="done" />
+	              <field name="ready" select="2" colspan="3"/>
+	              <field name="note" colspan="4"/>
+	              <field name="state" select="2" colspan="2" />
+	              <group colspan="2">
+	                <button string="Connect to Database" name="dbconnect" states="none"/>
+	                <button string="Load Database Structure"
+	                	name="%(act_bi_load_db_wizard)d" type="action"
+	                	states="dbconnect" target="new" />
+	                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
+	                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
+	              </group>
+	              <separator string="Auto Application Configuration" colspan="4"/>
+	              <field name="app_detect" nolabel="1" colspan="3"/>
+	              <button string="Configure Automatically "
+	              	name="%(act_bi_auto_configure)d" type="action"
+	              	states="dbload" target="new" />
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_schema_form">
+	        <field name="name">Olap Schemas</field>
+	        <field name="res_model">olap.schema</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Schema"
+	        action="action_olap_schema_form"
+	        id="menu_action_olap_schema_form"
+	        parent="menu_bi_conf_cubes"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Cubes Table
+	    # ------------------------------------------------------------------
+	    <record model="ir.ui.view" id="view_olap_cube_table_form">
+	        <field name="name">olap.cube.table.form</field>
+	        <field name="model">olap.cube.table</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap cube_table" >
+	                <field name="name" select="2"/>
+	                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
+	                <newline/>
+	                <separator colspan="2" string="Joined Tables"/>
+	                <field invisible="True" name="line_ids" nolabel="1">
+	                    <form string="Database Tables">
+	                        <field name="table_id"/>
+	                        <field name="field_id"/>
+	                    </form>
+	                    <tree string="Database Tables">
+	                        <field name="table_id"/>
+	                        <field name="field_id"/>
+	                    </tree>
+	                </field>
+	                <field name="available_table_ids" colspan="4"
+	                	nolabel="1" readonly="0"
+	                	domain="[('available_table_ids','in',available_table_ids)]"
+	                	context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
+	                	<tree string="Database Tables">
+	                		<field name="related_to" string="Joined Table" />
+	                		<field name="name" />
+	                		<field name="table_id" />
+	                		<field name="primary_key" />
+	                	</tree>
+	                </field>
+	            </form>
+	        </field>
+	    </record>
+	
+	    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
+	        <field name="name">Olap Cube Tables</field>
+	        <field name="res_model">olap.cube.table</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Cubes Table"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_cube_table_form"
+	        id="menu_action_olap_cube_table_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Cubes
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_cube_tree">
+	        <field name="name">olap.cube.tree</field>
+	        <field name="model">olap.cube</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap cube">
+	                <field name="name"/>
+	                <field name="table_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_cube_form">
+	        <field name="name">olap.cube.form</field>
+	        <field name="model">olap.cube</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap cube">
+	                <field name="name" select="1" colspan="4"/>
+	                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
+	                <field name="query_log" select="2"/>
+	                <field name="table_id"  colspan="4" context="{'parent_schema_id':schema_id}"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_cube_form">
+	        <field name="name">Olap Cubes</field>
+	        <field name="res_model">olap.cube</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Cubes"
+	        parent ="menu_bi_conf_cubes"
+	        action="action_olap_cube_form"
+	        id="menu_action_olap_cube_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Dimensions
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_dimension_tree">
+	        <field name="name">olap.dimension.tree</field>
+	        <field name="model">olap.dimension</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap dimension">
+	                <field name="name"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_dimension_form">
+	        <field name="name">olap.dimension.form</field>
+	        <field name="model">olap.dimension</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap dimension">
+	                <field name="name" select="1"/>
+	                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_dimension_form">
+	        <field name="name">Olap Dimensions</field>
+	        <field name="res_model">olap.dimension</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Dimension"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_dimension_form"
+	        id="menu_action_olap_dimension_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Hierarchies
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
+	        <field name="name">olap.hierarchy.tree</field>
+	        <field name="model">olap.hierarchy</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap hierarchy">
+	                <field name="name"/>
+	                <field name="dimension_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_hierarchy_form">
+	        <field name="name">olap.hierarchy.form</field>
+	        <field name="model">olap.hierarchy</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap hierarchy">
+	                <field name="name" select="1" colspan="4"/>
+	                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}"/>
+	<!--                <field name="field_name" select="2"/>-->
+	                <field name="sequence"/>
+	                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
+	<!--                <separator string="Levels" colspan="4"/>
+	                <field name="level_ids" colspan="4" nolabel="1"/>-->
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
+	        <field name="name">Olap Hierarchies</field>
+	        <field name="res_model">olap.hierarchy</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Hierarchy"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_hierarchy_form"
+	        id="menu_action_olap_hierarchy_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Levels
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_level_tree">
+	        <field name="name">olap.level.tree</field>
+	        <field name="model">olap.level</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Level">
+	                <field name="name"/>
+	                <field name="column_name"/>
+	                <field name="column_id_name" invisible="True"/>
+	                <field name="type"/>
+	                <field name="table_name" invisible="True"/>
+	                <field name="sequence"/>
+	                <field name="hierarchy_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_level_form">
+	        <field name="name">olap.level.form</field>
+	        <field name="model">olap.level</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap level">
+	                <field name="name" select="1" colspan="4"/>
+	                <field name="column_name" select="1"
+	                	on_change="onchange_column_name(column_name)"
+	                	context="{'filter_cols_hier':hierarchy_id}" />
+	                <field name="column_id_name" select="1"/>
+	                <field name="type" select="1"/>
+	                <field name="table_name" select="1"/>
+	                <field name="sequence"/>
+	                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
+	            </form>
+	       </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_level_form">
+	        <field name="name">Olap Level</field>
+	        <field name="res_model">olap.level</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Level"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_level_form"
+	        id="menu_action_olap_level_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Measure
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_measure_tree">
+	        <field name="name">olap.measure.tree</field>
+	        <field name="model">olap.measure</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap measure">
+	                <field name="name"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_measure_form">
+	        <field name="name">olap.measure.form</field>
+	        <field name="model">olap.measure</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap measure">
+	                <field name="name" select="1"/>
+	                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+	                <field name="value_column_id_name" invisible="True"/>
+	                <field name="table_name" invisible="True"/>
+	                <field name="measure_type"/>
+	                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
+	                    <newline/>
+	                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
+	                    <field name="agregator" select="2" />
+	                    <field name="formatstring" select="2"/>
+	                </group>
+	                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
+	                    <newline/>
+	                    <field name="value_sql" colspan="4" select="2"
+	                    	attrs="{'required':[('measure_type','=','sql_expr')]}" />
+	                    <field name="datatype" select="2"/>
+	                </group>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_measure_form">
+	        <field name="name">Olap Measures</field>
+	        <field name="res_model">olap.measure</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Measures"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_measure_form"
+	        id="menu_action_olap_measure_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Saved Query
+	    # ------------------------------------------------------------------
+	    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
+	        <field name="name">olap.saved.query.tree</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Saved Query">
+	            	<field name="name"/>
+	                <field name="cube_id"/>
+	                <field name="mdx_id"/>
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="time"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
+	        <field name="name">olap.saved.query.mdx</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">mdx</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Saved Query">
+	            	<field name="name"/>
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	                <field name="mdx_id"/>
+	                <field name="axis_keys" readonly="True"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_saved_query_form">
+	        <field name="name">olap.saved.query.form</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap Saved Query">
+	             	<field name="name" select="1" readonly="True"/>
+	                <field name="query" select="1" colspan="4" readonly="True"/>
+	                <field name="user_id" readonly="True"/>
+	                <field name="cube_id" select="2" readonly="True"/>
+	                <field name="mdx_id" select="2" readonly="True"/>
+	                <field name="schema_id" select="2" readonly="True"/>
+	                <field name="axis_keys" readonly="True"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
+	        <field name="name">Olap Saved Query</field>
+	        <field name="res_model">olap.saved.query</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form,mdx</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Saved Query"
+	        parent = "menu_bi_conf_tools"
+	        action="action_olap_saved_query_form"
+	        id="menu_action_olap_saved_query_form"/>
+	
+	<!-- All Logs -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="All Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	                <field name="schema_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_query_logs_form">
+	        <field name="name">olap.query.logs.form</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="All Logs">
+	                <field name="query" colspan="4" select="1" readonly="True"/>
+	                <field name="time" select="2" readonly="True"/>
+	                <field name="result_size" select="2" readonly="True"/>
+	                <field name="cube_id" select="2" readonly="True"/>
+	                <field name="count" readonly="True"/>
+	                <field name="schema_id" readonly="True"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
+	        <field name="name">All Logs</field>
+	        <field name="res_model">olap.query.logs</field>
+	        <field name="view_type">form</field>
+	    </record>
+	
+	    <menuitem
+	        name="All Logs"
+	        action="action_olap_query_logs_form"
+	        id="menu_action_olap_query_logs_form"
+	        parent="menu_bi_conf_tools"/>
+	
+	<!-- All Logs / My logs -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="My Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">mdx</field>
+	        <field name="arch" type="xml">
+	            <tree string="My Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	<!-- Query Logs  -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
+	        <field name="name">olap.query.logs.form</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="My Logs">
+	                <field name="user_id" select="1" readonly="True"/>
+	                <field name="query" colspan="4" select="1" readonly="True"/>
+	                <field name="time" select="2" readonly="True"/>
+	                <field name="result_size" select="2" readonly="True"/>
+	                <field name="cube_id" select="2" readonly="True"/>
+	            </form>
+	        </field>
+	    </record>
+	
+	    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
+	        <field name="name">My Logs</field>
+	        <field name="res_model">olap.query.logs</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form,mdx</field>
+	        <field name="domain">[('user_id','=',uid)]</field>
+	    </record>
+	
+	    <menuitem
+	        name="My Logs"
+	        action="action_olap_query_logs_my_form"
+	        id="menu_action_olap_query_logs_my_form"
+	        parent="menu_action_olap_query_logs_form"/>
+	
+	</data>
 </openerp>
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
index 74a794d9eee..8d38949b3f0 100755
--- a/addons/olap/data/olap_fact_view.xml
+++ b/addons/olap/data/olap_fact_view.xml
@@ -230,10 +230,10 @@
         <field name="arch" type="xml">
             <form string="Olap Application">
                 <newline/>
-                <field name="name" select="1" colspan="2"/>
-                <field name="query" select="1" colspan="2"/>
-                <field name="table_ids" select="1" colspan="4" nolabel="1"/>
-                <field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
+                	<field name="name" select="1" colspan="2"/>
+                	<field name="query" select="1" colspan="4"/>
+                	<field name="table_ids" select="1" colspan="4" nolabel="1"/>
+                	<field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
             </form>
         </field>
     </record>
@@ -320,9 +320,10 @@
                 <field name="name" select="1" colspan="2"/>
                 <field name="field_name" select="1" />
                 <field name="table_name" select="1" />
+                <field name="application_id" select="1" />
                 <newline/>
                 <field name="is_hidden" select="1" colspan="2"/>
-                <field name="application_id" select="1" />
+                
             </form>
         </field>
     </record>