[MERGE]

bzr revid: hmo@tinyerp.com-20101001110658-zrmg32f4hmwc21ww

diff --cc bin/addons/base/base_menu.xml
index 31ddb5d,19b1bcd..b37b78f
--- 1/bin/addons/base/base_menu.xml
--- 2/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@@ -19,9 -20,11 +19,10 @@@
          <menuitem id="menu_users" name="Users" parent="base.menu_administration" sequence="6"/>
          <menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="8"
              groups="base.group_extended"/>
 -        <menuitem id="menu_management" name="Modules Management" parent="base.menu_administration" sequence="10"
 +        <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
              groups="base.group_extended"/>
-         <menuitem icon="terp-graph" id="reporting_menu" name="Reporting" sequence="45"
-             groups="group_extended"/>
 -<!--
 -        <menuitem icon="terp-graph" id="reporting_menu" name="Reporting" sequence="45"
 -            groups="group_extended"/>
 --->
++        <menuitem icon="STOCK_OPEN" id="reporting_menu"
++            parent="base.menu_custom" name="Reporting" sequence="30"
++             />
      </data>
  </openerp>

diff --cc bin/addons/base/ir/ir.xml
index 8f5a1f0,08c2b6a..17e9ecc
--- 1/bin/addons/base/ir/ir.xml
--- 2/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@@ -2062,14 -2038,8 +2062,7 @@@
          </record>
          <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
  
-         <wizard id="wizard_configuration" model="ir.module.module" name="module.configuration" string="Start Configuration"/>
          <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
                  parent="next_id_11" groups="base.group_extended" sequence="20"/>
--
-         <menuitem
-             action="wizard_configuration" name="Start Configuration"
-             id="menu_configurator_module" parent="next_id_11"
-             type="wizard"/>
- 
      </data>
  </openerp>

diff --cc bin/addons/base/ir/workflow/workflow_view.xml
index 3fb98ef,986630d..c3e5c3f
--- 1/bin/addons/base/ir/workflow/workflow_view.xml
--- 2/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@@ -15,11 -15,11 +15,11 @@@
        <field name="type">form</field>
        <field name="arch" type="xml">
          <form string="Workflow">
--              <group col="6" colspan="4" >
--                      <field name="name"/>
--                      <field name="osv"/>
--                      <field name="on_create"/>
--              </group>
++            <group col="6" colspan="4" >
++                  <field name="name"/>
++                  <field name="osv"/>
++                  <field name="on_create"/>
++              </group>
            <separator colspan="4" string="Activities"/>
            <field colspan="4" name="activities" nolabel="1"/>
          </form>
@@@ -94,10 -94,10 +94,10 @@@
        <field name="type">form</field>
        <field name="arch" type="xml">
          <form string="Activity">
--              <group col="6" colspan="4">
--              <field name="name"/>
--              <field name="wkf_id"/>
--              <field name="kind"/>
++            <group col="6" colspan="4">
++                <field name="name"/>
++                <field name="wkf_id"/>
++                <field name="kind"/>
              </group>
            <group  colspan="2">
              <field name="flow_start"/>
@@@ -181,9 -181,9 +181,9 @@@
            <field name="action_id"/>
            <field name="action"/>
            <newline/>
--                <group expand="0" string="Group By...">
--                    <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
--            </group>
++              <group expand="0" string="Group By...">
++                  <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
++              </group>
          </search>
        </field>
      </record>
@@@ -210,14 -210,14 +210,14 @@@
        <field name="type">form</field>
        <field name="arch" type="xml">
          <form string="Transition">
--              <group col="6" colspan ="4">
--              <field name="act_from"/>
--              <field name="act_to"/>
--              <field name="signal"/>
--              <field name="condition"/>
--              <field name="trigger_model"/>
--                  <field name="trigger_expr_id"/>
--              <field name="role_id"/>
++            <group col="6" colspan ="4">
++                <field name="act_from"/>
++                <field name="act_to"/>
++                <field name="signal"/>
++                <field name="condition"/>
++                <field name="trigger_model"/>
++                  <field name="trigger_expr_id"/>
++                <field name="role_id"/>
              </group>
          </form>
        </field>
@@@ -299,6 -299,8 +299,8 @@@
        <field name="type">search</field>
        <field name="arch" type="xml">
          <search string="Workflow Instances">
 -          <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" context="{'search_default_active':1}"/>
++          <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
+           <separator orientation="vertical"/>
            <field name="wkf_id"/>
            <field name="uid"/>
            <field name="res_id"/>
@@@ -313,6 -315,6 +315,7 @@@
        <field name="res_model">workflow.instance</field>
        <field name="view_type">form</field>
        <field name="view_id" ref="view_workflow_instance_tree"/>
++      <field name="context">{'search_default_active':1}</field>
        <field name="search_view_id" ref="view_workflow_instance_search"/>
      </record>
      <menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_low_workflow"/>
@@@ -355,6 -357,8 +358,8 @@@
        <field name="type">search</field>
        <field name="arch" type="xml">
          <search string="Workflow Workitems">
 -          <filter icon="terp-camera_test" string="Active" domain="['state','=','active']" context="{'search_default_active':1}"/>
++          <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
+           <separator orientation="vertical"/>
            <field name="act_id"/>
            <field name="subflow_id"/>
            <field name="inst_id"/>
@@@ -368,6 -372,6 +373,7 @@@
        <field name="res_model">workflow.workitem</field>
        <field name="view_type">form</field>
        <field name="view_id" ref="view_workflow_workitem_tree"/>
++      <field name="context">{'search_default_active':1}</field>
        <field name="search_view_id" ref="view_workflow_workitem_search"/>
      </record>
      <menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_low_workflow"/>