[IMP] base:

* remove icon on reporting menu
* add wkf_id related field in workitem
* correct close button icon on request form

bzr revid: hmo@tinyerp.com-20101001115415-pbaj7bz46bkkf41l

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index b37b78f..9aab35b 100644 (file)
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -21,7 +21,7 @@
             groups="base.group_extended"/>
         <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
-        <menuitem icon="STOCK_OPEN" id="reporting_menu"
+        <menuitem id="reporting_menu"
             parent="base.menu_custom" name="Reporting" sequence="30"
              />
     </data>

diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 8074d78..30fd666 100644 (file)
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -171,7 +171,6 @@ class wkf_instance(osv.osv):
     _log_access = False
     _columns = {
         'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True),
-        'uid': fields.integer('User ID'),
         'res_id': fields.integer('Resource ID', select=True),
         'res_type': fields.char('Resource Object', size=64, select=True),
         'state': fields.char('State', size=32, select=True),
@@ -194,6 +193,7 @@ class wkf_workitem(osv.osv):
     _rec_name = 'state'
     _columns = {
         'act_id': fields.many2one('workflow.activity', 'Activity', required=True, ondelete="cascade", select=True),
+        'wkf_id': fields.related('act_id','wkf_id', type='many2one', relation='workflow', string='Workflow'),
         'subflow_id': fields.many2one('workflow.instance', 'Subflow', ondelete="cascade", select=True),
         'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True),
         'state': fields.char('State', size=64, select=True),

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index c3e5c3f..9adbec0 100644 (file)
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -272,7 +272,6 @@
       <field name="arch" type="xml">
         <form string="Workflow Instances">
           <field name="wkf_id" readonly="1"/>
-          <field name="uid" readonly="1"/>
           <field name="res_id" readonly="1"/>
           <field name="res_type" readonly="1"/>
           <field name="state" readonly="1"/>
@@ -286,7 +285,6 @@
       <field name="arch" type="xml">
         <tree string="Workflow Instances">
           <field name="wkf_id"/>
-          <field name="uid"/>
           <field name="res_id"/>
           <field name="res_type"/>
           <field name="state"/>
@@ -301,8 +299,7 @@
         <search string="Workflow Instances">
           <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
           <separator orientation="vertical"/>
-          <field name="wkf_id"/>
-          <field name="uid"/>
+          <field name="wkf_id" widget="selection"/>
           <field name="res_id"/>
           <field name="res_type"/>
           <field name="state"/>
@@ -332,6 +329,7 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow Workitems">
+          <field name="wkf_id" readonly="1"/>  
           <field name="act_id" readonly="1"/>
           <field name="subflow_id" readonly="1"/>
           <field name="inst_id" readonly="1"/>
@@ -345,6 +343,7 @@
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="Workflow Workitems">
+          <field name="wkf_id"/>  
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>
@@ -360,6 +359,7 @@
         <search string="Workflow Workitems">
           <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
           <separator orientation="vertical"/>
+          <field name="wkf_id" widget="selection"/>  
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>

diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 53b7044..7cec248 100644 (file)
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -42,7 +42,7 @@
                             <field colspan="4" name="body" nolabel="1"/>
                             <group col="5" colspan="4">
                                 <field name="state"/>
-                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-stop"/>
+                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-close"/>
                                 <button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/>
                                 <button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
                             </group>