merge

bzr revid: fp@tinyerp.com-20080919143639-8wyr7xzcn94suqcl

95 files changed, 6198 insertions, 4185 deletions

diff --git a/addons/account/account.py b/addons/account/account.py
index b17de9add39..94086e86742 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -33,7 +33,7 @@ from osv import fields, osv
 
 from tools.misc import currency
 from tools.translate import _
-
+import pooler
 import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
@@ -1476,19 +1476,29 @@ class account_subscription_line(osv.osv):
 account_subscription_line()
 
 
-class account_config_fiscalyear(osv.osv_memory):
-    _name = 'account.config.fiscalyear'
+class account_config_wizard(osv.osv_memory):
+    _name = 'account.config.wizard'
+    def _get_charts(self, cr, uid, context):
+        module_obj=self.pool.get('ir.module.module')
+        ids=module_obj.search(cr, uid, [('category_id', '=', 'Account charts'), ('state', '<>', 'installed')])
+        res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids)]
+        res.append((-1, 'None'))
+        res.sort(lambda x,y: cmp(x[1],y[1]))
+        return res
     _columns = {
         '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),
+        'period':fields.selection([('month','Month'),('3months','3 Months')], 'Periods', required=True),
+        'charts' : fields.selection(_get_charts, 'Charts of Account',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'),
+        'period':lambda *a:'month'
     }
     def action_cancel(self,cr,uid,ids,conect=None):
         return {
@@ -1498,21 +1508,48 @@ class account_config_fiscalyear(osv.osv_memory):
                 'type': 'ir.actions.act_window',
                 'target':'new',
         }
+
+    def install_account_chart(self, cr, uid,ids, context=None):
+        for res in self.read(cr,uid,ids):            
+            id = res['charts']
+            def install(id):
+                mod_obj = self.pool.get('ir.module.module')
+                mod_obj.write(cr , uid, [id] ,{'state' : 'to install'})
+                mod_obj.download(cr, uid, [id], context=context)
+                cr.commit()
+                cr.execute("select m.id as id from ir_module_module_dependency d inner join ir_module_module m on (m.name=d.name) where d.module_id=%d and m.state='uninstalled'",(id,))
+                ret = cr.fetchall()
+                if len(ret):
+                    for r in ret:
+                        install(r[0])
+                else:
+                    mod_obj.write(cr , uid, [id] ,{'state' : 'to install'})
+                    mod_obj.download(cr, uid, [id], context=context)
+                    cr.commit()
+            if id>0:
+                install(id)
+        cr.commit()
+        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+
     def action_create(self, cr, uid,ids, context=None):
-        res=self.read(cr,uid,ids)[0]
-        if 'date1' in res and 'date2' in res:
-            res_obj = self.pool.get('account.fiscalyear')
-            start_date=res['date1']
-            end_date=res['date2']
-            name=res['name']#DateTime.strptime(start_date, '%Y-%m-%d').strftime('%m.%Y') + '-' + DateTime.strptime(end_date, '%Y-%m-%d').strftime('%m.%Y')
-            vals={
-                'name':name,
-                'code':name,
-                'date_start':start_date,
-                'date_stop':end_date,
-            }
-            new_id=res_obj.create(cr, uid, vals, context=context)
-            res_obj.create_period(cr,uid,[new_id])
+        for res in self.read(cr,uid,ids):
+            if 'date1' in res and 'date2' in res:
+                res_obj = self.pool.get('account.fiscalyear')
+                start_date=res['date1']
+                end_date=res['date2']
+                name=res['name']#DateTime.strptime(start_date, '%Y-%m-%d').strftime('%m.%Y') + '-' + DateTime.strptime(end_date, '%Y-%m-%d').strftime('%m.%Y')
+                vals={
+                    'name':name,
+                    'code':name,
+                    'date_start':start_date,
+                    'date_stop':end_date,
+                }
+                new_id=res_obj.create(cr, uid, vals, context=context)
+                if res['period']=='month':
+                    res_obj.create_period(cr,uid,[new_id])
+                elif res['period']=='3months':
+                    res_obj.create_period3(cr,uid,[new_id])
+        self.install_account_chart(cr,uid,ids)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1521,7 +1558,10 @@ class account_config_fiscalyear(osv.osv_memory):
                 'target':'new',
         }
 
-account_config_fiscalyear()
+    
+
+account_config_wizard()
+
 
 #  ---------------------------------------------------------------
 #   Account Templates : Account, Tax, Tax Code and chart. + Wizard
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 638ba88f44a..62cb55b13e4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1323,45 +1323,52 @@
 
         <!-- configuration wizard view -->
 
-        <record id="view_config_fiscalyear_form" model="ir.ui.view">
-            <field name="name">Configure Fiscal Year</field>
-            <field name="model">account.config.fiscalyear</field>
+        <record id="view_account_config_wizard_form" model="ir.ui.view">
+            <field name="name">Account Configure wizard</field>
+            <field name="model">account.config.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Your Fiscal Year">
-                    <separator col="4" colspan="4" string="Configure Your Fiscal Year"/>
+                <form string="Account Configure">
+                    <separator col="4" colspan="4" string="Create a Fiscal Year"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date1"/>
                     <field name="date2"/>
+					<field name="period" colspan="4"/>
+					<separator col="4" colspan="4" string="Select Chart of Accounts"/>
+					<field name="charts"/>
                     <separator string="" colspan="4"/>
                     <label string="" colspan="2"/>
                     <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" string="Don't Create" name="action_cancel" type="object"/>
-                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Don't Continue" name="action_cancel" type="object"/>
+                        <button icon="gtk-ok" name="action_create" string="Continue" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
 
-        <record id="action_config_fiscalyear_form" model="ir.actions.act_window">
-            <field name="name">Configure Fiscal Year</field>
+        <record id="action_account_config_wizard_form" model="ir.actions.act_window">
+            <field name="name">Account Configure Wizard </field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.config.fiscalyear</field>
+            <field name="res_model">account.config.wizard</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-        </record>
+        </record>     
+         
+
+        
 
 
         <!-- register configuration wizard -->
 
         <record id="config_fiscalyear" model="ir.module.module.configuration.step">
-            <field name="name">Define Fiscal Years</field>
-            <field name="note">Define Fiscal Years</field>
-            <field name="action_id" ref="action_config_fiscalyear_form"/>
+            <field name="name">Account Configure Wizard</field>
+            <field name="note">Define Fiscal Years and Select Charts of Account</field>
+            <field name="action_id" ref="action_account_config_wizard_form"/>
             <field name="state">open</field>
-        </record>
+        </record>        
+        
 
 
         <!-- Account Templates -->
@@ -1584,9 +1591,9 @@
 					<separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
 					<field name="company_id" />
                     <field name ="code_digits" />
-	                <field name="chart_template_id" colspan="4"/>					
-		            <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">						
-						<form string="Bank Information">
+	                <field name="chart_template_id" colspan="4"/>
+		            <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+		            	<form string="Bank Information">
 	                    	<field name="acc_no"/>
 		                    <field name="currency_id"/>
 			            </form>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 983790e2b7f..a6d39d42f10 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -126,23 +126,19 @@ class account_invoice(osv.osv):
                 l = map(lambda x: x.id, ids_line)
                 res[id]=[x for x in l if x <> line.id]
         return res
-    
+
     def _compute_lines(self, cr, uid, ids, name, args, context={}):
         result = {}
-        print 'ICI 0'
         for invoice in self.browse(cr, uid, ids, context):
             moves = self.move_line_id_payment_get(cr, uid, [invoice.id])
             src = []
-            print 'ICI 1'
             lines = []
             for m in self.pool.get('account.move.line').browse(cr, uid, moves, context):
-                print 'ICI 2'
                 if m.reconcile_id:
                     lines += map(lambda x: x.id, m.reconcile_id.line_id)
                 elif m.reconcile_partial_id:
                     lines += map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
                 src.append(m.id)
-                print 'ICI 3'
             lines = filter(lambda x: x not in src, lines)
             result[invoice.id] = lines
         return result
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 4cf98aedec0..67bbe0f197e 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -17,7 +17,6 @@
 "access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
 "access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
 "access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
-"access_account_config_fiscalyear","account.config.fiscalyear","model_account_config_fiscalyear","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
 "access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
 "access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 23b0b40140e..3f4665878b8 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -438,7 +438,8 @@ 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, context)
             if res:
                 data['amount'] = res['value']['amount']
             data['partner_id']=line.partner_id.id
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index ce512679722..98eb2b7cacf 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -48,19 +48,7 @@ view_form_profit = """<?xml version="1.0"?>
     </group>
 </form>"""
 
-view_form_charts = """<?xml version="1.0"?>
-<form string="Setup">
-    <image name="gtk-dialog-info" colspan="2"/>
-    <group>
-        <separator string="Select a Chart of Accounts" colspan="2"/>
-        <newline/>
-        <field name="charts" align="0.0"/>
-        <newline/>
-        <label string="There are much more charts of accounts available on the OpenERP website." colspan="2" align="0.0"/>
-        <newline/>
-        <label string="If you don't select one now, you'll be able to install another one through the Administration menu." colspan="2" align="0.0"/>
-    </group>
-</form>"""
+
 
 view_form_company = """<?xml version="1.0"?>
 <form string="Setup">
@@ -94,9 +82,7 @@ view_form_update = """<?xml version="1.0"?>
         <separator string="Summary" colspan="2"/>
         <newline/>
         <field name="profile" align="0.0" readonly="1"/>
-        <newline/>
-        <field name="charts" align="0.0" readonly="1"/>
-        <newline/>
+        <newline/>        
         <field name="name" align="0.0" readonly="1"/>
     </group>
 </form>
@@ -124,14 +110,7 @@ class wizard_base_setup(wizard.interface):
         res.sort()
         return res
 
-    def _get_charts(self, cr, uid, context):
-        module_obj=pooler.get_pool(cr.dbname).get('ir.module.module')
-        ids=module_obj.search(cr, uid, [('category_id', '=', 'Account charts'),
-            ('state', '<>', 'uninstallable')])
-        res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids)]
-        res.append((-1, 'None'))
-        res.sort(lambda x,y: cmp(x[1],y[1]))
-        return res
+    
 
     def _get_company(self, cr, uid, data, context):
         pool=pooler.get_pool(cr.dbname)
@@ -188,9 +167,7 @@ class wizard_base_setup(wizard.interface):
         if 'profile' in data['form'] and data['form']['profile'] > 0:
             module_obj=pool.get('ir.module.module')
             module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context)
-        if 'charts' in data['form'] and data['form']['charts'] > 0:
-            module_obj=pool.get('ir.module.module')
-            module_obj.state_update(cr, uid, [data['form']['charts']], 'to install', ['uninstalled'], context)
+        
 
         company_obj=pool.get('res.company')
         partner_obj=pool.get('res.partner')
@@ -300,13 +277,7 @@ class wizard_base_setup(wizard.interface):
             'default': -1,
             'required': True,
         },
-        'charts':{
-            'string':'Chart of accounts',
-            'type':'selection',
-            'selection':_get_charts,
-            'default': -1,
-            'required': True,
-        },
+        
         'name':{
             'string': 'Company Name',
             'type': 'char',
@@ -389,36 +360,36 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
             'result': {'type': 'form', 'arch': view_form_profit, 'fields': fields,
                 'state': [
                     ('menu', 'Cancel', 'gtk-cancel'),
-                    ('next', 'Next', 'gtk-go-forward', True)
-                ]
-            }
-        },
-        'next': {
-            'actions': [],
-            'result': {'type': 'choice', 'next_state': _next}
-        },
-        'charts':{
-            'actions': [],
-            'result': {'type': 'form', 'arch': view_form_charts, 'fields': fields,
-                'state':[
-                    ('init', 'Previous', 'gtk-go-back'),
                     ('company', 'Next', 'gtk-go-forward', True)
                 ]
             }
         },
+#        'next': {
+#            'actions': [],
+#            'result': {'type': 'choice', 'next_state': _next}
+#        },
+#        'charts':{
+#            'actions': [],
+#            'result': {'type': 'form', 'arch': view_form_charts, 'fields': fields,
+#                'state':[
+#                    ('init', 'Previous', 'gtk-go-back'),
+#                    ('company', 'Next', 'gtk-go-forward', True)
+#                ]
+#            }
+#        },
         'company':{
             'actions': [],
             'result': {'type': 'form', 'arch': view_form_company, 'fields': fields,
                 'state': [
-                    ('previous', 'Previous', 'gtk-go-back'),
+                    ('init', 'Previous', 'gtk-go-back'),
                     ('update', 'Next', 'gtk-go-forward', True)
                 ]
             }
         },
-        'previous':{
-            'actions': [],
-            'result': {'type': 'choice', 'next_state': _previous}
-        },
+#        'previous':{
+#            'actions': [],
+#            'result': {'type': 'choice', 'next_state': _previous}
+#        },
         'update':{
             'actions': [],
             'result': {'type': 'form', 'arch': view_form_update, 'fields': fields,
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index d8f11683c5b..e9aae3c76d3 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -6,7 +6,7 @@
 	Case Sections
 	-->
 
-        <record id="section_support" model="crm.case.section">
+        <record id="section_support_help" model="crm.case.section">
             <field name="name">Helpdesk and Support</field>
             <field name="code">support</field>
         </record>
@@ -25,15 +25,15 @@
 
         <record id="categ1" model="crm.case.categ">
             <field name="name">Computer Crashed</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
         </record>
         <record id="categ2" model="crm.case.categ">
             <field name="name">Unknown</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
         </record>
         <record id="categ3" model="crm.case.categ">
             <field name="name">Bad Program Utilisation</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
         </record>
         <record id="categ4" model="crm.case.categ">
             <field name="name">Website Opportunity</field>
@@ -56,7 +56,7 @@
 		<field name="res_model">crm.case</field>
 		<field name="view_type">form</field>
 		<field name="view_id" ref="crm_case-view"/>
-		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support_help)+')]'"/>
 	</record>
 	<menuitem name="CRM &amp; SRM/Helpdesk/Helpdesk Cases" id="menu_crm_case_categ2-act" action="crm_case_categ2-act"/>
 	-->
@@ -111,7 +111,7 @@
                 Linux turned it readonly.
                 The CPU Cooler is down.
             </field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
             <field eval="categ1" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_sednacom"/>
             <field name="som" ref="base.som_unhappy"/>
@@ -172,7 +172,7 @@
             <field name="name">Bug in program</field>
             <field name="priority">3</field>
             <field name="description">There is a bug in the program</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
             <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
             <field name="som" ref="base.som_normal"/>
@@ -191,7 +191,7 @@
             <field name="name">Server is down</field>
             <field name="priority">3</field>
             <field name="description">The web server is down</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
             <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="som" ref="base.som_normal"/>
@@ -241,7 +241,7 @@
             <field name="name">Missing hardware</field>
             <field name="priority">3</field>
             <field name="description">Missing some hardwares in the packing</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
             <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_seagate"/>
             <field name="som" ref="base.som_normal"/>
@@ -359,7 +359,7 @@
             <field name="name">Need quotation</field>
             <field name="priority">3</field>
             <field name="description">Need quotation for new development</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
             <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
             <field name="som" ref="base.som_happy"/>
@@ -434,7 +434,7 @@
             <field name="name">Need new specific reports</field>
             <field name="priority">3</field>
             <field name="description">Need some specific reports</field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
             <field eval="categ5" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_thymbra"/>
             <field name="som" ref="base.som_normal"/>
@@ -462,7 +462,7 @@
 
                 (btw : this is only demo data. no stress dear sysadmin :))
             </field>
-            <field name="section_id" ref="section_support"/>
+            <field name="section_id" ref="section_support_help"/>
             <field eval="categ1" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field name="som" ref="base.som_normal"/>
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 4b61410cd43..45503709487 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 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 model="crm.case.categ" id="categ2">
+		<field name="name">Patches</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 model="crm.case.categ" id="categ3">
+		<field name="name">Feature Requests</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"/>
+	<!--
+	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_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>
+	<!--
+	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_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)+')]'"/>
-	</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"/>
+<!--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>
-	<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 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_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 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>
-	<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 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>
-	<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 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 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 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>
-	<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 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>
-	<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 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>
-	<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_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_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 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_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 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_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 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>
-	<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 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 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 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_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 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_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 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>
-	<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..c89d49af7ba 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
@@ -59,6 +88,7 @@ class crm_menu_config_wizard(osv.osv_memory):
         'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
         'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"),
         'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
+        'helpdesk' : fields.boolean('Help Desk Operations', help="This may help your Help Desk."),
     }
     _defaults = {
         'meeting': lambda *args: True,
@@ -71,7 +101,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_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 264518ce155..20dc8ed42c5 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -19,6 +19,7 @@
                     <field name="jobs"/>
                     <field name="bugs"/>
                     <field name="fund"/>
+                    <field name="helpdesk"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
                         <button icon="gtk-go-forward" name="action_create" string="Next" type="object"/>
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_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
new file mode 100644
index 00000000000..9d40a9b700f
--- /dev/null
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+	<record id="crm.section_support_help" model="crm.case.section">
+            <field name="name">Helpdesk and Support</field>
+            <field name="code">support</field>
+    </record>
+    ######################## Help Desk (menu) ###########################
+    
+	<menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="crm.menu_crm"/>	
+	
+	<record model="ir.actions.act_window" id="crm_case_categ_help_act">
+		<field name="name">My Helpdesk</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_categ_help_act"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_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_categ_help_act"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_categ_help_act"/>
+	</record>
+	
+	<menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act"/>
+	
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
+		<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.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+	</record>
+	
+	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view_my1">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+	</record>
+	
+	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_calendar_view_my1">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+	</record>
+	
+	<record model="ir.actions.act_window.view" id="action_crm_helpdesk_form_view_my1">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+	</record>
+	
+	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_my2">
+		<field name="name">My helpdesk 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.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
+	</record>
+	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
+		<field name="name">My Pending helpdesk Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
+	</record>
+	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1"/>		
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_my0">
+		<field name="name">My Open Helpdesk Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
+	</record>
+	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0"/>	
+		
+	
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_myhelpdesk">
+		<field name="name">Calendar of Helpdesk</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm.crm_case_calendar-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myhelpdesk">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_myhelpdesk">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_myhelpdesk">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
+	</record>	
+	<menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk"/>
+	
+	<!-- 
+		ALL Helpdesk REQUESTS 
+	-->
+	 <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
+		<field name="name">All Helpdesk Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+')]'"/>
+	</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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act111"/>
+	</record>
+	<menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111"/>	
+	
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_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.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
+	</record>
+	<menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3"/>
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_all2">
+		<field name="name">All Helpdesk Propositions</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
+	</record>
+	<menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_all1">
+		<field name="name">All Pending Helpdesk Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
+	</record>
+	<menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1"/>	
+
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_all0">
+		<field name="name">All Open Helpdesk Requests</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">tree,calendar,form</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'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.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_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.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
+	</record>
+	<menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0"/>	
+
+	<record model="ir.actions.act_window" id="crm_case_helpdesk_act_allhelpdesk">
+		<field name="name">Calendar of Helpdesk</field>
+		<field name="res_model">crm.case</field>
+		<field name="view_mode">calendar,tree,form</field>
+		<field name="view_id" ref="crm.crm_case_calendar-view"/>
+		<field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('crm.section_support_help'))+'),(\'state\',\'=\',\'done\')]'"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_allhelpdesk">
+		<field name="sequence" eval="1"/>
+		<field name="view_mode">calendar</field>
+		<field name="view_id" ref="crm.crm_case_calendar-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_allhelpdesk">
+		<field name="sequence" eval="2"/>
+		<field name="view_mode">tree</field>
+		<field name="view_id" ref="crm.crm_case_tree-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
+	</record>
+	<record model="ir.actions.act_window.view" id="action_crm_sec_form_view_allhelpdesk">
+		<field name="sequence" eval="3"/>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="crm.crm_case-view"/>
+		<field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
+	</record>
+	<menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk"/>
+	
+	
+</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"/>
+		<!--	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 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 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 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 model="crm.case.category2" id="category_job3">
+		<field name="name"> > Bac +5</field>
+		<field name="section_id" ref="section_support0"/>
 	</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"/>
+	
+         <!--	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 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 model="crm.case.stage" id="stage_job2">
+		<field name="name">First Interview</field>
+		<field name="section_id" ref="section_support0"/>
 	</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"/>
+	<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\')]'"/>
-	</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"/>
+	<!--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>	
-	<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 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>
-	<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>
-
-<!--		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"/>
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
+
+	<!--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"/>
-	</record>
-</data>
+			<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">
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
 
-	<record model="crm.case.section" id="section_support1">
-		<field name="name">Meetings</field>
-		<field name="code">Mtngs</field>
-	</record>
-		<!--	CASE CATEGORY(categ_id)		-->
+	<!--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.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_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>
 	
-        <!--	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_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 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>	
+		<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>
 	
-	######################## 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 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 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"/>
+		<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"/>
-	</record>
-</data>
+			<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..4611cbb1763
--- /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="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'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="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'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="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'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="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'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="'[(\'section_id\',\'=\','+str(section_support1)+'),(\'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="[('section_id','=',str(section_support1)),('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>
-
-<!--		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>	
-
-<!--		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"/>
+	<!-- 
+		((((((((((( Demo Cases ))))))))))) 
+	-->
+
+	<!--For Opportunity-->
+
+		<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>
diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index e30166aebda..fb8873e5fc7 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -47,10 +47,9 @@
         "hr_department_demo.xml",
     ],
     "update_xml" : [
-        "security/hr_security.xml",
-        "security/ir.model.access.csv",
+#        "security/hr_security.xml",
+#        "security/ir.model.access.csv",
         "hr_view.xml", 
-        "hr_report.xml", 
         "hr_wizard.xml",
         "hr_department_view.xml",
     ],
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index ab75529d4b8..5926e64eae4 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -97,26 +97,6 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
 
-    def _state(self, cr, uid, ids, name, args, context={}):
-        result = {}
-        for id in ids:
-            result[id] = 'absent'
-        cr.execute('SELECT hr_attendance.action, hr_attendance.employee_id \
-                FROM ( \
-                    SELECT MAX(name) AS name, employee_id \
-                    FROM hr_attendance \
-                    WHERE action in (\'sign_in\', \'sign_out\') \
-                    GROUP BY employee_id \
-                ) AS foo \
-                LEFT JOIN hr_attendance \
-                    ON (hr_attendance.employee_id = foo.employee_id \
-                        AND hr_attendance.name = foo.name) \
-                WHERE hr_attendance.employee_id \
-                    in (' + ','.join([str(x) for x in ids]) + ')')
-        for res in cr.fetchall():
-            result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
-        return result
-
     _columns = {
         'name' : fields.char("Employee", size=128, required=True),
         'active' : fields.boolean('Active'),
@@ -137,55 +117,14 @@ class hr_employee(osv.osv):
         'work_location': fields.char('Office Location', size=32),
 
         'notes': fields.text('Notes'),
-        'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
-
         'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
         'category_id' : fields.many2one('hr.employee.category', 'Category'),
-
         'child_ids': fields.one2many('hr.employee', 'parent_id','Subordinates'),
     }
     _defaults = {
         'active' : lambda *a: True,
-        'state' : lambda *a: 'absent',
     }
-    def sign_change(self, cr, uid, ids, context={}, dt=False):
-        for emp in self.browse(cr, uid, ids):
-            if not self._action_check(cr, uid, emp.id, dt, context):
-                raise osv.except_osv(_('Warning'), _('You tried to sign with a date anterior to another event !\nTry to contact the administrator to correct attendances.'))
-            res = {'action':'action', 'employee_id':emp.id}
-            if dt:
-                res['name'] = dt
-            att_id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
-        return True
-
-    def sign_out(self, cr, uid, ids, context={}, dt=False, *args):
-        id = False
-        for emp in self.browse(cr, uid, ids):
-            if not self._action_check(cr, uid, emp.id, dt, context):
-                raise osv.except_osv(_('Warning'), _('You tried to sign out with a date anterior to another event !\nTry to contact the administrator to correct attendances.'))
-            res = {'action':'sign_out', 'employee_id':emp.id}
-            if dt:
-                res['name'] = dt
-            att_id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
-            id = att_id
-        return id
-
-    def _action_check(self, cr, uid, emp_id, dt=False,context={}):
-        cr.execute('select max(name) from hr_attendance where employee_id=%d', (emp_id,))
-        res = cr.fetchone()
-        return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
-
-    def sign_in(self, cr, uid, ids, context={}, dt=False, *args):
-        id = False
-        for emp in self.browse(cr, uid, ids):
-            if not self._action_check(cr, uid, emp.id, dt, context):
-                raise osv.except_osv(_('Warning'), _('You tried to sign in with a date anterior to another event !\nTry to contact the administrator to correct attendances.'))
-            res = {'action':'sign_in', 'employee_id':emp.id}
-            if dt:
-                res['name'] = dt
-            id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
-        return id
-
+    
 hr_employee()
 
 class hr_timesheet(osv.osv):
@@ -202,56 +141,4 @@ class hr_timesheet(osv.osv):
     _order = 'dayofweek, hour_from'
 hr_timesheet()
 
-class hr_action_reason(osv.osv):
-    _name = "hr.action.reason"
-    _description = "Action reason"
-    _columns = {
-        'name' : fields.char('Reason', size=64, required=True),
-        'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
-    }
-    _defaults = {
-        'action_type' : lambda *a: 'sign_in',
-    }
-hr_action_reason()
-
-def _employee_get(obj,cr,uid,context={}):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
-    if ids:
-        return ids[0]
-    return False
-
-class hr_attendance(osv.osv):
-    _name = "hr.attendance"
-    _description = "Attendance"
-    _columns = {
-        'name' : fields.datetime('Date', required=True),
-        'action' : fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'),('action','Action')], 'Action', required=True),
-        'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]"),
-        'employee_id' : fields.many2one('hr.employee', 'Employee', required=True, select=True),
-    }
-    _defaults = {
-        'name' : lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'employee_id' : _employee_get,
-    }
-    
-    def _altern_si_so(self, cr, uid, ids):
-        for id in ids:
-            sql = '''
-            select action, name
-            from hr_attendance as att
-            where employee_id = (select employee_id from hr_attendance where id=%s)
-            and action in ('sign_in','sign_out')
-            and name <= (select name from hr_attendance where id=%s)
-            order by name desc
-            limit 2
-            ''' % (id, id)
-            cr.execute(sql)
-            atts = cr.fetchall()
-            if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
-                return False
-        return True
-    
-    _constraints = [(_altern_si_so, 'Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
-    _order = 'name desc'
-hr_attendance()
 
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index c83c20d5a9b..9465e57ab14 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -2,31 +2,6 @@
 <openerp>
     <data>
         
-        <record model="hr.action.reason">
-            <field name="name">Start of shift</field>
-            <field name="action_type">sign_in</field>
-        </record>
-        <record model="hr.action.reason">
-            <field name="name">End of shift</field>
-            <field name="action_type">sign_out</field>
-        </record>
-        <record model="hr.action.reason">
-            <field name="name">Meal Break</field>
-            <field name="action_type">sign_in</field>
-        </record>
-        <record model="hr.action.reason">
-            <field name="name">Meal Break</field>
-            <field name="action_type">sign_out</field>
-        </record>
-        <record model="hr.action.reason">
-            <field name="name">Early exit (sick)</field>
-            <field name="action_type">sign_out</field>
-        </record>
-        <record model="hr.action.reason">
-            <field name="name">Early exit (work injury)</field>
-            <field name="action_type">sign_out</field>
-        </record>
-        
         <!-- Example employee -->
         
         <record id="timesheet_group1" model="hr.timesheet.group">
@@ -111,105 +86,5 @@
             <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         
-        <record id="attendance1" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance2" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance3" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance4" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance5" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance6" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance7" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance8" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance9" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance10" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance11" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance12" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance13" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance14" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance15" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance16" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance17" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance18" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance19" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
-        <record id="attendance20" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 879f4328db6..5b58d7cf448 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -49,9 +49,7 @@
                             <group col="4" colspan="2">
                                 <separator string="Job Information" colspan="4"/>
                                 <field name="parent_id" select="1" colspan="4"/>
-                                <field name="state"/>
-                                <button name="sign_in" states="absent" string="Sign In" type="object"/>
-                                <button name="sign_out" states="present" string="Sign Out" type="object"/>
+
                                 <field name="category_id" colspan="4"/>
                             </group>
                         </page>
@@ -75,7 +73,6 @@
                     <field name="work_email"/>
                     <field name="address_id"/>
                     <field name="parent_id"/>
-                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -142,7 +139,7 @@
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="address_id"/>
-                    <field name="state"/>
+
                 </tree>
             </field>
         </record>
@@ -219,34 +216,13 @@
             </field>
         </record>
         
-        <!-- Attendance -->
-        <record id="view_attendance_form" model="ir.ui.view">
-            <field name="name">hr.attendance.form</field>
-            <field name="model">hr.attendance</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Employee attendance">
-                    <field name="employee_id" select="1"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="action" select="1"/>
-                    <field name="action_desc" select="1"/>
-                </form>
-            </field>
-        </record>
-        <record id="view_attendance_tree" model="ir.ui.view">
-            <field name="name">hr.attendance.tree</field>
-            <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Employee attendances">
-                    <field name="name"/>
-                    <field name="action"/>
-                    <field name="action_desc"/>
-                </tree>
-            </field>
-        </record>
+        <!-- 
+        ============
+        Employee Category
+        ============
+        -->
         
-        <record id="view_employee_category_form" model="ir.ui.view">
+       <record id="view_employee_category_form" model="ir.ui.view">
             <field name="name">hr.employee.category.form</field>
             <field name="model">hr.employee.category</field>
             <field name="type">form</field>
@@ -296,62 +272,6 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
-        
-        <record id="view_attendance_who" model="ir.ui.view">
-            <field name="name">hr.attendance.tree</field>
-            <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
-            <field eval="3" name="priority"/>
-            <field name="arch" type="xml">
-                <tree string="Employee attendance">
-                    <field name="employee_id"/>
-                    <field name="name"/>
-                    <field name="action"/>
-                    <field name="action_desc"/>
-                </tree>
-            </field>
-        </record>
-        <record id="open_view_attendance" model="ir.actions.act_window">
-            <field name="name">Attendances</field>
-            <field name="res_model">hr.attendance</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="hr.menu_hr_attendance"/>
-        
-        
-        <record id="edit_attendance_reason" model="ir.ui.view">
-            <field name="name">hr.action.reason.form</field>
-            <field name="model">hr.action.reason</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Define attendance reason">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="action_type" select="1"/>
-                </form>
-            </field>
-        </record>
-        <record id="view_attendance_reason" model="ir.ui.view">
-            <field name="name">hr.action.reason.tree</field>
-            <field name="model">hr.action.reason</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Attendance reasons">
-                    <field name="name"/>
-                    <field name="action_type"/>
-                </tree>
-            </field>
-        </record>
-        <record id="open_view_attendance_reason" model="ir.actions.act_window">
-            <field name="name">Attendance Reasons</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.action.reason</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_attendance_reason"/>
-        </record>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
-        
+       
     </data>
 </openerp>
diff --git a/addons/hr/hr_wizard.xml b/addons/hr/hr_wizard.xml
index 71dcb201381..8b3c3e1c619 100644
--- a/addons/hr/hr_wizard.xml
+++ b/addons/hr/hr_wizard.xml
@@ -2,15 +2,12 @@
 <openerp>
     <data>
 
-        <wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
-
-        <menuitem action="si_so" id="menu_si_so" parent="hr.menu_hr_attendance" type="wizard"/>
 
         <!-- <wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.print_week" string="Print Timesheet by week"/>
 
         <wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.print_month" string="Print Timesheet by month"/> -->
 
-        <wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.timesheet.attendance.report" string="Print Attendance Error Report"/>
+        
 
     </data>
 </openerp>
diff --git a/addons/hr/report/__init__.py b/addons/hr/report/__init__.py
index b3d4f8263fe..0a96f7363f4 100644
--- a/addons/hr/report/__init__.py
+++ b/addons/hr/report/__init__.py
@@ -29,7 +29,6 @@
 ##############################################################################
 
 import bymonth
-import attendance_errors
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr/wizard/__init__.py b/addons/hr/wizard/__init__.py
index dab91d43608..e898f4c6561 100644
--- a/addons/hr/wizard/__init__.py
+++ b/addons/hr/wizard/__init__.py
@@ -28,11 +28,11 @@
 #
 ##############################################################################
 
-from print_byweek import wiz_byweek
-from print_bymonth import wiz_bymonth
-import print_attendance_error
+#from print_byweek import wiz_byweek
+#from print_bymonth import wiz_bymonth
+
+
 
-import sign_in_out
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_attendance/__init__.py b/addons/hr_attendance/__init__.py
new file mode 100644
index 00000000000..917959631a7
--- /dev/null
+++ b/addons/hr_attendance/__init__.py
@@ -0,0 +1,35 @@
+# -*- 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 hr_attendance
+import wizard
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__terp__.py
new file mode 100644
index 00000000000..0dd9eff1013
--- /dev/null
+++ b/addons/hr_attendance/__terp__.py
@@ -0,0 +1,16 @@
+{
+    "name" : "Attendances Of Employees",
+    "version" : "1.0",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Human Resources",
+    "description": "This module aims to manage employee's attendances.",
+    "depends" : ["base","hr",],
+    "demo_xml" : ["hr_attendance_demo.xml"],
+    "update_xml" : [
+       "hr_attendance_view.xml",
+       "hr_attendance_wizard.xml",
+       "hr_attendance_report.xml"
+    ],
+    "active": False,
+    "installable": True,
+}
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
new file mode 100644
index 00000000000..7550ec18847
--- /dev/null
+++ b/addons/hr_attendance/hr_attendance.py
@@ -0,0 +1,158 @@
+# -*- 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.
+#
+##############################################################################
+
+from mx import DateTime
+import time
+
+from osv import fields, osv
+from tools.translate import _
+
+class hr_action_reason(osv.osv):
+    _name = "hr.action.reason"
+    _description = "Action reason"
+    _columns = {
+        'name' : fields.char('Reason', size=64, required=True),
+        'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
+    }
+    _defaults = {
+        'action_type' : lambda *a: 'sign_in',
+    }
+hr_action_reason()
+
+def _employee_get(obj,cr,uid,context={}):
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+    if ids:
+        return ids[0]
+    return False
+
+class hr_attendance(osv.osv):
+    _name = "hr.attendance"
+    _description = "Attendance"
+    _columns = {
+        'name' : fields.datetime('Date', required=True),
+        'action' : fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'),('action','Action')], 'Action', required=True),
+        'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]"),
+        'employee_id' : fields.many2one('hr.employee', 'Employee', required=True, select=True),
+    }
+    _defaults = {
+        'name' : lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'employee_id' : _employee_get,
+    }
+    
+    def _altern_si_so(self, cr, uid, ids):
+        for id in ids:
+            sql = '''
+            select action, name
+            from hr_attendance as att
+            where employee_id = (select employee_id from hr_attendance where id=%s)
+            and action in ('sign_in','sign_out')
+            and name <= (select name from hr_attendance where id=%s)
+            order by name desc
+            limit 2
+            ''' % (id, id)
+            cr.execute(sql)
+            atts = cr.fetchall()
+            if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
+                return False
+        return True
+    
+    _constraints = [(_altern_si_so, 'Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
+    _order = 'name desc'
+hr_attendance()
+
+class hr_employee(osv.osv):
+    _inherit = "hr.employee"
+    _description = "Employee"
+    
+    def _state(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for id in ids:
+            result[id] = 'absent'
+        cr.execute('SELECT hr_attendance.action, hr_attendance.employee_id \
+                FROM ( \
+                    SELECT MAX(name) AS name, employee_id \
+                    FROM hr_attendance \
+                    WHERE action in (\'sign_in\', \'sign_out\') \
+                    GROUP BY employee_id \
+                ) AS foo \
+                LEFT JOIN hr_attendance \
+                    ON (hr_attendance.employee_id = foo.employee_id \
+                        AND hr_attendance.name = foo.name) \
+                WHERE hr_attendance.employee_id \
+                    in (' + ','.join([str(x) for x in ids]) + ')')
+        for res in cr.fetchall():
+            result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
+        return result
+    
+    _columns = {
+       'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
+     }
+    
+    def sign_change(self, cr, uid, ids, context={}, dt=False):
+        for emp in self.browse(cr, uid, ids):
+            if not self._action_check(cr, uid, emp.id, dt, context):
+                raise osv.except_osv(_('Warning'), _('You tried to sign with a date anterior to another event !\nTry to contact the administrator to correct attendances.'))
+            res = {'action':'action', 'employee_id':emp.id}
+            if dt:
+                res['name'] = dt
+            att_id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
+        return True
+
+    def sign_out(self, cr, uid, ids, context={}, dt=False, *args):
+        id = False
+        for emp in self.browse(cr, uid, ids):
+            if not self._action_check(cr, uid, emp.id, dt, context):
+                raise osv.except_osv(_('Warning'), _('You tried to sign out with a date anterior to another event !\nTry to contact the administrator to correct attendances.'))
+            res = {'action':'sign_out', 'employee_id':emp.id}
+            if dt:
+                res['name'] = dt
+            att_id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
+            id = att_id
+        return id
+
+    def _action_check(self, cr, uid, emp_id, dt=False,context={}):
+        cr.execute('select max(name) from hr_attendance where employee_id=%d', (emp_id,))
+        res = cr.fetchone()
+        return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
+
+    def sign_in(self, cr, uid, ids, context={}, dt=False, *args):
+        id = False
+        for emp in self.browse(cr, uid, ids):
+            if not self._action_check(cr, uid, emp.id, dt, context):
+                raise osv.except_osv(_('Warning'), _('You tried to sign in with a date anterior to another event !\nTry to contact the administrator to correct attendances.'))
+            res = {'action':'sign_in', 'employee_id':emp.id}
+            if dt:
+                res['name'] = dt
+            id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
+        return id
+    
+hr_employee()
+    
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:    
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
new file mode 100644
index 00000000000..640d6b5257a
--- /dev/null
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data> 
+          
+        
+
+		<record id="attendance1" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance2" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance3" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance4" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance5" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance6" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance7" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance8" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance9" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance10" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance11" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance12" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance13" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance14" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance15" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance16" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance17" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance18" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance19" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
+            <field name="action">sign_in</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+        <record id="attendance20" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
+            <field name="action">sign_out</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr/hr_report.xml b/addons/hr_attendance/hr_attendance_report.xml
index a0d3497c9aa..a0d3497c9aa 100644
--- a/addons/hr/hr_report.xml
+++ b/addons/hr_attendance/hr_attendance_report.xml
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
new file mode 100644
index 00000000000..fe2b1e6f0dc
--- /dev/null
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		
+		<record id="view_attendance_form" model="ir.ui.view">
+            <field name="name">hr.attendance.form</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee attendance">
+                    <field name="employee_id" select="1"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="action" select="1"/>
+                    <field name="action_desc" select="1"/>
+                </form>
+            </field>
+        </record>
+        <record id="view_attendance_tree" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Employee attendances">
+                    <field name="name"/>
+                    <field name="action"/>
+                    <field name="action_desc"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_attendance_who" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field eval="3" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Employee attendance">
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="action"/>
+                    <field name="action_desc"/>
+                </tree>
+            </field>
+        </record>
+        <record id="open_view_attendance" model="ir.actions.act_window">
+            <field name="name">Attendances</field>
+            <field name="res_model">hr.attendance</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance"/>
+        
+        
+        <record id="edit_attendance_reason" model="ir.ui.view">
+            <field name="name">hr.action.reason.form</field>
+            <field name="model">hr.action.reason</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Define attendance reason">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="action_type" select="1"/>
+                </form>
+            </field>
+        </record>
+        <record id="view_attendance_reason" model="ir.ui.view">
+            <field name="name">hr.action.reason.tree</field>
+            <field name="model">hr.action.reason</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Attendance reasons">
+                    <field name="name"/>
+                    <field name="action_type"/>
+                </tree>
+            </field>
+        </record>
+        <record id="open_view_attendance_reason" model="ir.actions.act_window">
+            <field name="name">Attendance Reasons</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.action.reason</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_attendance_reason"/>
+        </record>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
+        
+        <record id="hr_attendance_employee" model="ir.ui.view">
+            <field name="name">hr.employee.form1</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="parent_id" position="after">
+                	<field name="state"/>
+                	<button name="sign_in" states="absent" string="Sign In" type="object"/>
+                	<button name="sign_out" states="present" string="Sign Out" type="object"/>
+                </field>
+            </field>
+        </record>
+        
+	</data>
+</openerp>
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
new file mode 100644
index 00000000000..707e63a4460
--- /dev/null
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>		
+ 		
+ 		<wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
+		<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.timesheet.attendance.report" string="Print Attendance Error Report"/>
+
+        <menuitem action="si_so" id="menu_si_so" parent="menu_hr_attendance" type="wizard"/>
+        
+    </data>
+</openerp>
diff --git a/addons/hr_attendance/report/__init__.py b/addons/hr_attendance/report/__init__.py
new file mode 100644
index 00000000000..c9f1ff7008a
--- /dev/null
+++ b/addons/hr_attendance/report/__init__.py
@@ -0,0 +1,32 @@
+# -*- 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 attendance_errors
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 231fe98b8e5..286fad59f67 100644
--- a/addons/hr/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -81,7 +81,7 @@ class attendance_print(report_sxw.rml_parse):
 
         return (self._sign(total),total2 and self._sign(total2))
 
-report_sxw.report_sxw('report.hr.timesheet.attendance.error', 'hr.employee', 'addons/hr/report/attendance_errors.rml',parser=attendance_print)
+report_sxw.report_sxw('report.hr.timesheet.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml',parser=attendance_print)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml
index a2d9ebe3625..aacdde99e06 100644
--- a/addons/hr/report/attendance_errors.rml
+++ b/addons/hr_attendance/report/attendance_errors.rml
@@ -10,7 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table_employee_detail_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -33,7 +33,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="tbl_header">
+    <blockTableStyle id="Table_employee_detail_content">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -42,7 +42,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table_employee_total">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
@@ -52,7 +52,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -71,6 +70,18 @@
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -80,10 +91,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="60.0,114.0,146.0,85.0,77.0" style="Table1">
+    <blockTable colWidths="60.0,114.0,146.0,85.0,77.0" style="Table_employee_detail_header">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Operation</para>
+          <para style="terp_tblheader_Details_Centre">Operation</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Date Signed</para>
@@ -102,11 +113,11 @@
     <blockTable colWidths="482.0" style="tbl_detail">
       <tr>
         <td>
-          <para style="P1">[[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]]</para>
-          <blockTable colWidths="58.0,114.0,143.0,93.0,69.0" style="tbl_header">
+          <para style="terp_default_8">[[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]]</para>
+          <blockTable colWidths="58.0,114.0,143.0,93.0,69.0" style="Table_employee_detail_content">
             <tr>
               <td>
-                <para style="terp_default_9">[[ att['action']  ]]</para>
+                <para style="terp_default_Centre_9">[[ att['action']  ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_9">[[  att['date']  ]]</para>
@@ -125,7 +136,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="319.0,99.0,63.0" style="Table3">
+    <blockTable colWidths="319.0,99.0,63.0" style="Table_employee_total">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total period:</para>
@@ -138,10 +149,10 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">(*) A positive delay means that the employee worked less than recorded.</para>
-    <para style="terp_default_9">(*) A negative delay means that the employee worked more than encoded.</para>
+    <para style="terp_default_8">(*) A positive delay means that the employee worked less than recorded.</para>
+    <para style="terp_default_8">(*) A negative delay means that the employee worked more than encoded.</para>
   </story>
 </document>
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
new file mode 100644
index 00000000000..447b2047f2c
--- /dev/null
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -0,0 +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 sign_in_out
+import print_attendance_error
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py
index 83da09863ce..83da09863ce 100644
--- a/addons/hr/wizard/print_attendance_error.py
+++ b/addons/hr_attendance/wizard/print_attendance_error.py
diff --git a/addons/hr_attendance/wizard/sign_in_out.py b/addons/hr_attendance/wizard/sign_in_out.py
new file mode 100644
index 00000000000..a3e82b9d669
--- /dev/null
+++ b/addons/hr_attendance/wizard/sign_in_out.py
@@ -0,0 +1,194 @@
+# -*- 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 netsvc
+import time
+from tools.translate import _
+
+si_so_form ='''<?xml version="1.0"?> 
+<form string="Sign in / Sign out">
+    <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
+    <field name="name" readonly="True" />
+    <field name="state" readonly="True" />
+</form>'''
+
+si_so_fields = {
+    'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
+    'state' : {'string' : "Current state", 'type' : 'char', 'required' : True, 'readonly': True},
+}
+
+si_form = '''<?xml version="1.0" ?>
+<form string="Sign in status">
+    <seperator string="This is the status of your sign in request. Check it out maybe you were already signed in." colspan="4" />
+    <field name="success" readonly="True" />
+</form>'''
+
+si_fields = {
+    'success' : {'string' : "Sign in's status", 'type' : 'char', 'required' : True, 'readonly' : True}, 
+}
+
+so_form = '''<?xml version="1.0" ?>
+<form string="Sign in status">
+    <seperator string="This is the status of your sign out request. Check it out maybe you were already signed out." colspan="4" />
+    <field name="success" readonly="True" />
+</for>'''
+
+so_fields = {
+    'success' : {'string' : "Sign out's status", 'type' : 'char', 'required' : True, 'readonly' : True}, 
+}
+
+def _get_empid(self, cr, uid, data, context):
+    service = netsvc.LocalService('object_proxy')
+    emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+    print "EMP :::::::::", emp_id
+    if emp_id:
+        print "IF ::::::::"
+        employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
+        print "employee .........", employee
+        return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]}
+    return {}
+
+def _sign_in(self, cr, uid, data, context):
+    service = netsvc.LocalService('object_proxy')
+    emp_id = data['form']['emp_id']
+    if 'last_time' in data['form'] :
+        if data['form']['last_time'] > time.strftime('%Y-%m-%d'):
+            raise wizard.except_wizard(_('UserError'), _('The sign-out date must be in the past'))
+            return {'success': False}
+        service.execute(cr.dbname, uid, 'hr.attendance', 'create', {
+            'name': data['form']['last_time'], 
+            'action': 'sign_out',
+            'employee_id': emp_id
+        })
+    try:
+        success = service.execute(cr.dbname, uid, 'hr.employee', 'sign_in', [emp_id])
+        print success
+    except:
+        raise wizard.except_wizard(_('UserError'), _('A sign-in must be right after a sign-out !'))
+    return {'success': success}
+
+def _sign_out(self, cr, uid, data, context):
+    service = netsvc.LocalService('object_proxy')
+    emp_id = data['form']['emp_id']
+    if 'last_time' in data['form'] :
+        if data['form']['last_time'] > time.strftime('%Y-%m-%d'):
+            raise wizard.except_wizard(_('UserError'), _('The Sign-in date must be in the past'))
+            return {'success': False}
+        service.execute(cr.dbname, uid, 'hr.attendance', 'create', {'name':data['form']['last_time'], 'action':'sign_in',  'employee_id':emp_id})
+    try:
+        success = service.execute(cr.dbname, uid, 'hr.employee', 'sign_out', [emp_id])
+    except:
+        raise wizard.except_wizard(_('UserError'), _('A sign-out must be right after a sign-in !'))
+
+    return {'success' : success}
+
+so_ask_form ='''<?xml version="1.0"?> 
+<form string="Sign in / Sign out">
+    <separator string="You did not signed out the last time. Please enter the date and time you signed out." colspan="4" />
+    <field name="name" readonly="True" />
+    <field name="last_time" />
+</form>'''
+
+so_ask_fields = {
+    'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
+    'last_time' : {'string' : "Your last sign out", 'type' : 'datetime', 'required' : True},
+}
+
+def _si_check(self, cr, uid, data, context):
+    states = {True : 'si', False: 'si_ask_so'}
+    service = netsvc.LocalService('object_proxy')
+    emp_id = data['form']['emp_id']
+    att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
+    last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+    if last_att:
+        last_att = last_att[0]
+    cond = not last_att or last_att['action'] == 'sign_out'
+    return states[cond]
+
+si_ask_form ='''<?xml version="1.0"?> 
+<form string="Sign in / Sign out">
+    <separator string="You did not signed in the last time. Please enter the date and time you signed in." colspan="4" />
+    <field name="name" readonly="True" />
+    <field name="last_time" />
+</form>'''
+
+si_ask_fields = {
+    'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
+    'last_time' : {'string' : "Your last sign in", 'type' : 'datetime', 'required' : True},
+}
+
+def _so_check(self, cr, uid, data, context):
+    states = {True : 'so', False: 'so_ask_si'}
+    service = netsvc.LocalService('object_proxy')
+    emp_id = data['form']['emp_id']
+    att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
+    last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+    if last_att:
+        last_att = last_att[0]
+    cond = last_att and last_att['action'] == 'sign_in'
+    return states[cond]
+
+class wiz_si_so(wizard.interface):
+    states = {
+           'init' : {
+               'actions' : [_get_empid],
+               'result' : {'type' : 'form', 'arch' : si_so_form, 'fields' : si_so_fields, 'state' : [('end', 'Cancel'),('si_test', 'Sign in'),('so_test', 'Sign out')] }
+            },
+            'si_test' : {
+                'actions' : [],
+                'result' : {'type' : 'choice', 'next_state': _si_check}
+            },
+            'si_ask_so' : {
+                'actions' : [],
+                'result' : {'type' : 'form', 'arch' : so_ask_form, 'fields' : so_ask_fields, 'state' : [('end', 'Cancel'),('si', 'Sign in') ] }
+            },
+            'si' : {
+                'actions' : [_sign_in],
+                'result' : {'type' : 'state', 'state':'end'}
+            },
+            'so_test' : {
+                'actions' : [],
+                'result' : {'type' : 'choice', 'next_state': _so_check }
+            },
+            'so_ask_si' : {
+                'actions' : [],
+                'result' : {'type' : 'form', 'arch' : si_ask_form, 'fields' : si_ask_fields, 'state' : [('end', 'Cancel'),('so', 'Sign out')] }
+            },
+            'so' : {
+                'actions' : [_sign_out],
+                'result' : {'type' : 'state', 'state':'end'}
+            },
+    }
+wiz_si_so('hr.si_so')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index f42dfb11761..6d2be72d4e7 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -10,7 +10,35 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table_employee_ref_header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_employee_ref_content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_employee_detail_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -27,76 +55,30 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="4,1" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,2" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,2" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table_employee_detail_content">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table_employee_total">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
@@ -107,13 +89,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Bold" fontSize="14.0" leading="17" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Times-Roman" fontSize="14.0" leading="17"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/>
-    <paraStyle name="P4" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P5" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/>
-    <paraStyle name="P6" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -140,7 +115,7 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_centre_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -148,18 +123,44 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="P2">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_header_Centre">HR Expenses [[ o.name or '' ]]</para>
-    <para style="P1">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Employee: <font face="Times-Roman">[[ o.employee_id.name ]]</font><font face="Times-Roman"/></para>
-    <para style="terp_default_9">Date: <font face="Times-Roman">[[ time.strftime('%d/%m/%Y', time.strptime(o.date, '%Y-%m-%d')) ]]</font></para>
-    <para style="terp_default_9">Reference: <font face="Times-Roman">[[ o.ref ]]</font></para>
-    <para style="P3">
+    <blockTable colWidths="174.0,174.0,174.0" style="Table_employee_ref_header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Employee</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Reference</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="174.0,174.0,174.0" style="Table_employee_ref_content">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.employee_id.name ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y', time.strptime(o.date, '%Y-%m-%d')) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.ref ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="63.0,224.0,72.0,58.0,43.0,62.0" style="Table2">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="63.0,224.0,72.0,58.0,43.0,62.0" style="Table_employee_detail_header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -185,82 +186,62 @@
       <tr>
         <td>
           <para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
-          <blockTable colWidths="61.0,224.0,72.0,58.0,43.0,34.0,24.0" style="Table3">
+          <blockTable colWidths="61.0,224.0,72.0,58.0,43.0,34.0,24.0" style="Table_employee_detail_content">
             <tr>
               <td>
-                <para style="P6">[[ time.strftime('%d/%m/%Y', time.strptime(line.date_value,   '%Y-%m-%d')) or '' ]]</para>
+                <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime(line.date_value, '%Y-%m-%d')) or '' ]]</para>
               </td>
               <td>
-                <para style="terp_default_9">[[ line.name or '' ]][[ line.description or '' ]]</para>
+                <para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_9">[[ line.ref or '' ]]</para>
-                <blockTable colWidths="33.0,33.0" style="Table5">
-                  <tr>
-                    <td>
-                      <para style="P7">
-                        <font color="white"> </font>
-                      </para>
-                    </td>
-                    <td>
-                      <para style="P7">
-                        <font color="white"> </font>
-                      </para>
-                    </td>
-                  </tr>
-                </blockTable>
-                <para style="terp_default_Centre_9">
-                  <font color="white"> </font>
-                </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ '%.2f' % line.unit_amount or  '' ]]</para>
+                <para style="terp_default_Right_9">[[ '%.2f' % line.unit_amount or '' ]]</para>
               </td>
               <td>
-                <para style="terp_default_9">[[  '%.2f' % line.unit_quantity or '' ]]</para>
+                <para style="terp_default_Centre_9">[[ '%.2f' % line.unit_quantity or '' ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ '%.2f' % line.total_amount or '' ]]</para>
+                <para style="terp_default_Right_9">[[ '%.2f' % line.total_amount or '' ]] </para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ company.currency_id.name  ]]</para>
+                <para style="terp_default_Right_9">[[ company.currency_id.name ]]</para>
               </td>
             </tr>
           </blockTable>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="418.0,43.0,39.0,23.0" style="Table4">
+    <blockTable colWidths="418.0,43.0,39.0,23.0" style="Table_employee_total">
       <tr>
         <td>
-          <para style="P5">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Total:</para>
+          <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_default_9_bold_right">[[ '%.2f' % o.amount  ]]</para>
+          <para style="terp_default_9_bold_right">[[ '%.2f' % o.amount ]]</para>
         </td>
         <td>
           <para style="terp_default_9_bold_right">[[ company.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="P4">[[ o.note or ''  ]][[ setTag('para','xpre')  ]]</para>
+    <para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">Certified honest and conform,</para>
     <para style="terp_default_9">(Date and signature)</para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">This document must be dated and signed for reimbursment</para>
diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__terp__.py
index 0812a3578a9..1004f06d903 100644
--- a/addons/hr_timesheet/__terp__.py
+++ b/addons/hr_timesheet/__terp__.py
@@ -43,7 +43,7 @@ Lots of reporting on time and employee tracking are provided.
 It is completly integrated with the cost accounting module. It allows you
 to set up a management by affair.
     """,
-    "depends" : ["account", "hr", "base",],
+    "depends" : ["account", "hr", "base", "hr_attendance"],
     "init_xml" : ["hr_timesheet_data.xml"],
     "demo_xml" : ["hr_timesheet_demo.xml",],
     "update_xml" : [
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index f1798cba4ce..eae167002a4 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+		<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
         
         <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet"/>
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index e0364f0204b..d78c617e9dc 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
-        <menuitem action="si_so"  id="menu_si_so" parent="hr.menu_hr_attendance" type="wizard"/>
+        <menuitem action="si_so"  id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index d2bd328cb55..e5a29a08eb4 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+		<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.rml b/addons/hr_timesheet_invoice/report/cost_ledger.rml
index ed555887315..607d709546b 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.rml
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,80 +10,160 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau1">
+    <blockTableStyle id="Table_main_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau3">
+    <blockTableStyle id="Table_period_date_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau2">
+    <blockTableStyle id="Table_period_date_content">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau4">
+    <blockTableStyle id="Table_account_detail_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table_account_code_name">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau6">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,3" stop="0,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,3" stop="2,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,3" stop="3,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau5">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau10">
+    <blockTableStyle id="Table_move_content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_move_repeat">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_account_code_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_account_total">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Times-Bold" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Times-Roman"/>
-    <paraStyle name="P12" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P13" fontName="Times-Roman" fontSize="3.0" leading="4" alignment="LEFT"/>
-    <paraStyle name="P14" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P15" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="P16" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER"/>
-    <paraStyle name="P17" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P18" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P19" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P23" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P24" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -91,216 +171,234 @@
     <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_bold_right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_bold_8_20" rightIndent="0.0" leftIndent="-6.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_bold_9_20" rightIndent="0.0" leftIndent="-6.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_bold_9_10" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_bold_8_10" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
+  <images/>
   <story>
-    <blockTable colWidths="179.0,179.0,179.0" repeatRows="1" style="Tableau1">
+    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_main_header">
       <tr>
         <td>
-          <para style="P1">
-            <font color="white"> </font>
-          </para>
+          <para style="terp_default_8">[[ company.name ]]</para>
         </td>
         <td>
-          <para style="P2">Cost Ledger</para>
+          <para style="terp_header_Centre">Cost Ledger</para>
         </td>
         <td>
-          <para style="P21">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table_period_date_header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Period from startdate</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Period to enddate</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Currency</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Printing date</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table_period_date_content">
       <tr>
         <td>
-          <para style="P1">[[ company.name ]]</para>
+          <para style="terp_default_Centre_8">[[ data['form']['date1'] ]]</para>
         </td>
         <td>
-          <para style="P22">Period from [[ data['form']['date1'] ]]</para>
-          <para style="P22">to [[ data['form']['date2'] ]]</para>
+          <para style="terp_default_Centre_8">[[ data['form']['date2'] ]]</para>
         </td>
         <td>
-          <para style="P21">Currency: [[ company.currency_id.name ]]</para>
+          <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P11">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P12">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-    <para style="P12">
+    <para style="terp_default_Centre_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="63.0,46.0,139.0,54.0,55.0,55.0,63.0,63.0" style="Tableau3">
+    <blockTable colWidths="54.0,29.0,42.0,184.0,57.0,57.0,57.0" style="Table_account_detail_header">
       <tr>
         <td>
-          <para style="P4">Date</para>
+          <para style="terp_tblheader_Details_Centre">Date</para>
         </td>
         <td>
-          <para style="P4">J.C.</para>
+          <para style="terp_tblheader_Details_Centre">J.C.</para>
         </td>
         <td>
-          <para style="P4">Move name</para>
+          <para style="terp_tblheader_Details_Centre">Code</para>
         </td>
         <td>
-          <para style="P4">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Move name</para>
         </td>
         <td>
-          <para style="P4">Debit </para>
+          <para style="terp_tblheader_Details_Right">Debit </para>
         </td>
         <td>
-          <para style="P4">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit</para>
         </td>
         <td>
-          <para style="P4">Balance</para>
-        </td>
-        <td>
-          <para style="P4">Theorical Revenue</para>
+          <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P13">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <section>
-      <para style="P14">[[ repeatIn(objects, 'o') ]]</para>
-      <para style="P15">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="539.0" style="Tableau2">
+      <blockTable colWidths="481.0" style="Table_account_code_name">
         <tr>
           <td>
-            <para style="P17"><font face="Times-Roman" size="8.0">[[ o.code ]] [[ o.name ]]: </font>max qty: [[ o.quantity_max or '-' ]], max amount: [[ o.amount_max or '-']]</para>
+            <para style="terp_default_bold_9_20">[[ o.code ]] [[ o.complete_name ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="P13">
+      <para style="terp_default_8">
         <font color="white"> </font>
       </para>
       <section>
-        <para style="P15">[[ repeatIn(lines_g(o.id, data['form']['date1'], data['form']['date2']), 'move_g') ]]</para>
-        <para style="P13">
-          <font color="white"> </font>
-        </para>
-        <blockTable colWidths="475.0,63.0" style="Tableau4">
+        <blockTable colWidths="482.0" style="Table1">
           <tr>
             <td>
-              <para style="P5">[[ move_g['code'] ]] <font face="Times-Bold" size="10.0">[[ move_g['name'] ]]</font></para>
-            </td>
-            <td>
-              <para style="P3">
-                <font color="white"> </font>
-              </para>
+              <para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
+              <blockTable colWidths="471.0" style="Table4">
+                <tr>
+                  <td>
+                    <para style="terp_default_bold_8_10">[[ move_g['code'] ]] [[ move_g['name'] ]]</para>
+                    <para style="terp_default_8">
+                      <font color="white"> </font>
+                    </para>
+                    <blockTable colWidths="38.0,34.0,41.0,192.0,51.0,57.0,54.0" style="Table_move_content">
+                      <tr>
+                        <td>
+                          <para style="terp_default_Centre_9">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
+                          <para style="terp_default_Centre_9">[[ move_a['date'] ]]</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Centre_9">[[ move_a['cj'] ]]</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Centre_9">[[ move_a['code'] ]]</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Centre_9">[[ move_a['name'] ]]</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Right_9">[[ '%.2f' % move_a['debit'] ]]</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Right_9">[[ '%.2f' % move_a['credit'] ]]</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Right_9">[[ '%.2f' % move_a['balance'] ]]</para>
+                        </td>
+                      </tr>
+                    </blockTable>
+                  </td>
+                </tr>
+              </blockTable>
+              <blockTable colWidths="310.0,52.0,57.0,57.0" style="Table_move_repeat">
+                <tr>
+                  <td>
+                    <para style="terp_default_bold_9_10">Total ([[ move_g['code'] ]])</para>
+                  </td>
+                  <td>
+                    <para style="terp_default_bold_right_9">[[ '%.2f' % move_g['debit'] ]]</para>
+                  </td>
+                  <td>
+                    <para style="terp_default_bold_right_9">[[ '%.2f' % move_g['credit'] ]]</para>
+                  </td>
+                  <td>
+                    <para style="terp_default_bold_right_9">[[ '%.2f' % move_g['balance'] ]]</para>
+                  </td>
+                </tr>
+              </blockTable>
             </td>
           </tr>
         </blockTable>
-        <blockTable colWidths="63.0,46.0,139.0,55.0,53.0,57.0,63.0,63.0" style="Tableau7">
-          <tr>
-            <td>
-              <para style="P6">[[ repeatIn(lines_a(move_g['id'], o.id, data['form']['date1'], data['form']['date2']), 'move_a') ]]</para>
-              <para style="P6">[[ move_a['date'] ]]</para>
-            </td>
-            <td>
-              <para style="P7">[[ move_a['cj'] ]]</para>
-            </td>
-            <td>
-              <para style="P6">[[ move_a['name'] ]]</para>
-            </td>
-            <td>
-              <para style="P7">[[ '%.2f' % move_a['quantity'] ]]</para>
-            </td>
-            <td>
-              <para style="P7">[[ '%.2f' % move_a['debit'] ]]</para>
-            </td>
-            <td>
-              <para style="P7">[[ '%.2f' % move_a['credit'] ]]</para>
-            </td>
-            <td>
-              <para style="P7">[[ '%.2f' % move_a['balance'] ]]</para>
-            </td>
-            <td>
-              <para style="P7">[[ '%.2f' % move_a['revenue'] ]]</para>
-            </td>
-          </tr>
-        </blockTable>
-        <blockTable colWidths="247.0,55.0,53.0,57.0,63.0,63.0" style="Tableau6">
-          <tr>
-            <td>
-              <para style="P8">Total ([[ move_g['name'] ]])</para>
-            </td>
-            <td>
-              <para style="P8">[[ '%.2f' % move_g['quantity'] ]]</para>
-            </td>
-            <td>
-              <para style="P8">[[ '%.2f' % move_g['debit'] ]]</para>
-            </td>
-            <td>
-              <para style="P8">[[ '%.2f' % move_g['credit'] ]]</para>
-            </td>
-            <td>
-              <para style="P8">[[ '%.2f' % move_g['balance'] ]]</para>
-            </td>
-            <td>
-              <para style="P8">[[ '%.2f' % (account_g_sum_revenue(move_g['id']) or 0.0) ]]</para>
-            </td>
-          </tr>
-        </blockTable>
-        <para style="P13">
-          <font color="white"> </font>
-        </para>
       </section>
-      <blockTable colWidths="247.0,55.0,53.0,56.0,63.0,63.0" style="Tableau5">
+      <blockTable colWidths="312.0,57.0,57.0,56.0" style="Table_account_code_total">
         <tr>
           <td>
-            <para style="P24">Total ([[ o['code'] ]])</para>
-          </td>
-          <td>
-            <para style="P10">[[ '%.2f' % (account_sum_qty(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
+            <para style="terp_default_bold_9_10">Total ([[ o.code ]])</para>
           </td>
           <td>
-            <para style="P10">[[ '%.2f' % (account_sum_debit(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
+            <para style="terp_default_bold_right_9">[[ '%.2f' % (account_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or 0.0) ]]</para>
           </td>
           <td>
-            <para style="P10">[[ '%.2f' % (account_sum_credit(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
+            <para style="terp_default_bold_right_9">[[ '%.2f' % (account_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or 0.0) ]]</para>
           </td>
           <td>
-            <para style="P10">[[ '%.2f' % (account_sum_balance(o.id, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
-          </td>
-          <td>
-            <para style="P10">[[ '%.2f' % (account_sum_revenue(o.id) or 0.0) ]]</para>
+            <para style="terp_default_bold_right_9">[[ '%.2f' % (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or 0.0)]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="P15">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="P16">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="247.0,55.0,53.0,56.0,63.0,64.0" style="Tableau10">
+    <blockTable colWidths="311.0,59.0,56.0,57.0" style="Table_account_total">
       <tr>
         <td>
-          <para style="P9">Total</para>
-        </td>
-        <td>
-          <para style="P9">[[ '%.2f' % (sum_qty(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
-        </td>
-        <td>
-          <para style="P9">[[ '%.2f' % (sum_debit(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
+          <para style="terp_default_bold_9_10">Total</para>
         </td>
         <td>
-          <para style="P9">[[ '%.2f' % (sum_credit(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
+          <para style="terp_default_bold_right_9">[[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]</para>
         </td>
         <td>
-          <para style="P9">[[ '%.2f' % (sum_balance(objects, data['form']['date1'], data['form']['date2']) or 0.0) ]]</para>
+          <para style="terp_default_bold_right_9">[[ '%.2f' % (sum_credit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]</para>
         </td>
         <td>
-          <para style="P9">[[ '%.2f' % (sum_revenue(objects) or 0.0) ]]</para>
+          <para style="terp_default_bold_right_9">[[ '%.2f' % (sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P18">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>
-</document>
-
+</document>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index 4b707196d37..c687b171640 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -19,7 +19,7 @@
             <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
         
-        <record id="hr.attendance1" model="hr.attendance">
+        <!-- <record id="hr.attendance1" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
         <record id="hr.attendance2" model="hr.attendance">
@@ -78,7 +78,7 @@
         </record>
         <record id="hr.attendance20" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
-        </record>
+        </record> -->
         
         <record id="hr_timesheet.analytic_timesheet1" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index ab654cad9b7..00b01f46ed2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -279,7 +279,7 @@
             <field name="name">hr.attendance.form</field>
             <field name="model">hr.attendance</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_attendance_form"/>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_form"/>
             <field name="arch" type="xml">
                 <field name="action_desc" position="after">
                     <field name="sheet_id" select="2"/>
@@ -290,7 +290,7 @@
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
             <field name="type">tree</field>
-            <field name="inherit_id" ref="hr.view_attendance_tree"/>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_tree"/>
             <field name="arch" type="xml">
                 <field name="action_desc" position="after">
                     <field name="sheet_id"/>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 121ebbe6e1d..bb6684ca04f 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -304,6 +304,33 @@ class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Production'
     _date_name  = 'date_planned'
+    
+    def _get_sale_order(self,cr,uid,ids,field_name=False):
+        move_obj=self.pool.get('stock.move')
+        def get_parent_move(move_id):
+            move = move_obj.browse(cr,uid,move_id)
+            if move.move_dest_id:
+                return get_parent_move(move.move_dest_id.id)
+            return move_id
+        productions=self.read(cr,uid,ids,['id','move_prod_id'])
+        res={}
+        for production in productions:
+            if production.get('move_prod_id',False):
+                parent_move_line=get_parent_move(production['move_prod_id'][0])
+                if parent_move_line:
+                    move = move_obj.browse(cr,uid,parent_move_line)
+                    if field_name=='name':
+                        res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.name or False
+                    if field_name=='client_order_ref':
+                        res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.client_order_ref or False
+        return res
+    
+    def _sale_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+        return self._get_sale_order(cr,uid,ids,field_name='name')
+    
+    def _sale_ref_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
+        return self._get_sale_order(cr,uid,ids,field_name='client_order_ref')
+    
     _columns = {
         'name': fields.char('Reference', size=64, required=True),
         'origin': fields.char('Origin', size=64),
@@ -332,7 +359,9 @@ class mrp_production(osv.osv):
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
 
-        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'Status', readonly=True)
+        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'Status', readonly=True),
+        'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'),
+        'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Ref'),
     }
     _defaults = {
         'priority': lambda *a: '1',
diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml
index f6eca4722e8..eb97477f687 100644
--- a/addons/mrp/mrp_report.xml
+++ b/addons/mrp/mrp_report.xml
@@ -4,5 +4,14 @@
         
         <report auto="True" header="False" id="report_bom_structure" model="mrp.bom" name="bom.structure" rml="mrp/report/bom_structure.rml" string="BOM Structure"/>
         
+        <report
+			id="report_mrp_production_report"
+			string="Production Order"
+			model="mrp.production"
+			name="mrp.production.order"
+			rml="mrp/report/order.rml"
+			auto="False"
+			/>
+			
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2718dbefd7d..50cfd1881c6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -406,7 +406,6 @@
                         <field name="name" select="1"/>
                         <field name="date_planned" select="1"/>
                         <field name="priority"/>
-                        
                         <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
@@ -448,6 +447,8 @@
                             <field name="date_finnished"/>
                             <field name="picking_id"/>
                             <field name="move_prod_id"/>
+                            <field name="sale_name"/>
+                        	<field name="sale_ref"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/mrp/report/__init__.py b/addons/mrp/report/__init__.py
index f55a94f166e..32bb00568ff 100644
--- a/addons/mrp/report/__init__.py
+++ b/addons/mrp/report/__init__.py
@@ -28,6 +28,7 @@
 ###############################################################################
 import price
 import workcenter_load
+import order
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
new file mode 100644
index 00000000000..1d801b3aa2e
--- /dev/null
+++ b/addons/mrp/report/order.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# 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
+from report import report_sxw
+from osv import osv
+import pooler
+
+class order(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+
+
+report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order)
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
new file mode 100644
index 00000000000..cc1b0bf34b3
--- /dev/null
+++ b/addons/mrp/report/order.rml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="16.0" leading="20"/>
+    <paraStyle name="P3" fontName="Helvetica"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="P12" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P13" fontName="Helvetica-Oblique" fontSize="9.0" leading="11"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER"/>
+    <paraStyle name="P17" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P18" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P14">[[ repeatIn(objects,'o') ]] </para>
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <para style="P14">
+      <font color="white"> </font>
+    </para>
+    <para style="P1">Production Order N° : [[ o.name ]]</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P18">Printing date : [[ time.strftime('%d/%m/%Y') ]]</para>
+    <para style="P18">Partner Order reference : [[ o.sale_ref or ' ' ]]</para>
+    <para style="P18">SO number : [[ o.sale_name or '' ]]</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="130.0,313.0,85.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="P4">Product Name</para>
+        </td>
+        <td>
+          <para style="P5">Product Description</para>
+        </td>
+        <td>
+          <para style="P6">Qty</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <blockTable colWidths="130.0,312.0,86.0" style="Table2">
+        <tr>
+          <td>
+            <para style="P10">[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[ o.product_id.description ]]</para>
+          </td>
+          <td>
+            <para style="P11">[[ '%.2f' % o.product_qty ]] [[ o.product_uom.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+    </para>
+    <blockTable colWidths="86.0,16.0,425.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P15">Planned Date </para>
+        </td>
+        <td>
+          <para style="P16">:</para>
+        </td>
+        <td>
+          <para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P12">
+      <font face="Times-Roman"/>
+    </para>
+  </story>
+</document>
diff --git a/addons/process/process.py b/addons/process/process.py
index 74b0d6fc036..9044a9d82a5 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -31,6 +31,25 @@ import pooler, tools
 
 from osv import fields, osv
 
+class Env(dict):
+    
+    def __init__(self, obj, user):
+        self.__obj = obj
+        self.__usr = user
+        
+    def __getitem__(self, name):
+        
+        if name in ('__obj', '__user'):
+            return super(ExprContext, self).__getitem__(name)
+        
+        if name == 'user':
+            return self.__user
+        
+        if name == 'object':
+            return self.__obj
+        
+        return self.__obj[name]
+
 class process_process(osv.osv):
     _name = "process.process"
     _description = "Process"
@@ -46,34 +65,46 @@ class process_process(osv.osv):
 
     def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
         pool = pooler.get_pool(cr.dbname)
+        
         process = pool.get('process.process').browse(cr, uid, [id])[0]
-        current_object = pool.get(res_model).browse(cr, uid, [res_id])[0]
+        current_object = pool.get(res_model).browse(cr, uid, [res_id], context)[0]
+        current_user = pool.get('res.users').browse(cr, uid, [uid], context)[0]
+        
+        expr_context = Env(current_object, current_user)
+        
         nodes = {}
         start = []
         transitions = {}
-        for node in process.node_ids:
 
+        for node in process.node_ids:
             data = {}
-
             data['name'] = node.name
-            data['menu'] = (node.menu_id or None) and node.menu_id.name
             data['model'] = (node.model_id or None) and node.model_id.model
             data['kind'] = node.kind
             data['notes'] = node.note
             data['active'] = 0
+            data['gray'] = 0
 
+            if node.menu_id:
+                data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
+            
             if node.kind == "state" and node.model_id and node.model_id.model == res_model:
-                states = node.model_states
-                states = (states or []) and states.split(',')
-                data['active'] = not states or current_object.state in states
-
-            elif node.kind == "router":
-                #TODO:
-                pass
-
-            elif node.kind == "subflow":
-                #TODO: subflow
-                pass
+                try:
+                    if eval(node.model_states, expr_context):
+                        data['active'] = current_object.name_get(context)[0][1]
+                except Exception, e:
+                    # waring: invalid state expression
+                    pass
+                
+            if not data['active']:
+                try:
+                    gray = True
+                    for cond in node.condition_ids:
+                        if cond.model_id and cond.model_id.model == res_model:
+                            gray = gray and eval(cond.model_states, expr_context)
+                    data['gray'] = not gray
+                except:
+                    pass
 
             nodes[node.id] = data
             if node.flow_start:
@@ -129,7 +160,7 @@ class process_node(osv.osv):
     _columns = {
         'name': fields.char('Name', size=30,required=True),
         'process_id': fields.many2one('process.process', 'Process', required=True),
-        'kind': fields.selection([('state','State'),('router','Router'),('subflow','Subflow')],'Kind of Node', 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'),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
@@ -137,6 +168,7 @@ class process_node(osv.osv):
         'flow_start': fields.boolean('Starting Flow'),
         'transition_in': fields.one2many('process.transition', 'target_node_id', 'Starting Transitions'),
         'transition_out': fields.one2many('process.transition', 'source_node_id', 'Ending Transitions'),
+        'condition_ids': fields.one2many('process.condition', 'node_id', 'Conditions')
     }
     _defaults = {
         'kind': lambda *args: 'state',
@@ -145,6 +177,17 @@ class process_node(osv.osv):
     }
 process_node()
 
+class process_node_condition(osv.osv):
+    _name = 'process.condition'
+    _description = 'Condition'
+    _columns = {
+        'name': fields.char('Name', size=30, required=True),
+        'node_id': fields.many2one('process.node', 'Node', required=True),
+        'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
+        'model_states': fields.char('Expression', required=True, size=128)
+    }
+process_node_condition()
+
 class process_transition(osv.osv):
     _name = 'process.transition'
     _description ='Process Transitions'
@@ -164,12 +207,12 @@ class process_transition_action(osv.osv):
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'state': fields.selection([('dummy','Dummy'),
-                                   ('method','Object Method'),
+                                   ('object','Object Method'),
                                    ('workflow','Workflow Trigger'),
                                    ('action','Action')], 'Type', required=True),
         'action': fields.char('Action ID', size=64, states={
             'dummy':[('readonly',1)],
-            'method':[('required',1)],
+            'object':[('required',1)],
             'workflow':[('required',1)],
             'action':[('required',1)],
         },),
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index ac3020cea59..d9a4d93799f 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -71,11 +71,26 @@
                                             </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>                            
+                            </form>
                         </field>
                     </page>
                     <page string="Extra Information">
@@ -109,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">
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 17c7823c1bd..d35019d9b30 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -151,6 +151,6 @@ class product_pricelist(report_sxw.rml_parse):
                                 newnode=False
         return super(product_pricelist,self).repeatIn(lst, name, nodes_parent=False)
 #end
-report_sxw.report_sxw('report.product.pricelist','product.product','addons/product_pricelist_print/report/product_pricelist.rml',parser=product_pricelist)
+report_sxw.report_sxw('report.product.pricelist','product.product','addons/product/report/product_pricelist.rml',parser=product_pricelist)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6c1c8148f8f..13d48317139 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -411,7 +411,7 @@ class purchase_order_line(osv.osv):
         if not pricelist:
             raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist in the purchase form !\nPlease set one before choosing a product.'))
         if not product:
-            return {'value': {'price_unit': 0.0, 'name':'','notes':''}, 'domain':{'product_uom':[]}}
+            return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}
         lang=False
         if partner_id:
             lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 6b39f7084b3..99cd2a14a6e 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -90,7 +90,7 @@
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]] </para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
-          <para style="terp_default_9">[[ order.partner_address_id.state_id.code ]] [[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.code) or '' ]]</para>
+          <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.code) or '' ]] [[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.code) or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b427a0588cb..45783dd5978 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -301,7 +301,7 @@ class sale_order(osv.osv):
     def _inv_get(self, cr, uid, order, context={}):
         return {}
 
-    def _make_invoice(self, cr, uid, order, lines, context={}):
+    def _make_invoice(self, cr, uid, order, lines,context={}):
         a = order.partner_id.property_account_receivable.id
         if order.payment_term:
             pay_term = order.payment_term.id
@@ -770,10 +770,10 @@ class sale_order_line(osv.osv):
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False, packaging=False):
+        warning={}
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
         product_obj = self.pool.get('product.product')
-
         if partner_id:
             lang = partner_obj.browse(cr, uid, partner_id).lang
         context = {'lang': lang, 'partner_id': partner_id}
@@ -781,7 +781,7 @@ class sale_order_line(osv.osv):
         if not product:
             return {'value': {'th_weight' : 0, 'product_packaging': False,
                 'product_uos_qty': qty}, 'domain': {'product_uom': [],
-                    'product_uos': []}}
+                   'product_uos': []}}
 
         if not date_order:
             date_order = time.strftime('%Y-%m-%d')
@@ -792,9 +792,19 @@ class sale_order_line(osv.osv):
             default_uom = product_obj.uom_id and product_obj.uom_id.id
             pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context)
             q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
-            qty = qty - qty % q + q
+#            qty = qty - qty % q + q
+            if not (qty % q) == 0 :
+                ean = pack.ean
+                qty_pack = pack.qty
+                type_ul = pack.ul
+                warn_msg = "You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: " % (qty)
+                warn_msg = warn_msg + "\n\nEAN: " + str(ean) + " Quantiny: " + str(qty_pack) + " Type of ul: " + str(type_ul.name)
+                warning={
+                    'title':'Packing Information !',
+                    'message': warn_msg
+                    }
             result['product_uom_qty'] = qty
-
+            
         if uom:
             uom2 = product_uom_obj.browse(cr, uid, uom)
             if product_obj.uom_id.category_id.id <> uom2.category_id.id:
@@ -864,7 +874,7 @@ class sale_order_line(osv.osv):
         # Round the quantity up
 
         # get unit price
-        warning={}
+        
         if not pricelist:
             warning={
                 'title':'No Pricelist !',
@@ -884,11 +894,9 @@ class sale_order_line(osv.osv):
                     'message':
                         "Couldn't find a pricelist line matching this product and quantity.\n"
                         "You have to change either the product, the quantity or the pricelist."
-                    }
+                    }                
             else:
-                result.update({'price_unit': price})
-
-
+                result.update({'price_unit': price})		
         return {'value': result, 'domain': domain,'warning':warning}
 
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 002caba90d5..9dafbc6ff1d 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -114,3 +114,4 @@ stock_picking()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index f6cc1f1c03f..db273c38b60 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -15,4 +15,3 @@
         
     </data>
 </openerp>
-
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index 792a3d41da2..da1bfb04b65 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -94,7 +94,7 @@ def _createInvoices(self, cr, uid, data, context={}):
             'invoice_line': [(6,0,create_ids)],
             'currency_id' :sale.pricelist_id.currency_id.id,
             'comment': '',
-            'payment_term':sale.partner_id.property_payment_term.id,
+            'payment_term':sale.payment_term.id,
             }
         inv_obj = pool_obj.get('account.invoice')
         inv_id = inv_obj.create(cr, uid, inv)
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"/>
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 30b48da5a03..3fb81c22195 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -36,7 +36,7 @@ import ir
 from tools import config
 from tools.translate import _
 import tools
-
+from xml.dom import minidom
 
 #----------------------------------------------------------
 # Incoterms
@@ -497,7 +497,25 @@ class stock_picking(osv.osv):
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
-
+    
+    def draft_force_assign(self, cr, uid, ids, *args):
+        wf_service = netsvc.LocalService("workflow")
+        for pick in self.browse(cr, uid, ids):
+            wf_service.trg_validate(uid, 'stock.picking', pick.id,
+                'button_confirm', cr)
+            move_ids = [x.id for x in pick.move_lines]
+            self.pool.get('stock.move').force_assign(cr, uid, move_ids)
+            wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+        return True
+    
+    def draft_validate(self, cr, uid, ids, *args):
+        wf_service = netsvc.LocalService("workflow")
+        self.draft_force_assign(cr, uid, ids)
+        for pick in self.browse(cr, uid, ids):
+            self.action_move(cr, uid, [pick.id])
+            wf_service.trg_validate(uid, 'stock.picking', pick.id , 'button_done', cr)
+        return True
+    
     def cancel_assign(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         for pick in self.browse(cr, uid, ids):
@@ -607,7 +625,8 @@ class stock_picking(osv.osv):
         invoice_line_obj = self.pool.get('account.invoice.line')
         invoices_group = {}
         res = {}
-
+        sale_line_obj = self.pool.get('sale.order.line')
+        
         for picking in self.browse(cursor, user, ids, context=context):
             if picking.invoice_state != '2binvoiced':
                 continue
@@ -645,7 +664,51 @@ class stock_picking(osv.osv):
                         context=context)
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
-
+            
+            sale_line_ids = sale_line_obj.search(cursor, user, [('order_id','=',picking.sale_id.id)])
+            sale_lines = sale_line_obj.browse(cursor, user, sale_line_ids, context=context)
+            
+            for sale_line in sale_lines:
+                if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
+                    if group:
+                        name = picking.name + '-' + sale_line.name
+                    else:
+                        name = sale_line.name
+                    if type in ('out_invoice', 'out_refund'):
+                        account_id = sale_line.product_id.product_tmpl_id.\
+                                property_account_income.id
+                        if not account_id:
+                            account_id = sale_line.product_id.categ_id.\
+                                    property_account_income_categ.id
+                    else:
+                        account_id = sale_line.product_id.product_tmpl_id.\
+                                property_account_expense.id
+                        if not account_id:
+                            account_id = sale_line.product_id.categ_id.\
+                                    property_account_expense_categ.id
+                    price_unit = self._get_price_unit_invoice(cursor, user,
+                            sale_line, type)
+                    discount = self._get_discount_invoice(cursor, user, sale_line)
+                    tax_ids = self._get_taxes_invoice(cursor, user, sale_line, type)
+                    account_analytic_id = self._get_account_analytic_invoice(cursor,
+                            user, picking, sale_line)
+    
+                    invoice_line_id = invoice_line_obj.create(cursor, user, {
+                        'name': name,
+                        'invoice_id': invoice_id,
+                        'uos_id': sale_line.product_uos.id or sale_line.product_uom.id,
+                        'product_id': sale_line.product_id.id,
+                        'account_id': account_id,
+                        'price_unit': price_unit,
+                        'discount': discount,
+                        'quantity': sale_line.product_uos_qty,
+                        'invoice_line_tax_id': [(6, 0, tax_ids)],
+                        'account_analytic_id': account_analytic_id,
+                        }, context=context)
+                    sale_line_obj.write(cursor, user, [sale_line.id], {'invoiced':True,
+                        'invoice_lines': [(6, 0, [invoice_line_id])],
+                        })
+                    
             for move_line in picking.move_lines:
                 if group:
                     name = picking.name + '-' + move_line.name
@@ -1269,4 +1332,38 @@ class stock_picking_move_wizard(osv.osv_memory):
             
 stock_picking_move_wizard()        
 
+class product_product(osv.osv):
+    _inherit = 'product.product'
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+        res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        if ('location' in context) and context['location']:
+            location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
+            
+            if location_info.usage == 'supplier':
+                res['fields']['virtual_available']['string'] = 'Futur Receptions'
+                res['fields']['qty_available']['string'] = 'Received Qty'
+                
+            if location_info.usage == 'internal':
+                res['fields']['virtual_available']['string'] = 'Futur Stock'
+                
+            if location_info.usage == 'customer':
+                res['fields']['virtual_available']['string'] = 'Futur Deliveries'
+                res['fields']['qty_available']['string'] = 'Delivered Qty'
+                
+            if location_info.usage == 'inventory':
+                res['fields']['virtual_available']['string'] = 'Futur P&L'
+                res['fields']['qty_available']['string'] = 'P&L Qty'
+                
+            if location_info.usage == 'procurement':
+                res['fields']['virtual_available']['string'] = 'Futur Qty'
+                res['fields']['qty_available']['string'] = 'Unplanned Qty'
+            
+            if location_info.usage == 'production':
+                res['fields']['virtual_available']['string'] = 'Futur Productions'
+                res['fields']['qty_available']['string'] = 'Produced Qty'
+                
+        return res
+
+product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 04ad0cf745b..d935858d35e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -550,9 +550,10 @@
                                 <label colspan="6"/>
                                 <button name="%(move_split)d" string="Split move lines in two" type="action"/>
                             </group>
-                            <group col="8" colspan="4">
+                            <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Assign" type="object"/>
                                 <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
                                 <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
@@ -638,9 +639,10 @@
                                 <label colspan="6"/>
                                 <button name="%(move_split)d" string="Split in Two" type="action"/>
                             </group>
-                            <group col="8" colspan="4">
+                            <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Assign" type="object"/>
                                 <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
                                 <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
@@ -806,9 +808,10 @@
                                 <label colspan="6"/>
                                 <button name="%(move_split)d" string="Split in Two" type="action"/>
                             </group>
-                            <group col="8" colspan="4">
+                            <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Assign" type="object"/>
                                 <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
                                 <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
@@ -975,9 +978,10 @@
                                 <label colspan="5"/>
                                 <button name="%(act_stock_picking_move_wizard)d" string="Fill From Unreceived Products" type="action"/>
                             </group>
-                            <group col="8" colspan="4">
+                            <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="button_confirm" states="draft" string="Confirm" type="object"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Assign" type="object"/>
                                 <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
                                 <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
@@ -1264,4 +1268,3 @@
 
     </data>
 </openerp>
-
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index fa46831cf2c..4bbba3808d5 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -34,5 +34,13 @@
 		multi="True"
 		id="wizard_merge_inventory"/>
 
+		
+		<wizard
+			string="Fill Inventory"
+			model="stock.inventory"
+			name="stock.fill_inventory"
+			keyword="client_action_multi"
+			id="wizard_fill_inventory"
+		/>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index b18ad592fb3..0064614f005 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -37,8 +37,9 @@ import wizard_split_lot_line
 import wizard_track_line
 import wizard_ups
 import wizard_invoice_onshipping
-import inventory_merge
+import wizard_move_by_location
+import wizard_inventory
 import inventory_merge_zero
-
+import inventory_merge
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py
new file mode 100644
index 00000000000..f70b82b863d
--- /dev/null
+++ b/addons/stock/wizard/wizard_inventory.py
@@ -0,0 +1,113 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# 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 wizard
+import ir
+import pooler
+from osv.osv import except_osv
+from osv import fields,osv
+import netsvc
+
+inventory_form = """<?xml version="1.0"?>
+<form string="Fill Inventory">
+    <separator colspan="4" string="Fill Inventory for specific location" />
+    <field name="location_id"/>
+    <newline/>
+    <field name="recursive"/>
+    <newline/>
+
+</form>
+"""
+
+inventory_fields = {
+    'location_id' : {
+        'string':'Location',
+        'type':'many2one',
+        'relation':'stock.location',
+        'required':True
+    },
+    'recursive' : {'string':'Include all childs for the location', 'type':'boolean'}
+}
+
+
+
+def _fill_inventory(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    inventory_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
+    location_obj = pooler.get_pool(cr.dbname).get('stock.location')
+    res={}
+    res_location={}
+    if data['form']['recursive'] :
+        location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', [data['form']['location_id']])])
+        for location in location_ids :
+            res=location_obj._product_get(cr, uid, location)
+            res_location[location]=res
+    else:
+        res=location_obj._product_get(cr, uid, data['form']['location_id'])
+        res_location[data['form']['location_id']]=res
+
+    product_ids=[]
+    for location in res_location.keys():
+        res=res_location[location]
+        for product_id in res.keys():
+            #product_ids.append(product_id)
+            prod = pool.get('product.product').browse(cr, uid, [product_id])[0]
+            uom = prod.uom_id.id
+            amount=pool.get('stock.location')._product_get(cr, uid, location, [product_id], {'uom': uom})[product_id]
+
+            if(amount):
+                line_ids=inventory_line_obj.search(cr,uid,[('inventory_id','=',data['id']),('location_id','=',location),('product_id','=',product_id),('product_uom','=',uom),('product_qty','=',amount)])
+		if not len(line_ids):
+		    inventory_line={'inventory_id':data['id'],'location_id':location,'product_id':product_id,'product_uom':uom,'product_qty':amount}
+                    inventory_line_obj.create(cr, uid, inventory_line)
+                product_ids.append(product_id)
+
+    if(len(product_ids)==0):
+        raise wizard.except_wizard('Message ! ','No product in this location.')
+    return {}
+
+
+
+class fill_inventory(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : inventory_form,
+                    'fields' : inventory_fields,
+                    'state' : [('end', 'Cancel'),('fill_inventory', 'Fill Inventory') ]}
+        },
+        'fill_inventory' : {
+            'actions' : [],
+            'result' : {'type' : 'action', 'action': _fill_inventory, 'state' : 'end'}
+        },
+    }
+fill_inventory("stock.fill_inventory")
+
+
+
diff --git a/addons/stock/wizard/wizard_move_by_location.py b/addons/stock/wizard/wizard_move_by_location.py
new file mode 100755
index 00000000000..3c1d025e721
--- /dev/null
+++ b/addons/stock/wizard/wizard_move_by_location.py
@@ -0,0 +1,61 @@
+# -*- 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
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index 926b1d95e10..8c3626f9de8 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -73,5 +73,5 @@ class stock_location(osv.osv):
             for path in product.path_ids:
                 if path.location_from_id.id == location.id:
                     return path.location_dest_id, path.auto, path.delay
-        return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, contex)
+        return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, context)
 stock_location()
diff --git a/addons/warning/__init__.py b/addons/warning/__init__.py
new file mode 100644
index 00000000000..b26647e7ffb
--- /dev/null
+++ b/addons/warning/__init__.py
@@ -0,0 +1,34 @@
+# -*- 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 warning
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/warning/__terp__.py b/addons/warning/__terp__.py
new file mode 100644
index 00000000000..db4a1616ac9
--- /dev/null
+++ b/addons/warning/__terp__.py
@@ -0,0 +1,44 @@
+# -*- 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.
+###############################################################################
+{
+    "name":"Module for Warnings form onchange Event",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Tools",
+    "depends":["base","sale"],
+    "demo_xml":[],
+    "update_xml":[
+        "warning_view.xml"],
+    "description": "Module for Warnings form onchange Event.",
+    "active":False,
+    "installable":True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
new file mode 100644
index 00000000000..a8b276aaa7c
--- /dev/null
+++ b/addons/warning/warning.py
@@ -0,0 +1,191 @@
+# -*- 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
+from osv import fields,osv
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+                 'sale_warn' : fields.boolean('Sale Order'),
+                 'sale_warn_msg' : fields.char('Message for Sale Order', size=64),
+                 'purchase_warn' : fields.boolean('Purchase Order'),
+                 'purchase_warn_msg' : fields.char('Message for Purchase Order', size=64),
+                 'picking_warn' : fields.boolean('Stock Picking'),
+                 'picking_warn_msg' : fields.char('Message for Stock Picking', size=64),
+                 'invoice_warn' : fields.boolean('Invoice'),
+                 'invoice_warn_msg' : fields.char('Message for Invoice', size=64),
+                 }
+res_partner()
+
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    def onchange_partner_id(self, cr, uid, ids, part):
+        if not part:
+            return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'partner_order_id':False, 'payment_term' : False}}
+        warning = {}
+        title=False
+        message=False
+        partner = self.pool.get('res.partner').browse(cr, uid, part)
+        if partner.sale_warn:
+            title= "Message",
+            message=partner.sale_warn_msg
+             
+        result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)['value']
+        if result.get('warning',False):
+            warning['title']=title and title+' & '+result['warning']['title'] or result['warning']['title']
+            warning['message']=message and message +' '+result['warning']['message'] or result['warning']['message']
+        return {'value': result, 'warning':warning}
+sale_order()
+
+
+class purchase_order(osv.osv):
+    _inherit = 'purchase.order'
+    def onchange_partner_id(self, cr, uid, ids, part):
+        if not part:
+            return {'value':{'partner_address_id': False}}
+        warning = {}
+        partner = self.pool.get('res.partner').browse(cr, uid, part)
+        if partner.purchase_warn:
+                warning={
+                    'title': "Message",
+                    'message': partner.purchase_warn_msg
+                    }
+        result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)['value']
+        return {'value': result, 'warning':warning}
+    
+purchase_order()
+
+
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
+            date_invoice=False, payment_term=False, partner_bank_id=False):
+        if not partner_id:
+            return {'value': {
+            'address_contact_id': False ,
+            'address_invoice_id': False,
+            'account_id': False,
+            'payment_term': False,
+            }
+        }
+        warning = {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        if partner.invoice_warn:
+                warning={
+                    'title': "Message",
+                    'message': partner.invoice_warn_msg
+                    }
+        result =  super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
+            date_invoice=False, payment_term=False, partner_bank_id=False)['value']
+        return {'value': result, 'warning':warning}
+    
+account_invoice()
+
+class stock_picking(osv.osv):
+    _inherit = 'stock.picking'
+    
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner.address').browse(cr, uid, [partner_id])[0].partner_id
+        warning = {}
+        if partner.picking_warn:
+            warning={
+                'title': "Message",
+                'message': partner.picking_warn_msg
+            }
+        result =  super(stock_picking, self).onchange_partner_in(cr, uid, context, partner_id)
+        return {'value': result, 'warning':warning}
+    
+stock_picking()
+
+class product_product(osv.osv):
+    _inherit = 'product.product'
+    _columns = {
+                 'sale_line_warn' : fields.boolean('Sale Order Line'),
+                 'sale_line_warn_msg' : fields.char('Message for Sale Order Line', size=64),
+                 'purchase_line_warn' : fields.boolean('Purchase Order Line'),
+                 'purchase_line_warn_msg' : fields.char('Message for Purchase Order Line', size=64),
+                 }
+product_product()
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False):
+        warning = {}
+        if not product:
+            return {'value': {'th_weight' : 0, 'product_packaging': False,
+                'product_uos_qty': qty}, 'domain': {'product_uom': [],
+                   'product_uos': []}}
+        product_obj = self.pool.get('product.product') 
+        product_info = product_obj.browse(cr, uid, product)
+        title=False
+        message=False
+        if product_info.sale_line_warn:
+            title= "Message",
+            message= product_info.sale_line_warn_msg
+                    
+        result =  super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False)['value']        
+        if result.get('warning',False):
+            warning['title']=title and title+' & '+result['warning']['title'] or result['warning']['title']
+            warning['message']=message and message +' '+result['warning']['message'] or result['warning']['message']
+        return {'value': result, 'warning':warning}
+    
+sale_order_line()
+
+class purchase_order_line(osv.osv):
+    _inherit = 'purchase.order.line'
+    def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order=False):
+        warning = {}
+        if not product:
+            return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}
+        product_obj = self.pool.get('product.product') 
+        product_info = product_obj.browse(cr, uid, product)
+        if product_info.purchase_line_warn:
+            warning={
+                    'title': "Message",
+                    'message': product_info.purchase_line_warn_msg
+                    }
+            
+        result =  super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order=False)['value']
+        return {'value': result, 'warning':warning}
+    
+purchase_order_line()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
new file mode 100644
index 00000000000..769ddc8d5d2
--- /dev/null
+++ b/addons/warning/warning_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+         <record id="view_partner_warning_form" model="ir.ui.view">
+            <field name="name">res.partner.warning.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">
+                <notebook>
+                    <page string="Messages" position="inside">
+                        <newline/>
+                            <field name="sale_warn"/>
+                            <field name="sale_warn_msg"/>
+                             <field name="purchase_warn"/>
+                            <field name="purchase_warn_msg"/>
+                             <field name="picking_warn"/>
+                            <field name="picking_warn_msg"/>
+                             <field name="invoice_warn"/>
+                            <field name="invoice_warn_msg"/>
+                </page>
+                </notebook>
+            </field>
+        </record>
+        
+        
+        <record id="product_warning_form_view" model="ir.ui.view">
+            <field name="name">product.warning.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Messages">
+                    	 <field name="sale_line_warn"/>
+                         <field name="sale_line_warn_msg"/>
+                         <field name="purchase_line_warn"/>
+                         <field name="purchase_line_warn_msg"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        
+    </data>
+</openerp>