From 99911f35509725abcbea1b405d55780f13299c24 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 17 Sep 2008 14:22:11 +0200
Subject: [PATCH 01/26] get_binary_size set as True by default

bzr revid: christophe@tinyerp.com-20080917122211-34u4ykx806nrh0xo
---
 bin/osv/fields.py | 4 ++--
 bin/osv/orm.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index a6f7280a69d..8df45a2e0f9 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -223,7 +223,7 @@ class binary(_column):
                     val = v[name]
                     break
             res.setdefault(i, val)
-            if context.get('get_binary_size',False):
+            if context.get('get_binary_size', True):
                 res[i] = tools.human_size(val)
 
         return res
@@ -620,7 +620,7 @@ class function(_column):
         else:
             res = self._fnct(cr, obj._table, ids, name, self._arg, context)
 
-        if self._type == 'binary' and context.get('get_binary_size', False):
+        if self._type == 'binary' and context.get('get_binary_size', True):
             # convert the data returned by the function with the size of that data...
             res = dict(map(lambda (x, y): (x, tools.human_size(len(y))), res.items()))
         return res
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 82fd2a79523..96f91b36ea3 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1125,7 +1125,7 @@ class orm_memory(orm_template):
                 for f in fields_to_read:
                     if id in self.datas:
                         r[f] = self.datas[id].get(f, False)
-                        if r[f] and isinstance(self._columns[f], fields.binary) and context.get('get_binary_size', False):
+                        if r[f] and isinstance(self._columns[f], fields.binary) and context.get('get_binary_size', True):
                             r[f] = len(r[f])
                 result.append(r)
                 if id in self.datas:

From e27eb7005a0cd94465bb58e86300112adf8bfc2a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 17 Sep 2008 17:31:12 +0200
Subject: [PATCH 02/26] forgetdatetime

bzr revid: fp@tinyerp.com-20080917153112-8kn5br5nxe0z3ku3
---
 addons/account/account.py                | 5 +++--
 addons/mrp/mrp_view.xml                  | 2 +-
 addons/sale/sale.py                      | 2 +-
 addons/sale/security/ir.model.access.csv | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b47b4c14bd9..ef02e970a5f 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1479,13 +1479,14 @@ account_subscription_line()
 class account_config_fiscalyear(osv.osv_memory):
     _name = 'account.config.fiscalyear'
     _columns = {
-        'name':fields.char('Name', required=True,size=64),
-        'code':fields.char('Code', required=True,size=64),
+        'name':fields.char('Name', required=True, size=64, help="Name of the fiscal year as displayed on screens."),
+        'code':fields.char('Code', required=True, size=64, help="Name of the fiscal year as displayed in reports."),
         'date1': fields.date('Starting Date', required=True),
         'date2': fields.date('Ending Date', required=True),
     }
     _defaults = {
         'code': lambda *a: time.strftime('%Y'),
+        'name': lambda *a: time.strftime('%Y'),
         'date1': lambda *a: time.strftime('%Y-01-01'),
         'date2': lambda *a: time.strftime('%Y-12-31'),
     }
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 55986cd260c..a5d0c6f0500 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -440,7 +440,7 @@
                         <page string="Finnished Products">
                             <field colspan="4" name="move_created_ids" nolabel="1"/>
                         </page>
-                        <page string="Workcenters">
+                        <page string="Operations">
                             <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 4a52e8d4608..7de48d9370c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -479,7 +479,7 @@ class sale_order(osv.osv):
             for line in order.order_line:
                 proc_id=False
                 date_planned = DateTime.now() + DateTime.RelativeDateTime(days=line.delay or 0.0)
-                date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d')
+                date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d %H:%M:%S')
                 if line.state == 'done':
                     continue
                 if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 04064fa910d..31c68c7c885 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sale_shop,sale.shop,model_sale_shop,group_sale_user,1,0,0,0
-access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,1
-access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,1
+access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,0
+access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,0
 access_sale_shop_admin,sale.shop,model_sale_shop,base.group_system,1,1,1,1

From 98f1d94a949a3e415635630b306f5191e020fe56 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 17 Sep 2008 17:55:18 +0200
Subject: [PATCH 03/26] bugfix

lp bug: https://launchpad.net/bugs/271380 fixed

bzr revid: fp@tinyerp.com-20080917155518-i0sw7bd7pav0tnj5
---
 bin/addons/base/module/module.py       | 18 +++++++++++++++++-
 bin/addons/base/module/module_view.xml |  6 +++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 7879a118294..fa8ce19fd57 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -317,8 +317,24 @@ class module(osv.osv):
     def button_uninstall_cancel(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'installed'})
         return True
+
     def button_upgrade(self, cr, uid, ids, context=None):
-        return self.state_update(cr, uid, ids, 'to upgrade', ['installed'], context)
+        depobj = self.pool.get('ir.module.module.dependency')
+        todo = self.browse(cr, uid, ids, context=context)
+        i = 0
+        while i<len(todo):
+            mod = todo[i]
+            i += 1
+            if mod.state not in ('installed','to upgrade'):
+                raise orm.except_orm(_('Error'),
+                        _("Can not upgrade module '%s'. It is not installed.") % (mod.name,))
+            iids = depobj.search(cr, uid, [('name', '=', mod.name)], context=context)
+            for dep in depobj.browse(cr, uid, iids, context=context):
+                if dep.module_id.state=='installed':
+                    todo.append(dep.module_id)
+        self.write(cr,uid, map(lambda x: x.id, todo), {'state':'to upgrade'}, context=context)
+        return True
+
     def button_upgrade_cancel(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'installed'})
         return True
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index 54c93228e29..8580d163c27 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -63,10 +63,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module">
-                    <notebook>
+                    <field name="name" select="1"/>
+                    <field colspan="4" name="shortdesc" select="2"/>
+                    <notebook colspan="4">
                         <page string="Module">
-                            <field name="name" select="1"/>
-                            <field colspan="4" name="shortdesc" select="2"/>
                             <field colspan="4" name="description" select="2"/>
                             <field name="installed_version"/>
                             <field name="latest_version"/>

From c8298ab59fc417d5c0636de86bfd83c476070c29 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Thu, 18 Sep 2008 11:11:01 +0200
Subject: [PATCH 04/26] bugfix in the context to get the data from the binary
 field and not the size

bzr revid: stephane@tinyerp.com-20080918091101-8cnu8hsodxa4dyzb
---
 bin/report/report_sxw.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index e54fabded1b..5b9a78c630a 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -566,6 +566,8 @@ class report_sxw(report_rml):
         if not context:
             context={}
         context = context.copy()
+        context['get_binary_size'] = False
+
         pool = pooler.get_pool(cr.dbname)
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_actions_report_xml_obj.search(cr, uid,

From 9abaa999e9c52b8c18abdef33648d17f3ab924b6 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Thu, 18 Sep 2008 16:58:57 +0530
Subject: [PATCH 05/26] Added fields.related field type

bzr revid: hda@tinyerp.com-20080918112857-4ixoi25qv33lum32
---
 bin/addons/base/res/partner/partner.py       | 20 +++---
 bin/addons/base/res/partner/partner_view.xml | 38 +++++-----
 bin/osv/fields.py                            | 73 ++++++++++++++++++++
 3 files changed, 105 insertions(+), 26 deletions(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 3432cf6bde2..87df45c300c 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -125,7 +125,7 @@ def _lang_get(self, cr, uid, context={}):
     ids = obj.search(cr, uid, [], context=context)
     res = obj.read(cr, uid, ids, ['code', 'name'], context)
     return [(r['code'], r['name']) for r in res]
-    
+
 
 class res_partner(osv.osv):
     _description='Partner'
@@ -153,6 +153,8 @@ class res_partner(osv.osv):
         'active': fields.boolean('Active'),
         'customer': fields.boolean('Customer'),
         'supplier': fields.boolean('Supplier'),
+        'city':fields.related('address','city',type='char', string='City'),
+        'country':fields.related('address','country_id','name',type='char', string='Country'),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -166,7 +168,7 @@ class res_partner(osv.osv):
         name = self.read(cr, uid, [id], ['name'])[0]['name']
         default.update({'name': name+' (copy)'})
         return super(res_partner, self).copy(cr, uid, id, default, context)
-    
+
     def _check_ean_key(self, cr, uid, ids):
         for partner_o in pooler.get_pool(cr.dbname).get('res.partner').read(cr, uid, ids, ['ean13',]):
             thisean=partner_o['ean13']
@@ -192,10 +194,10 @@ class res_partner(osv.osv):
             rec_name = 'ref'
         else:
             rec_name = 'name'
-            
+
         res = [(r['id'], r[rec_name]) for r in self.read(cr, uid, ids, [rec_name], context)]
         return res
-        
+
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
         if not args:
             args=[]
@@ -229,12 +231,12 @@ class res_partner(osv.osv):
             })
             ids = ids[16:]
         return True
-        
+
     def address_get(self, cr, uid, ids, adr_pref=['default']):
         cr.execute('select type,id from res_partner_address where partner_id in ('+','.join(map(str,ids))+')')
         res = cr.fetchall()
         adr = dict(res)
-        # get the id of the (first) default address if there is one, 
+        # get the id of the (first) default address if there is one,
         # otherwise get the id of the first address in the list
         if res:
             default_address = adr.get('default', res[0][1])
@@ -244,11 +246,11 @@ class res_partner(osv.osv):
         for a in adr_pref:
             result[a] = adr.get(a, default_address)
         return result
-    
+
     def gen_next_ref(self, cr, uid, ids):
         if len(ids) != 1:
             return True
-            
+
         # compute the next number ref
         cr.execute("select ref from res_partner where ref is not null order by char_length(ref) desc, ref desc limit 1")
         res = cr.dictfetchall()
@@ -322,7 +324,7 @@ class res_partner_address(osv.osv):
             ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit, context=context)
         else:
             ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit, context=context)
-            if not ids: 
+            if not ids:
                 ids = self.search(cr, user, [('city',operator,name)] + args, limit=limit, context=context)
             if name:
                 ids += self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index aad15578511..37f1c30031d 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -2,9 +2,9 @@
 <openerp>
     <data>
         <menuitem icon="terp-partner" id="menu_base_partner" name="Partners" sequence="0"/>
-        
+
         <menuitem id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="1"/>
-        
+
         <!--
     ================================
     Function
@@ -39,7 +39,7 @@
             <field name="view_type">form</field>
         </record>
         <menuitem action="action_partner_function_form" id="menu_partner_function_form" parent="base.menu_base_config"/>
-        
+
         <!--
     =====================
     Partner Address
@@ -66,7 +66,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_partner_address_tree"/>
         </record>
-        
+
         <record id="view_partner_address_form1" model="ir.ui.view">
             <field name="name">res.partner.address.form1</field>
             <field name="model">res.partner.address</field>
@@ -116,7 +116,7 @@
             <field name="act_window_id" ref="action_partner_address_form"/>
         </record>
         <menuitem action="action_partner_address_form" id="menu_partner_address_form" parent="base.menu_base_partner"/>
-        
+
         <!--
     =========================================
     the short form used in the partner form
@@ -149,7 +149,7 @@
                 </form>
             </field>
         </record>
-        
+
         <!--
     =======================
     Partner Titles
@@ -174,7 +174,7 @@
             <field name="view_type">form</field>
         </record>
         <menuitem action="action_partner_title" id="menu_partner_title" parent="base.menu_base_config"/>
-        
+
         <!--
     =======================
     Partner
@@ -188,6 +188,8 @@
             <field name="arch" type="xml">
                 <tree string="Partners">
                     <field name="name"/>
+                    <field name="city"/>
+                    <field name="country"/>
                     <field name="title" string="Type"/>
                     <field name="ref"/>
                     <field name="address" string="# of Contacts"/>
@@ -208,6 +210,8 @@
                         <field domain="[('domain', '=', 'partner')]" name="title"/>
                         <field name="lang" select="2"/>
                         <field name="supplier" select="2"/>
+                        <field name="city" select="2" />
+	                    <field name="country" select="2" />
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -261,7 +265,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_partner_form" model="ir.actions.act_window">
             <field name="name">Partners</field>
             <field name="type">ir.actions.act_window</field>
@@ -281,9 +285,9 @@
             <field name="act_window_id" ref="action_partner_form"/>
         </record>
         <menuitem
-            action="action_partner_form" 
-            id="menu_partner_form" 
-            parent="base.menu_base_partner" 
+            action="action_partner_form"
+            id="menu_partner_form"
+            parent="base.menu_base_partner"
             sequence="2"/>
 
         <record id="action_partner_customer_form" model="ir.actions.act_window">
@@ -336,7 +340,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_payterm_form"/>
         </record>
-        
+
         <record id="view_partner_bank_type_form" model="ir.ui.view">
             <field name="name">res.partner.bank.type.form</field>
             <field name="model">res.partner.bank.type</field>
@@ -348,7 +352,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_partner_bank_type_tree" model="ir.ui.view">
             <field name="name">res.partner.bank.type.tree</field>
             <field name="model">res.partner.bank.type</field>
@@ -360,8 +364,8 @@
                 </tree>
             </field>
         </record>
-        
-        
+
+
         <record id="view_partner_bank_form" model="ir.ui.view">
             <field name="name">res.partner.bank.form</field>
             <field name="model">res.partner.bank</field>
@@ -400,7 +404,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <!--
     ======================
     Company Architecture
@@ -434,7 +438,7 @@
             <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <!--
     ======================
     Categories
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 8df45a2e0f9..2065d990a02 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -631,6 +631,79 @@ class function(_column):
         if self._fnct_inv:
             self._fnct_inv(obj, cr, user, id, name, value, self._fnct_inv_arg, context)
 
+# ---------------------------------------------------------
+# Related fields
+# ---------------------------------------------------------
+
+class related(function):
+
+    def _fnct_search(self, cr, uid, ids, obj=None, name=None, context=None):
+        print "_fnct_search >>>",ids,obj,name
+        return self._fnct_search(obj, cr, uid, obj, name, args)
+
+    def _fnct_read(self,obj,cr, uid, ids, field_name, args, context=None):
+        relation=obj._name
+        res={}
+        for data in obj.browse(cr,uid,ids):
+            t_data=data
+            relation=obj._name
+            for i in range(0,len(args)-1):
+                field_detail=self._field_get(cr,uid,relation,args[i])
+                relation=field_detail[0]
+                if field_detail[1]=='one2many':
+                    if t_data[args[i]]:
+                        t_data=t_data[args[i]][0]
+                    else:
+                        t_data=False
+                        break
+                elif field_detail[1]=='many2one':
+                    if t_data[args[i]]:
+                        t_data=t_data[args[i]]
+                    else:
+                        t_data=False
+                        break
+            if t_data:
+                res[data.id]=t_data[args[len(args)-1]]
+            else:
+                res[data.id]=t_data
+        return res
+
+#    def _fnct_write(self,obj, cr, uid, ids, name, value, args, context=None):
+#        print "_fnct_write>>>",ids,name,value,args
+#        if type(ids)!=type([]):
+#            ids=[ids]
+#        for data in obj.browse(cr,uid,ids):
+#            t_data=data
+#            relation=obj._name
+#            for i in range(0,len(args)-1):
+#                field_detail=self._field_get(cr,uid,relation,args[i])
+#                relation=field_detail[0]
+#                if field_detail[1]=='one2many':
+#                    if t_data[args[i]]:
+#                        t_data=t_data[args[i]][0]
+#                    else:
+#                        t_data=False
+#                        break
+#                elif field_detail[1]=='many2one':
+#                    if t_data[args[i]]:
+#                        t_data=t_data[args[i]]
+#                    else:
+#                        t_data=False
+#                        break
+#            if t_data:
+#                query="UPDATE",relation.replace('.','_'),"set",args[len(args)-1],"=",value," where id=",t_data.id
+#                print query
+#                cr.execute(query)
+##                return obj.write(cr,uid,data.id,{args[len(args)-1]:value})
+#        return True
+
+    def __init__(self,*arg,**args):
+        function.__init__(self,self._fnct_read, arg, self._fnct_write, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
+
+    def _field_get(self, cr, uid, model_name, prop):
+        cr.execute('SELECT relation,ttype FROM ir_model_fields WHERE name=%s AND model=%s', (prop, model_name))
+        res = cr.fetchone()
+        return res
 
 # ---------------------------------------------------------
 # Serialized fields

From 8fb6ff9046ab83387dc66bcfaa0aaa718dbae4fe Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Thu, 18 Sep 2008 17:00:39 +0530
Subject: [PATCH 06/26] Added city,country on partner form

bzr revid: hda@tinyerp.com-20080918113039-lsspd38e75phbi2d
---
 bin/addons/base/res/partner/partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 37f1c30031d..aabe4196ca8 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -210,8 +210,8 @@
                         <field domain="[('domain', '=', 'partner')]" name="title"/>
                         <field name="lang" select="2"/>
                         <field name="supplier" select="2"/>
-                        <field name="city" select="2" />
-	                    <field name="country" select="2" />
+                        <field name="city" select="2" invisible="1"/>
+	                    <field name="country" select="2" invisible="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">

From 43daa23bad95ece8cd69fdc10c189da7ff46c009 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Thu, 18 Sep 2008 17:50:46 +0530
Subject: [PATCH 07/26] fixed bug on relate field

bzr revid: hmo@tinyerp.com-20080918122046-qhcjmjyitq2i8rev
---
 bin/osv/fields.py | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 2065d990a02..4e148d68df7 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -667,38 +667,9 @@ class related(function):
             else:
                 res[data.id]=t_data
         return res
-
-#    def _fnct_write(self,obj, cr, uid, ids, name, value, args, context=None):
-#        print "_fnct_write>>>",ids,name,value,args
-#        if type(ids)!=type([]):
-#            ids=[ids]
-#        for data in obj.browse(cr,uid,ids):
-#            t_data=data
-#            relation=obj._name
-#            for i in range(0,len(args)-1):
-#                field_detail=self._field_get(cr,uid,relation,args[i])
-#                relation=field_detail[0]
-#                if field_detail[1]=='one2many':
-#                    if t_data[args[i]]:
-#                        t_data=t_data[args[i]][0]
-#                    else:
-#                        t_data=False
-#                        break
-#                elif field_detail[1]=='many2one':
-#                    if t_data[args[i]]:
-#                        t_data=t_data[args[i]]
-#                    else:
-#                        t_data=False
-#                        break
-#            if t_data:
-#                query="UPDATE",relation.replace('.','_'),"set",args[len(args)-1],"=",value," where id=",t_data.id
-#                print query
-#                cr.execute(query)
-##                return obj.write(cr,uid,data.id,{args[len(args)-1]:value})
-#        return True
-
+    
     def __init__(self,*arg,**args):
-        function.__init__(self,self._fnct_read, arg, self._fnct_write, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
+        function.__init__(self,self._fnct_read, arg, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
 
     def _field_get(self, cr, uid, model_name, prop):
         cr.execute('SELECT relation,ttype FROM ir_model_fields WHERE name=%s AND model=%s', (prop, model_name))

From deec1863f6c250a04537abdd6b27d76cf24a0337 Mon Sep 17 00:00:00 2001
From: Fabian Semal <fabian@tinyerp.com>
Date: Thu, 18 Sep 2008 14:31:16 +0200
Subject: [PATCH 08/26] Concert date to datetime

bzr revid: fabian@tinyerp.com-20080918123116-r5999hs4i7fe0qw4
---
 bin/osv/orm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 96f91b36ea3..e0722cbe4dc 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1441,6 +1441,12 @@ class orm(orm_template):
                                         cr.execute("UPDATE \"%s\" SET \"%s\"=temp_change_size::VARCHAR(%d)" % (self._table, k, f.size))
                                         cr.execute("ALTER TABLE \"%s\" DROP COLUMN temp_change_size" % (self._table,))
                                         cr.commit()
+                            if f_pg_type == 'date' and f._type == 'datetime':
+                                        cr.execute("ALTER TABLE \"%s\" RENAME COLUMN \"%s\" TO temp_change_type" % (self._table, k))
+                                        cr.execute("ALTER TABLE \"%s\" ADD COLUMN \"%s\" TIMESTAMP " % (self._table, k))
+                                        cr.execute("UPDATE \"%s\" SET \"%s\"=temp_change_type::TIMESTAMP" % (self._table, k))
+                                        cr.execute("ALTER TABLE \"%s\" DROP COLUMN temp_change_type" % (self._table,))
+                                        cr.commit()
                             # if the field is required and hasn't got a NOT NULL constraint
                             if f.required and f_pg_notnull == 0:
                                 # set the field to the default value if any

From 34fcda731a31de77e5d6ce2c616e52f29d9d9e30 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 18 Sep 2008 19:32:05 +0530
Subject: [PATCH 09/26] Added Groups option for report,wizard and act_window.

bzr revid: jvo@tinyerp.com-20080918140205-dod9qocp1n1u9q0b
---
 bin/addons/base/ir/ir_actions.py | 82 ++++++++++++++++++++------------
 bin/addons/base/ir/ir_ui_menu.py |  2 +-
 bin/addons/base/ir/ir_values.py  | 33 +++++++------
 bin/import_xml.rng               |  3 ++
 bin/netsvc.py                    |  4 +-
 bin/tools/convert.py             | 46 +++++++++++++++++-
 6 files changed, 119 insertions(+), 51 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index f6cffc3944a..03f79a067ce 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -148,6 +148,26 @@ class act_window(osv.osv):
     _table = 'ir_act_window'
     _sequence = 'ir_actions_id_seq'
 
+#    def search(self, cr, uid, args, offset=0, limit=2000, order=None,
+#            context=None, count=False):
+#        if context is None:
+#            context = {}
+#        ids = osv.orm.orm.search(self, cr, uid, args, offset, limit, order,
+#                context=context)
+#        if uid==1:
+#            return ids
+#        user_groups = self.pool.get('res.users').read(cr, uid, [uid])[0]['groups_id']
+#        result = []
+#        for act in self.browse(cr, uid, ids):
+#            if not len(act.groups_id):
+#                result.append(act.id)
+#                continue
+#            for g in act.groups_id:
+#                if g.id in user_groups:
+#                    result.append(act.id)
+#                    break
+#        return result
+
     def _views_get_fnc(self, cr, uid, ids, name, arg, context={}):
         res={}
         for act in self.browse(cr, uid, ids):
@@ -186,6 +206,8 @@ class act_window(osv.osv):
         'limit': fields.integer('Limit', help='Default limit for the list view'),
         'auto_refresh': fields.integer('Auto-Refresh',
             help='Add an auto-refresh on the view'),
+        'groups_id': fields.many2many('res.groups', 'ir_act_window_group_rel',
+            'act_id', 'gid', 'Groups'),
     }
     _defaults = {
         'type': lambda *a: 'ir.actions.act_window',
@@ -261,7 +283,7 @@ def model_get(self, cr, uid, context={}):
     wkf_pool = self.pool.get('workflow')
     ids = wkf_pool.search(cr, uid, [])
     osvs = wkf_pool.read(cr, uid, ids, ['osv'])
-    
+
     res = []
     mpool = self.pool.get('ir.model')
     for osv in osvs:
@@ -269,7 +291,7 @@ def model_get(self, cr, uid, context={}):
         id = mpool.search(cr, uid, [('model','=',model)])
         name = mpool.read(cr, uid, id)[0]['name']
         res.append((model, name))
-        
+
     return res
 
 class ir_model_fields(osv.osv):
@@ -285,26 +307,26 @@ class ir_model_fields(osv.osv):
             result = []
             mobj = self.pool.get('ir.model')
             id = mobj.search(cr, uid, [('model','=',rel)])
-            
+
             obj = self.pool.get('ir.model.fields')
             ids = obj.search(cr, uid, [('model_id','in',id)])
             records = obj.read(cr, uid, ids)
             for record in records:
                 id = record['id']
                 fld = field + '/' + record['name']
-                
+
                 result.append((id, fld))
             return result
-        
+
         if not args:
             args=[]
         if not context:
             context={}
             return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
-        
+
         if context.get('key') != 'server_action':
             return super(ir_model_fields, self).name_search(cr, uid, name, args, operator, context, limit)
-        
+
         result = []
         obj = self.pool.get('ir.model.fields')
         ids = obj.search(cr, uid, args)
@@ -312,7 +334,7 @@ class ir_model_fields(osv.osv):
         for record in records:
             id = record['id']
             field = record['name']
-            
+
             if record['ttype'] == 'many2one':
                 rel = record['relation']
                 res = get_fields(cr, uid, field, record['relation'])
@@ -320,16 +342,16 @@ class ir_model_fields(osv.osv):
                     result.append(rs)
 
             result.append((id, field))
-        
+
         for rs in result:
             obj.write(cr, uid, [rs[0]], {'complete_name':rs[1]})
-        
+
         iids = []
         for rs in result:
             iids.append(rs[0])
-            
+
         result = super(ir_model_fields, self).name_search(cr, uid, name, [('complete_name','ilike',name), ('id','in',iids)], operator, context, limit)
-        
+
         return result
 
 ir_model_fields()
@@ -404,35 +426,35 @@ class actions_server(osv.osv):
 """,
         'otype': lambda *a: 'copy',
     }
-    
+
     def get_field_value(self, cr, uid, action, context):
         obj_pool = self.pool.get(action.model_id.model)
         id = context.get('active_id')
         obj = obj_pool.browse(cr, uid, id)
-        
+
         fields = None
-        
+
         if '/' in action.address.complete_name:
             fields = action.address.complete_name.split('/')
         elif '.' in action.address.complete_name:
             fields = action.address.complete_name.split('.')
-            
+
         for field in fields:
             try:
                 obj = getattr(obj, field)
             except Exception,e :
                 logger.notifyChannel('Workflow', netsvc.LOG_ERROR, 'Failed to parse : %s' % (match.group()))
-        
+
         return obj
 
     def merge_message(self, cr, uid, keystr, action, context):
         logger = netsvc.Logger()
         def merge(match):
-            
+
             obj_pool = self.pool.get(action.model_id.model)
             id = context.get('active_id')
             obj = obj_pool.browse(cr, uid, id)
-        
+
             field = match.group()
             field = field.replace('[','')
             field = field.replace(']','')
@@ -444,13 +466,13 @@ class actions_server(osv.osv):
                     obj = getattr(obj, field)
                 except Exception,e :
                     logger.notifyChannel('Workflow', netsvc.LOG_ERROR, 'Failed to parse : %s' % (match.group()))
-            
+
             return str(obj)
-        
+
         com = re.compile('\[\[(.+?)\]\]')
         message = com.sub(merge, keystr)
         return message
-    
+
     #
     # Context should contains:
     #   ids : original ids
@@ -473,14 +495,14 @@ class actions_server(osv.osv):
                 exec action.code in localdict
                 if 'action' in localdict:
                     return localdict['action']
-                
+
             if action.state == 'email':
                 user = config['email_from']
                 subject = action.name
-                
+
                 address = self.get_field_value(cr, uid, str(action.message), action, context)
                 body = self.merge_message(cr, uid, action, context)
-                
+
                 if tools.email_send_attach(user, address, subject, body, debug=False) == True:
                     logger.notifyChannel('email', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address))
                 else:
@@ -492,7 +514,7 @@ class actions_server(osv.osv):
                 model = res[0]
                 id = res[1]
                 wf_service.trg_validate(uid, model, int(id), action.trigger_name, cr)
-                
+
             if action.state == 'sms':
                 #TODO: set the user and password from the system
                 # for the sms gateway user / password
@@ -513,7 +535,7 @@ class actions_server(osv.osv):
                     'cr': cr,
                     'uid': uid
                 }
-                
+
                 for act in action.child_ids:
                     code = """action = {'model':'%s','type':'%s', %s}""" % (action.model_id.model, act.type, act.usage)
                     exec code in localdict
@@ -531,7 +553,7 @@ class actions_server(osv.osv):
                     res[exp.col1.name] = expr
                 obj_pool = self.pool.get(action.model_id.model)
                 obj_pool.write(cr, uid, [context.get('active_id')], res)
-                
+
             if action.state == 'object_create':
                 res = {}
                 for exp in action.fields_lines:
@@ -542,7 +564,7 @@ class actions_server(osv.osv):
                     else:
                         expr = exp.value
                     res[exp.col1.name] = expr
-                
+
                 obj_pool = None
                 if action.state == 'object_create' and action.otype == 'new':
                     obj_pool = self.pool.get(action.srcmodel_id.model)
@@ -551,7 +573,7 @@ class actions_server(osv.osv):
                     obj_pool = self.pool.get(action.model_id.model)
                     id = context.get('active_id')
                     obj_pool.copy(cr, uid, id, res)
-                
+
         return False
 actions_server()
 
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 1133c755aa0..a76b8ec1e76 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -153,7 +153,7 @@ class ir_ui_menu(osv.osv):
                 'key2': 'tree_but_open',
                 'res_id': menu_id,
                 }, context=ctx)
-    
+
     def _get_icon_pict(self, cr, uid, ids, name, args, context):
         res = {}
         for m in self.browse(cr, uid, ids, context=context):
diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index ee864e2f225..a015071ef93 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -144,7 +144,7 @@ class ir_values(osv.osv):
                 m,res_id = m
             else:
                 res_id=False
-            
+
             where1 = ['key=%s','model=%s']
             where2 = [key,str(m)]
             where_opt = []
@@ -172,7 +172,6 @@ class ir_values(osv.osv):
 #           if not without_user:
             where_opt.append('user_id=%d' % (uid,))
 
-
             result = []
             ok = True
             while ok:
@@ -200,7 +199,7 @@ class ir_values(osv.osv):
                     'and (company_id is null or company_id = %d) '\
                 'ORDER BY user_id', (cid,))
         result = cr.fetchall()
-                        
+
         def _result_get(x, keys):
             if x[1] in keys:
                 return False
@@ -233,20 +232,20 @@ class ir_values(osv.osv):
         res = filter(bool, map(lambda x: _result_get(x, keys), list(result)))
         res2 = res[:]
         for r in res:
-            if type(r) == type([]):
-                if r[2]['type'] == 'ir.actions.report.xml' or r[2]['type'] == 'ir.actions.report.xml':
-                    print 
-                    if r[2].has_key('groups_id'):
-                        groups = r[2]['groups_id']
-                        if len(groups) > 0:
-                            group_ids = ','.join([ str(x) for x in r[2]['groups_id']])
-                            cr.execute("select count(*) from res_groups_users_rel where gid in (%s) and uid='%s'" % (group_ids, uid))
-                            gr_ids = cr.fetchall()
-                            if not gr_ids[0][0] > 0:
-                                res2.remove(r)
-                    else:
-                        #raise osv.except_osv('Error !','You have not permission to perform operation !!!')
-                        res2.remove(r)
+            if r[2]['type'] in ('ir.actions.report.xml','ir.actions.act_window','ir.actions.wizard'):
+                if r[2].has_key('groups_id'):
+                    groups = r[2]['groups_id']
+                    if len(groups) > 0:
+                        group_ids = ','.join([ str(x) for x in r[2]['groups_id']])
+                        cr.execute("select count(*) from res_groups_users_rel where gid in (%s) and uid='%s'" % (group_ids, uid))
+                        gr_ids = cr.fetchall()
+                        if not gr_ids[0][0] > 0:
+                            res2.remove(r)
+                        if r[1]=='Menuitem' and not res2:
+                              raise osv.except_osv('Error !','You do not have the permission to perform this operation !!!')
+#                else:
+#                    #raise osv.except_osv('Error !','You have not permission to perform operation !!!')
+#                    res2.remove(r)
         return res2
 ir_values()
 
diff --git a/bin/import_xml.rng b/bin/import_xml.rng
index dd4ca044f80..91b3a9554e5 100644
--- a/bin/import_xml.rng
+++ b/bin/import_xml.rng
@@ -86,6 +86,7 @@
             <rng:optional><rng:attribute name="keyword" /></rng:optional>
             <rng:optional><rng:attribute name="multi" /></rng:optional>
             <rng:optional><rng:attribute name="client_action_multi" /></rng:optional>
+            <rng:optional> <rng:attribute name="groups"/> </rng:optional>
         </rng:element>
     </rng:define>
 
@@ -104,6 +105,7 @@
             <rng:optional> <rng:attribute name="auto" /> </rng:optional>
             <rng:optional> <rng:attribute name="header" /> </rng:optional>
             <rng:optional> <rng:attribute name="attachment" /> </rng:optional>
+            <rng:optional> <rng:attribute name="groups"/> </rng:optional>
             <rng:empty />
         </rng:element>
     </rng:define>
@@ -178,6 +180,7 @@
             <rng:optional> <rng:attribute name="view_mode"/> </rng:optional>
             <rng:optional> <rng:attribute name="multi"/> </rng:optional>
             <rng:optional> <rng:attribute name="target"/> </rng:optional>
+            <rng:optional> <rng:attribute name="groups"/> </rng:optional>
             <rng:empty />
         </rng:element>
     </rng:define>
diff --git a/bin/netsvc.py b/bin/netsvc.py
index 0e9ead733f7..e67fcea9c58 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -160,7 +160,7 @@ def init_logger():
         logf = config['logfile']
         # test if the directories exist, else create them
         try:
-            handler = logging.handlers.TimedRotatingFileHandler(logf,'D',1,30) 
+            handler = logging.handlers.TimedRotatingFileHandler(logf,'D',1,30)
         except:
             sys.stderr.write("ERROR: couldn't create the logfile directory\n")
             handler = logging.StreamHandler(sys.stdout)
@@ -185,7 +185,7 @@ def init_logger():
         colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', None, 'default']
         foreground = lambda f: 30 + colors.index(f)
         background = lambda f: 40 + colors.index(f)
-        
+
         mapping = {
             'DEBUG': ('blue', 'default'),
             'INFO': ('green', 'default'),
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index c28bd57fe02..0b073127420 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -230,7 +230,7 @@ class xml_import(object):
             assert '.' not in id, """The ID reference "%s" must contains
 maximum one dot. They are used to refer to other modules ID, in the
 form: module.record_id""" % (xml_id,)
-            if module != self.module: 
+            if module != self.module:
                 modcnt = self.pool.get('ir.module.module').search_count(self.cr, self.uid, ['&', ('name', '=', module), ('state', 'in', ['installed'])])
                 assert modcnt == 1, """The ID "%s" refer to an uninstalled module""" % (xml_id,)
 
@@ -269,6 +269,20 @@ form: module.record_id""" % (xml_id,)
         res['multi'] = rec.hasAttribute('multi') and  eval(rec.getAttribute('multi'))
         xml_id = rec.getAttribute('id').encode('utf8')
         self._test_xml_id(xml_id)
+
+        if rec.hasAttribute('groups'):
+            g_names = rec.getAttribute('groups').split(',')
+            groups_value = []
+            groups_obj = self.pool.get('res.groups')
+            for group in g_names:
+                if group.startswith('-'):
+                    group_id = self.id_get(cr, 'res.groups', group[1:])
+                    groups_value.append((3, group_id))
+                else:
+                    group_id = self.id_get(cr, 'res.groups', group)
+                    groups_value.append((4, group_id))
+            res['groups_id'] = groups_value
+
         id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.report.xml", self.module, res, xml_id, mode=self.mode)
         self.idref[xml_id] = int(id)
         if not rec.hasAttribute('menu') or eval(rec.getAttribute('menu')):
@@ -296,6 +310,19 @@ form: module.record_id""" % (xml_id,)
         multi = rec.hasAttribute('multi') and  eval(rec.getAttribute('multi'))
         res = {'name': string, 'wiz_name': name, 'multi':multi}
 
+        if rec.hasAttribute('groups'):
+            g_names = rec.getAttribute('groups').split(',')
+            groups_value = []
+            groups_obj = self.pool.get('res.groups')
+            for group in g_names:
+                if group.startswith('-'):
+                    group_id = self.id_get(cr, 'res.groups', group[1:])
+                    groups_value.append((3, group_id))
+                else:
+                    group_id = self.id_get(cr, 'res.groups', group)
+                    groups_value.append((4, group_id))
+            res['groups_id'] = groups_value
+
         id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.wizard", self.module, res, xml_id, mode=self.mode)
         self.idref[xml_id] = int(id)
         # ir_set
@@ -347,6 +374,7 @@ form: module.record_id""" % (xml_id,)
         limit = rec.hasAttribute('limit') and rec.getAttribute('limit').encode('utf-8')
         auto_refresh = rec.hasAttribute('auto_refresh') \
                 and rec.getAttribute('auto_refresh').encode('utf-8')
+#        groups_id = rec.hasAttribute('groups') and rec.getAttribute('groups').encode('utf-8')
 
         res = {
             'name': name,
@@ -361,7 +389,22 @@ form: module.record_id""" % (xml_id,)
             'usage': usage,
             'limit': limit,
             'auto_refresh': auto_refresh,
+#            'groups_id':groups_id,
         }
+
+        if rec.hasAttribute('groups'):
+            g_names = rec.getAttribute('groups').split(',')
+            groups_value = []
+            groups_obj = self.pool.get('res.groups')
+            for group in g_names:
+                if group.startswith('-'):
+                    group_id = self.id_get(cr, 'res.groups', group[1:])
+                    groups_value.append((3, group_id))
+                else:
+                    group_id = self.id_get(cr, 'res.groups', group)
+                    groups_value.append((4, group_id))
+            res['groups_id'] = groups_value
+
         if rec.hasAttribute('target'):
             res['target'] = rec.getAttribute('target')
         id = self.pool.get('ir.model.data')._update(cr, self.uid, 'ir.actions.act_window', self.module, res, xml_id, mode=self.mode)
@@ -493,6 +536,7 @@ form: module.record_id""" % (xml_id,)
             values['sequence'] = int(rec.getAttribute('sequence'))
         if rec.hasAttribute('icon'):
             values['icon'] = str(rec.getAttribute('icon'))
+
         if rec.hasAttribute('groups'):
             g_names = rec.getAttribute('groups').split(',')
             groups_value = []

From c8a12237d4c1be078f1c4501aad6acc9fa71156c Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Thu, 18 Sep 2008 21:58:21 +0530
Subject: [PATCH 10/26] country name in English

bzr revid: hmo@tinyerp.com-20080918162821-l9vmgj8jgibvsz26
---
 bin/addons/base/base_data.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index b7d1f9fa5e0..9073be04ed5 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -90,7 +90,7 @@
             <field name="code">aw</field>
         </record>
         <record id="az" model="res.country">
-            <field name="name">Azerbaidjan</field>
+            <field name="name">Azerbaijan</field>
             <field name="code">az</field>
         </record>
         <record id="ba" model="res.country">
@@ -190,7 +190,7 @@
             <field name="code">cg</field>
         </record>
         <record id="ch" model="res.country">
-            <field name="name">Suisse</field>
+            <field name="name">Switzerland</field>
             <field name="code">ch</field>
         </record>
         <record id="ci" model="res.country">
@@ -858,7 +858,7 @@
             <field name="code">th</field>
         </record>
         <record id="tj" model="res.country">
-            <field name="name">Tadjikistan</field>
+            <field name="name">Tajikistan</field>
             <field name="code">tj</field>
         </record>
         <record id="tk" model="res.country">

From 27a6756dac2c233b788efe93b14145f1c376cbd0 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Fri, 19 Sep 2008 11:48:16 +0530
Subject: [PATCH 11/26] Bugfix for record type in ir_values

bzr revid: jvo@tinyerp.com-20080919061816-5t9wey0562xc0lsn
---
 bin/addons/base/ir/ir_values.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index a015071ef93..0c6d13a0036 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -232,20 +232,21 @@ class ir_values(osv.osv):
         res = filter(bool, map(lambda x: _result_get(x, keys), list(result)))
         res2 = res[:]
         for r in res:
-            if r[2]['type'] in ('ir.actions.report.xml','ir.actions.act_window','ir.actions.wizard'):
-                if r[2].has_key('groups_id'):
-                    groups = r[2]['groups_id']
-                    if len(groups) > 0:
-                        group_ids = ','.join([ str(x) for x in r[2]['groups_id']])
-                        cr.execute("select count(*) from res_groups_users_rel where gid in (%s) and uid='%s'" % (group_ids, uid))
-                        gr_ids = cr.fetchall()
-                        if not gr_ids[0][0] > 0:
-                            res2.remove(r)
-                        if r[1]=='Menuitem' and not res2:
-                              raise osv.except_osv('Error !','You do not have the permission to perform this operation !!!')
-#                else:
-#                    #raise osv.except_osv('Error !','You have not permission to perform operation !!!')
-#                    res2.remove(r)
+            if type(r[2])==type({}) and 'type' in r[2]:
+                if r[2]['type'] in ('ir.actions.report.xml','ir.actions.act_window','ir.actions.wizard'):
+                    if r[2].has_key('groups_id'):
+                        groups = r[2]['groups_id']
+                        if len(groups) > 0:
+                            group_ids = ','.join([ str(x) for x in r[2]['groups_id']])
+                            cr.execute("select count(*) from res_groups_users_rel where gid in (%s) and uid='%s'" % (group_ids, uid))
+                            gr_ids = cr.fetchall()
+                            if not gr_ids[0][0] > 0:
+                                res2.remove(r)
+                            if r[1]=='Menuitem' and not res2:
+                                  raise osv.except_osv('Error !','You do not have the permission to perform this operation !!!')
+    #                else:
+    #                    #raise osv.except_osv('Error !','You have not permission to perform operation !!!')
+    #                    res2.remove(r)
         return res2
 ir_values()
 

From efd46a5e9d9cc327ae540cf4eae8acd1d7f986f6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 19 Sep 2008 08:30:20 +0200
Subject: [PATCH 12/26] fixedrelated

bzr revid: fp@tinyerp.com-20080919063020-bgvwhya3r7xs85ct
---
 bin/addons/base/res/partner/partner.py |  2 +-
 bin/osv/fields.py                      | 46 ++++++++++++++------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 87df45c300c..4183eccaf2f 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -154,7 +154,7 @@ class res_partner(osv.osv):
         'customer': fields.boolean('Customer'),
         'supplier': fields.boolean('Supplier'),
         'city':fields.related('address','city',type='char', string='City'),
-        'country':fields.related('address','country_id','name',type='char', string='Country'),
+        'country':fields.related('address','country_id',type='many2one', relation='res.country', string='Country'),
     }
     _defaults = {
         'active': lambda *a: 1,
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 4e148d68df7..60586e5e5af 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -638,39 +638,41 @@ class function(_column):
 class related(function):
 
     def _fnct_search(self, cr, uid, ids, obj=None, name=None, context=None):
-        print "_fnct_search >>>",ids,obj,name
-        return self._fnct_search(obj, cr, uid, obj, name, args)
+        raise 'Not Implemented Yet'
+
+    def _fnct_write(self,obj,cr, uid, ids, field_name, args, context=None):
+        raise 'Not Implemented Yet'
 
     def _fnct_read(self,obj,cr, uid, ids, field_name, args, context=None):
+        if not ids: return {}
         relation=obj._name
         res={}
-        for data in obj.browse(cr,uid,ids):
+        objlst = obj.browse(cr,uid,ids)
+        for data in objlst:
             t_data=data
             relation=obj._name
-            for i in range(0,len(args)-1):
-                field_detail=self._field_get(cr,uid,relation,args[i])
+            for i in range(len(self.arg)):
+                field_detail=self._field_get(cr,uid,relation,self.arg[i])
                 relation=field_detail[0]
-                if field_detail[1]=='one2many':
-                    if t_data[args[i]]:
-                        t_data=t_data[args[i]][0]
-                    else:
-                        t_data=False
-                        break
-                elif field_detail[1]=='many2one':
-                    if t_data[args[i]]:
-                        t_data=t_data[args[i]]
-                    else:
-                        t_data=False
-                        break
-            if t_data:
-                res[data.id]=t_data[args[len(args)-1]]
+                if not t_data[self.arg[i]]:
+                    t_data = False
+                    break
+                if field_detail[1] in ('one2many','many2many'):
+                    t_data=t_data[self.arg[i]][0]
+                else:
+                    t_data=t_data[self.arg[i]]
+            if type(t_data) == type(objlst[0]):
+                res[data.id]=t_data.id
             else:
                 res[data.id]=t_data
         return res
-    
-    def __init__(self,*arg,**args):
-        function.__init__(self,self._fnct_read, arg, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
 
+    def __init__(self,*arg,**args):
+        print arg
+        self.arg = arg
+        super(related, self).__init__(self._fnct_read, arg, fnct_inf=self._fnct_write, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
+
+    # TODO: call field_get on the object, not in the DB
     def _field_get(self, cr, uid, model_name, prop):
         cr.execute('SELECT relation,ttype FROM ir_model_fields WHERE name=%s AND model=%s', (prop, model_name))
         res = cr.fetchone()

From 5c1949e71aa76412cc42f5747878d3c65c1dcf4c Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Fri, 19 Sep 2008 12:58:20 +0530
Subject: [PATCH 13/26] fixed bug : configuration wizard for Select Extended
 View

bzr revid: hmo@tinyerp.com-20080919072820-9kvxnse755unyvu3
---
 bin/addons/base/res/res_user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 95397a85a02..4a5e7d9e81c 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -262,9 +262,9 @@ class res_config_view(osv.osv_memory):
         users_obj = self.pool.get('res.users')
         group_obj=self.pool.get('res.groups')
         if 'view' in res and res['view'] and res['view']=='extended':
-            group_ids=group_obj.search(cr,uid,[('name','=','Extended View')])
+            group_ids=group_obj.search(cr,uid,[('name','ilike','Extended')])
             if group_ids and len(group_ids):
-                users_obj.write(cr, uid, [3],{
+                users_obj.write(cr, uid, [uid],{
                                 'groups_id':[(4,group_ids[0])]
                             }, context=context)
         return {

From 6346d5d49d3ff8dbbfe21bd28dfecc821e980825 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Fri, 19 Sep 2008 14:13:43 +0530
Subject: [PATCH 14/26] Fixed gray node calculation.

bzr revid: ame@tinyerp.com-20080919084343-l67hk7qth109ri2f
---
 addons/process/process.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index ac85fc8a15b..9044a9d82a5 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -98,11 +98,11 @@ class process_process(osv.osv):
                 
             if not data['active']:
                 try:
-                    gray = False
+                    gray = True
                     for cond in node.condition_ids:
                         if cond.model_id and cond.model_id.model == res_model:
-                            gray = gray or eval(cond.model_states, expr_context)
-                    data['gray'] = gray
+                            gray = gray and eval(cond.model_states, expr_context)
+                    data['gray'] = not gray
                 except:
                     pass
 

From 368ed24bbcea2942fac73ea6085251d93420bd78 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Fri, 19 Sep 2008 16:10:52 +0530
Subject: [PATCH 15/26] Added views for process_node.

bzr revid: ame@tinyerp.com-20080919104052-sxaofldbrec948e8
---
 addons/process/process_view.xml | 109 +++++++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 1 deletion(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 46f2dec71cd..d9a4d93799f 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -90,7 +90,7 @@
                                         <field name="note" nolabel="1" colspan="4"/>
                                     </page>
                                 </notebook>
-                            </form>                            
+                            </form>
                         </field>
                     </page>
                     <page string="Extra Information">
@@ -124,6 +124,113 @@
         action="action_process_form"
         parent="menu_process"/>
 
+    <!-- Nodes -->
+    <record model="ir.ui.view" id="view_process_node_tree">
+        <field name="name">process.node.tree</field>
+        <field name="model">process.node</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Process Nodes">
+                <field name="name"/>      
+                <field name="process_id" select="1"/>          
+                <field name="model_id" select="1"/>
+                <field name="kind" select="1"/>
+                <field name="flow_start"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_node_form">
+        <field name="name">process.node.form</field>
+        <field name="model">process.node</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Process Node">
+                <group colspan="4" string="Details">
+                    <field name="name" select="1"/>
+                    <field name="flow_start"/>                                    
+                    <field name="process_id"/>
+                    <newline/>                                    
+                    <field name="model_id" select="1"/>
+                    <field name="menu_id" select="2"/>                                    
+                    <newline/>
+                    <field name="kind" select="1"/>
+                    <field name="model_states"/>
+                </group>
+                <notebook colspan="4">
+                    <page string="Outgoing Transitions">
+                        <field name="transition_out" colspan="4" nolabel="1">
+                            <tree string="Transitions">
+                                <field name="name"/>
+                                <field name="target_node_id"/>
+                            </tree>
+                            <form string="Transition">
+                                <group colspan="4" string="Details">
+                                    <field name="name"/>
+                                    <newline/>
+                                    <field name="target_node_id"/>
+                                </group>
+                                <notebook colspan="4">
+                                    <page string="Buttons">
+                                        <field name="action_ids" colspan="4" nolabel="1">
+                                            <tree string="Actions">
+                                                <field name="name"/>
+                                                <field name="state"/>
+                                                <field name="action"/>
+                                            </tree>
+                                            <form string="Actions">
+                                                <field name="name" colspan="4"/>
+                                                <newline/>
+                                                <field name="state"/>
+                                                <field name="action"/>
+                                            </form>               
+                                        </field>
+                                    </page>
+                                    <page string="Roles Required">
+                                        <field name="transition_ids" colspan="4" nolabel="1"/>
+                                    </page>
+                                    <page string="Extra Information">
+                                        <field name="note" colspan="4" nolabel="1"/>
+                                    </page>
+                                </notebook>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Conditions">
+                        <field name="condition_ids" nolabel="1" colspan="4">
+                            <tree string="Conditions">
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <field name="model_states"/>
+                            </tree>
+                            <form string="Condition">
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <newline/>
+                                <field name="model_states" colspan="4"/>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Extra Information">
+                        <field name="note" nolabel="1" colspan="4"/>
+                    </page>
+                </notebook>
+            </form>                                
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_process_node_form">
+        <field name="name">Process Nodes</field>
+        <field name="res_model">process.node</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_process_node_form"
+        action="action_process_node_form"
+        parent="menu_process"/>
+
     <!-- Transitions -->
 
     <record model="ir.ui.view" id="view_process_transition_tree">

From 7ee77ad4da7671e53b5b6c7b0c39c8dfea12dcf1 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Fri, 19 Sep 2008 17:14:13 +0530
Subject: [PATCH 16/26] ** added menu data files for each sections which will
 be loaded on configuration wizard. ** data and demo files are loaded on
 installation. ** added vertical view files for each sections which will be
 loaded on configuration wizard but currently it is not implemented bz
 inheritance is not implement on osv.memory wizard. and need to inherit
 configuration wizard.

bzr revid: hmo@tinyerp.com-20080919114413-pxsyxzx8dpnoxzjy
---
 addons/crm_configuration/__terp__.py          |  27 +-
 addons/crm_configuration/crm_bugs_data.xml    | 328 ++-----
 addons/crm_configuration/crm_bugs_demo.xml    | 922 +++++-------------
 addons/crm_configuration/crm_bugs_menu.xml    | 650 ++++++++++++
 addons/crm_configuration/crm_config.py        |  31 +-
 addons/crm_configuration/crm_fund_data.xml    | 196 +---
 addons/crm_configuration/crm_fund_demo.xml    | 385 +++-----
 addons/crm_configuration/crm_fund_menu.xml    | 198 ++++
 addons/crm_configuration/crm_jobs_data.xml    | 200 ++--
 addons/crm_configuration/crm_jobs_demo.xml    | 530 +++-------
 addons/crm_configuration/crm_jobs_menu.xml    | 346 +++++++
 addons/crm_configuration/crm_lead_data.xml    | 238 ++---
 addons/crm_configuration/crm_lead_demo.xml    | 693 +++----------
 addons/crm_configuration/crm_lead_menu.xml    | 460 +++++++++
 addons/crm_configuration/crm_meeting_data.xml | 161 ++-
 addons/crm_configuration/crm_meeting_demo.xml | 386 ++------
 addons/crm_configuration/crm_meeting_menu.xml | 229 +++++
 .../crm_opportunity_data.xml                  | 170 ++--
 .../crm_opportunity_demo.xml                  | 409 ++------
 .../crm_opportunity_menu.xml                  | 244 +++++
 addons/crm_vertical/__init__.py               |   2 +-
 addons/crm_vertical/__terp__.py               |   2 +-
 .../crm_vertical/crm_bugs_vertical_view.xml   |  12 +
 .../crm_vertical/crm_fund_vertical_view.xml   |   9 +
 .../crm_vertical/crm_jobs_vertical_view.xml   |  17 +
 .../crm_vertical/crm_lead_vertical_view.xml   |  18 +
 .../crm_meeting_vertical_view.xml             |  17 +
 .../crm_opportunity_vertical_view.xml         |  17 +
 addons/crm_vertical/crm_vertical.py           |  54 +
 addons/crm_vertical/crm_vertical_view.xml     |  30 -
 30 files changed, 3591 insertions(+), 3390 deletions(-)
 create mode 100644 addons/crm_configuration/crm_bugs_menu.xml
 create mode 100644 addons/crm_configuration/crm_fund_menu.xml
 create mode 100644 addons/crm_configuration/crm_jobs_menu.xml
 create mode 100644 addons/crm_configuration/crm_lead_menu.xml
 create mode 100644 addons/crm_configuration/crm_meeting_menu.xml
 create mode 100644 addons/crm_configuration/crm_opportunity_menu.xml
 create mode 100644 addons/crm_vertical/crm_bugs_vertical_view.xml
 create mode 100644 addons/crm_vertical/crm_fund_vertical_view.xml
 create mode 100644 addons/crm_vertical/crm_jobs_vertical_view.xml
 create mode 100644 addons/crm_vertical/crm_lead_vertical_view.xml
 create mode 100644 addons/crm_vertical/crm_meeting_vertical_view.xml
 create mode 100644 addons/crm_vertical/crm_opportunity_vertical_view.xml
 create mode 100644 addons/crm_vertical/crm_vertical.py
 delete mode 100644 addons/crm_vertical/crm_vertical_view.xml

diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 4b61410cd43..dd5ffb26fdc 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -17,22 +17,25 @@
                     "crm_lead_view.xml",
                     "crm_meeting_view.xml",
                     "crm_opportunity_view.xml",
-                    "crm_fund_view.xml"
+                    "crm_fund_view.xml",
+                    "crm_report_view.xml"
                  ],
     "demo_xml" : [
-#                    "crm_bugs_data.xml",
-#                    "crm_jobs_data.xml",
-#                    "crm_meeting_data.xml",
-#                    "crm_lead_data.xml",
-#                    "crm_opportunity_data.xml"
+                    "crm_bugs_demo.xml",
+                    "crm_fund_demo.xml",
+                    "crm_jobs_demo.xml",
+                    "crm_meeting_demo.xml",
+                    "crm_lead_demo.xml",
+                    "crm_opportunity_demo.xml"
                   ],
     "update_xml" : [
-#                    "crm_bugs_demo.xml",
-#                    "crm_jobs_demo.xml",
-#                    "crm_lead_demo.xml",
-#                    "crm_meeting_demo.xml",
-#                    "crm_opportunity_demo.xml",
-#                    "crm_report_view.xml"
+                    "crm_bugs_data.xml",  
+                    "crm_fund_data.xml",                  
+                    "crm_jobs_data.xml",
+                    "crm_meeting_data.xml",
+                    "crm_lead_data.xml",
+                    "crm_opportunity_data.xml",
+                    
                     ],
     "active": False,
     "installable": True
diff --git a/addons/crm_configuration/crm_bugs_data.xml b/addons/crm_configuration/crm_bugs_data.xml
index c618447703a..bc03ac1f4b1 100644
--- a/addons/crm_configuration/crm_bugs_data.xml
+++ b/addons/crm_configuration/crm_bugs_data.xml
@@ -1,276 +1,78 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
+	<!--
+	Case Sections
 	-->
-<!--For Bug Tracking-->
-	<record id="crm_case_buginaccountsmodule0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_8"/>
-		<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;5&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage1"/>
-		<field eval="15.0" name="duration"/>
-		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
-		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
-	</record>
-	<record id="crm_case_log_takecorrectiveactions0" model="crm.case.log">
-		<field eval="time.strftime('%Y-%m-08')" name="date"/>
-		<field name="case_id" ref="crm_case_buginaccountsmodule0"/>
-		<field name="som" ref="base.som_normal"/>
-		<field eval="&quot;Take corrective actions&quot;" name="name"/>
-		<field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
+	<record model="crm.case.section" id="section_support">
+		<field name="name">Bug Tracking</field>
+		<field name="code">BugSup</field>
 	</record>
 
-	<record id="crm_case_programnotgivingproperoutput0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_tang"/>
-		<field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category2"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_asus"/>
-		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="3.5" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage2"/>
-		<field eval="&quot;Program not giving proper output&quot;" name="name"/>
+	<!--
+	Case Categories
+	-->
+         <!--	For Bugs	-->
+         
+	<record model="crm.case.categ" id="categ1">
+		<field name="name">Bugs</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.categ" id="categ2">
+		<field name="name">Patches</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.categ" id="categ3">
+		<field name="name">Feature Requests</field>
+		<field name="section_id" ref="section_support"/>
 	</record>
 
-	<record id="crm_case_outputincorrect0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_9"/>
-		<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_2"/>
-		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="2.3" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage3"/>
-		<field eval="&quot;Output incorrect&quot;" name="name"/>
+	<!--
+	Case Category2
+	-->
+         <!--	For Bugs	-->
+	<record model="crm.case.category2" id="category1">
+		<field name="name">Version 4.2</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.category2" id="category2">
+		<field name="name">Version 4.4</field>
+		<field name="section_id" ref="section_support"/>
 	</record>
 
-	<record id="crm_case_problemloadingpage0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_13"/>
-		<field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_14"/>
-		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="4.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage4"/>
-		<field eval="&quot;Problem loading page&quot;" name="name"/>
-	</record>
+	<!--
+	Case Stage
+	-->
+         <!--	For Bugs	-->
+         
+	<record model="crm.case.stage" id="stage1">
+		<field name="name">Accepted as Bug</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage2">
+		<field name="name">Fixed</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage3">
+		<field name="name">Won't fix</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage4">
+		<field name="name">Invalid</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage5">
+		<field name="name">Awaiting Response</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage6">
+		<field name="name">Works For Me</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage7">
+		<field name="name">Future</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
 
-	<record id="crm_case_pagenotfound0" model="crm.case">
-		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
-		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="1.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage5"/>
-		<field eval="&quot;Page not Found&quot;" name="name"/>
-	</record>
-
-	<record id="crm_case_programmingerror0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_10"/>
-		<field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category2"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_5"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="4.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage6"/>
-		<field eval="&quot;Programming Error&quot;" name="name"/>
-	</record>
-
-	<record id="crm_case_logicalerrorinprogram0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_6"/>
-		<field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_6"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="2.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage7"/>
-		<field eval="&quot;Logical Error in Program&quot;" name="name"/>
-	</record>
-
-	<record id="crm_case_constrainterror0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_6"/>
-		<field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_6"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="7.3" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ1"/>
-		<field name="stage_id" ref="crm_configuration.stage5"/>
-		<field eval="&quot;Constraint Error&quot;" name="name"/>
-	</record>
-	
-	<record id="crm_case_errorinprogram0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_10"/>
-		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category2"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_5"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="1.3" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ2"/>
-		<field name="stage_id" ref="crm_configuration.stage5"/>
-		<field eval="&quot;Error in Program&quot;" name="name"/>
-	</record>
-	
-	<record id="crm_case_patcheserrorinprogram0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_9"/>
-		<field eval="time.strftime('%Y-%m-30  16:30:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category2"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_2"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="13.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ2"/>
-		<field name="stage_id" ref="crm_configuration.stage5"/>
-		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
-	</record>
-	
-	<record id="crm_case_newfeaturestobeadded0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
-		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_maxtor"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="3.2" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ3"/>
-		<field name="stage_id" ref="crm_configuration.stage1"/>
-		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
-	</record>
-	
-	<record id="crm_case_addmenustothemodule0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_1"/>
-		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category2"/>
-		<field eval="&quot;1&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_9"/>
-		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="3.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ3"/>
-		<field name="stage_id" ref="crm_configuration.stage2"/>
-		<field eval="&quot;Add menus to the module&quot;" name="name"/>
-		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-	</record>
-	
-	<record id="crm_case_includeattendancesheetinproject0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_2"/>
-		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_10"/>
-		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="2.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ3"/>
-		<field name="stage_id" ref="crm_configuration.stage3"/>
-		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
-		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
-	</record>
-	
-	<record id="crm_case_createnewobject0" model="crm.case">
-		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
-		<field name="partner_address_id" ref="base.res_partner_address_6"/>
-		<field name="som" ref="base.som_happy"/>
-		<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_6"/>
-		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="2.45" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ3"/>
-		<field name="stage_id" ref="crm_configuration.stage5"/>
-		<field eval="&quot;Create new object&quot;" name="name"/>
-	</record>
-	
-	<record id="crm_case_improvereportsinhrms0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_15"/>
-		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="partner_id" ref="base.res_partner_11"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="15.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ3"/>
-		<field name="stage_id" ref="crm_configuration.stage7"/>
-		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
-	</record>
-	
-	<record id="crm_case_improvereportsinpms0" model="crm.case">
-		<field name="partner_address_id" ref="base.res_partner_address_15"/>
-		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category1"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_11"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support"/>
-		<field eval="1" name="active"/>
-		<field eval="06.15" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ3"/>
-		<field name="stage_id" ref="crm_configuration.stage5"/>
-		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
-	</record>
-	
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_bugs_demo.xml b/addons/crm_configuration/crm_bugs_demo.xml
index 66467393e66..c618447703a 100644
--- a/addons/crm_configuration/crm_bugs_demo.xml
+++ b/addons/crm_configuration/crm_bugs_demo.xml
@@ -1,694 +1,276 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-
-	<!--
-	Case Sections
-	-->
-	<record model="crm.case.section" id="section_support">
-		<field name="name">Bug Tracking</field>
-		<field name="code">BugSup</field>
-	</record>
-
-	<!--
-	Case Categories
-	-->
-         <!--	For Bugs	-->
-         
-	<record model="crm.case.categ" id="categ1">
-		<field name="name">Bugs</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-	<record model="crm.case.categ" id="categ2">
-		<field name="name">Patches</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-	<record model="crm.case.categ" id="categ3">
-		<field name="name">Feature Requests</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-
-	<!--
-	Case Category2
-	-->
-         <!--	For Bugs	-->
-	<record model="crm.case.category2" id="category1">
-		<field name="name">Version 4.2</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.category2" id="category2">
-		<field name="name">Version 4.4</field>
-		<field name="section_id" ref="section_support"/>
-	</record>
-
-	<!--
-	Case Stage
-	-->
-         <!--	For Bugs	-->
-         
-	<record model="crm.case.stage" id="stage1">
-		<field name="name">Accepted as Bug</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.stage" id="stage2">
-		<field name="name">Fixed</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.stage" id="stage3">
-		<field name="name">Won't fix</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.stage" id="stage4">
-		<field name="name">Invalid</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.stage" id="stage5">
-		<field name="name">Awaiting Response</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.stage" id="stage6">
-		<field name="name">Works For Me</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	<record model="crm.case.stage" id="stage7">
-		<field name="name">Future</field>
-		<field name="section_id" ref="section_support"/>
-	</record>	
-	
-	######################## BUG TRACKING (menu) ###########################
 	<!-- 
-		ALL BUGS
+		((((((((((( Demo Cases ))))))))))) 
 	-->
-	<record model="ir.actions.act_window" id="crm_case_categ_act0">
-		<field name="name">All Bugs</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+<!--For Bug Tracking-->
+	<record id="crm_case_buginaccountsmodule0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_8"/>
+		<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;5&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage1"/>
+		<field eval="15.0" name="duration"/>
+		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
+		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_act0"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_categ_act0"/>
+	<record id="crm_case_log_takecorrectiveactions0" model="crm.case.log">
+		<field eval="time.strftime('%Y-%m-08')" name="date"/>
+		<field name="case_id" ref="crm_case_buginaccountsmodule0"/>
+		<field name="som" ref="base.som_normal"/>
+		<field eval="&quot;Take corrective actions&quot;" name="name"/>
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_act0"/>
-	</record>
-	<menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="crm.menu_crm"/>
-	<menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ_act_new">
-		<field name="name">New Bug</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form,tree</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+	<record id="crm_case_programnotgivingproperoutput0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_tang"/>
+		<field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="3.5" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage2"/>
+		<field eval="&quot;Program not giving proper output&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view1_new">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_categ_act_new"/>
+
+	<record id="crm_case_outputincorrect0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_9"/>
+		<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_2"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.3" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage3"/>
+		<field eval="&quot;Output incorrect&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_problemloadingpage0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_13"/>
+		<field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_14"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage4"/>
+		<field eval="&quot;Problem loading page&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_pagenotfound0" model="crm.case">
+		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="1.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Page not Found&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_programmingerror0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_10"/>
+		<field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category2"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="4.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage6"/>
+		<field eval="&quot;Programming Error&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_logicalerrorinprogram0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage7"/>
+		<field eval="&quot;Logical Error in Program&quot;" name="name"/>
+	</record>
+
+	<record id="crm_case_constrainterror0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="7.3" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ1"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Constraint Error&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view1_new">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_categ_act_new"/>
-	</record>	
-	<menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_categ_act0"/>
 	
-	<record model="ir.actions.act_window" id="crm_case_category_act_all1">
-		<field name="name">Bugs Waiting Approval</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'draft\')]'"/>
+	<record id="crm_case_errorinprogram0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_10"/>
+		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category2"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="1.3" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ2"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Error in Program&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all1"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_all2">
-		<field name="name">Open Bugs</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all2"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_all3">
-		<field name="name">Bugs With Patches Waiting Approval</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all3"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_all4">
-		<field name="name">Bugs Not Fixed</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all4">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all4">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all4"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_all5">
-		<field name="name">Pending Bugs</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all5">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all5">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all5">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all5"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_all6">
-		<field name="name">Planned For Future Release</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage7)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all6">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all6">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all6">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all6"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5"/>
-
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_all7">
-		<field name="name">Waiting For Reporter Response</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all7">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all7"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all7">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all7"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all7">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all7"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5"/>
-
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_all8">
-		<field name="name">Old Bugs</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all8">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all8"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all8">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all8"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all8">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_all8"/>
-	</record>
-	<menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0"/>	<!-- 
-		MY BUGS
-	-->
-	<record model="ir.actions.act_window" id="crm_case_category_act_my0">
-		<field name="name">My Bugs</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my0"/>
-	</record>
-	<menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0"/>
 	
-	<record model="ir.actions.act_window" id="crm_case_category_act_my1">
-		<field name="name">My Open Bugs</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	<record id="crm_case_patcheserrorinprogram0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_9"/>
+		<field eval="time.strftime('%Y-%m-30  16:30:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category2"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_2"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="13.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ2"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my1"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_my2">
-		<field name="name">My Bugs With Patches</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_my3">
-		<field name="name">My Bugs Not Fixed</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_my3"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3"/>
-
-	<!-- 
-		ALL FEATURE REQUESTS 
-	-->
-	<record model="ir.actions.act_window" id="crm_case_category_act_f0">
-		<field name="name">All Feature Request</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f0"/>
-	</record>
-	<menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>
 	
-	<record model="ir.actions.act_window" id="crm_case_category_act_f1">
-		<field name="name">New Feature Request</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form,tree</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
+	<record id="crm_case_newfeaturestobeadded0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
+		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_maxtor"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="3.2" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage1"/>
+		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f1"/>
+	
+	<record id="crm_case_addmenustothemodule0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_1"/>
+		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category2"/>
+		<field eval="&quot;1&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_9"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="3.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage2"/>
+		<field eval="&quot;Add menus to the module&quot;" name="name"/>
+		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f1"/>
+	
+	<record id="crm_case_includeattendancesheetinproject0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_2"/>
+		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_10"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage3"/>
+		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
+		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 	</record>
-	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1"/>
-
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_f2">
-		<field name="name">Feature Requests Waiting Approval</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'=\','+str(categ3)+'), (\'state\',\'=\',\'draft\')]'"/>
+	
+	<record id="crm_case_createnewobject0" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
+		<field name="partner_address_id" ref="base.res_partner_address_6"/>
+		<field name="som" ref="base.som_happy"/>
+		<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_6"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="2.45" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Create new object&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f2"/>
+	
+	<record id="crm_case_improvereportsinhrms0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_15"/>
+		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="15.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage7"/>
+		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f2"/>
+	
+	<record id="crm_case_improvereportsinpms0" model="crm.case">
+		<field name="partner_address_id" ref="base.res_partner_address_15"/>
+		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category1"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support"/>
+		<field eval="1" name="active"/>
+		<field eval="06.15" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ3"/>
+		<field name="stage_id" ref="crm_configuration.stage5"/>
+		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f2"/>
-	</record>
-	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2"/>
-	<record model="ir.actions.act_window" id="crm_case_category_act_f3">
-		<field name="name">Open Feature Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f3"/>
-	</record>
-	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_f4">
-		<field name="name">Pending Feature Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f4">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f4">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f4"/>
-	</record>
-	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_f5">
-		<field name="name">Planned For Future Release</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage7)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f5">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f5">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f5">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f5"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_f6">
-		<field name="name">Waiting For Reporter Response</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage5)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f6">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f6">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f6">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f6"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_f7">
-		<field name="name">Old Feature Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f7">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f7"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f7">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f7"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f7">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view"/>
-		<field name="act_window_id" ref="crm_case_category_act_f7"/>
-	</record>
-	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7"/>
 	
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
new file mode 100644
index 00000000000..4f24f096b47
--- /dev/null
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -0,0 +1,650 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	<record model="crm.case.section" id="section_support">
+		<field name="name">Bug Tracking</field>
+		<field name="code">BugSup</field>
+	</record>
+	<record model="crm.case.categ" id="categ1">
+		<field name="name">Bugs</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.categ" id="categ2">
+		<field name="name">Patches</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.categ" id="categ3">
+		<field name="name">Feature Requests</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.stage" id="stage2">
+		<field name="name">Fixed</field>
+		<field name="section_id" ref="section_support"/>
+	</record>
+	<record model="crm.case.stage" id="stage5">
+		<field name="name">Awaiting Response</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	<record model="crm.case.stage" id="stage7">
+		<field name="name">Future</field>
+		<field name="section_id" ref="section_support"/>
+	</record>	
+	
+	
+	######################## BUG TRACKING (menu) ###########################
+	<!-- 
+		ALL BUGS
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ_act0">
+		<field name="name">All Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act0"/>
+	</record>	
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act0"/>
+	</record>
+	<menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="crm.menu_crm"/>
+	<menuitem  id="menu_crm_case_categ_act0" action="crm_case_categ_act0" parent="menu_crm_case_bug_track"/>
+
+	<record model="ir.actions.act_window" id="crm_case_categ_act_new">
+		<field name="name">New Bug</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view1_new">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act_new"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view1_new">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_categ_act_new"/>
+	</record>	
+	<menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_categ_act0"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_all1">
+		<field name="name">Bugs Waiting Approval</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all1"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all2">
+		<field name="name">Open Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all2"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all3">
+		<field name="name">Bugs With Patches Waiting Approval</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all3"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all4">
+		<field name="name">Bugs Not Fixed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all4">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all4"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all5">
+		<field name="name">Pending Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all5">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all5"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all6">
+		<field name="name">Planned For Future Release</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage7)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all6">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all6"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all7">
+		<field name="name">Waiting For Reporter Response</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all7">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all7">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all7">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all7"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_all8">
+		<field name="name">Old Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all8">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all8"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_all8">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all8"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_all8">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_all8"/>
+	</record>
+	<menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0"/>	<!-- 
+		MY BUGS
+	-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_my0">
+		<field name="name">My Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my0">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my0"/>
+	</record>
+	<menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_my1">
+		<field name="name">My Open Bugs</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_my2">
+		<field name="name">My Bugs With Patches</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_my3">
+		<field name="name">My Bugs Not Fixed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_my3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3"/>
+
+	<!-- 
+		ALL FEATURE REQUESTS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_f0">
+		<field name="name">All Feature Request</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f0">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f0"/>
+	</record>
+	<menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f0" action="crm_case_category_act_f0"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_f1">
+		<field name="name">New Feature Request</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f1"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f2">
+		<field name="name">Feature Requests Waiting Approval</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'=\','+str(categ3)+'), (\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f2"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2"/>
+	<record model="ir.actions.act_window" id="crm_case_category_act_f3">
+		<field name="name">Open Feature Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f3"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f4">
+		<field name="name">Pending Feature Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f4">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f4"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f5">
+		<field name="name">Planned For Future Release</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage7)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f5">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f5"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f6">
+		<field name="name">Waiting For Reporter Response</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage5)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f6">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f6"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_f7">
+		<field name="name">Old Feature Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f7">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_f7">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f7"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f7">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view"/>
+		<field name="act_window_id" ref="crm_case_category_act_f7"/>
+	</record>
+	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7"/>
+	
+</data>
+</openerp>
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index 1e82f135839..c10d9bab425 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -1,4 +1,33 @@
 # -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
 import time
 import tools
 from osv import fields,osv,orm
@@ -71,7 +100,7 @@ class crm_menu_config_wizard(osv.osv_memory):
     #        'update'
             for section in res :
                 if res[section]:
-                    file_name = 'crm_'+section+'_demo.xml'
+                    file_name = 'crm_'+section+'_menu.xml'
                     try:
                         tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_configuration',file_name )),  {}, 'init', *args)
                     except Exception, e:
diff --git a/addons/crm_configuration/crm_fund_data.xml b/addons/crm_configuration/crm_fund_data.xml
index c6965852c6e..d62df40d66e 100644
--- a/addons/crm_configuration/crm_fund_data.xml
+++ b/addons/crm_configuration/crm_fund_data.xml
@@ -1,146 +1,54 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
-		<record id="crm_case_helpingstreetchildren0" model="crm.case">
-			<field eval="0.5" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund3"/>
-			<field eval="3.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="250000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
-			<field name="categ_id" ref="association_vertical.categ_fund1"/>
-			<field eval="&quot;Helping Street Children&quot;" name="name"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_helpingearthquakevictims0" model="crm.case">
-			<field eval="0.8" name="probability"/>
-			<field name="partner_address_id" ref="base.main_address"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund4"/>
-			<field name="partner_id" ref="base.main_partner"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="2000000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
-			<field eval="8.0" name="duration"/>
-			<field name="categ_id" ref="association_vertical.categ_fund1"/>
-			<field eval="&quot;Helping earthquake victims&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_donatingbookstoschoollibraries0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund1"/>
-			<field eval="5.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_3"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="500000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
-			<field name="categ_id" ref="association_vertical.categ_fund2"/>
-			<field eval="&quot;Donating books to school libraries&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_renovatinggovernmentschools0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_7"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund2"/>
-			<field eval="3.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_4"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="1000000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
-			<field name="categ_id" ref="association_vertical.categ_fund2"/>
-			<field eval="4.3" name="duration"/>
-			<field eval="&quot;Renovating government schools&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_donatingambulancestohospitals0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_13"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund4"/>
-			<field name="partner_id" ref="base.res_partner_14"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="5000000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
-			<field eval="3" name="duration"/>
-			<field name="categ_id" ref="association_vertical.categ_fund3"/>
-			<field eval="&quot;Donating ambulances to hospitals&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_donatinghospitalequipments0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_2"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund3"/>
-			<field name="partner_id" ref="base.res_partner_10"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field eval="10000000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
-			<field eval="12" name="duration"/>
-			<field name="categ_id" ref="association_vertical.categ_fund3"/>
-			<field eval="&quot;Donating hospital equipments&quot;" name="name"/>
-			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_encouragingarts0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_14"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund2"/>
-			<field eval="7.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_15"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="10000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
-			<field name="categ_id" ref="association_vertical.categ_fund4"/>
-			<field eval="&quot;Encouraging arts&quot;" name="name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.case">
-			<field eval="1.0" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="association_vertical.categ2_fund1"/>
-			<field eval="6.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="800000.0" name="planned_cost"/>
-			<field name="section_id" ref="association_vertical.section_support4"/>
-			<field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
-			<field name="categ_id" ref="association_vertical.categ_fund4"/>
-			<field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-	</data>
+<data noupdate="1">
+	<record model="crm.case.section" id="section_support4">
+		<field name="name">Fund Raising</field>
+		<field name="code">funds</field>
+	</record>
+
+		<!--	CASE CATEGORY(categ_id)		-->
+		
+	<record model="crm.case.categ" id="categ_fund1">
+		<field name="name">Social Rehabilitation And Rural Upliftment</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.categ" id="categ_fund2">
+		<field name="name">Learning And Education</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+	
+	<record model="crm.case.categ" id="categ_fund3">
+		<field name="name">Healthcare</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>		
+	
+	<record model="crm.case.categ" id="categ_fund4">
+		<field name="name">Arts And Culture</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+
+		<!--	CASE CATEGORY2(category2_id)		-->
+		
+	<record model="crm.case.category2" id="categ2_fund1">
+		<field name="name">Cash</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.category2" id="categ2_fund2">
+		<field name="name">Cheque</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>		
+
+	<record model="crm.case.category2" id="categ2_fund3">
+		<field name="name">Credit Card</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>
+	
+	<record model="crm.case.category2" id="categ2_fund4">
+		<field name="name">Demand Draft</field>
+		<field name="section_id" ref="section_support4"/>
+	</record>	
+
+</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_demo.xml b/addons/crm_configuration/crm_fund_demo.xml
index e5f1a83e6ae..e7b6cd2bde5 100644
--- a/addons/crm_configuration/crm_fund_demo.xml
+++ b/addons/crm_configuration/crm_fund_demo.xml
@@ -1,243 +1,146 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <openerp>
-<data noupdate="1">
-
-	<record model="crm.case.section" id="section_support4">
-		<field name="name">Fund Raising</field>
-		<field name="code">funds</field>
-	</record>
-
-		<!--	CASE CATEGORY(categ_id)		-->
-		
-	<record model="crm.case.categ" id="categ_fund1">
-		<field name="name">Social Rehabilitation And Rural Upliftment</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>
-	
-	<record model="crm.case.categ" id="categ_fund2">
-		<field name="name">Learning And Education</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>	
-	
-	<record model="crm.case.categ" id="categ_fund3">
-		<field name="name">Healthcare</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>		
-	
-	<record model="crm.case.categ" id="categ_fund4">
-		<field name="name">Arts And Culture</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>	
-
-		<!--	CASE CATEGORY2(category2_id)		-->
-		
-	<record model="crm.case.category2" id="categ2_fund1">
-		<field name="name">Cash</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>
-	
-	<record model="crm.case.category2" id="categ2_fund2">
-		<field name="name">Cheque</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>		
-
-	<record model="crm.case.category2" id="categ2_fund3">
-		<field name="name">Credit Card</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>
-	
-	<record model="crm.case.category2" id="categ2_fund4">
-		<field name="name">Demand Draft</field>
-		<field name="section_id" ref="section_support4"/>
-	</record>	
-	
-	<!-- MENU -->
-	<menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm"/>
-	
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund1">
-		<field name="name">Funds</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
-	</record>
-	<menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise"/>
-	
-	<!-- My Funds -->
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my1">
-		<field name="name">My Funds</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
-	</record>
-	<menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
-		<field name="name">My Funds Waiting Validation</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
-	</record>
-	<menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
-		<field name="name">My Funds To Be Processed</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
-	</record>
-	<menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1"/>
-
-	<!-- All Funds -->
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
-		<field name="name">All Funds</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
-	</record>
-	<menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
-		<field name="name">All Funds Waiting Validation</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
-	</record>
-	<menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
-		<field name="name">All Funds To Be Processed</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">graph</field>
-		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
-		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
-	</record>
-	<menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1"/>
-
-</data>
+	<data noupdate="1">
+		<record id="crm_case_helpingstreetchildren0" model="crm.case">
+			<field eval="0.5" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund3"/>
+			<field eval="3.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_9"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_demo"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="250000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+			<field name="categ_id" ref="categ_fund1"/>
+			<field eval="&quot;Helping Street Children&quot;" name="name"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_helpingearthquakevictims0" model="crm.case">
+			<field eval="0.8" name="probability"/>
+			<field name="partner_address_id" ref="base.main_address"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund4"/>
+			<field name="partner_id" ref="base.main_partner"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="2000000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
+			<field eval="8.0" name="duration"/>
+			<field name="categ_id" ref="categ_fund1"/>
+			<field eval="&quot;Helping earthquake victims&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_donatingbookstoschoollibraries0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund1"/>
+			<field eval="5.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="500000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
+			<field name="categ_id" ref="categ_fund2"/>
+			<field eval="&quot;Donating books to school libraries&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_renovatinggovernmentschools0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_7"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund2"/>
+			<field eval="3.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_4"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_demo"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="1000000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
+			<field name="categ_id" ref="categ_fund2"/>
+			<field eval="4.3" name="duration"/>
+			<field eval="&quot;Renovating government schools&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_donatingambulancestohospitals0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_13"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund4"/>
+			<field name="partner_id" ref="base.res_partner_14"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="5000000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
+			<field eval="3" name="duration"/>
+			<field name="categ_id" ref="categ_fund3"/>
+			<field eval="&quot;Donating ambulances to hospitals&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_donatinghospitalequipments0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_2"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund3"/>
+			<field name="partner_id" ref="base.res_partner_10"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field eval="10000000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
+			<field eval="12" name="duration"/>
+			<field name="categ_id" ref="categ_fund3"/>
+			<field eval="&quot;Donating hospital equipments&quot;" name="name"/>
+			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_encouragingarts0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_14"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund2"/>
+			<field eval="7.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_15"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_demo"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="10000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
+			<field name="categ_id" ref="categ_fund4"/>
+			<field eval="&quot;Encouraging arts&quot;" name="name"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.case">
+			<field eval="1.0" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="categ2_fund1"/>
+			<field eval="6.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_9"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="800000.0" name="planned_cost"/>
+			<field name="section_id" ref="section_support4"/>
+			<field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
+			<field name="categ_id" ref="categ_fund4"/>
+			<field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+	</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
new file mode 100644
index 00000000000..40c3e9fdee7
--- /dev/null
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">	
+	<record model="crm.case.section" id="section_support4">
+		<field name="name">Fund Raising</field>
+		<field name="code">funds</field>
+	</record>
+	
+	<!-- MENU -->
+	<menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund1">
+		<field name="name">Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund1"/>
+	</record>
+	<menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise"/>
+	
+	<!-- My Funds -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my1">
+		<field name="name">My Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
+	</record>
+	<menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
+		<field name="name">My Funds Waiting Validation</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
+	</record>
+	<menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
+		<field name="name">My Funds To Be Processed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
+	</record>
+	<menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1"/>
+
+	<!-- All Funds -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
+		<field name="name">All Funds</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
+	</record>
+	<menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
+		<field name="name">All Funds Waiting Validation</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
+	</record>
+	<menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
+		<field name="name">All Funds To Be Processed</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">graph</field>
+		<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
+		<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
+	</record>
+	<menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1"/>
+
+</data>
+</openerp>
diff --git a/addons/crm_configuration/crm_jobs_data.xml b/addons/crm_configuration/crm_jobs_data.xml
index 9366486e483..8fdbbea6c17 100644
--- a/addons/crm_configuration/crm_jobs_data.xml
+++ b/addons/crm_configuration/crm_jobs_data.xml
@@ -1,149 +1,67 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
-	-->
+	<record model="crm.case.section" id="section_support0">
+		<field name="name">Jobs</field>
+		<field name="code">jobs</field>
+	</record>
 
-	<!--For Jobs Requests-->
-	<record id="crm_case_salesman0" model="crm.case">
-		<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
-		<field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_configuration.category_job1"/>
-		<field name="partner_id" ref="base.res_partner_asus"/>
-		<field eval="&quot;2&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field eval="&quot;Enrique Jones&quot;" name="partner_name"/>
-		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support0"/>
-		<field eval="&quot;enrique@rediff.com&quot;" name="partner_name2"/>
-		<field eval="&quot;9963214587&quot;" name="partner_mobile"/>
-		<field eval="1" name="active"/>
-		<field eval="9.0" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ_job1"/>
-		<field name="stage_id" ref="crm_configuration.stage_job1"/>
-		<field eval="&quot;Salesman&quot;" name="name"/>
-		<field eval="&quot;1236547890&quot;" name="partner_phone"/>
-	</record>
-	<record id="crm_case_traineemca0" model="crm.case">
-		<field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
-		<field name="partner_address_id" ref="base.res_partner_address_14"/>
-		<field name="som" ref="base.som_fury"/>
-		<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category_job3"/>
-		<field name="partner_id" ref="base.res_partner_15"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field eval="&quot;Marie Justine&quot;" name="partner_name"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field eval="5.15" name="duration"/>
-		<field name="section_id" ref="crm_configuration.section_support0"/>
-		<field eval="&quot;marie@gmail.com&quot;" name="partner_name2"/>
-		<field eval="&quot;9988774455&quot;" name="partner_mobile"/>
-		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_configuration.categ_job2"/>
-		<field name="stage_id" ref="crm_configuration.stage_job4"/>
-		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
-		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-		<field eval="&quot;6633225&quot;" name="partner_phone"/>
-	</record>
-	<record id="crm_case_fresher0" model="crm.case">
-		<field model="res.partner.canal" name="canal_id" search="[('name','=','direct')]"/>
-		<field name="som" ref="base.som_happy"/>
-		<field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
-		<field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_configuration.category_job2"/>
-		<field name="partner_id" ref="base.res_partner_5"/>
-		<field eval="&quot;1&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field eval="1.45" name="duration"/>
-		<field eval="&quot;Jose&quot;" name="partner_name"/>
-		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support0"/>
-		<field eval="&quot;jose@timesgroup.com&quot;" name="partner_name2"/>
-		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_configuration.categ_job1"/>
-		<field name="stage_id" ref="crm_configuration.stage_job3"/>
-		<field eval="&quot;Fresher&quot;" name="name"/>
-		<field eval="&quot;999666735&quot;" name="partner_phone"/>
-	</record>
-	<record id="crm_case_yrsexperienceinphp0" model="crm.case">
-		<field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
-		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="categ_id" ref="crm_configuration.categ_job2"/>
-		<field name="category2_id" ref="crm_configuration.category_job3"/>
-		<field name="partner_id" ref="base.res_partner_10"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field eval="1.35" name="duration"/>
-		<field eval="&quot;Sandra Elvis&quot;" name="partner_name"/>
-		<field eval="&quot;sandra@example.com&quot;" name="partner_name2"/>
-		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support0"/>
-		<field eval="1" name="active"/>
-		<field name="stage_id" ref="crm_configuration.stage_job6"/>
-		<field eval="&quot;More than 5 yrs Experience in PHP&quot;" name="name"/>
-	</record>
-	<record id="crm_case_marketingjob0" model="crm.case">
-		<field eval="time.strftime('%Y-%m-29 17:15:32')" name="date"/>
-		<field eval="time.strftime('%Y-%m-30')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_configuration.category_job2"/>
-		<field name="partner_id" ref="base.res_partner_11"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_demo"/>
-		<field eval="2.0" name="duration"/>
-		<field eval="&quot;John Bruno&quot;" name="partner_name"/>
-		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support0"/>
-		<field eval="&quot;john@market.edu&quot;" name="partner_name2"/>
-		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
-		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_configuration.categ_job1"/>
-		<field name="stage_id" ref="crm_configuration.stage_job5"/>
-		<field eval="&quot;Marketing Job&quot;" name="name"/>
-		<field eval="&quot;33968745&quot;" name="partner_phone"/>
-	</record>
-	<record id="crm_case_financejob0" model="crm.case">
-		<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
-		<field eval="time.strftime('%Y-%m-29')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_configuration.category_job2"/>
-		<field name="partner_id" ref="base.res_partner_11"/>
-		<field eval="&quot;4&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field eval="&quot;David Armstrong&quot;" name="partner_name"/>
-		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm_configuration.section_support0"/>
-		<field eval="&quot;david@market.edu&quot;" name="partner_name2"/>
-		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
-		<field eval="1" name="active"/>
-		<field eval="2.20" name="duration"/>
-		<field name="categ_id" ref="crm_configuration.categ_job1"/>
-		<field name="stage_id" ref="crm_configuration.stage_job5"/>
-		<field eval="&quot;Finance Job&quot;" name="name"/>
-		<field eval="&quot;33968745&quot;" name="partner_phone"/>
-	</record>	
-	<record id="crm_case_traineemca1" model="crm.case">
-		<field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
-		<field name="partner_address_id" ref="base.res_partner_address_14"/>
-		<field name="som" ref="base.som_fury"/>
-		<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-		<field name="category2_id" ref="crm_configuration.category_job3"/>
-		<field name="partner_id" ref="base.res_partner_15"/>
-		<field eval="&quot;3&quot;" name="priority"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field eval="&quot;Tina Augustie&quot;" name="partner_name"/>
-		<field eval="&quot;open&quot;" name="state"/>
-		<field eval="1.15" name="duration"/>
-		<field name="section_id" ref="crm_configuration.section_support0"/>
-		<field eval="&quot;tina_augustie@example.com&quot;" name="partner_name2"/>
-		<field eval="&quot;9898745745&quot;" name="partner_mobile"/>
-		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_configuration.categ_job2"/>
-		<field name="stage_id" ref="crm_configuration.stage_job4"/>
-		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
-		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-		<field eval="&quot;6630125&quot;" name="partner_phone"/>
+		<!--	CASE CATEGORY(categ_id)		-->
+		
+	<record model="crm.case.categ" id="categ_job1">
+		<field name="name">Salesman</field>
+		<field name="section_id" ref="section_support0"/>
 	</record>
 	
+	<record model="crm.case.categ" id="categ_job2">
+		<field name="name">Junior Developer</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>	
+		
+		<!--	CATEGORY2(category2_id)		-->
+		
+	<record model="crm.case.category2" id="category_job1">
+		<field name="name">Graduate</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>		
+	<record model="crm.case.category2" id="category_job2">
+		<field name="name">Licenced</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	<record model="crm.case.category2" id="category_job3">
+		<field name="name"> > Bac +5</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	
+         <!--	STAGE(stage_id)	-->
+         
+	<record model="crm.case.stage" id="stage_job1">
+		<field name="name">Initial Jobs Demand</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	<record model="crm.case.stage" id="stage_job2">
+		<field name="name">First Interview</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	<record model="crm.case.stage" id="stage_job3">
+		<field name="name">Second Interview</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	<record model="crm.case.stage" id="stage_job4">
+		<field name="name">Contract Proposed</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	<record model="crm.case.stage" id="stage_job5">
+		<field name="name">Contract Signed</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	<record model="crm.case.stage" id="stage_job6">
+		<field name="name">Refused by Employee</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
+	<record model="crm.case.stage" id="stage_job7">
+		<field name="name">Refused by Company</field>
+		<field name="section_id" ref="section_support0"/>
+	</record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_jobs_demo.xml b/addons/crm_configuration/crm_jobs_demo.xml
index d2aebb803a6..9366486e483 100644
--- a/addons/crm_configuration/crm_jobs_demo.xml
+++ b/addons/crm_configuration/crm_jobs_demo.xml
@@ -1,411 +1,149 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-
-	<record model="crm.case.section" id="section_support0">
-		<field name="name">Jobs</field>
-		<field name="code">jobs</field>
-	</record>
-
-		<!--	CASE CATEGORY(categ_id)		-->
-		
-	<record model="crm.case.categ" id="categ_job1">
-		<field name="name">Salesman</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	
-	<record model="crm.case.categ" id="categ_job2">
-		<field name="name">Junior Developer</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>	
-		
-		<!--	CATEGORY2(category2_id)		-->
-		
-	<record model="crm.case.category2" id="category_job1">
-		<field name="name">Graduate</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>		
-	<record model="crm.case.category2" id="category_job2">
-		<field name="name">Licenced</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	<record model="crm.case.category2" id="category_job3">
-		<field name="name"> > Bac +5</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	
-         <!--	STAGE(stage_id)	-->
-         
-	<record model="crm.case.stage" id="stage_job1">
-		<field name="name">Initial Jobs Demand</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	<record model="crm.case.stage" id="stage_job2">
-		<field name="name">First Interview</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	<record model="crm.case.stage" id="stage_job3">
-		<field name="name">Second Interview</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	<record model="crm.case.stage" id="stage_job4">
-		<field name="name">Contract Proposed</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	<record model="crm.case.stage" id="stage_job5">
-		<field name="name">Contract Signed</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	<record model="crm.case.stage" id="stage_job6">
-		<field name="name">Refused by Employee</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-	<record model="crm.case.stage" id="stage_job7">
-		<field name="name">Refused by Company</field>
-		<field name="section_id" ref="section_support0"/>
-	</record>
-
-	######################## JOB OPPORTUNITIES (menu) ###########################
-	<menuitem name="Jobs Requests" id="menu_crm_case_job_req_main" parent="crm.menu_crm"/>	
-
 	<!-- 
-		MY JOBS REQUESTS 
+		((((((((((( Demo Cases ))))))))))) 
 	-->
-	<record model="ir.actions.act_window" id="crm_case_categ0_act11">
-		<field name="name">My Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act11"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act11"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act11"/>
-	</record>
-	<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11"/>
 
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
-		<field name="name">My Unclosed Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+	<!--For Jobs Requests-->
+	<record id="crm_case_salesman0" model="crm.case">
+		<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+		<field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
+		<field name="category2_id" ref="crm_configuration.category_job1"/>
+		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field eval="&quot;2&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field eval="&quot;Enrique Jones&quot;" name="partner_name"/>
+		<field eval="&quot;draft&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<field eval="&quot;enrique@rediff.com&quot;" name="partner_name2"/>
+		<field eval="&quot;9963214587&quot;" name="partner_mobile"/>
+		<field eval="1" name="active"/>
+		<field eval="9.0" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.stage_job1"/>
+		<field eval="&quot;Salesman&quot;" name="name"/>
+		<field eval="&quot;1236547890&quot;" name="partner_phone"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	<record id="crm_case_traineemca0" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
+		<field name="partner_address_id" ref="base.res_partner_address_14"/>
+		<field name="som" ref="base.som_fury"/>
+		<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category_job3"/>
+		<field name="partner_id" ref="base.res_partner_15"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field eval="&quot;Marie Justine&quot;" name="partner_name"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field eval="5.15" name="duration"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<field eval="&quot;marie@gmail.com&quot;" name="partner_name2"/>
+		<field eval="&quot;9988774455&quot;" name="partner_mobile"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="crm_configuration.categ_job2"/>
+		<field name="stage_id" ref="crm_configuration.stage_job4"/>
+		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
+		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
+		<field eval="&quot;6633225&quot;" name="partner_phone"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	<record id="crm_case_fresher0" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','direct')]"/>
+		<field name="som" ref="base.som_happy"/>
+		<field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
+		<field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
+		<field name="category2_id" ref="crm_configuration.category_job2"/>
+		<field name="partner_id" ref="base.res_partner_5"/>
+		<field eval="&quot;1&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field eval="1.45" name="duration"/>
+		<field eval="&quot;Jose&quot;" name="partner_name"/>
+		<field eval="&quot;pending&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<field eval="&quot;jose@timesgroup.com&quot;" name="partner_name2"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="crm_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.stage_job3"/>
+		<field eval="&quot;Fresher&quot;" name="name"/>
+		<field eval="&quot;999666735&quot;" name="partner_phone"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	<record id="crm_case_yrsexperienceinphp0" model="crm.case">
+		<field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
+		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
+		<field name="categ_id" ref="crm_configuration.categ_job2"/>
+		<field name="category2_id" ref="crm_configuration.category_job3"/>
+		<field name="partner_id" ref="base.res_partner_10"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field eval="1.35" name="duration"/>
+		<field eval="&quot;Sandra Elvis&quot;" name="partner_name"/>
+		<field eval="&quot;sandra@example.com&quot;" name="partner_name2"/>
+		<field eval="&quot;cancel&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<field eval="1" name="active"/>
+		<field name="stage_id" ref="crm_configuration.stage_job6"/>
+		<field eval="&quot;More than 5 yrs Experience in PHP&quot;" name="name"/>
 	</record>
-	<menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3"/>	
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
-		<field name="name">My Jobs Propositions to Review</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	<record id="crm_case_marketingjob0" model="crm.case">
+		<field eval="time.strftime('%Y-%m-29 17:15:32')" name="date"/>
+		<field eval="time.strftime('%Y-%m-30')" name="date_deadline"/>
+		<field name="category2_id" ref="crm_configuration.category_job2"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_demo"/>
+		<field eval="2.0" name="duration"/>
+		<field eval="&quot;John Bruno&quot;" name="partner_name"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<field eval="&quot;john@market.edu&quot;" name="partner_name2"/>
+		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="crm_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.stage_job5"/>
+		<field eval="&quot;Marketing Job&quot;" name="name"/>
+		<field eval="&quot;33968745&quot;" name="partner_phone"/>
 	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs2" action="crm_case_categ0_act_my2"/>	
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
-		<field name="name">My Pending Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"/>		
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
-		<field name="name">My Open Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0" action="crm_case_categ0_act_my0"/>	
-		
-	
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
-		<field name="name">Calendar Of Jobs Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myjobs">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myjobs">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myjobs">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
+	<record id="crm_case_financejob0" model="crm.case">
+		<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+		<field eval="time.strftime('%Y-%m-29')" name="date_deadline"/>
+		<field name="category2_id" ref="crm_configuration.category_job2"/>
+		<field name="partner_id" ref="base.res_partner_11"/>
+		<field eval="&quot;4&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field eval="&quot;David Armstrong&quot;" name="partner_name"/>
+		<field eval="&quot;done&quot;" name="state"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<field eval="&quot;david@market.edu&quot;" name="partner_name2"/>
+		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
+		<field eval="1" name="active"/>
+		<field eval="2.20" name="duration"/>
+		<field name="categ_id" ref="crm_configuration.categ_job1"/>
+		<field name="stage_id" ref="crm_configuration.stage_job5"/>
+		<field eval="&quot;Finance Job&quot;" name="name"/>
+		<field eval="&quot;33968745&quot;" name="partner_phone"/>
 	</record>	
-	<menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs"/>
+	<record id="crm_case_traineemca1" model="crm.case">
+		<field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
+		<field name="partner_address_id" ref="base.res_partner_address_14"/>
+		<field name="som" ref="base.som_fury"/>
+		<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+		<field name="category2_id" ref="crm_configuration.category_job3"/>
+		<field name="partner_id" ref="base.res_partner_15"/>
+		<field eval="&quot;3&quot;" name="priority"/>
+		<field name="user_id" ref="base.user_root"/>
+		<field eval="&quot;Tina Augustie&quot;" name="partner_name"/>
+		<field eval="&quot;open&quot;" name="state"/>
+		<field eval="1.15" name="duration"/>
+		<field name="section_id" ref="crm_configuration.section_support0"/>
+		<field eval="&quot;tina_augustie@example.com&quot;" name="partner_name2"/>
+		<field eval="&quot;9898745745&quot;" name="partner_mobile"/>
+		<field eval="1" name="active"/>
+		<field name="categ_id" ref="crm_configuration.categ_job2"/>
+		<field name="stage_id" ref="crm_configuration.stage_job4"/>
+		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
+		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
+		<field eval="&quot;6630125&quot;" name="partner_phone"/>
+	</record>
 	
-	<!-- 
-		ALL JOBS REQUESTS 
-	-->
-	 <record model="ir.actions.act_window" id="crm_case_categ0_act111">
-		<field name="name">All Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act111"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act111"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act111"/>
-	</record>
-	<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act111" action="crm_case_categ0_act111"/>	
-	
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_all3">
-		<field name="name">All Unclosed Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3"/>
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
-		<field name="name">All Jobs Propositions</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2"/>	
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
-		<field name="name">All Pending Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
-	</record>
-	<menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1"/>	
-
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
-		<field name="name">All Open Jobs Requests</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all0">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
-	</record>
-	<menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0"/>	
-
-	<record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
-		<field name="name">Calendar Of Jobs Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_alljobs">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_alljobs">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_alljobs">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view11"/>
-		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs"/>
-	<!-- short cut -->
-	<record id="ir_ui_view_sc_myjobsrequests0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ0_act11" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;My Jobs Requests&quot;" name="name"/>
-			<field name="user_id" ref="base.user_root"/>
-   </record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
new file mode 100644
index 00000000000..44ac99da6de
--- /dev/null
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -0,0 +1,346 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	<record model="crm.case.section" id="section_support0">
+		<field name="name">Jobs</field>
+		<field name="code">jobs</field>
+	</record>
+
+	######################## JOB OPPORTUNITIES (menu) ###########################
+	<menuitem name="Jobs Requests" id="menu_crm_case_job_req_main" parent="crm.menu_crm"/>	
+
+	<!-- 
+		MY JOBS REQUESTS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ0_act11">
+		<field name="name">My Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act11"/>
+	</record>
+	<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11"/>
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my3">
+		<field name="name">My Unclosed Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
+		<field name="name">My Jobs Propositions to Review</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs2" action="crm_case_categ0_act_my2"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
+		<field name="name">My Pending Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"/>		
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
+		<field name="name">My Open Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_my0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_my0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_my0"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0" action="crm_case_categ0_act_my0"/>	
+		
+	
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
+		<field name="name">Calendar Of Jobs Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myjobs">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myjobs">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myjobs">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
+	</record>	
+	<menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs"/>
+	
+	<!-- 
+		ALL JOBS REQUESTS 
+	-->
+	 <record model="ir.actions.act_window" id="crm_case_categ0_act111">
+		<field name="name">All Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act111"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act111"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act111"/>
+	</record>
+	<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act111" action="crm_case_categ0_act111"/>	
+	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all3">
+		<field name="name">All Unclosed Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
+		<field name="name">All Jobs Propositions</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
+		<field name="name">All Pending Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all1"/>
+	</record>
+	<menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1"/>	
+
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
+		<field name="name">All Open Jobs Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_all0">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_all0">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_all0"/>
+	</record>
+	<menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
+		<field name="name">Calendar Of Jobs Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+'),(\'state\',\'=\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_alljobs">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_alljobs">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_alljobs">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view11"/>
+		<field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs"/>
+	
+</data>
+</openerp>
diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml
index c53098b6518..a761961968c 100644
--- a/addons/crm_configuration/crm_lead_data.xml
+++ b/addons/crm_configuration/crm_lead_data.xml
@@ -1,143 +1,105 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
-	-->
+<!--		CASE SECTION		-->
+	<record model="crm.case.section" id="section_support2">
+		<field name="name">Leads</field>
+		<field name="code">leads</field>
+	</record>
 
-	<!--For Leads-->
-		<record id="crm_case_itisatelesalescampaign0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_15"/>
-			<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
-			<field name="category2_id" ref="crm_configuration.category_lead1"/>
-			<field name="partner_id" ref="base.res_partner_11"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Faustino Speegle&quot;" name="name"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support2"/>
-			<field eval="&quot;info.hr.phone@example.com&quot;" name="partner_name2"/>
-			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
-			<field eval="1" name="active"/>
-			<field eval="16.1" name="duration"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead5"/>
-			<field name="stage_id" ref="crm_configuration.stage_lead1"/>
-			<field eval="&quot;President&quot;" name="partner_name"/>
-			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
-		</record>
-		<record id="crm_case_electonicgoodsdealer0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_6"/>
-			<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
-			<field name="category2_id" ref="crm_configuration.category_lead7"/>
-			<field name="partner_id" ref="base.res_partner_6"/>
-			<field eval="&quot;4&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="22.25" name="duration"/>
-			<field eval="&quot;Jesse Denning&quot;" name="name"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support2"/>
-			<field eval="&quot;hr70@example.name&quot;" name="partner_name2"/>
-			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
-			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead2"/>
-			<field name="stage_id" ref="crm_configuration.stage_lead2"/>
-			<field eval="&quot;IT Developer&quot;" name="partner_name"/>
-			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
-		</record>
-		<record id="crm_case_developingwebapplications0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_2"/>
-			<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
-			<field name="category2_id" ref="crm_configuration.category_lead5"/>
-			<field name="partner_id" ref="base.res_partner_10"/>
-			<field eval="&quot;2&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="12.45" name="duration"/>
-			<field eval="&quot;Taylor Mullane&quot;" name="name"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support2"/>
-			<field eval="&quot;qa.phone@example.us&quot;" name="partner_name2"/>
-			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
-			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead4"/>
-			<field name="stage_id" ref="crm_configuration.stage_lead4"/>
-			<field eval="&quot;VP Operations&quot;" name="partner_name"/>
-			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
-			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
-		</record>
-		<record id="crm_case_qrecorp0" model="crm.case">
-			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
-			<field name="category2_id" ref="crm_configuration.category_lead8"/>
-			<field name="partner_id" ref="base.res_partner_tinyatwork"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Diego Barga&quot;" name="name"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support2"/>
-			<field eval="&quot;kid.support.the@example.it&quot;" name="partner_name2"/>
-			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
-			<field eval="1" name="active"/>
-			<field eval="8.00" name="duration"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead1"/>
-			<field name="stage_id" ref="crm_configuration.stage_lead1"/>
-			<field eval="&quot;Director Sales&quot;" name="partner_name"/>
-			<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
-		</record>
-		<record id="crm_case_itdeveloper0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_10"/>
-			<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
-			<field name="category2_id" ref="crm_configuration.category_lead4"/>
-			<field name="partner_id" ref="base.res_partner_5"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Carrie Helle&quot;" name="name"/>
-			<field eval="&quot;pending&quot;" name="state"/>
-			<field eval="8" name="duration"/>
-			<field name="section_id" ref="crm_configuration.section_support2"/>
-			<field eval="&quot;info.qa.info@example.co.uk&quot;" name="partner_name2"/>
-			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
-			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead6"/>
-			<field name="stage_id" ref="crm_configuration.stage_lead3"/>
-			<field eval="&quot;IT Developer&quot;" name="partner_name"/>
-			<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
-		</record>
-		<record id="crm_case_mgroperations0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_lead3"/>
-			<field eval="3.15" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Tina Pinero&quot;" name="name"/>
-			<field eval="&quot;cancel&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support2"/>
-			<field eval="&quot;beans.beans@example.com &quot;" name="partner_name2"/>
-			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
-			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead8"/>
-			<field name="stage_id" ref="crm_configuration.stage_lead6"/>
-			<field eval="&quot;Mgr Operations&quot;" name="partner_name"/>
-			<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-		<record id="crm_case_vpoperations0" model="crm.case">
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_lead8"/>
-			<field name="partner_id" ref="base.res_partner_seagate"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Wendi Baltz&quot;" name="name"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support2"/>
-			<field eval="&quot;beans69@example.biz&quot;" name="partner_name2"/>
-			<field eval="&quot;	(463) 014-1208&quot;" name="partner_mobile"/>
-			<field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_lead4"/>
-			<field name="stage_id" ref="crm_configuration.stage_lead4"/>
-			<field eval="&quot;VP Operations&quot;" name="partner_name"/>
-			<field eval="7.15" name="duration"/>
-			<field eval="&quot;(282) 603-7489&quot;" name="partner_phone"/>
-		</record>
-	</data>
+<!--		CASE CATEGORY(categ_id)		-->	
+	<record model="crm.case.categ" id="categ_lead1">
+		<field name="name">Existing Customer</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.categ" id="categ_lead2">
+		<field name="name">Self Generated</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead3">
+		<field name="name">Employee</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.categ" id="categ_lead4">
+		<field name="name">Partner</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.categ" id="categ_lead5">
+		<field name="name">Campaign</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead6">
+		<field name="name">Website</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead7">
+		<field name="name">Word of mouth</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_lead8">
+		<field name="name">Other</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>	
+
+<!--		CASE STATUS(stage_id)		-->
+	<record model="crm.case.stage" id="stage_lead1">
+		<field name="name">New</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead2">
+		<field name="name">Assigned</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead3">
+		<field name="name">In Process</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead4">
+		<field name="name">Converted</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead5">
+		<field name="name">Recycled</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.stage" id="stage_lead6">
+		<field name="name">Dead</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+
+<!--		CASE CATEGORY2(category2_id)		-->	
+	<record model="crm.case.category2" id="category_lead1">
+		<field name="name">Telesales</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>		
+	<record model="crm.case.category2" id="category_lead2">
+		<field name="name">Mail</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead3">
+		<field name="name">Email</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead4">
+		<field name="name">Print</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>		
+	<record model="crm.case.category2" id="category_lead5">
+		<field name="name">Web</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead6">
+		<field name="name">Radio</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead7">
+		<field name="name">Television</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	<record model="crm.case.category2" id="category_lead8">
+		<field name="name">Newsletter</field>
+		<field name="section_id" ref="section_support2"/>
+	</record>
+	
+</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
index 17acce86078..c53098b6518 100644
--- a/addons/crm_configuration/crm_lead_demo.xml
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -1,562 +1,143 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<!--		CASE SECTION		-->
-	<record model="crm.case.section" id="section_support2">
-		<field name="name">Leads</field>
-		<field name="code">leads</field>
-	</record>
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
 
-<!--		CASE CATEGORY(categ_id)		-->	
-	<record model="crm.case.categ" id="categ_lead1">
-		<field name="name">Existing Customer</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.categ" id="categ_lead2">
-		<field name="name">Self Generated</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_lead3">
-		<field name="name">Employee</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.categ" id="categ_lead4">
-		<field name="name">Partner</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.categ" id="categ_lead5">
-		<field name="name">Campaign</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_lead6">
-		<field name="name">Website</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_lead7">
-		<field name="name">Word of mouth</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_lead8">
-		<field name="name">Other</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>	
-
-<!--		CASE STATUS(stage_id)		-->
-	<record model="crm.case.stage" id="stage_lead1">
-		<field name="name">New</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.stage" id="stage_lead2">
-		<field name="name">Assigned</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.stage" id="stage_lead3">
-		<field name="name">In Process</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.stage" id="stage_lead4">
-		<field name="name">Converted</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.stage" id="stage_lead5">
-		<field name="name">Recycled</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.stage" id="stage_lead6">
-		<field name="name">Dead</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-
-<!--		CASE CATEGORY2(category2_id)		-->	
-	<record model="crm.case.category2" id="category_lead1">
-		<field name="name">Telesales</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>		
-	<record model="crm.case.category2" id="category_lead2">
-		<field name="name">Mail</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.category2" id="category_lead3">
-		<field name="name">Email</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.category2" id="category_lead4">
-		<field name="name">Print</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>		
-	<record model="crm.case.category2" id="category_lead5">
-		<field name="name">Web</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.category2" id="category_lead6">
-		<field name="name">Radio</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.category2" id="category_lead7">
-		<field name="name">Television</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	<record model="crm.case.category2" id="category_lead8">
-		<field name="name">Newsletter</field>
-		<field name="section_id" ref="section_support2"/>
-	</record>
-	
-	
-<!--		MENU		-->
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads">
-		<field name="name">Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form,tree</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads"/>
-	</record>
-	<menuitem parent="crm.menu_crm" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads"/>
-
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
-		<field name="name">All Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
-		<field name="name">All Unclosed Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
-		<field name="name">All Draft Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
-		<field name="name">All Open Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
-		<field name="name">All Pending Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all4">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all4">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all5">
-		<field name="name">All Cancelled Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all5">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all5">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all5">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all5" action="crm_case_category_act_leads_all5"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all6">
-		<field name="name">Calendar Of All Leads Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="domain" eval="[('section_id','=',section_support2),('date','>=',time.strftime('%Y-%m-%d'))]"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all6">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all6">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all6">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all6" action="crm_case_category_act_leads_all6"/>
-
-<!-- =================================================================== -->
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
-		<field name="name">My Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
-		<field name="name">My Unclosed Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my2">
-		<field name="name">My Draft Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my2" action="crm_case_category_act_leads_my2"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
-		<field name="name">My Open Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
-		<field name="name">My Pending Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my4">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my4">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my4">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my5">
-		<field name="name">My Cancelled Leads</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'cancel\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my5">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my5">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my5">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my5" action="crm_case_category_act_leads_my5"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my6">
-		<field name="name">Calendar Of My Leads Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">calendar,tree,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="domain" eval="[('section_id','=',section_support2),('user_id','=','admin'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my6">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my6">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my6">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_leads"/>
-		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_category_act_leads_my6" action="crm_case_category_act_leads_my6"/>
-
-
-
-<!--		REPORTS		-->
-	<menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>	
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
-		<field name="res_model">report.crm.case.user</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
-
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
-		<field name="res_model">report.crm.case.section.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Category2" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_stage">
-		<field name="res_model">report.crm.case.section.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Leads and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_stage">
-		<field name="res_model">report.crm.case.section.categ.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_lead"  action="action_report_crm_case_lead_categ_stage" id="menu_action_report_crm_case_lead_categ_stage"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_categ2">
-		<field name="res_model">report.crm.case.section.categ.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
-
-	<!-- short cut -->
-	<record id="ir_ui_view_sc_myleads0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ0_act_leads_my" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;My Leads&quot;" name="name"/>
+	<!--For Leads-->
+		<record id="crm_case_itisatelesalescampaign0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_15"/>
+			<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
+			<field name="category2_id" ref="crm_configuration.category_lead1"/>
+			<field name="partner_id" ref="base.res_partner_11"/>
+			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
-	</record>
-</data>
+			<field eval="&quot;Faustino Speegle&quot;" name="name"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;info.hr.phone@example.com&quot;" name="partner_name2"/>
+			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field eval="16.1" name="duration"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead5"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead1"/>
+			<field eval="&quot;President&quot;" name="partner_name"/>
+			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_electonicgoodsdealer0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_6"/>
+			<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
+			<field name="category2_id" ref="crm_configuration.category_lead7"/>
+			<field name="partner_id" ref="base.res_partner_6"/>
+			<field eval="&quot;4&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="22.25" name="duration"/>
+			<field eval="&quot;Jesse Denning&quot;" name="name"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;hr70@example.name&quot;" name="partner_name2"/>
+			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead2"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead2"/>
+			<field eval="&quot;IT Developer&quot;" name="partner_name"/>
+			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_developingwebapplications0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_2"/>
+			<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
+			<field name="category2_id" ref="crm_configuration.category_lead5"/>
+			<field name="partner_id" ref="base.res_partner_10"/>
+			<field eval="&quot;2&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_demo"/>
+			<field eval="12.45" name="duration"/>
+			<field eval="&quot;Taylor Mullane&quot;" name="name"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;qa.phone@example.us&quot;" name="partner_name2"/>
+			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead4"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead4"/>
+			<field eval="&quot;VP Operations&quot;" name="partner_name"/>
+			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
+			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_qrecorp0" model="crm.case">
+			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
+			<field name="category2_id" ref="crm_configuration.category_lead8"/>
+			<field name="partner_id" ref="base.res_partner_tinyatwork"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;Diego Barga&quot;" name="name"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;kid.support.the@example.it&quot;" name="partner_name2"/>
+			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field eval="8.00" name="duration"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead1"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead1"/>
+			<field eval="&quot;Director Sales&quot;" name="partner_name"/>
+			<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_itdeveloper0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_10"/>
+			<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
+			<field name="category2_id" ref="crm_configuration.category_lead4"/>
+			<field name="partner_id" ref="base.res_partner_5"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;Carrie Helle&quot;" name="name"/>
+			<field eval="&quot;pending&quot;" name="state"/>
+			<field eval="8" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;info.qa.info@example.co.uk&quot;" name="partner_name2"/>
+			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
+			<field eval="1" name="active"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead6"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead3"/>
+			<field eval="&quot;IT Developer&quot;" name="partner_name"/>
+			<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
+		</record>
+		<record id="crm_case_mgroperations0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_lead3"/>
+			<field eval="3.15" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_9"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;Tina Pinero&quot;" name="name"/>
+			<field eval="&quot;cancel&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;beans.beans@example.com &quot;" name="partner_name2"/>
+			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
+			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead8"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead6"/>
+			<field eval="&quot;Mgr Operations&quot;" name="partner_name"/>
+			<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_vpoperations0" model="crm.case">
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_lead8"/>
+			<field name="partner_id" ref="base.res_partner_seagate"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;Wendi Baltz&quot;" name="name"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support2"/>
+			<field eval="&quot;beans69@example.biz&quot;" name="partner_name2"/>
+			<field eval="&quot;	(463) 014-1208&quot;" name="partner_mobile"/>
+			<field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_lead4"/>
+			<field name="stage_id" ref="crm_configuration.stage_lead4"/>
+			<field eval="&quot;VP Operations&quot;" name="partner_name"/>
+			<field eval="7.15" name="duration"/>
+			<field eval="&quot;(282) 603-7489&quot;" name="partner_phone"/>
+		</record>
+	</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
new file mode 100644
index 00000000000..277b0dd2fa0
--- /dev/null
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -0,0 +1,460 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	<record model="crm.case.section" id="section_support2">
+		<field name="name">Leads</field>
+		<field name="code">leads</field>
+	</record>
+	
+<!--		MENU		-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads">
+		<field name="name">Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads"/>
+	</record>
+	<menuitem parent="crm.menu_crm" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
+		<field name="name">All Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
+		<field name="name">All Unclosed Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
+		<field name="name">All Draft Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
+		<field name="name">All Open Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
+		<field name="name">All Pending Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all4">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all5">
+		<field name="name">All Cancelled Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all5">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all5"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all5" action="crm_case_category_act_leads_all5"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_all6">
+		<field name="name">Calendar Of All Leads Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="domain" eval="[('section_id','=',section_support2),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_all6">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_all6"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all6" action="crm_case_category_act_leads_all6"/>
+
+<!-- =================================================================== -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
+		<field name="name">My Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
+		<field name="name">My Unclosed Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my2">
+		<field name="name">My Draft Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my2" action="crm_case_category_act_leads_my2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
+		<field name="name">My Open Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
+		<field name="name">My Pending Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my4">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my4">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my4">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my5">
+		<field name="name">My Cancelled Leads</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'cancel\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my5">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my5">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my5">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my5"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my5" action="crm_case_category_act_leads_my5"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_leads_my6">
+		<field name="name">Calendar Of My Leads Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="domain" eval="[('section_id','=',section_support2),('user_id','=','admin'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_leads_my6">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my6">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_my6">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_leads"/>
+		<field name="act_window_id" ref="crm_case_category_act_leads_my6"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_category_act_leads_my6" action="crm_case_category_act_leads_my6"/>
+
+
+
+<!--		REPORTS		-->
+	<menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>	
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
+		<field name="res_model">report.crm.case.user</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
+
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
+		<field name="res_model">report.crm.case.section.categ2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Category2" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_lead_stage">
+		<field name="res_model">report.crm.case.section.stage</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<menuitem name="Cases by Leads and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_stage">
+		<field name="res_model">report.crm.case.section.categ.stage</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_lead"  action="action_report_crm_case_lead_categ_stage" id="menu_action_report_crm_case_lead_categ_stage"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_categ2">
+		<field name="res_model">report.crm.case.section.categ.categ2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+	</record>
+	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
+
+	
+</data>
+</openerp>
diff --git a/addons/crm_configuration/crm_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml
index 4444573e9b7..55101c62b17 100644
--- a/addons/crm_configuration/crm_meeting_data.xml
+++ b/addons/crm_configuration/crm_meeting_data.xml
@@ -1,114 +1,63 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
-	-->
 
-	<!--For Meetings-->
-		<record id="crm_case_followuponproposal0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
-			<field eval="1" name="active"/>
-			<field name="partner_id" ref="base.res_partner_maxtor"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support1"/>
-			<field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
-			<field name="stage_id" ref="crm_configuration.stage_meet2"/>
-			<field eval="&quot;Follow-up on proposal&quot;" name="name"/>
-			<field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
-			<field eval="6.3" name="duration"/>
-		</record>
+	<record model="crm.case.section" id="section_support1">
+		<field name="name">Meetings</field>
+		<field name="code">Mtngs</field>
+	</record>
+		<!--	CASE CATEGORY(categ_id)		-->
 	
-		<record id="crm_case_initialdiscussion0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_2"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_meet1"/>
-			<field eval="7.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_10"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support1"/>
-			<field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_meet3"/>
-			<field name="stage_id" ref="crm_configuration.stage_meet4"/>
-			<field eval="&quot;Initial discussion&quot;" name="name"/>
-			<field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
-			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
-		</record>
+	<record model="crm.case.categ" id="categ_meet1">
+		<field name="name">Sales Meeting</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>
+	<record model="crm.case.categ" id="categ_meet2">
+		<field name="name">Internal Meeting</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_meet3">
+		<field name="name">Training</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
 	
-		<record id="crm_case_discusspricing0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_meet3"/>
-			<field eval="3.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_3"/>
-			<field eval="&quot;1&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support1"/>
-			<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_meet1"/>
-			<field name="stage_id" ref="crm_configuration.stage_meet1"/>
-			<field eval="&quot;Discuss pricing&quot;" name="name"/>
-			<field eval="time.strftime('%Y-%m-20')" name="date_deadline"/>
-		</record>
+        <!--	CASE CATEGORY2(category2_id)	-->
+         
+	<record model="crm.case.category2" id="category_meet1">
+		<field name="name">Office</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+	<record model="crm.case.category2" id="category_meet2">
+		<field name="name">Home</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>
+	<record model="crm.case.category2" id="category_meet3">
+		<field name="name">Customer Office</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>
 	
-		<record id="crm_case_reviewneeds0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_15"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_meet2"/>
-			<field eval="6.0" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_11"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support1"/>
-			<field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_meet3"/>
-			<field name="stage_id" ref="crm_configuration.stage_meet5"/>
-			<field eval="&quot;Review needs&quot;" name="name"/>
-			<field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
-		</record>
-	
-		<record id="crm_case_changesindesigning0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_meet1"/>
-			<field eval="05" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;pending&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support1"/>
-			<field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
-			<field name="stage_id" ref="crm_configuration.stage_meet2"/>
-			<field eval="&quot;Changes in Designing&quot;" name="name"/>
-			<field eval="time.strftime('%Y-%m-30')" name="date_deadline"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-	
-		<record id="crm_case_updatethedata0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_7"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_meet2"/>
-			<field name="partner_id" ref="base.res_partner_4"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm_configuration.section_support1"/>
-			<field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
-			<field name="stage_id" ref="crm_configuration.stage_meet1"/>
-			<field eval="&quot;Update the data&quot;" name="name"/>
-			<field eval="13.3" name="duration"/>
-			<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		</record>
-	</data>
+         <!--	CASE STAGE(stage_id)	-->
+         
+	<record model="crm.case.stage" id="stage_meet1">
+		<field name="name">Fixed</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+	<record model="crm.case.stage" id="stage_meet2">
+		<field name="name">Not fixed</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+	<record model="crm.case.stage" id="stage_meet3">
+		<field name="name">Invalid</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+	<record model="crm.case.stage" id="stage_meet4">
+		<field name="name">Awaiting Response</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+	<record model="crm.case.stage" id="stage_meet5">
+		<field name="name">Future</field>
+		<field name="section_id" ref="section_support1"/>
+	</record>	
+
+</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml
index f931633e4c6..4444573e9b7 100644
--- a/addons/crm_configuration/crm_meeting_demo.xml
+++ b/addons/crm_configuration/crm_meeting_demo.xml
@@ -1,288 +1,114 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-
-	<record model="crm.case.section" id="section_support1">
-		<field name="name">Meetings</field>
-		<field name="code">Mtngs</field>
-	</record>
-		<!--	CASE CATEGORY(categ_id)		-->
-	
-	<record model="crm.case.categ" id="categ_meet1">
-		<field name="name">Sales Meeting</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>
-	<record model="crm.case.categ" id="categ_meet2">
-		<field name="name">Internal Meeting</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_meet3">
-		<field name="name">Training</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	
-        <!--	CASE CATEGORY2(category2_id)	-->
-         
-	<record model="crm.case.category2" id="category_meet1">
-		<field name="name">Office</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	<record model="crm.case.category2" id="category_meet2">
-		<field name="name">Home</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>
-	<record model="crm.case.category2" id="category_meet3">
-		<field name="name">Customer Office</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>
-	
-         <!--	CASE STAGE(stage_id)	-->
-         
-	<record model="crm.case.stage" id="stage_meet1">
-		<field name="name">Fixed</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	<record model="crm.case.stage" id="stage_meet2">
-		<field name="name">Not fixed</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	<record model="crm.case.stage" id="stage_meet3">
-		<field name="name">Invalid</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	<record model="crm.case.stage" id="stage_meet4">
-		<field name="name">Awaiting Response</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	<record model="crm.case.stage" id="stage_meet5">
-		<field name="name">Future</field>
-		<field name="section_id" ref="section_support1"/>
-	</record>	
-	
-	######################## MEETINGS (menu) ###########################
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetings">
-		<field name="name">Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form,tree</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetings">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetings"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetings">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetings"/>
-	</record>
-	<menuitem parent="crm.menu_crm" id="menu_crm_case_category_act_meetings" action="crm_case_category_act_meetings"/>
-
 	<!-- 
-		MY MEETINGS 
+		((((((((((( Demo Cases ))))))))))) 
 	-->
-	<record model="ir.actions.act_window" id="crm_case_categ_meetmy">
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_my">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_my">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
-	</record>
-	<menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
 
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy1">
-		<field name="name">Draft Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
-	</record>
-	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetmy1" action="crm_case_category_act_meetmy1" parent="menu_crm_case_categ_meet_my"/>
-
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy2">
-		<field name="name">Confirmed Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetmy2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
-	</record>
-	<menuitem  parent="menu_crm_case_categ_meet_my" name="Confirmed Meetings" id="menu_crm_case_categ0_act_meetmy2" action="crm_case_category_act_meetmy2"/>
-
-
-	<!-- 
-		ALL MEETINGS 
-	-->
-	<record model="ir.actions.act_window" id="crm_case_categ_meet">
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meet"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meet"/>
-	</record>	
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_categ_meet"/>
-	</record>
-	<menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetall1">
-		<field name="name">Draft Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'state\',\'=\',\'draft\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
-	</record>
-	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetall1" action="crm_case_category_act_meetall1" parent="menu_crm_case_categ_meet"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetall2">
-		<field name="name">Confirmed Meetings</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="'[(\'state\',\'=\',\'done\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
-	</record>
-	<menuitem name="Confirmed Meetings" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall2" action="crm_case_category_act_meetall2"/>
-	
-	<record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
-		<field name="name">Next Deadlines</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="domain" eval="[('state','!=','done'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_meet"/>
-		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-	</record>
-	<menuitem name="Next Deadlines" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall3" action="crm_case_category_act_meetall3"/>
-
-	<!-- short cut -->
-	<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;My Meetings&quot;" name="name"/>
+	<!--For Meetings-->
+		<record id="crm_case_followuponproposal0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
+			<field eval="1" name="active"/>
+			<field name="partner_id" ref="base.res_partner_maxtor"/>
+			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
-	</record>
-</data>
+			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet2"/>
+			<field eval="&quot;Follow-up on proposal&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
+			<field eval="6.3" name="duration"/>
+		</record>
+	
+		<record id="crm_case_initialdiscussion0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_2"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_meet1"/>
+			<field eval="7.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_10"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet3"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet4"/>
+			<field eval="&quot;Initial discussion&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
+			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
+		</record>
+	
+		<record id="crm_case_discusspricing0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_meet3"/>
+			<field eval="3.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field eval="&quot;1&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet1"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet1"/>
+			<field eval="&quot;Discuss pricing&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-20')" name="date_deadline"/>
+		</record>
+	
+		<record id="crm_case_reviewneeds0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_15"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_meet2"/>
+			<field eval="6.0" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_11"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_demo"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet3"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet5"/>
+			<field eval="&quot;Review needs&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
+		</record>
+	
+		<record id="crm_case_changesindesigning0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_meet1"/>
+			<field eval="05" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_9"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_demo"/>
+			<field eval="&quot;pending&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet2"/>
+			<field eval="&quot;Changes in Designing&quot;" name="name"/>
+			<field eval="time.strftime('%Y-%m-30')" name="date_deadline"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+	
+		<record id="crm_case_updatethedata0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_7"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_meet2"/>
+			<field name="partner_id" ref="base.res_partner_4"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field name="section_id" ref="crm_configuration.section_support1"/>
+			<field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_meet2"/>
+			<field name="stage_id" ref="crm_configuration.stage_meet1"/>
+			<field eval="&quot;Update the data&quot;" name="name"/>
+			<field eval="13.3" name="duration"/>
+			<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
+		</record>
+	</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
new file mode 100644
index 00000000000..4802fd5124b
--- /dev/null
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	<record model="crm.case.section" id="section_support1">
+		<field name="name">Meetings</field>
+		<field name="code">Mtngs</field>
+	</record>	
+	
+	######################## MEETINGS (menu) ###########################
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetings">
+		<field name="name">Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetings">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetings"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetings">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetings"/>
+	</record>
+	<menuitem parent="crm.menu_crm" id="menu_crm_case_category_act_meetings" action="crm_case_category_act_meetings"/>
+
+	<!-- 
+		MY MEETINGS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ_meetmy">
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_my">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_my">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meetmy"/>
+	</record>
+	<menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy1">
+		<field name="name">Draft Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy1"/>
+	</record>
+	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetmy1" action="crm_case_category_act_meetmy1" parent="menu_crm_case_categ_meet_my"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetmy2">
+		<field name="name">Confirmed Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetmy2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetmy2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetmy2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetmy2"/>
+	</record>
+	<menuitem  parent="menu_crm_case_categ_meet_my" name="Confirmed Meetings" id="menu_crm_case_categ0_act_meetmy2" action="crm_case_category_act_meetmy2"/>
+
+
+	<!-- 
+		ALL MEETINGS 
+	-->
+	<record model="ir.actions.act_window" id="crm_case_categ_meet">
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meet"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meet"/>
+	</record>	
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_categ_meet"/>
+	</record>
+	<menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetall1">
+		<field name="name">Draft Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'state\',\'=\',\'draft\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall1"/>
+	</record>
+	<menuitem name="Draft Meetings" id="menu_crm_case_categ0_act_meetall1" action="crm_case_category_act_meetall1" parent="menu_crm_case_categ_meet"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetall2">
+		<field name="name">Confirmed Meetings</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="'[(\'state\',\'=\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall2"/>
+	</record>
+	<menuitem name="Confirmed Meetings" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall2" action="crm_case_category_act_meetall2"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
+		<field name="name">Next Deadlines</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="domain" eval="[('state','!=','done'),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_meet"/>
+		<field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+	</record>
+	<menuitem name="Next Deadlines" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall3" action="crm_case_category_act_meetall3"/>
+
+	
+</data>
+</openerp>
diff --git a/addons/crm_configuration/crm_opportunity_data.xml b/addons/crm_configuration/crm_opportunity_data.xml
index c20cb450468..41ef8714aa5 100644
--- a/addons/crm_configuration/crm_opportunity_data.xml
+++ b/addons/crm_configuration/crm_opportunity_data.xml
@@ -1,98 +1,84 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
-	-->
+<record model="crm.case.section" id="section_support3">
+		<field name="name">Opportunities</field>
+		<field name="code">oppor</field>
+	</record>
 
-	<!--For Opportunity-->
+<!--		CASE CATEGORY(categ_id)		-->	
+	<record model="crm.case.categ" id="categ_oppor1">
+		<field name="name">Existing Customer</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.categ" id="categ_oppor2">
+		<field name="name">Self Generated</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor3">
+		<field name="name">Employee</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.categ" id="categ_oppor4">
+		<field name="name">Partner</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.categ" id="categ_oppor5">
+		<field name="name">Campaign</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor6">
+		<field name="name">Website</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor7">
+		<field name="name">Word of mouth</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.categ" id="categ_oppor8">
+		<field name="name">Other</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
 
-		<record id="crm_case_construstazunits0" model="crm.case">
-			<field eval="0.6" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
-			<field eval="1" name="active"/>
-			<field eval="17.0" name="duration"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
-			<field name="partner_id" ref="base.res_partner_3"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="75000.0" name="planned_cost"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor1"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor3"/>
-			<field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
-		</record>
-		<record id="crm_case_rdroundfundingunits0" model="crm.case">
-			<field name="partner_address_id" ref="base.res_partner_address_15"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor2"/>
-			<field name="partner_id" ref="base.res_partner_11"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;draft&quot;" name="state"/>
-			<field eval="30000.0" name="planned_cost"/>
-			<field eval="0.5" name="probability"/>
-			<field eval="8.0" name="duration"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor1"/>
-			<field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
-		</record>
-		<record id="crm_case_mediapoleunits0" model="crm.case">
-			<field eval="0.1" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_3"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
-			<field name="partner_id" ref="base.res_partner_8"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;pending&quot;" name="state"/>
-			<field eval="50000.0" name="planned_cost"/>
-			<field eval="0.75" name="probability"/>
-			<field eval="10.0" name="duration"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor7"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor5"/>
-			<field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
-			<field eval="&quot;info@mediapole.net&quot;" name="email_from"/>
-		</record>
-		<record id="crm_case_abcfuelcounits0" model="crm.case">
-			<field eval="0.4" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_demo"/>
-			<field eval="&quot;open&quot;" name="state"/>
-			<field eval="50000.0" name="planned_cost"/>
-			<field eval="24.0" name="duration"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor4"/>
-			<field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
-			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
-		</record>
-		<record id="crm_case_dirtminingltdunits0" model="crm.case">
-			<field eval="0.8" name="probability"/>
-			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
-			<field eval="1" name="active"/>
-			<field eval="2.25" name="duration"/>
-			<field name="partner_id" ref="base.res_partner_maxtor"/>
-			<field eval="&quot;3&quot;" name="priority"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;done&quot;" name="state"/>
-			<field eval="25000.0" name="planned_cost"/>
-			<field name="section_id" ref="crm_configuration.section_support3"/>
-			<field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
-			<field name="categ_id" ref="crm_configuration.categ_oppor2"/>
-			<field name="stage_id" ref="crm_configuration.stage_oppor6"/>
-			<field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
-		</record>
-	</data>
+<!--		CASE STATUS(stage_id)		-->
+	<record model="crm.case.stage" id="stage_oppor1">
+		<field name="name">Prospecting</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor2">
+		<field name="name">Needs Analysis</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor3">
+		<field name="name">Value Proposition</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor4">
+		<field name="name">Proposal/Price Quote</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor5">
+		<field name="name">Negotiation/Review</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor6">
+		<field name="name">Closed Won</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+	<record model="crm.case.stage" id="stage_oppor7">
+		<field name="name">Closed Lost</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+
+<!--		CASE CATEGORY2(category2_id)		-->
+	<record model="crm.case.category2" id="category_oppor1">
+		<field name="name">Existing Business</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>	
+	<record model="crm.case.category2" id="category_oppor2">
+		<field name="name">New Business</field>
+		<field name="section_id" ref="section_support3"/>
+	</record>
+
+</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_opportunity_demo.xml b/addons/crm_configuration/crm_opportunity_demo.xml
index 964da43ba5f..c20cb450468 100644
--- a/addons/crm_configuration/crm_opportunity_demo.xml
+++ b/addons/crm_configuration/crm_opportunity_demo.xml
@@ -1,325 +1,98 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support3">
-		<field name="name">Opportunities</field>
-		<field name="code">oppor</field>
-	</record>
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
 
-<!--		CASE CATEGORY(categ_id)		-->	
-	<record model="crm.case.categ" id="categ_oppor1">
-		<field name="name">Existing Customer</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.categ" id="categ_oppor2">
-		<field name="name">Self Generated</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_oppor3">
-		<field name="name">Employee</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.categ" id="categ_oppor4">
-		<field name="name">Partner</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.categ" id="categ_oppor5">
-		<field name="name">Campaign</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_oppor6">
-		<field name="name">Website</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_oppor7">
-		<field name="name">Word of mouth</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>	
-	<record model="crm.case.categ" id="categ_oppor8">
-		<field name="name">Other</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>	
+	<!--For Opportunity-->
 
-<!--		CASE STATUS(stage_id)		-->
-	<record model="crm.case.stage" id="stage_oppor1">
-		<field name="name">Prospecting</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.stage" id="stage_oppor2">
-		<field name="name">Needs Analysis</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.stage" id="stage_oppor3">
-		<field name="name">Value Proposition</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.stage" id="stage_oppor4">
-		<field name="name">Proposal/Price Quote</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.stage" id="stage_oppor5">
-		<field name="name">Negotiation/Review</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.stage" id="stage_oppor6">
-		<field name="name">Closed Won</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-	<record model="crm.case.stage" id="stage_oppor7">
-		<field name="name">Closed Lost</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-
-<!--		CASE CATEGORY2(category2_id)		-->
-	<record model="crm.case.category2" id="category_oppor1">
-		<field name="name">Existing Business</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>	
-	<record model="crm.case.category2" id="category_oppor2">
-		<field name="name">New Business</field>
-		<field name="section_id" ref="section_support3"/>
-	</record>
-
-<menuitem name="Opportunities" id="menu_crm_case_opp" parent="crm.menu_crm"/>
-
-
-<!--		MENU		-->
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-		<field name="name">All Opportunities</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,form,calendar</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor11">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
-	</record>
-	<menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor">
-		<field name="name">Opportunity</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">form,tree</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor"/>
-	</record>
-	<menuitem name="New Opportunity" parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor" action="crm_case_category_act_oppor"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor1">
-		<field name="name">All Open Opportunities</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor1">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor1">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1"/>
-
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
-		<field name="name">All Pending Opportunities</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\')]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_all2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_all2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_all2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2"/>
-
-
-<!-- ======================================================== -->
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor22">
-		<field name="name">My Opportunities</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor22">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor22">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor22">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
-	</record>
-	<menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22"/>
-
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
-		<field name="name">My Open Opportunities</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2"/>
-
-	<record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
-		<field name="name">My Pending Opportunities</field>
-		<field name="res_model">crm.case</field>
-		<field name="view_mode">tree,calendar,form</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\'),(\'user_id\',\'=\',uid)]'"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_my2">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="view_id" ref="crm_case_tree_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_my2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">calendar</field>
-		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_my2">
-		<field name="sequence" eval="3"/>
-		<field name="view_mode">form</field>
-		<field name="view_id" ref="crm_case_form_view_oppor"/>
-		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
-	</record>
-	<menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2"/>
-
-<!--		REPORTS			-->
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
-		<field name="res_model">report.crm.case.user</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	  <menuitem name="Opportunity" 	parent="report_crm.next_id_64" id="menu_action_report_crm_case_oppor"/>
-	<menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
-		<field name="res_model">report.crm.case.section.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Opportunities and Category2"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_stage">
-		<field name="res_model">report.crm.case.section.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_stage">
-		<field name="res_model">report.crm.case.section.categ.stage</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
-
-	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_categ2">
-		<field name="res_model">report.crm.case.section.categ.categ2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-	</record>
-	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
-	<!-- short cut -->
-	<record id="ir_ui_view_sc_openopportunities0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ0_act_oppor1" name="res_id"/>
-			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;Open Opportunities&quot;" name="name"/>
+		<record id="crm_case_construstazunits0" model="crm.case">
+			<field eval="0.6" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
+			<field eval="1" name="active"/>
+			<field eval="17.0" name="duration"/>
+			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
-	</record>
-
-</data>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="75000.0" name="planned_cost"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor1"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor3"/>
+			<field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
+		</record>
+		<record id="crm_case_rdroundfundingunits0" model="crm.case">
+			<field name="partner_address_id" ref="base.res_partner_address_15"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_oppor2"/>
+			<field name="partner_id" ref="base.res_partner_11"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;draft&quot;" name="state"/>
+			<field eval="30000.0" name="planned_cost"/>
+			<field eval="0.5" name="probability"/>
+			<field eval="8.0" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor1"/>
+			<field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
+		</record>
+		<record id="crm_case_mediapoleunits0" model="crm.case">
+			<field eval="0.1" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_3"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
+			<field name="partner_id" ref="base.res_partner_8"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;pending&quot;" name="state"/>
+			<field eval="50000.0" name="planned_cost"/>
+			<field eval="0.75" name="probability"/>
+			<field eval="10.0" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor7"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor5"/>
+			<field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
+			<field eval="&quot;info@mediapole.net&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_abcfuelcounits0" model="crm.case">
+			<field eval="0.4" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_1"/>
+			<field eval="1" name="active"/>
+			<field name="category2_id" ref="crm_configuration.category_oppor1"/>
+			<field name="partner_id" ref="base.res_partner_9"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_demo"/>
+			<field eval="&quot;open&quot;" name="state"/>
+			<field eval="50000.0" name="planned_cost"/>
+			<field eval="24.0" name="duration"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor5"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor4"/>
+			<field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
+			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
+		</record>
+		<record id="crm_case_dirtminingltdunits0" model="crm.case">
+			<field eval="0.8" name="probability"/>
+			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
+			<field eval="1" name="active"/>
+			<field eval="2.25" name="duration"/>
+			<field name="partner_id" ref="base.res_partner_maxtor"/>
+			<field eval="&quot;3&quot;" name="priority"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="&quot;done&quot;" name="state"/>
+			<field eval="25000.0" name="planned_cost"/>
+			<field name="section_id" ref="crm_configuration.section_support3"/>
+			<field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
+			<field name="categ_id" ref="crm_configuration.categ_oppor2"/>
+			<field name="stage_id" ref="crm_configuration.stage_oppor6"/>
+			<field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
+		</record>
+	</data>
 </openerp>
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
new file mode 100644
index 00000000000..2104d39f415
--- /dev/null
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+		<record model="crm.case.section" id="section_support3">
+		<field name="name">Opportunities</field>
+		<field name="code">oppor</field>
+	</record>	
+<menuitem name="Opportunities" id="menu_crm_case_opp" parent="crm.menu_crm"/>
+
+
+<!--		MENU		-->
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
+		<field name="name">All Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,form,calendar</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor11">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+	</record>
+	<menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor">
+		<field name="name">Opportunity</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form,tree</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor"/>
+	</record>
+	<menuitem name="New Opportunity" parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor" action="crm_case_category_act_oppor"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor1">
+		<field name="name">All Open Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor1"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
+		<field name="name">All Pending Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_all2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_all2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_all2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2"/>
+
+
+<!-- ======================================================== -->
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor22">
+		<field name="name">My Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor22">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor22">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor22">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor22"/>
+	</record>
+	<menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22"/>
+
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
+		<field name="name">My Open Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2"/>
+
+	<record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
+		<field name="name">My Pending Opportunities</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_my2">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm_case_tree_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_my2">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm_case_calendar_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_my2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm_case_form_view_oppor"/>
+		<field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2"/>
+
+<!--		REPORTS			-->
+	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
+		<field name="res_model">report.crm.case.user</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	  <menuitem name="Opportunity" 	parent="report_crm.next_id_64" id="menu_action_report_crm_case_oppor"/>
+	<menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
+		<field name="res_model">report.crm.case.section.categ2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<menuitem name="Cases by Opportunities and Category2"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_stage">
+		<field name="res_model">report.crm.case.section.stage</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">graph,tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_stage">
+		<field name="res_model">report.crm.case.section.categ.stage</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
+
+	<record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_categ2">
+		<field name="res_model">report.crm.case.section.categ.categ2</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree</field>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+	</record>
+	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
+	
+
+</data>
+</openerp>
diff --git a/addons/crm_vertical/__init__.py b/addons/crm_vertical/__init__.py
index cd9c7c0a27c..a820153d64e 100644
--- a/addons/crm_vertical/__init__.py
+++ b/addons/crm_vertical/__init__.py
@@ -3,4 +3,4 @@
 # Generated by the Tiny ERP module recorder !
 #
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+#import crm_vertical
diff --git a/addons/crm_vertical/__terp__.py b/addons/crm_vertical/__terp__.py
index d30dae92963..889ba7fd67f 100644
--- a/addons/crm_vertical/__terp__.py
+++ b/addons/crm_vertical/__terp__.py
@@ -9,7 +9,7 @@
         "depends" : ["crm_configuration"],
         "init_xml" : [ ],
         "demo_xml" : [ ],
-        "update_xml" : ["crm_vertical_view.xml"],
+        "update_xml" : [],
         "installable": True
 } 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_vertical/crm_bugs_vertical_view.xml b/addons/crm_vertical/crm_bugs_vertical_view.xml
new file mode 100644
index 00000000000..75dbffc9559
--- /dev/null
+++ b/addons/crm_vertical/crm_bugs_vertical_view.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>		
+		<record id="crm_configuration.menu_crm_case_bug_track" model="ir.ui.menu">
+			<field eval="&quot;terp-sale&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<!-- <record id="base.menu_finance_main" model="ir.ui.menu">
+			<field ref="base.menu_base_config" name="parent_id"/>
+		</record> -->
+	</data>
+</openerp>
diff --git a/addons/crm_vertical/crm_fund_vertical_view.xml b/addons/crm_vertical/crm_fund_vertical_view.xml
new file mode 100644
index 00000000000..0a611753ec2
--- /dev/null
+++ b/addons/crm_vertical/crm_fund_vertical_view.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<record id="crm_configuration.menu_crm_case_fund_raise" model="ir.ui.menu">
+			<field eval="&quot;terp-sale&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+	</data>
+</openerp>
diff --git a/addons/crm_vertical/crm_jobs_vertical_view.xml b/addons/crm_vertical/crm_jobs_vertical_view.xml
new file mode 100644
index 00000000000..2a3abb7fe42
--- /dev/null
+++ b/addons/crm_vertical/crm_jobs_vertical_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>		
+		<record id="crm_configuration.menu_crm_case_job_req_main" model="ir.ui.menu">
+			<field eval="Jobs Requests" name="name"/>
+			<field eval="&quot;terp-hr&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<!-- short cut -->
+		<record id="ir_ui_view_sc_myjobsrequests0" model="ir.ui.view_sc">
+				<field ref="crm_configuration.menu_crm_case_categ0_act11" name="res_id"/>
+				<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+				<field eval="&quot;My Jobs Requests&quot;" name="name"/>
+				<field name="user_id" ref="base.user_root"/>
+	   </record>
+	</data>
+</openerp>
diff --git a/addons/crm_vertical/crm_lead_vertical_view.xml b/addons/crm_vertical/crm_lead_vertical_view.xml
new file mode 100644
index 00000000000..be658f099de
--- /dev/null
+++ b/addons/crm_vertical/crm_lead_vertical_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>		
+		<record id="crm_configuration.menu_crm_case_categ0_act_leads" model="ir.ui.menu">
+			<field eval="&quot;Leads Tracking&quot;" name="name"/>
+			<field eval="&quot;terp-account&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<!-- short cut -->
+	<record id="ir_ui_view_sc_myleads0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ0_act_leads_my" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Leads&quot;" name="name"/>
+			<field name="user_id" ref="base.user_root"/>
+	</record>
+		
+	</data>
+</openerp>
diff --git a/addons/crm_vertical/crm_meeting_vertical_view.xml b/addons/crm_vertical/crm_meeting_vertical_view.xml
new file mode 100644
index 00000000000..fe638b8abab
--- /dev/null
+++ b/addons/crm_vertical/crm_meeting_vertical_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
+			<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
+			<field eval="&quot;terp-calendar&quot;" name="icon"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<!-- short cut -->
+	<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
+			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
+			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+			<field eval="&quot;My Meetings&quot;" name="name"/>
+			<field name="user_id" ref="base.user_root"/>
+	</record>		
+	</data>
+</openerp>
diff --git a/addons/crm_vertical/crm_opportunity_vertical_view.xml b/addons/crm_vertical/crm_opportunity_vertical_view.xml
new file mode 100644
index 00000000000..f7c4dd5f8d6
--- /dev/null
+++ b/addons/crm_vertical/crm_opportunity_vertical_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>		
+		<record id="crm_configuration.menu_crm_case_opp" model="ir.ui.menu">
+			<field eval="&quot;terp-sale&quot;" name="icon"/>
+			<field eval="Opportunities" name="name"/>
+			<field eval="False" name="parent_id"/>
+		</record>
+		<!-- short cut -->
+		<record id="ir_ui_view_sc_openopportunities0" model="ir.ui.view_sc">
+				<field ref="crm_configuration.menu_crm_case_categ0_act_oppor1" name="res_id"/>
+				<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
+				<field eval="&quot;Open Opportunities&quot;" name="name"/>
+				<field name="user_id" ref="base.user_root"/>
+		</record>		
+	</data>
+</openerp>
diff --git a/addons/crm_vertical/crm_vertical.py b/addons/crm_vertical/crm_vertical.py
new file mode 100644
index 00000000000..c8ae2e23554
--- /dev/null
+++ b/addons/crm_vertical/crm_vertical.py
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import time
+import tools
+from osv import fields,osv,orm
+import os
+import mx.DateTime
+import base64
+
+# here need to implement inheritance on osv_memory object. after that, it will work well.
+class crm_menu_config_wizard(osv.osv_memory):
+    _inherit='crm.menu.config_wizard'
+    def action_create(self, cr, uid, ids, *args):
+        res=super(crm_menu_config_wizard, self).action_create(cr, uid, ids, *args)
+        for res in self.read(cr,uid,ids):
+            res.__delitem__('id')
+            for section in res :
+                if res[section]:
+                    file_name = 'crm_'+section+'_vertical_view.xml'
+                    try:
+                        tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_vertical',file_name )),  {}, 'init', *args)
+                    except Exception, e:
+                        raise osv.except_osv('Error !', e)
+        return res
+
+crm_menu_config_wizard()
diff --git a/addons/crm_vertical/crm_vertical_view.xml b/addons/crm_vertical/crm_vertical_view.xml
deleted file mode 100644
index 57d4c1eeb69..00000000000
--- a/addons/crm_vertical/crm_vertical_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-		<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
-			<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
-			<field eval="&quot;terp-calendar&quot;" name="icon"/>
-			<field eval="False" name="parent_id"/>
-		</record>
-		<record id="crm_configuration.menu_crm_case_categ0_act_leads" model="ir.ui.menu">
-			<field eval="&quot;Leads Tracking&quot;" name="name"/>
-			<field eval="&quot;terp-account&quot;" name="icon"/>
-			<field eval="False" name="parent_id"/>
-		</record>
-		<record id="crm_configuration.menu_crm_case_opp" model="ir.ui.menu">
-			<field eval="&quot;terp-sale&quot;" name="icon"/>
-			<field eval="False" name="parent_id"/>
-		</record>
-		<record id="crm_configuration.menu_crm_case_job_req_main" model="ir.ui.menu">
-			<field eval="&quot;terp-hr&quot;" name="icon"/>
-			<field eval="False" name="parent_id"/>
-		</record>
-		<record id="crm_configuration.menu_crm_case_bug_track" model="ir.ui.menu">
-			<field eval="&quot;terp-sale&quot;" name="icon"/>
-			<field eval="False" name="parent_id"/>
-		</record>
-		<record id="base.menu_finance_main" model="ir.ui.menu">
-			<field ref="base.menu_base_config" name="parent_id"/>
-		</record>
-	</data>
-</openerp>

From 0274b668a0425fc8f216092b9759ea10e857b936 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Fri, 19 Sep 2008 17:30:16 +0530
Subject: [PATCH 17/26] improve fields.related for speed improvement

bzr revid: hda@tinyerp.com-20080919120016-wmygwid2asy5dkyo
---
 bin/osv/fields.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 60586e5e5af..825420b1ec6 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -637,8 +637,16 @@ class function(_column):
 
 class related(function):
 
-    def _fnct_search(self, cr, uid, ids, obj=None, name=None, context=None):
+    def _fnct_search(self, tobj, cr, uid, obj=None, name=None, context=None):
         raise 'Not Implemented Yet'
+#        field_detail=self._field_get(cr,uid,obj,obj._name,name)
+#        print field_detail
+#        if field_detail[1] in ('many2one'):
+#            ids=obj.pool.get(field_detail[0] or obj._name).search(cr,uid,[('name','ilike',context[0][2])])
+#            print ids
+#            return [('id','in',[5,6,7])]
+#        return True
+
 
     def _fnct_write(self,obj,cr, uid, ids, field_name, args, context=None):
         raise 'Not Implemented Yet'
@@ -652,7 +660,7 @@ class related(function):
             t_data=data
             relation=obj._name
             for i in range(len(self.arg)):
-                field_detail=self._field_get(cr,uid,relation,self.arg[i])
+                field_detail=self._field_get(cr,uid,obj,relation,self.arg[i])
                 relation=field_detail[0]
                 if not t_data[self.arg[i]]:
                     t_data = False
@@ -670,13 +678,15 @@ class related(function):
     def __init__(self,*arg,**args):
         print arg
         self.arg = arg
-        super(related, self).__init__(self._fnct_read, arg, fnct_inf=self._fnct_write, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
+        super(related, self).__init__(self._fnct_read, arg, fnct_inv=self._fnct_write, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
 
     # TODO: call field_get on the object, not in the DB
-    def _field_get(self, cr, uid, model_name, prop):
-        cr.execute('SELECT relation,ttype FROM ir_model_fields WHERE name=%s AND model=%s', (prop, model_name))
-        res = cr.fetchone()
-        return res
+    def _field_get(self, cr, uid, obj, model_name, prop):
+        fields=obj.pool.get(model_name).fields_get(cr,uid,[prop])
+        if fields.get(prop,False):
+            return(fields[prop].get('relation',False),fields[prop].get('type',False))
+        else:
+            raise 'Fields %s not exist in %s'%(prop,model_name)
 
 # ---------------------------------------------------------
 # Serialized fields

From 2b8402d590f8bee03b5ed021223fb38824526e87 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Fri, 19 Sep 2008 14:56:57 +0200
Subject: [PATCH 18/26] fix and complete base access rights

bzr revid: christophe@tinyerp.com-20080919125657-q9spohajdvnxrikt
---
 bin/addons/base/__terp__.py         |   2 +-
 bin/addons/base/base_security.xml   | 120 +---------------------------
 bin/addons/base/ir.model.access.csv |  23 ++++++
 3 files changed, 27 insertions(+), 118 deletions(-)

diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index 917a0ff3541..ae83f7ea164 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -47,7 +47,6 @@
         "res/partner/crm_demo.xml",
     ],
     "update_xml" : [
-        "ir.model.access.csv",
         "base_update.xml",
         "ir/wizard/wizard_menu_view.xml",
         "ir/ir.xml",
@@ -68,6 +67,7 @@
         "res/partner/partner_data.xml",
         "res/ir_property_view.xml",
         "base_security.xml",
+        "ir.model.access.csv",
     ],
     "active": True,
     "installable": True,
diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index 387044d8a50..d109ae05e9c 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+	<!--<data noupdate="0">-->
+	<data>
 
 <!--
  Users Groups
@@ -40,121 +41,6 @@
         <field name="menu_id" ref="action_menu_admin"/>
     </record>
 
-<!--
- Access
--->
-
-<!--Don't remove after-->
-    <record model="ir.model.access" id="access_ir_actions_employee">
-        <field name="name">ir.actions.actions Employee</field>
-        <field model="ir.model" name="model_id" search="[('model', '=', 'ir.actions.actions')]"/>
-        <field name="group_id" ref="group_user"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_ir_actions_act_window_employee">
-        <field name="name">ir.actions.act_window Employee</field>
-        <field model="ir.model" name="model_id" search="[('model', '=', 'ir.actions.act_window')]"/>
-        <field name="group_id" ref="group_user"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_ir_actions_act_window_employee">
-        <field name="name">ir.actions.act_window_close System</field>
-        <field model="ir.model" name="model_id" search="[('model', '=', 'ir.actions.act_window_close')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_ir_actions_act_window_employee">
-        <field name="name">ir.actions.act_window_close System</field>
-        <field model="ir.model" name="model_id" search="[('model', '=', 'ir.actions.report.xml')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_ir_actions_act_window_employee">
-        <field name="name">ir.actions.act_window_close System</field>
-        <field model="ir.model" name="model_id" search="[('model', '=', 'ir.actions.wizard')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    
-    <record model="ir.model.access" id="access_workflow_group_system">
-        <field name="name">workflow group_system</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-
-    <record model="ir.model.access" id="access_workflow_activity_group_system">
-        <field name="name">workflow_activity group_system</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow.activity')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-
-    <record model="ir.model.access" id="access_workflow_instance_group_system">
-        <field name="name">workflow_instance group_system</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow.instance')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-
-    <record model="ir.model.access" id="access_workflow_transition_group_system">
-        <field name="name">workflow_transition group_system</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow.transition')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-
-    <record model="ir.model.access" id="access_workflow_triggers_group_system">
-        <field name="name">workflow_triggers group_system</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow.triggers')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-
-    <record model="ir.model.access" id="access_workflow_workitem_group_system">
-        <field name="name">workflow_workitem group_system</field>
-        <field name="model_id" model="ir.model" search="[('model', '=', 'workflow.workitem')]"/>
-        <field name="group_id" ref="group_system"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-<!--Don't remove before-->
-
 </data>
 </openerp>
+
diff --git a/bin/addons/base/ir.model.access.csv b/bin/addons/base/ir.model.access.csv
index 4ec941b0f28..a9ae41ee90e 100644
--- a/bin/addons/base/ir.model.access.csv
+++ b/bin/addons/base/ir.model.access.csv
@@ -7,6 +7,7 @@ access_ir_exports_group_system,"ir_exports group_system",model_ir_exports,,1,1,1
 access_ir_exports_line_group_system,"ir_exports_line group_system",model_ir_exports_line,,1,1,1,1
 access_ir_model_group_system,"ir_model group_system",model_ir_model,,1,0,0,0
 access_ir_model_access_group_system,"ir_model_access group_system",model_ir_model_access,,1,0,0,0
+access_ir_model_grid_group_system,ir_model_access_grid_group_system,model_ir_model_grid,,1,0,0,0
 access_ir_model_config_group_system,"ir_model_config group_system",model_ir_model_config,,1,0,0,0
 access_ir_model_data_group_user,"ir_model_data group_user",model_ir_model_data,,1,0,0,0
 access_ir_model_fields_group_user,"ir_model_fields group_user",model_ir_model_fields,,1,0,0,0
@@ -26,6 +27,7 @@ access_ir_sequence_type_group_user,"ir_sequence_type group_user",model_ir_sequen
 access_ir_translation_group_system,"ir_translation group_system",model_ir_translation,,1,1,1,1
 access_ir_ui_menu_group_user,"ir_ui_menu group_user",model_ir_ui_menu,,1,0,0,0
 access_ir_ui_view_group_user,"ir_ui_view group_user",model_ir_ui_view,,1,0,0,0
+access_ir_ui_view_custom_group_user,ir_ui_view_custom_group_user,model_ir_ui_view_custom,,1,0,0,0
 access_ir_ui_view_sc_group_user,"ir_ui_view_sc group_user",model_ir_ui_view_sc,,1,1,1,1
 access_ir_values_group_erp_manager,"ir_values group_erp_manager",model_ir_values,,1,1,1,1
 access_wizard_ir_model_menu_create_group_system,"wizard_ir_model_menu_create group_system",model_wizard_ir_model_menu_create,group_system,1,1,1,1
@@ -74,3 +76,24 @@ access_res_request_link_group_system,"res_request_link group_system",model_res_r
 access_res_request_link_group_user,"res_request_link group_user",model_res_request_link,,1,0,0,0
 access_res_users_group_user,"res_users group_user",model_res_users,,1,0,0,0
 access_res_users_group_erp_manager,"res_users group_erp_manager",model_res_users,group_erp_manager,1,1,1,1
+access_ir_actions_employee,ir_actions_employee,model_ir_actions_actions,group_user,1,0,0,0
+access_ir_actions_act_window_employee,ir_actions_act_window_employee,model_ir_actions_act_window,group_user,1,0,0,0
+access_ir_actions_act_window_close_group_system,ir_actions_act_window_close_system,model_ir_actions_act_window_close,group_system,1,0,0,0
+access_ir_actions_report_xml_group_system,ir_actions_report_xml_system,model_ir_actions_report_xml,group_system,1,0,0,0
+access_ir_actions_wizard_group_system,ir_actions_wizard,model_ir_actions_wizard,group_system,1,0,0,0
+access_workflow_group_system,workflow_group_system,model_workflow,group_system,1,0,0,0
+access_workflow_activity_group_system,workflow_activity_group_system,model_workflow_activity,group_system,1,0,0,0
+access_workflow_instance_group_system,workflow_instance_group_system,model_workflow_instance,group_system,1,0,0,0
+access_workflow_transition_group_system,workflow_transition_group_system,model_workflow_transition,group_system,1,0,0,0
+access_workflow_triggers_group_system,workflow_triggers_group_system,model_workflow_triggers,group_system,1,0,0,0
+access_workflow_workitem_group_system,workflow_workitem_group_system,model_workflow_workitem,group_system,1,0,0,0
+access_actions_report_custom_group_system,ir_actions_report_custom_group_system,model_ir_actions_report_custom,group_system,1,0,0,0
+access_ir_actions_act_window_view_group_employee,ir_actions_act_window_view_group_employee,model_ir_actions_act_window_view,group_user,1,0,0,0
+access_ir_actions_url_group_user,ir_actions_url_group_user,model_ir_actions_url,group_user,1,0,0,0
+access_ir_server_object_lines_group_user,ir_server_object_lines_group_user,model_ir_server_object_lines,group_user,1,0,0,0
+access_ir_actions_server_group_user,ir_actions_server_group_user,model_ir_actions_server,group_user,1,0,0,0
+access_module_update_translations_group_user,wizard_update_translations_group_user,model_wizard_module_update_translations,group_user,1,1,1,1
+access_res_bank_group_system,res_bank_group_system,model_res_bank,group_system,1,1,1,1
+access_res_payterm_group_system,res_payterm_group_system,model_res_payterm,group_system,1,1,1,1
+access_res_roles_group_erpmanager,res_roles_group_erp_manager,model_res_roles,group_erp_manager,1,1,1,1
+access_res_config_view_group_erpmanager,res_config_view_erp_manager,model_res_config_view,group_erp_manager,1,1,1,1

From 7089825650628de32c73d40d804e95980d50084f Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Fri, 19 Sep 2008 19:31:46 +0530
Subject: [PATCH 19/26] resolve menu problem on sale_journal module

bzr revid: hmo@tinyerp.com-20080919140146-5ah0mz0bqj9mro2z
---
 addons/sale_journal/picking_journal_view.xml        | 12 ++++++------
 addons/sale_journal/picking_journal_view_report.xml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 4bc9493e6bd..87ef5eedea3 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -56,8 +56,8 @@
 		<field name="view_mode">tree,form</field>
 	</record>
 	
-	<menuitem name="Configuration" id="menu_definition_journal_configuration"/>
-	<menuitem name="Packings Journals" id="menu_definition_journal_picking" parent="menu_definition_journal_configuration" action="action_definition_picking_journal"/>
+	
+	<menuitem name="Packings Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree">
 		<field name="name">Packings by journal</field>
@@ -67,8 +67,8 @@
 		<field name="domain">[]</field>
 	</record>
 	
-	<menuitem name="Packing Lists" id="menu_definition_journal_packing_lists"/>
-	<menuitem name="Packings by Journal" id="menu_definition_journal_picking_byjournal" parent="menu_definition_journal_packing_lists" action="action_definition_picking_journal_tree"/>
+	
+	<menuitem name="Packings by Journal" id="menu_definition_journal_picking_byjournal" parent="stock.menu_stock_root" action="action_definition_picking_journal_tree"/>
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_my">
 		<field name="name">My open packing journals</field>
@@ -98,8 +98,8 @@
 		<field name="view_type">tree</field>
 	</record>
 	
-	<menuitem name="Sending Goods" id="menu_definition_journal_picking_sending_goods" parent="menu_definition_journal_packing_lists"/>
-	<menuitem name="Packings to Invoice" id="menu_definition_journal_picking_invoice" parent="menu_definition_journal_picking_sending_goods"/>
+	
+	<menuitem name="Packings to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>
 	<menuitem name="Packings by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>
 	
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
index 7f956736fc0..d177673726e 100644
--- a/addons/sale_journal/picking_journal_view_report.xml
+++ b/addons/sale_journal/picking_journal_view_report.xml
@@ -57,7 +57,7 @@
 		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
 	
-	<menuitem name="Reporting" id="menu_definition_journal_reporting"/>
+	<menuitem name="Packings Journal" id="menu_definition_journal_reporting" parent="stock.next_id_61"/>
 	<menuitem name="This Month" id="menu_definition_journal_reporting_this" parent="menu_definition_journal_reporting"/>
 	<menuitem name="Packings by Invoice Method" id="menu_invoice_type_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_invoice_type_picking_stats_open_menu_month"/>
 

From ae297f02073e1b9426abf0c92051f3d7d3a24ff1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 19 Sep 2008 16:35:02 +0200
Subject: [PATCH 20/26] improvement

bzr revid: fp@tinyerp.com-20080919143502-9ed1rufs8kmis002
---
 addons/account_payment/payment.py         |   2 +-
 addons/mrp/mrp_view.xml                   |   6 +-
 addons/sale/sale.py                       |   4 +-
 addons/sale/sale_view.xml                 |   1 -
 addons/sale_journal/sale_journal_view.xml | 534 +++++++++++-----------
 addons/stock/stock_view.xml               |   6 +-
 6 files changed, 282 insertions(+), 271 deletions(-)

diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 7b110f8635a..23b0b40140e 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -438,7 +438,7 @@ class payment_line(osv.osv):
         if move_line_id:
             line = self.pool.get('account.move.line').browse(cr,uid,move_line_id)
             data['amount_currency']=line.amount_to_pay
-            res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency, company_currency, 
+            #res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency, company_currency, 
             if res:
                 data['amount'] = res['value']['amount']
             data['partner_id']=line.partner_id.id
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a5d0c6f0500..2718dbefd7d 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -677,7 +677,7 @@
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"/>
+        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
         
         <record id="mrp_procurement_action2" model="ir.actions.act_window">
             <field name="name">Draft procurements</field>
@@ -706,7 +706,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
         </record>
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="mrp.menu_mrp_procurement_action"/>
+        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="stock.menu_stock_root"/>
         
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Exceptions procurements to fix</field>
@@ -735,7 +735,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action5"/>
+        <menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action"/>
         
         <!-- Order Point -->
         <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 7de48d9370c..b427a0588cb 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -214,7 +214,7 @@ class sale_order(osv.osv):
         'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
 
         'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
-        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True ),
+        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True),
         'order_policy': fields.selection([
             ('prepaid','Payment before delivery'),
             ('manual','Shipping & Manual Invoice'),
@@ -241,7 +241,7 @@ class sale_order(osv.osv):
         'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
         'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
-        'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."),
+        'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.",required=True),
         'payment_term' : fields.many2one('account.payment.term', 'Payment Term'),
     }
     _defaults = {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 13523bb86ed..d4b6f973de8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -101,7 +101,6 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Sale Order">
-
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index be96302c583..7647a7b2bfb 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,283 +1,295 @@
 <openerp>
 <data>
-	<record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
-		<field name="name">sale_journal.invoice.type.form</field>
-		<field name="model">sale_journal.invoice.type</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Invoice Type">
-				<field name="name" select="1"/>
-				<field name="active" select="1"/>
-				<field name="invoicing_method" select="1"/>
-				<newline/>
-				<field name="note" colspan="4"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
-		<field name="name">sale_journal.invoice.type.tree</field>
-		<field name="model">sale_journal.invoice.type</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Invoice Type">
-				<field name="name"/>
-				<field name="invoicing_method"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
-		<field name="res_model">sale_journal.invoice.type</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	
-	<menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
+    <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
+        <field name="name">sale_journal.invoice.type.form</field>
+        <field name="model">sale_journal.invoice.type</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Invoice Type">
+                <field name="name" select="1"/>
+                <field name="active" select="1"/>
+                <field name="invoicing_method" select="1"/>
+                <newline/>
+                <field name="note" colspan="4"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
+        <field name="name">sale_journal.invoice.type.tree</field>
+        <field name="model">sale_journal.invoice.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Invoice Type">
+                <field name="name"/>
+                <field name="invoicing_method"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+        <field name="res_model">sale_journal.invoice.type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
 
-	<record model="ir.ui.view" id="view_sale_journal_form">
-		<field name="name">sale_journal.sale.journal.form</field>
-		<field name="model">sale_journal.sale.journal</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Sale Journal">
-				<notebook>
-				<page string="Journal">
-					<separator string="Journal Information" colspan="4"/>
-					<field name="name" select="1"/>
-					<field name="code" select="1"/>
-					<field name="user_id" select="1"/>
-					<field name="date" select="1"/>
-					<field name="date_created" select="1"/>
-					<field name="date_validation" select="1"/>
-					<separator string="States" colspan="4"/>
-					<field name="state"/>
-					<group col="3" colspan="2">
-						<button name="button_open" string="Open Journal" states="draft" type="object"/>
-						<button name="button_close" string="Close Journal" states="open" type="object"/>
-						<button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
-					</group>
-				</page>
-				<page string="Sales">
-					<button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object"/>
-					<button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object"/>
-					<newline/>
-					<field name="sale_stats_ids" colspan="4" nolabel="1">
-						<tree string="Sales">
-							<field name="name"/>
-							<field name="quantity"/>
-							<field name="price_total"/>
-							<field name="price_average"/>
-							<field name="count"/>
-							<field name="state"/>
-						</tree>
-					</field>
-				</page><page string="Notes">
-					<field name="note" colspan="4" nolabel="1"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_sale_journal_tree">
-		<field name="name">sale_journal.sale.journal.tree</field>
-		<field name="model">sale_journal.sale.journal</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Sale Journal">
-				<field name="name" select="1"/>
-				<field name="code" select="1"/>
-				<field name="user_id" select="1"/>
-				<field name="date" select="1"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_definition_journal">
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	
-	<menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
+    <record model="ir.ui.view" id="view_sale_journal_form">
+        <field name="name">sale_journal.sale.journal.form</field>
+        <field name="model">sale_journal.sale.journal</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Sale Journal">
+                <notebook>
+                <page string="Journal">
+                    <separator string="Journal Information" colspan="4"/>
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="date_created" select="1"/>
+                    <field name="date_validation" select="1"/>
+                    <separator string="States" colspan="4"/>
+                    <field name="state"/>
+                    <group col="3" colspan="2">
+                        <button name="button_open" string="Open Journal" states="draft" type="object"/>
+                        <button name="button_close" string="Close Journal" states="open" type="object"/>
+                        <button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
+                    </group>
+                </page>
+                <page string="Sales">
+                    <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object"/>
+                    <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object"/>
+                    <newline/>
+                    <field name="sale_stats_ids" colspan="4" nolabel="1">
+                        <tree string="Sales">
+                            <field name="name"/>
+                            <field name="quantity"/>
+                            <field name="price_total"/>
+                            <field name="price_average"/>
+                            <field name="count"/>
+                            <field name="state"/>
+                        </tree>
+                    </field>
+                </page><page string="Notes">
+                    <field name="note" colspan="4" nolabel="1"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_sale_journal_tree">
+        <field name="name">sale_journal.sale.journal.tree</field>
+        <field name="model">sale_journal.sale.journal</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Sale Journal">
+                <field name="name" select="1"/>
+                <field name="code" select="1"/>
+                <field name="user_id" select="1"/>
+                <field name="date" select="1"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_definition_journal">
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
 
-	<record model="ir.actions.act_window" id="action_definition_journal_tree">
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[]</field>
-	</record>
-	
-	<menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
+    <record model="ir.actions.act_window" id="action_definition_journal_tree">
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[]</field>
+    </record>
+    
+    <menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
 
-	<record model="ir.actions.act_window" id="action_definition_journal_tree_my">
-		<field name="name">My open journals</field>
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-	</record>
-	
-	<menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my"/>
+    <record model="ir.actions.act_window" id="action_definition_journal_tree_my">
+        <field name="name">My open journals</field>
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+    </record>
+    
+    <menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my"/>
 
-	<record model="ir.actions.act_window" id="action_definition_journal_tree_all">
-		<field name="name">Open journals</field>
-		<field name="res_model">sale_journal.sale.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('state','=','open')]</field>
-	</record>
-	
-	<menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all"/>
+    <record model="ir.actions.act_window" id="action_definition_journal_tree_all">
+        <field name="name">Open journals</field>
+        <field name="res_model">sale_journal.sale.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','=','open')]</field>
+    </record>
+    
+    <menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all"/>
 
-	<record model="ir.ui.view" id="sale_journal_sale_order">
-		<field name="name">sale.order.journal.view.form</field>
-		<field name="type">form</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_form" />
-		<field name="arch" type="xml">
-			<field name="client_order_ref" position="after">
-				<field name="journal_id" select="1"/>
-				<field name="invoice_type_id" select="1"/>
-			</field>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="sale_journal_sale_order_tree">
-		<field name="name">sale.order.journal.view.tree</field>
-		<field name="type">tree</field>
-		<field name="model">sale.order</field>
-		<field name="inherit_id" ref="sale.view_order_tree" />
-		<field name="arch" type="xml">
-			<field name="state" position="after">
-				<field name="journal_id"/>
-				<field name="invoice_type_id"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="sale_journal_sale_order">
+        <field name="name">sale.order.journal.view.form</field>
+        <field name="type">form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="arch" type="xml">
+            <field name="client_order_ref" position="after">
+                <field name="journal_id" select="1"/>
+                <field name="invoice_type_id" select="1"/>
+            </field>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="sale_journal_sale_order_tree">
+        <field name="name">sale.order.journal.view.tree</field>
+        <field name="type">tree</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_tree" />
+        <field name="arch" type="xml">
+            <field name="state" position="after">
+                <field name="journal_id"/>
+                <field name="invoice_type_id"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="sale_journal_picking_order">
-		<field name="name">stock.picking.journal.view.form</field>
-		<field name="type">form</field>
-		<field name="model">stock.picking</field>
-		<field name="inherit_id" ref="stock.view_picking_form" />
-		<field name="arch" type="xml">
-			<field name="origin" position="after">
-				<field name="invoice_type_id" select="1"/>
-				<field name="sale_journal_id" select="1"/>
-				<field name="journal_id" select="1"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="sale_journal_picking_order">
+        <field name="name">stock.picking.journal.view.form</field>
+        <field name="type">form</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form" />
+        <field name="arch" type="xml">
+            <field name="origin" position="after">
+                <field name="invoice_type_id" select="1"/>
+                <field name="sale_journal_id" select="1"/>
+                <field name="journal_id" select="1"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="sale_journal_picking_order_tree">
-		<field name="name">stock.picking.journal.view.tree</field>
-		<field name="type">tree</field>
-		<field name="model">stock.picking</field>
-		<field name="inherit_id" ref="stock.vpicktree" />
-		<field name="arch" type="xml">
-			<field name="invoice_state" position="after">
-				<field name="sale_journal_id" select="1"/>
-				<field name="invoice_type_id" select="1"/>
-				<field name="journal_id" select="1"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="sale_journal_picking_order_tree">
+        <field name="name">stock.picking.journal.view.tree</field>
+        <field name="type">tree</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.vpicktree" />
+        <field name="arch" type="xml">
+            <field name="invoice_state" position="after">
+                <field name="sale_journal_id" select="1"/>
+                <field name="invoice_type_id" select="1"/>
+                <field name="journal_id" select="1"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_sale_journal_sale_stats_tree">
-		<field name="name">sale_journal.sale.stats.tree</field>
-		<field name="model">sale_journal.sale.stats</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Sales by Journal">
-				<field name="name"/>
-				<field name="state"/>
-				<field name="journal_id"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_sale_journal_sale_stats_form">
-		<field name="name">sale_journal.sale.stats.form</field>
-		<field name="model">sale_journal.sale.stats</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Sales by Journal">
-				<field name="name" select="1"/>
-				<field name="state" select="1"/>
-				<field name="journal_id" select="1"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_sale_journal_sale_stats_tree">
+        <field name="name">sale_journal.sale.stats.tree</field>
+        <field name="model">sale_journal.sale.stats</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Sales by Journal">
+                <field name="name"/>
+                <field name="state"/>
+                <field name="journal_id"/>
+                <field name="quantity"/>
+                <field name="count"/>
+                <field name="price_total"/>
+                <field name="price_average"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_sale_journal_sale_stats_form">
+        <field name="name">sale_journal.sale.stats.form</field>
+        <field name="model">sale_journal.sale.stats</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Sales by Journal">
+                <field name="name" select="1"/>
+                <field name="state" select="1"/>
+                <field name="journal_id" select="1"/>
+                <field name="quantity"/>
+                <field name="count"/>
+                <field name="price_total"/>
+                <field name="price_average"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_month">
-		<field name="name">Sales by journal (this month)</field>
-		<field name="res_model">sale_journal.sale.stats</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
-	</record>
-	
-	<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
-	<menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
-	<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
+    <record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_month">
+        <field name="name">Sales by journal (this month)</field>
+        <field name="res_model">sale_journal.sale.stats</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+    </record>
+    
+    <menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
+    <menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
+    <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
 
-	<record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
-		<field name="res_model">sale_journal.sale.stats</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	
-	<menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
-	<menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
+    <record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
+        <field name="res_model">sale_journal.sale.stats</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
+    <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
 
-	<act_window name="Monthly sales"
-		domain="[('journal_id', '=', active_id)]"
-		res_model="sale_journal.sale.stats"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
+    <act_window name="Monthly sales"
+        domain="[('journal_id', '=', active_id)]"
+        res_model="sale_journal.sale.stats"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
 
-	<act_window name="Assigned packings"
-		domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
-		res_model="stock.picking"
-		src_model="sale_journal.picking.journal"
-		id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
+    <act_window name="Assigned packings"
+        domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
+        res_model="stock.picking"
+        src_model="sale_journal.picking.journal"
+        id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
 
-	<act_window name="Confirmed packings"
-		domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
-		res_model="stock.picking"
-		src_model="sale_journal.picking.journal"
-		id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
+    <act_window name="Confirmed packings"
+        domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
+        res_model="stock.picking"
+        src_model="sale_journal.picking.journal"
+        id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
 
-	<act_window name="Assigned packings"
-		domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
-		res_model="stock.picking"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
+    <act_window name="Assigned packings"
+        domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
+        res_model="stock.picking"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
 
-	<act_window name="Confirmed packings"
-		domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
-		res_model="stock.picking"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
+    <act_window name="Confirmed packings"
+        domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
+        res_model="stock.picking"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
 
-	<act_window name="Draft sales"
-		domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
-		res_model="sale.order"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_sale_order_draft"/>
+    <act_window name="Draft sales"
+        domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
+        res_model="sale.order"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_sale_order_draft"/>
 
-	<act_window name="Approved sales"
-		domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
-		res_model="sale.order"
-		src_model="sale_journal.sale.journal"
-		id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+    <act_window name="Approved sales"
+        domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
+        res_model="sale.order"
+        src_model="sale_journal.sale.journal"
+        id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+
+    <record id="view_partner_property_form" model="ir.ui.view">
+        <field name="name">res.partner.journal.property.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <field name="property_product_pricelist" position="after"/>
+                <field name="property_invoice_type"/>
+            </field>
+        </field>
+    </record>
 
 
 </data>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 54f46b5899c..04ad0cf745b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -563,7 +563,7 @@
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="Others info">
+                        <page string="Others info" groups="base.group_extended">
                             <field name="origin" select="2"/>
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
@@ -651,7 +651,7 @@
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="Others info">
+                        <page string="Others info" groups="base.group_extended">
                             <field name="auto_picking"/>
                             <field name="active" select="2"/>
                             <newline/>
@@ -819,7 +819,7 @@
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="Others info">
+                        <page string="Others info" groups="base.group_extended">
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
                             <newline/>

From ca784ddcce01b8ffa07a8486a2d0098f77b6a9ff Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Fri, 19 Sep 2008 20:15:23 +0530
Subject: [PATCH 21/26] Added process demo data.

bzr revid: ame@tinyerp.com-20080919144523-zxc73mz625dpvqcw
---
 addons/process/__terp__.py      |   4 +-
 addons/process/process.py       |   4 +-
 addons/process/process_data.xml |  92 --------------------
 addons/process/process_demo.xml | 143 ++++++++++++++++++++++++++++++++
 4 files changed, 147 insertions(+), 96 deletions(-)
 delete mode 100644 addons/process/process_data.xml
 create mode 100644 addons/process/process_demo.xml

diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py
index cc8edbe5848..f8cbf4ad927 100644
--- a/addons/process/__terp__.py
+++ b/addons/process/__terp__.py
@@ -10,10 +10,10 @@ This module allows you to manage your process for the end-users.
     """,
     "depends" : ["base", "sale"],
     "init_xml" : [],
-    "demo_xml" : [],
+    "demo_xml" : ['process_demo.xml'],
     "update_xml" : [
         "security/ir.model.access.csv",
-        'process_view.xml'
+        'process_view.xml',
     ],
     "active": False,
     "installable": True
diff --git a/addons/process/process.py b/addons/process/process.py
index 9044a9d82a5..013bdba8e7c 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -159,7 +159,7 @@ class process_node(osv.osv):
     _description ='Process Nodes'
     _columns = {
         'name': fields.char('Name', size=30,required=True),
-        'process_id': fields.many2one('process.process', 'Process', required=True),
+        'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'),
         'kind': fields.selection([('state','State'), ('subflow','Subflow')], 'Kind of Node', required=True),
         'menu_id': fields.many2one('ir.ui.menu', 'Related Menu'),
         'note': fields.text('Notes'),
@@ -182,7 +182,7 @@ class process_node_condition(osv.osv):
     _description = 'Condition'
     _columns = {
         'name': fields.char('Name', size=30, required=True),
-        'node_id': fields.many2one('process.node', 'Node', required=True),
+        'node_id': fields.many2one('process.node', 'Node', required=True, ondelete='cascade'),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'model_states': fields.char('Expression', required=True, size=128)
     }
diff --git a/addons/process/process_data.xml b/addons/process/process_data.xml
deleted file mode 100644
index 9e87801c767..00000000000
--- a/addons/process/process_data.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-		<record id="process_process_salesworkflow0" model="process.process">
-			<field eval="1" name="active"/>
-			<field eval="&quot;&quot;&quot;Sales flow for services companies.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Sales Workflow&quot;&quot;&quot;" name="name"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_node_quotation0" model="process.node">
-			<field name="menu_id" ref="sale.menu_action_order_tree10"/>
-			<field name="process_id" ref="process_process_salesworkflow0"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
-			<field name="model_id" ref="sale.model_sale_order"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_node_saleorder0" model="process.node">
-			<field name="menu_id" ref="sale.menu_action_order_tree9"/>
-			<field name="process_id" ref="process_process_salesworkflow0"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
-			<field name="model_id" ref="sale.model_sale_order"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_node_packinglist0" model="process.node">
-			<field name="menu_id" ref="stock.menu_picking_waiting"/>
-			<field name="process_id" ref="process_process_salesworkflow0"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Packing List&quot;&quot;&quot;" name="name"/>
-			<field name="model_id" ref="stock.model_stock_picking"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_node_deliveryorder0" model="process.node">
-			<field name="menu_id" ref="stock.menu_picking_waiting_delivery"/>
-			<field name="process_id" ref="process_process_salesworkflow0"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
-			<field name="model_id" ref="stock.model_stock_picking"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_node_invoice0" model="process.node">
-			<field name="menu_id" ref="account.menu_invoice_draft"/>
-			<field name="process_id" ref="process_process_salesworkflow0"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-			<field name="model_id" ref="account.model_account_invoice"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_transition_confirmquotation0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>
-			<field name="node_from_id" ref="process_node_quotation0"/>
-			<field name="node_to_id" ref="process_node_saleorder0"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_transition_packing0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Packing&quot;&quot;&quot;" name="name"/>
-			<field name="node_from_id" ref="process_node_saleorder0"/>
-			<field name="node_to_id" ref="process_node_packinglist0"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_transition_deliver0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Deliver&quot;&quot;&quot;" name="name"/>
-			<field name="node_from_id" ref="process_node_packinglist0"/>
-			<field name="node_to_id" ref="process_node_deliveryorder0"/>
-		</record>
-	</data>
-	<data>
-		<record id="process_transition_invoice0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-			<field name="node_from_id" ref="process_node_saleorder0"/>
-			<field name="node_to_id" ref="process_node_invoice0"/>
-		</record>
-	</data>
-</openerp>
diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml
new file mode 100644
index 00000000000..f8537ecf62e
--- /dev/null
+++ b/addons/process/process_demo.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" ?>
+<openerp>
+
+
+    <data>
+
+        <record id="sales_workflow" model="process.process">
+            <field name="name">Sales Workflow</field>
+            <field name="note">Sales flow for services companies.</field>
+        </record>
+
+        <!-- Nodes -->
+
+        <record id="node_quotation" model="process.node">
+            <field name="name">Quotation</field>
+            <field name="note">Quotations are sale orders in draft mode</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
+            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'My Quotations')]"></field>
+            <field name="kind">state</field>
+            <field name="model_states">object.state == 'draft'</field>
+            <field name="process_id" ref="sales_workflow"/>
+        </record>
+
+        <record id="node_sale_order" model="process.node">
+            <field name="name">Sale Order</field>
+            <field name="note">Manages the delivery in invoicing process</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
+            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'All Sales Order')]"></field>
+            <field name="kind">state</field>
+            <field name="model_states">object.state == 'manual'</field>
+            <field name="process_id" ref="sales_workflow"/>
+        </record>
+
+        <record id="node_invoice_on_sale" model="process.node">
+            <field name="name">Invoice</field>
+            <field name="note">In case you invoiced on Sale Order</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Invoice')]"></field>
+            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Invoices')]"></field>
+            <field name="kind">state</field>
+            <field name="model_states"></field>
+            <field name="process_id" ref="sales_workflow"/>
+        </record>
+
+        <record id="node_tasks" model="process.node">
+            <field name="name">Tasks</field>
+            <field name="note">In case you sale services on order</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Task')]"></field>
+            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'All Tasks')]"></field>
+            <field name="kind">subflow</field>
+            <field name="model_states"></field>
+            <field name="process_id" ref="sales_workflow"/>
+        </record>
+
+        <record id="node_packing" model="process.node">
+            <field name="name">Packing List</field>
+            <field name="note">The workers pack the requested items</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Packing list')]"></field>
+            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Packings to Process')]"></field>
+            <field name="kind">state</field>
+            <field name="model_states"></field>
+            <field name="process_id" ref="sales_workflow"/>
+        </record>
+
+        <record id="node_delivery_order" model="process.node">
+            <field name="name">Delivery Order</field>
+            <field name="note">The transporter take the box and deliver it</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Stock Move')]"></field>
+            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Waiting Delivery Orders')]"></field>
+            <field name="kind">state</field>
+            <field name="model_states"></field>
+            <field name="process_id" ref="sales_workflow"/>
+        </record>  
+
+        <record id="node_invoice_on_delivery" model="process.node">
+            <field name="name">Invoice</field>
+            <field name="note">In case you invoice based on deliveries</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Invoice')]"></field>
+            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Invoices')]"></field>
+            <field name="kind">subflow</field>
+            <field name="model_states"></field>
+            <field name="process_id" ref="sales_workflow"/>
+        </record>  
+
+        <!-- Node conditions (Gray nodes) -->
+
+        <record id="node_condition_invoice_on_order" model="process.condition">
+            <field name="name">Invoice on order</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
+            <field name="model_states">object.order_policy != 'postpaid'</field>
+            <field name="node_id" ref="node_invoice_on_sale"/>
+        </record>
+
+        <record id="node_condition_invoice_on_delivery" model="process.condition">
+            <field name="name">Invoice on delivery</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
+            <field name="model_states">object.order_policy == 'postpaid'</field>
+            <field name="node_id" ref="node_invoice_on_sale"/>
+        </record>
+
+        <!-- Transitions -->
+
+        <record id="transition_confirm_quotation" model="process.transition">
+            <field name="name">Confirm Quotation</field>
+            <field name="source_node_id" ref="node_quotation"></field>
+            <field name="target_node_id" ref="node_sale_order"></field>
+        </record>
+
+        <record id="transition_packing" model="process.transition">
+            <field name="name">Packing</field>
+            <field name="source_node_id" ref="node_sale_order"></field>
+            <field name="target_node_id" ref="node_packing"></field>
+        </record>
+
+        <record id="transition_invoce_on_sale" model="process.transition">
+            <field name="name">Invoice on order</field>
+            <field name="source_node_id" ref="node_sale_order"></field>
+            <field name="target_node_id" ref="node_invoice_on_sale"></field>
+        </record>
+
+        <record id="transition_traks" model="process.transition">
+            <field name="name">Create Tasks</field>
+            <field name="source_node_id" ref="node_sale_order"></field>
+            <field name="target_node_id" ref="node_tasks"></field>
+        </record>
+
+        <record id="transition_delivery" model="process.transition">
+            <field name="name">Deliver Goods</field>
+            <field name="source_node_id" ref="node_packing"></field>
+            <field name="target_node_id" ref="node_delivery_order"></field>
+        </record>
+
+        <record id="transition_invoice_on_delivery" model="process.transition">
+            <field name="name">Invoice or delivery</field>
+            <field name="source_node_id" ref="node_delivery_order"></field>
+            <field name="target_node_id" ref="node_invoice_on_delivery"></field>
+        </record>
+
+        <!-- TODO: Transition actions (Buttons) -->
+        <!-- TODO: Transition roles (workflow transition ids) -->
+
+    </data>
+
+</openerp>

From 8d4c1a2816635f5d940234a3885f1c7007df0d0b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 19 Sep 2008 16:58:37 +0200
Subject: [PATCH 22/26] translate

bzr revid: fp@tinyerp.com-20080919145837-9b5tu47xrwxg5s58
---
 addons/process/process.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 9044a9d82a5..9fe377ba7e2 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -54,9 +54,9 @@ class process_process(osv.osv):
     _name = "process.process"
     _description = "Process"
     _columns = {
-        'name': fields.char('Name', size=30,required=True),
+        'name': fields.char('Name', size=30,required=True, translate=True),
         'active': fields.boolean('Active'),
-        'note': fields.text('Notes'),
+        'note': fields.text('Notes', translate=True),
         'node_ids': fields.one2many('process.node', 'process_id', 'Nodes')
     }
     _defaults = {
@@ -158,11 +158,11 @@ class process_node(osv.osv):
     _name = 'process.node'
     _description ='Process Nodes'
     _columns = {
-        'name': fields.char('Name', size=30,required=True),
+        'name': fields.char('Name', size=30,required=True, translate=True),
         'process_id': fields.many2one('process.process', 'Process', required=True),
         'kind': fields.selection([('state','State'), ('subflow','Subflow')], 'Kind of Node', required=True),
         'menu_id': fields.many2one('ir.ui.menu', 'Related Menu'),
-        'note': fields.text('Notes'),
+        'note': fields.text('Notes', translate=True),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'model_states': fields.char('States Expression', size=128),
         'flow_start': fields.boolean('Starting Flow'),
@@ -192,12 +192,12 @@ class process_transition(osv.osv):
     _name = 'process.transition'
     _description ='Process Transitions'
     _columns = {
-        'name': fields.char('Name', size=32, required=True),
+        'name': fields.char('Name', size=32, required=True, translate=True),
         'source_node_id': fields.many2one('process.node', 'Source Node', required=True, ondelete='cascade'),
-        'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'),        
+        'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'),
         'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'),
         'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'),
-        'note': fields.text('Description'),
+        'note': fields.text('Description', translate=True),
     }
 process_transition()
 
@@ -205,7 +205,7 @@ class process_transition_action(osv.osv):
     _name = 'process.transition.action'
     _description ='Process Transitions Actions'
     _columns = {
-        'name': fields.char('Name', size=32, required=True),
+        'name': fields.char('Name', size=32, required=True, translate=True),
         'state': fields.selection([('dummy','Dummy'),
                                    ('object','Object Method'),
                                    ('workflow','Workflow Trigger'),

From 6e950e92ed13218f39ccbaaf72e6906f3475cd7d Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Fri, 19 Sep 2008 20:33:46 +0530
Subject: [PATCH 23/26] More process demo data.

bzr revid: ame@tinyerp.com-20080919150346-qe89jbky7b162t9h
---
 addons/process/process_demo.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml
index f8537ecf62e..0b1ae921c34 100644
--- a/addons/process/process_demo.xml
+++ b/addons/process/process_demo.xml
@@ -94,7 +94,7 @@
             <field name="name">Invoice on delivery</field>
             <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
             <field name="model_states">object.order_policy == 'postpaid'</field>
-            <field name="node_id" ref="node_invoice_on_sale"/>
+            <field name="node_id" ref="node_invoice_on_delivery"/>
         </record>
 
         <!-- Transitions -->
@@ -136,6 +136,21 @@
         </record>
 
         <!-- TODO: Transition actions (Buttons) -->
+
+        <record id="action_confirm_quotation" model="process.transition.action">
+            <field name="name">Confirm</field>
+            <field name="state">workflow</field>
+            <field name="action">order_confirm</field>
+            <field name="transition_id" ref="transition_confirm_quotation"/>
+        </record>
+
+        <record id="action_cancel_quotation" model="process.transition.action">
+            <field name="name">Cancel</field>
+            <field name="state">workflow</field>
+            <field name="action">cancel</field>
+            <field name="transition_id" ref="transition_confirm_quotation"/>
+        </record>
+
         <!-- TODO: Transition roles (workflow transition ids) -->
 
     </data>

From 4f1a35dd18f077855b2654c055a245393bc7ee2b Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Sat, 20 Sep 2008 14:20:20 +0530
Subject: [PATCH 24/26] * see the price if we select carrier from a sale order
 (wizard add delivery, or form in second tab) : for that pass active order id
 in context

bzr revid: hmo@tinyerp.com-20080920085020-d6bxrk5ogjfc0wny
---
 addons/delivery/delivery.py                   | 29 +++++++++++++++----
 addons/delivery/delivery_view.xml             |  5 ++--
 addons/delivery/wizard/delivery_sale_order.py |  4 ++-
 addons/sale/sale_view.xml                     |  1 +
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index da4bd854b10..8be5887eb2b 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -27,7 +27,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-
+import time
 import netsvc
 from osv import fields,osv,orm
 from tools.translate import _
@@ -35,11 +35,32 @@ from tools.translate import _
 class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
     _description = "Carrier and delivery grids"
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):        
+        res = super(delivery_carrier,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)        
+        if not context.get('order_id',False)  and view_type=='tree':
+            res['fields']['price'].update({'invisible':"True"})            
+        return res
+
+    def get_price(self, cr, uid, ids, field_name, arg=None, context={}):       
+        res={}
+        sale_obj=self.pool.get('sale.order')
+        grid_obj=self.pool.get('delivery.grid')
+        for carrier in self.browse(cr,uid,ids,context):
+            order_id=context.get('order_id',False)
+            price=False
+            if order_id:              
+              order = sale_obj.browse(cr, uid, [order_id])[0]
+              carrier_grid=self.grid_get(cr,uid,[carrier.id],order.partner_shipping_id.id,context)
+              price=grid_obj.get_price(cr, uid, carrier_grid, order, time.strftime('%Y-%m-%d'), context)             
+            res[carrier.id]=price           
+        return res
     _columns = {
         'name': fields.char('Carrier', size=64, required=True),
         'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
         'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
         'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
+        'price' : fields.function(get_price, method=True,string='Price'),
         'active': fields.boolean('Active')
     }
     _defaults = {
@@ -89,9 +110,8 @@ class delivery_grid(osv.osv):
 
         total = 0
         weight = 0
-        volume = 0
-
-        for line in order.order_line:
+        volume = 0        
+        for line in order.order_line:            
             if not line.product_id:
                 continue
             total += line.price_subtotal or 0.0
@@ -151,6 +171,5 @@ class delivery_grid_line(osv.osv):
 delivery_grid_line()
 
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 282c33b8921..5de932018a4 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -12,6 +12,7 @@
                 <tree string="Carrier">
                     <field name="name"/>
                     <field name="partner_id"/>
+                    <field name="price"/>
                 </tree>
             </field>
         </record>
@@ -125,7 +126,7 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <separator string="Notes" position="before">
-                    <field name="carrier_id"/>
+                    <field name="carrier_id" context="{'order_id':active_id}"/>
                 </separator>
             </field>
         </record>
@@ -176,7 +177,7 @@
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form</field>			
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree"/>
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index 4a8dcaa6d38..8dbf7b8f658 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -37,7 +37,7 @@ from tools.translate import _
 delivery_form = """<?xml version="1.0"?>
 <form string="Create deliveries">
     <separator colspan="4" string="Delivery Method" />
-    <field name="carrier_id" />
+    <field name="carrier_id" context="{'order_id':active_id}"/>
 </form>
 """
 
@@ -48,9 +48,11 @@ delivery_fields = {
 def _delivery_default(self, cr, uid, data, context):
     order_obj = pooler.get_pool(cr.dbname).get('sale.order')
     order = order_obj.browse(cr, uid, data['ids'])[0]
+    
     if not order.state in ('draft'):
         raise wizard.except_wizard(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
 
+    
     carrier_id = order.partner_id.property_delivery_carrier.id
     return {'carrier_id': carrier_id}
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d4b6f973de8..68cf27bddf5 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -231,6 +231,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id','=',uid)]</field>
+
         </record>
         <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order"/>
 

From fec257ca0a612c7a2b4b1d35d8f12928d65c8273 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Sat, 20 Sep 2008 16:43:31 +0530
Subject: [PATCH 25/26] calculated product stock on stock move between given
 dates in context and open wizard for that on location tree structure

bzr revid: hmo@tinyerp.com-20080920111331-0x1nsrdcxdt8jluj
---
 addons/stock/stock.py                         | 20 ++++-
 addons/stock/stock_view.xml                   | 20 ++++-
 addons/stock/stock_wizard.xml                 |  2 +
 addons/stock/wizard/__init__.py               |  2 +-
 .../stock/wizard/wizard_location_product.py   | 78 +++++++++++++++++++
 .../stock/wizard/wizard_move_by_location.py   | 61 ---------------
 6 files changed, 113 insertions(+), 70 deletions(-)
 create mode 100755 addons/stock/wizard/wizard_location_product.py
 delete mode 100755 addons/stock/wizard/wizard_move_by_location.py

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3fb81c22195..e655c52ef64 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -202,6 +202,7 @@ class stock_location(osv.osv):
         return result
 
     def _product_get_multi_location(self, cr, uid, ids, product_ids=False, context={}, states=['done'], what=('in', 'out')):
+        
         product_obj = self.pool.get('product.product')
         states_str = ','.join(map(lambda s: "'%s'" % s, states))
         if not product_ids:
@@ -218,27 +219,38 @@ class stock_location(osv.osv):
         location_ids_str = ','.join(map(str, ids))
         results = []
         results2 = []
+        
+        from_date=context.get('from_date',False)
+        to_date=context.get('to_date',False)        
+        date_str=False
+        if from_date and to_date:
+           date_str="date>='%s' and date<=%s"%(from_date,to_date)
+        elif from_date:
+           date_str="date>='%s'"%(from_date)
+        elif to_date:
+           date_str="date<='%s'"%(to_date) 
+            
         if 'in' in what:
-            # all moves from a location out of the set to a location in the set
+            # all moves from a location out of the set to a location in the set            
             cr.execute(
                 'select sum(product_qty), product_id, product_uom '\
                 'from stock_move '\
                 'where location_id not in ('+location_ids_str+') '\
                 'and location_dest_id in ('+location_ids_str+') '\
                 'and product_id in ('+prod_ids_str+') '\
-                'and state in ('+states_str+') '\
+                'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') +''\
                 'group by product_id,product_uom'
             )
             results = cr.fetchall()
         if 'out' in what:
-            # all moves from a location in the set to a location out of the set
+            # all moves from a location in the set to a location out of the set            
             cr.execute(
                 'select sum(product_qty), product_id, product_uom '\
                 'from stock_move '\
                 'where location_id in ('+location_ids_str+') '\
                 'and location_dest_id not in ('+location_ids_str+') '\
                 'and product_id in ('+prod_ids_str+') '\
-                'and state in ('+states_str+') '\
+                'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') + ''\
                 'group by product_id,product_uom'
             )
             results2 = cr.fetchall()
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d935858d35e..5e7d96ff2e4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1252,19 +1252,31 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>
+        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>		
 
         <act_window context="{'location': active_id}" domain="[('type','&lt;&gt;','service')]" id="act_product_location_open" name="Products" res_model="product.product" src_model="stock.location"/>
 
         <act_window context="{'location': active_id}" domain="[('product_id','=',active_id)]" id="act_product_stock_move_open" name="Stock Moves" res_model="stock.move" src_model="product.product"/>
-
-        <record id="ir_act_product_location_open" model="ir.values">
+  
+		<record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">stock.location</field>
             <field name="name">Products</field>
             <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
             <field eval="True" name="object"/>
-        </record>
+        </record>     
+
+		
+		<record id="ir_act_product_location_open" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">stock.location</field>
+            <field name="name">Open Products</field>
+            <field eval="'ir.actions.wizard,%d'%ref('location_product')" name="value"/>
+            <field eval="True" name="object"/>			
+        </record>   
+		
+	      
+		
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 4bbba3808d5..1e04921ea3c 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -42,5 +42,7 @@
 			keyword="client_action_multi"
 			id="wizard_fill_inventory"
 		/>
+
+		<wizard id="location_product" model="stock.location" name="stock.location.products" string="Products by Location"/> 
     </data>
 </openerp>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 0064614f005..4689425cee5 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -37,7 +37,7 @@ import wizard_split_lot_line
 import wizard_track_line
 import wizard_ups
 import wizard_invoice_onshipping
-import wizard_move_by_location
+import wizard_location_product
 import wizard_inventory
 import inventory_merge_zero
 import inventory_merge
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
new file mode 100755
index 00000000000..0083c0e9863
--- /dev/null
+++ b/addons/stock/wizard/wizard_location_product.py
@@ -0,0 +1,78 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+
+def _action_open_window(self, cr, uid, data, context):      
+    return {
+                'view_type': 'form',
+                "view_mode": 'tree,form',
+                'res_model': 'product.product',
+                'type': 'ir.actions.act_window',
+                'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
+                'domain':[('type','<>','service')]
+     }
+
+
+class product_by_location(wizard.interface):
+    
+    form1 = '''<?xml version="1.0"?>
+    <form string="View Stock of Products">
+        <field name="from_date"/>
+        <newline/>
+        <field name="to_date"/>
+    </form>'''
+    
+    form1_fields = {
+             'from_date': {
+                'string': 'From',
+                'type': 'date',
+        },
+             'to_date': {
+                'string': 'To',
+                'type': 'date',
+        },
+    }
+
+    states = {
+      'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [ ('open', 'Open Products'),('end', 'Cancel')]}
+        },
+    'open': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
+        }
+    }
+    
+product_by_location('stock.location.products')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/wizard_move_by_location.py b/addons/stock/wizard/wizard_move_by_location.py
deleted file mode 100755
index 3c1d025e721..00000000000
--- a/addons/stock/wizard/wizard_move_by_location.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- encoding: utf-8 -*-
-import wizard
-import pooler
-import time
-
-def _action_open_window(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    mod_obj = pool.get('ir.model.data')
-    act_obj = pool.get('ir.actions.act_window')
-
-    result = mod_obj._get_id(cr, uid, 'stock', 'action_move_form2')
-    id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-    result = act_obj.read(cr, uid, [id])[0]
-    location_id = data['ids'][0]
-
-    domain = []
-#    domain += [ '|' ,('location_id', '=', location_id) , ('location_dest_id', '=', location_id)]
-    if data['form']['from']:
-        domain += [('date_planned', '>=', data['form']['from'])]
-    
-    if data['form']['to']:
-        domain += [('date_planned', '<=', data['form']['to'])]
-    result['domain'] = str(domain)
-#    result['context'] = str({'location_id': location_id })
-    return result
-
-
-class move_by_location(wizard.interface):
-    
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Stock Moves">
-        <field name="from"/>
-        <newline/>
-        <field name="to"/>
-    </form>'''
-    
-    form1_fields = {
-             'from': {
-                'string': 'From',
-                'type': 'date',
-        },
-             'to': {
-                'string': 'To',
-                'type': 'date',
-#                'default': lambda *a: time.strftime("%Y-%m-%d"),
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [ ('open', 'Open Moves'),('end', 'Cancel')]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-    
-move_by_location('stock.location.moves')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 959c926ae505eda160a5d36d2896962bb0afabed Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Sat, 20 Sep 2008 17:21:20 +0530
Subject: [PATCH 26/26] Improvement on delivery grid tree view

bzr revid: hmo@tinyerp.com-20080920115120-ew4uk5vu4r10yk3h
---
 addons/delivery/delivery.py                   | 8 +-------
 addons/delivery/delivery_view.xml             | 2 +-
 addons/delivery/wizard/delivery_sale_order.py | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 8be5887eb2b..e4b0cd88837 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -34,13 +34,7 @@ from tools.translate import _
 
 class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
-    _description = "Carrier and delivery grids"
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):        
-        res = super(delivery_carrier,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)        
-        if not context.get('order_id',False)  and view_type=='tree':
-            res['fields']['price'].update({'invisible':"True"})            
-        return res
+    _description = "Carrier and delivery grids"    
 
     def get_price(self, cr, uid, ids, field_name, arg=None, context={}):       
         res={}
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5de932018a4..307f9128ed0 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -12,7 +12,7 @@
                 <tree string="Carrier">
                     <field name="name"/>
                     <field name="partner_id"/>
-                    <field name="price"/>
+                    <field name="price" invisible="'order_id' not in context"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index 8dbf7b8f658..8b56145639c 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -37,7 +37,7 @@ from tools.translate import _
 delivery_form = """<?xml version="1.0"?>
 <form string="Create deliveries">
     <separator colspan="4" string="Delivery Method" />
-    <field name="carrier_id" context="{'order_id':active_id}"/>
+    <field name="carrier_id"/>
 </form>
 """