diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip
index 22c0b7768f2..3ee0260060f 100644
Binary files a/addons/base_report_designer/plugin/openerp_report_designer.zip and b/addons/base_report_designer/plugin/openerp_report_designer.zip differ
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index 730ce8efefb..d4359a466ca 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -54,11 +54,11 @@ class Change:
     def __init__(self, aVal= None, sURL=""):
         self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
 
-        self.win.addFixedText("lblVariable", 38, 12, 60, 15, "Server")
+        self.win.addFixedText("lblVariable", 38, 12, 25, 15, "Server  ")
 
         self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
 
-        self.win.addFixedText("lblReportName",45 , 31, 60, 15, "Port")
+        self.win.addFixedText("lblReportName",45 , 31, 15, 15, "Port  ")
         self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
 
         self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
@@ -92,6 +92,8 @@ class Change:
         global url
         url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
         self.sock=RPCSession(url)
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
         docinfo=doc.getDocumentInfo()        
         docinfo.setUserFieldValue(0,url)
         res=self.sock.listdb()
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index de67ea0abda..123be9b9bc2 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -192,6 +192,10 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
         Change(aVal,url)
         if aVal[1]== -1:
            self.win.getEditText("lstDatabase")
+           self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+           self.win.setEditText("txtHost",aVal[0])
+           for i in range(len(aVal[1])):
+                self.lstDatabase.addItem(aVal[1][i],i)
         elif aVal[1]==0:
             ErrorDialog(aVal[0],"")
         else:
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 9798fd09a4e..5336bdd23fb 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -22,6 +22,7 @@
 import time
 import base64
 import tools
+
 from osv import fields
 from osv import osv
 from tools.translate import _
@@ -135,6 +136,52 @@ class crm_case(object):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.context_section_id.id or False
 
+    def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
+        if index + 1 == len(stage_list):
+            return False
+        next_stage_id = stage_list[index + 1]
+        next_stage = stage_pool.browse(cr, uid, next_stage_id, context=context)
+        if not next_stage:
+            return False
+            
+        next_seq = next_stage.sequence
+        if (abs(next_seq - current_seq)) >= 1:
+            return next_stage
+        else :
+            return self._find_next_stage(cr, uid, stage_list, index + 1, current_seq, stage_pool)
+            
+    def stage_change(self, cr, uid, ids, context=None, order='sequence'):
+        if not context:
+            context = {}
+        stage_pool = self.pool.get('crm.case.stage')
+        stage_type = context and context.get('stage_type','')
+        current_seq = False
+        next_stage_id = False
+        for case in self.browse(cr, uid, ids, context):
+            next_stage = False
+            data = {}
+
+            domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
+            if case.section_id and case.section_id.stage_ids:
+                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
+            
+            stages = stage_pool.search(cr, uid, domain, order=order)
+            current_seq = case.stage_id.sequence
+            index = -1
+            if case.stage_id and case.stage_id.id in stages:
+                index = stages.index(case.stage_id.id)
+
+            next_stage = self._find_next_stage(cr, uid, stages, index, current_seq, stage_pool, context=context)
+            if next_stage:
+                next_stage_id = next_stage.id
+                data = {'stage_id': next_stage.id}
+                if next_stage.on_change:
+                    data.update({'probability': next_stage.probability})
+            self.write(cr, uid, [case.id], data, context=context)
+            
+        return next_stage_id
+        
+        
     def stage_next(self, cr, uid, ids, context=None):
         """This function computes next stage for case from its current stage
              using available stage for that case type
@@ -143,32 +190,10 @@ class crm_case(object):
         @param uid: the current user’s ID for security checks,
         @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-        stage_pool = self.pool.get('crm.case.stage')
-        model = self._name
-        for case in self.browse(cr, uid, ids, context):
-            next_stage = False
-            data = {}
-            domain = [('object_id.model', '=', model),('section_ids', '=', case.section_id.id)]
-            if case.section_id and case.section_id.stage_ids:
-                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
-            stages = stage_pool.search(cr, uid, domain, order='sequence')
-            index = -1
-            if case.stage_id and case.stage_id.id in stages:
-                index = stages.index(case.stage_id.id)
-            if index + 1 == len(stages):
-                return False
-            else:
-                next_stage = stages[index + 1]
-            if next_stage:
-                data = {'stage_id': next_stage}
-                stage = stage_pool.browse(cr, uid, next_stage, context=context)
-                if stage.on_change:
-                    data.update({'probability': stage.probability})
-            self.write(cr, uid, [case.id], data, context=context)
-        return next_stage
-
+        
+       
+        return self.stage_change(cr, uid, ids, context=context, order='sequence')
+        
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage
              using available stage for that case type
@@ -177,31 +202,7 @@ class crm_case(object):
         @param uid: the current user’s ID for security checks,
         @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-        stage_pool = self.pool.get('crm.case.stage')
-        model = self._name
-        for case in self.browse(cr, uid, ids, context):
-            prev_stage = False
-            data = {}
-            domain = [('object_id.model', '=', model),('section_ids', '=', case.section_id.id)]
-            if case.section_id and case.section_id.stage_ids:
-                domain.append(('id', 'in', map(lambda x: x.id, case.section_id.stage_ids)))
-            stages = stage_pool.search(cr, uid, domain, order='sequence')
-            index = 0
-            if case.stage_id and case.stage_id.id in stages:
-                index = stages.index(case.stage_id.id)
-            if index == 0:
-                return False
-            else:
-                prev_stage = stages[index - 1]
-            if prev_stage:
-                data = {'stage_id': prev_stage}
-                stage = stage_pool.browse(cr, uid, prev_stage, context=context)
-                if stage.on_change:
-                    data.update({'probability': stage.probability})
-            self.write(cr, uid, [case.id], data, context=context)
-        return prev_stage
+        return self.stage_change(cr, uid, ids, context=context, order='sequence desc')
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
@@ -482,27 +483,27 @@ class crm_case_stage(osv.osv):
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
         'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
         'on_change': fields.boolean('Change Probability Automatically', \
                          help="Change Probability on next and previous stages."),
-        'requirements': fields.text('Requirements')
+        'requirements': fields.text('Requirements'),
+        'type': fields.selection([('lead','Lead'),('opportunity','Opportunity'),('claim','Claim'), ('fundraising','Fundraising')], 'Type'),
     }
-    def _find_object_id(self, cr, uid, context=None):
-        """Finds id for case object
+
+    def _find_stage_type(self, cr, uid, context=None):
+        """Finds type of stage according to object.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-        object_id = context and context.get('object_id', False) or False
-        ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]
+        type = context and context.get('type', '') or ''
+        return type
 
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'object_id' : _find_object_id
+        'type': _find_stage_type,
     }
 
 crm_case_stage()
@@ -629,6 +630,7 @@ class crm_case_stage(osv.osv):
     _columns = {
         'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
     }
+        
 crm_case_stage()
 
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e0bed8934f2..8cc45c75e57 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -135,7 +135,7 @@ class crm_lead(crm_case, osv.osv):
         ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage'),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','lead')]"),
         'user_id': fields.many2one('res.users', 'Salesman',help='By Default Salesman is Administrator when create New User'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -150,6 +150,19 @@ class crm_lead(crm_case, osv.osv):
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
+    
+    def _get_stage_id(self, cr, uid, context=None):
+        """Finds type of stage according to object.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        if context is None:
+            context = {}
+        type = context and context.get('stage_type', '')
+        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=',type),('sequence','>=',1)])
+        return stage_ids and stage_ids[0] or False
 
     _defaults = {
         'active': lambda *a: 1,
@@ -160,6 +173,7 @@ class crm_lead(crm_case, osv.osv):
         'section_id': crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'stage_id': _get_stage_id,
     }
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
@@ -297,7 +311,7 @@ class crm_lead(crm_case, osv.osv):
         return super(crm_lead,self).write(cr, uid, ids, vals, context)
     
     def stage_next(self, cr, uid, ids, context=None):
-        stage = super(crm_lead, self).stage_next(cr, uid, ids, context)
+        stage = super(crm_lead, self).stage_next(cr, uid, ids, context=context)
         if stage:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
             if stage_obj.on_change:
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 2a49e43e683..3cb34c49299 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -2,34 +2,39 @@
 <openerp>
     <data noupdate="1">
 
-
+	<record model="crm.case.stage" id="stage_lead6">
+            <field name="name">Lost</field>
+            <field eval="'0'" name="probability"/>
+            <field eval="'0'" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
         <!--        CASE STATUS(stage_id)        -->
         <record model="crm.case.stage" id="stage_lead1">
             <field name="name">New</field>
             <field eval="'10'" name="probability"/>
             <field eval="'1'" name="sequence"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+            <field name="type">lead</field>
         </record>
 
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Qualification</field>
             <field eval="'20'" name="probability"/>
             <field eval="'2'" name="sequence"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+            <field name="type">lead</field>
         </record>
 
         <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Proposition</field>
             <field eval="'40'" name="probability"/>
             <field eval="'3'" name="sequence"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+            <field name="type">lead</field>
         </record>
 
         <record model="crm.case.stage" id="stage_lead4">
             <field name="name">Negotiation</field>
             <field eval="'60'" name="probability"/>
             <field eval="'4'" name="sequence"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+            <field name="type">lead</field>
         </record>
 
         <record model="crm.case.stage" id="stage_lead5">
@@ -37,15 +42,10 @@
             <field eval="'100'" name="probability"/>
             <field eval="'5'" name="sequence"/>
             <field eval="1" name="on_change"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+            <field name="type">lead</field>
         </record>
 
-        <record model="crm.case.stage" id="stage_lead6">
-            <field name="name">Lost</field>
-            <field eval="'0'" name="probability"/>
-            <field eval="'6'" name="sequence"/>
-            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-        </record>
+        
 
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 6c74dccac15..2fff1b57d3c 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,7 +9,7 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id}</field>
+        <field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
         <field name="help">'Leads' allows you to manage and keep track of all first potential interests of a partner in one of your products or services. A lead is a first, unqualified, contact with a prospect or customer. After being qualified, a lead can be converted into a business opportunity with the creation of the related partner for further detailed tracking of any linked activities. You can use leads when you import a database of prospects or to integrate your website's contact form with OpenERP.</field>
     </record>
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index cda3c4fcc1f..979ab26cfd1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -9,8 +9,8 @@
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-        <field name="context">{'object_id':'crm.lead'}</field>
+        <field name="domain">[('type', '=', 'lead')]</field>
+        <field name="context">{'type':'lead'}</field>
         <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle.</field>
     </record>
 
@@ -57,14 +57,14 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
+                    <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string=""
                             states="open,pending,draft" type="object"
-                            icon="gtk-go-back" />
+                            icon="gtk-go-back" context="{'stage_type': 'lead'}" />
                         <button name="stage_next" string=""
                             states="open,pending,draft" type="object"
-                            icon="gtk-go-forward" />
+                            icon="gtk-go-forward" context="{'stage_type': 'lead'}" />
                     </group>
                     <field name="type" invisible="1"/>
                 </group>
@@ -329,7 +329,7 @@
                 <newline/>
 
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="stage_id" widget="selection" domain="[('type', '=', 'lead')]"/>
                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                       <separator orientation="vertical"/>
                       <field name="country_id" context="{'invisible_country': False}">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 9fddc61cab4..4f992622726 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -44,10 +44,10 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" >
-						  <field name="recurrency"/>      
+                           <field name="recurrency"/>      
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
-                                
+
                     </group>
                 </group>
                 <notebook colspan="4">
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index b41621b6f00..44f2b1b85a4 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -50,7 +50,9 @@ class crm_opportunity(osv.osv):
         'date_deadline': fields.date('Expected Closing'),
         'date_action': fields.date('Next Action Date'),
         'title_action': fields.char('Next Action', size=64),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','opportunity')]"),
      }
+    
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting probability and close date
         @param self: The object pointer
@@ -100,7 +102,7 @@ class crm_opportunity(osv.osv):
                 message = _("The opportunity '%s' has been marked as lost.") % name
                 self.log(cr, uid, id, message)
         return res
-
+    
     def case_cancel(self, cr, uid, ids, *args):
         """Overrides cancel for crm_case for setting probability
         @param self: The object pointer
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index c2f750c29d1..a20cbc5e344 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -1,56 +1,109 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <record model="crm.case.categ" id="categ_oppor1">
-        <field name="name">Interest in Computer</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.categ" id="categ_oppor2">
-        <field name="name">Interest in Accessories</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.categ" id="categ_oppor3">
-        <field name="name">Need Services</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.categ" id="categ_oppor4">
-        <field name="name">Need Information</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.categ" id="categ_oppor5">
-        <field name="name">Need a Website Design</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.categ" id="categ_oppor6">
-        <field name="name">Potential Reseller</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.categ" id="categ_oppor7">
-        <field name="name">Need Consulting</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.categ" id="categ_oppor8">
-        <field name="name">Other</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
+
+     <!--        CASE STATUS(stage_id)        -->
+     
+        <record model="crm.case.stage" id="stage_opportunity6">
+            <field name="name">Lost</field>
+            <field eval="'0'" name="probability"/>
+            <field eval="'0'" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+        
+        <record model="crm.case.stage" id="stage_opportunity1">
+            <field name="name">New</field>
+            <field eval="'10'" name="probability"/>
+            <field eval="'1'" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+
+        <record model="crm.case.stage" id="stage_opportunity2">
+            <field name="name">Qualification</field>
+            <field eval="'20'" name="probability"/>
+            <field eval="'2'" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+
+        <record model="crm.case.stage" id="stage_opportunity3">
+            <field name="name">Proposition</field>
+            <field eval="'40'" name="probability"/>
+            <field eval="'3'" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+
+        <record model="crm.case.stage" id="stage_opportunity4">
+            <field name="name">Negotiation</field>
+            <field eval="'60'" name="probability"/>
+            <field eval="'4'" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+
+        <record model="crm.case.stage" id="stage_opportunity5">
+            <field name="name">Won</field>
+            <field eval="'100'" name="probability"/>
+            <field eval="'5'" name="sequence"/>
+            <field eval="1" name="on_change"/>
+            <field name="type">opportunity</field>
+        </record>
+
+        <record model="crm.case.section" id="section_sales_department">
+            <field name="name">Sales Department</field>
+            <field name="code">Sales</field>
+            <field name="stage_ids" eval="[(4, ref('stage_opportunity1')), (4, ref('stage_opportunity2')), (4, ref('stage_opportunity3')), (4, ref('stage_opportunity4')), (4, ref('stage_opportunity5')), (4, ref('stage_opportunity6'))]"/>
+        </record>
+
+    <!--        CASE CATEGORY(categ_id)        -->
+	    <record model="crm.case.categ" id="categ_oppor1">
+	        <field name="name">Interest in Computer</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
+	    <record model="crm.case.categ" id="categ_oppor2">
+	        <field name="name">Interest in Accessories</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
+	    <record model="crm.case.categ" id="categ_oppor3">
+	        <field name="name">Need Services</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
+	    <record model="crm.case.categ" id="categ_oppor4">
+	        <field name="name">Need Information</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
+	    <record model="crm.case.categ" id="categ_oppor5">
+	        <field name="name">Need a Website Design</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
+	    <record model="crm.case.categ" id="categ_oppor6">
+	        <field name="name">Potential Reseller</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
+	    <record model="crm.case.categ" id="categ_oppor7">
+	        <field name="name">Need Consulting</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
+	    <record model="crm.case.categ" id="categ_oppor8">
+	        <field name="name">Other</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+	    </record>
 
 <!--        Case Resource(type_id)        -->
-    <record model="crm.case.resource.type" id="type_oppor1">
-        <field name="name">Campaign 2</field>
-        <field name="section_id" ref="section_sales_department"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_oppor2">
-        <field name="name">Campaign 1</field>
-        <field name="section_id" ref="section_sales_department"/>
-    </record>
+	    <record model="crm.case.resource.type" id="type_oppor1">
+	        <field name="name">Campaign 2</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	    </record>
+	    <record model="crm.case.resource.type" id="type_oppor2">
+	        <field name="name">Campaign 1</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	    </record>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index 48812b17cf0..8dda7436b64 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -20,7 +20,7 @@
             <field eval="85000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
-            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field name="stage_id" ref="crm.stage_opportunity3"/>
             <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
         </record>
         <record id="crm_case_rdroundfundingunits0" model="crm.lead">
@@ -36,7 +36,7 @@
             <field eval="50" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field name="stage_id" ref="crm.stage_opportunity1"/>
             <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
         </record>
         <record id="crm_case_mediapoleunits0" model="crm.lead">
@@ -53,7 +53,7 @@
             <field eval="70" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
-            <field name="stage_id" ref="crm.stage_lead5"/>
+            <field name="stage_id" ref="crm.stage_opportunity5"/>
             <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
             <field eval="&quot;info@mycompany.net&quot;" name="email_from"/>
         </record>
@@ -70,7 +70,7 @@
             <field eval="45000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_lead4"/>
+            <field name="stage_id" ref="crm.stage_opportunity4"/>
             <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
         </record>
@@ -86,7 +86,7 @@
             <field eval="42000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
-            <field name="stage_id" ref="crm.stage_lead6"/>
+            <field name="stage_id" ref="crm.stage_opportunity6"/>
             <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
         </record>
     </data>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 6b2e2d0fc39..cd57c2026af 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -28,7 +28,7 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id,'default_type': 'opportunity'}</field>
+          <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id, 'stage_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
           <field name="help">Opportunities allows you to manage and keep track of your sales pipeline by creating specific customer or prospect related sales documents in order to follow up potential sales. Information such as the expected revenue, opportunity stage, expected closing date, communication history and so on can be maintained in them. Opportunities can be connected with the email gateway: new emails create opportunities, each of them automatically gets the history of the conversation with the customer.
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5ca69c22790..4dff3dd6337 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+    
+    <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
+        <field name="name">Stages</field>
+        <field name="res_model">crm.case.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+        <field name="domain">[('type', '=', 'opportunity')]</field>
+        <field name="context">{'type':'opportunity'}</field>
+        <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle.</field>
+    </record>
+
+     <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
+        groups="base.group_extended" sequence="0"
+        parent="base.menu_crm_config_opportunity" />
+        
         <!-- Opportunities Form View -->
             <record model="ir.ui.view" id="crm_case_form_view_oppor">
                 <field name="name">Opportunities</field>
@@ -15,23 +30,24 @@
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
                                     on_change="onchange_stage_id(stage_id)"
-                                    domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
+                                    domain="[('type','=','opportunity'),('section_ids', '=', section_id)]"/>
                                 <button name="stage_previous"
                                     states="draft,open,pending" type="object"
                                     icon="gtk-go-back" string="" />
                                 <button name="stage_next" states="draft,open,pending"
-                                    type="object" icon="gtk-go-forward" string="" />
+                                    type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
                             </group>
                             <field name="user_id"/>
 
-                            <button name="action_makeMeeting" type="object"
-                            string="Schedule Meeting" icon="gtk-redo" />
+                            <button string="Schedule/Log Call"
+                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
 
                             <field name="planned_revenue"/>
                             <field name="probability"/>
                             <field name="date_deadline"/>
-                            <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
+
+                            <button name="action_makeMeeting" type="object"
+                            string="Schedule Meeting" icon="gtk-redo" />
                             <newline/>
                             <field name="date_action"/>
                             <field name="title_action"/>
@@ -303,7 +319,7 @@
                         </field>
                         <newline/>
                         <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]"/>
                               <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                               <separator orientation="vertical"/>
                               <field name="country_id" context="{'invisible_country': False}">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b387ef7288e..f0c2d55a642 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -7,6 +7,9 @@
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
+        
+        <menuitem id="base.menu_crm_config_opportunity" name="Opportunities"
+            parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
 
         <menuitem id="base.menu_sale_config_sales" name="Sales"
             parent="base.menu_base_config" sequence="0" groups="base.group_sale_manager"/>
@@ -119,7 +122,8 @@
                 <form string="Stage">
                     <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
-                    <field name="object_id" invisible="1" />
+                    <field name="type" invisible="1" />
+                     <field name="section_ids" invisible="1" />
                     <field name="sequence"/>
                     <field name="probability"/>
                     <field name="on_change"/>
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 5f469da1574..df344642183 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -63,7 +63,7 @@ class crm_lead_report(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="('object_id.model', '=', 'crm.lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="('type', '=', 'lead')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index cd5122df812..18ba93d6501 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -111,7 +111,7 @@
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                        <field name="stage_id" widget="selection" domain="[('type', '=', 'lead')]" />
                         <field name="categ_id" widget="selection"/>
                         <field name="type_id" widget="selection"/>
                         <field name="channel_id" widget="selection"/>
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index e293c8f1797..99e81afc828 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -8,7 +8,7 @@
     partner_address_id: base.res_partner_address_1
     partner_id: base.res_partner_9
     probability: 1.0
-    stage_id: crm.stage_lead1
+    stage_id: crm.stage_opportunity1
     categ_id: crm.categ_oppor2
     section_id: crm.section_sales_department
     
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 4043adcfb37..852a8043623 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -70,6 +70,7 @@ class crm_lead2opportunity(osv.osv_memory):
                 cr, uid, opportunity_view_tree, context=context).res_id
 
         lead = leads.browse(cr, uid, record_id, context=context)
+        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
 
         for this in self.browse(cr, uid, ids, context=context):
             vals ={
@@ -78,7 +79,8 @@ class crm_lead2opportunity(osv.osv_memory):
                 'name': this.name,
                 'partner_id': this.partner_id.id,
                 'user_id': (this.partner_id.user_id and this.partner_id.user_id.id) or (lead.user_id and lead.user_id.id),
-                'type': 'opportunity'
+                'type': 'opportunity',
+                'stage_id': stage_ids and stage_ids[0] or False
             }
             lead.write(vals, context=context)
             leads.history(cr, uid, [lead], _('Opportunity'), details='Converted to Opportunity', context=context)
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index f90a2d01b56..cc6a1ac6868 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -63,7 +63,7 @@ class crm_claim(crm.crm_case, osv.osv):
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'partner_phone': fields.char('Phone', size=32), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('object_id.model', '=', 'crm.claim')]"), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type','=','claim')]"), 
         'cause': fields.text('Root Cause'), 
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
@@ -72,6 +72,19 @@ class crm_claim(crm.crm_case, osv.osv):
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
+    
+    def _get_stage_id(self, cr, uid, context=None):
+        """Finds type of stage according to object.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        if context is None:
+            context = {}
+        type = context and context.get('stage_type', '')
+        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=',type),('sequence','>=',1)])
+        return stage_ids and stage_ids[0] or False
 
     _defaults = {
         'user_id': crm.crm_case._get_default_user, 
@@ -82,7 +95,8 @@ class crm_claim(crm.crm_case, osv.osv):
         'section_id':crm.crm_case. _get_section, 
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'stage_id': _get_stage_id, 
     }
     
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
@@ -119,7 +133,6 @@ class crm_claim(crm.crm_case, osv.osv):
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
         return {'value': {'email_from': address.email, 'partner_phone': address.phone, 'partner_mobile': address.mobile}}
 
-
 crm_claim()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index 13292d16c3b..e917ba5bea6 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -45,22 +45,22 @@
         <record model="crm.case.stage" id="stage_claim1">
             <field name="name">Accepted as Claim</field>
             <field name="sequence">1</field>
-            <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+            <field name="type">claim</field> 
         </record>
         <record model="crm.case.stage" id="stage_claim5">
             <field name="name">Actions Defined</field>
             <field name="sequence">2</field>
-            <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+            <field name="type">claim</field> 
         </record>
         <record model="crm.case.stage" id="stage_claim2">
             <field name="name">Actions Done</field>
             <field name="sequence">10</field>
-            <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+            <field name="type">claim</field> 
         </record>
         <record model="crm.case.stage" id="stage_claim3">
             <field name="name">Won't fix</field>
-            <field name="sequence">11</field>
-            <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+            <field name="sequence">0</field>
+            <field name="type">claim</field> 
         </record>
         
 
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 18642f18282..1989917ba6b 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -14,7 +14,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid}</field>
+            <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
             <field name="help">Record and track your customers' claims. Claims can be linked to a sales order or a lot. You can send emails with attachments and get the history of everything that happened on a specific claim (emails sent, interventions type and so on..). Claims can be automatically linked to an email address using the mail gateway module.</field>
         </record>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6e7cc710dc2..a6f81885714 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -29,8 +29,8 @@
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-            <field name="context">{'object_id':'crm.claim'}</field>
+            <field name="domain">[('type', '=', 'claim')]</field>
+            <field name="context">{'type':'claim'}</field>
             <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
         </record>
 
@@ -78,8 +78,7 @@
                         <field name="user_id"/>
                         <field name="priority"/>
                         <group colspan="2" col="4">
-                            <field name="stage_id"
-                                domain="[('object_id.model', '=', 'crm.claim'), ('section_ids', '=', section_id)]" />
+                            <field name="stage_id" domain="[('type','=','claim')]"/>
                             <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index f03a5f75d12..ffb56340aac 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -62,7 +62,7 @@ class crm_claim_report(osv.osv):
         'create_date': fields.datetime('Create Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True), 
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type','=','claim')]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.claim')]", readonly=True),
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 8dbff592277..ca1c03a58ae 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -108,7 +108,7 @@
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        <field name="stage_id" widget="selection" domain="[('type', '=', 'claim')]"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
                         <separator orientation="vertical"/>
                         <field name="priority" />
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 21d5e9081bd..f4950842800 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -61,7 +61,7 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'partner_name2': fields.char('Employee Email', size=64), 
             'partner_phone': fields.char('Phone', size=32), 
             'partner_mobile': fields.char('Mobile', size=32), 
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('object_id.model', '=', 'crm.fundraising')]"), 
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'fundraising')]"), 
             'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
                              domain="[('section_id','=',section_id)]"), 
             'duration': fields.float('Duration'), 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index eea653a4d48..51a2a2fa6b4 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -29,8 +29,8 @@
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-            <field name="context">{'object_id':'crm.fundraising'}</field>
+            <field name="domain">[('type', '=', 'fundraising')]</field>
+            <field name="context">{'type':'fundraising'}</field>
             <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>
 
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 0b4659c7adb..cf1d06dc36d 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -63,7 +63,7 @@ class crm_lead_report_assign(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('object_id.model', '=', 'crm.lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('type', '=', 'lead')]"),
         'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 9cb0f2e2d28..33d297928e5 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -33,7 +33,7 @@
                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                      <field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]" />
                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                       <separator orientation="vertical"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index d72467aafd5..7592061ec36 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -72,7 +72,7 @@ class email_server(osv.osv):
     }
 
     def check_duplicate(self, cr, uid, ids):
-	# RFC *-* Why this limitation? why not in SQL constraint?
+        # RFC *-* Why this limitation? why not in SQL constraint?
         vals = self.read(cr, uid, ids, ['user', 'password'])[0]
         cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password']))
         res = cr.fetchone()
@@ -113,7 +113,6 @@ class email_server(osv.osv):
         for server in self.browse(cr, uid, ids, context):
             logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             context.update({'server_id': server.id, 'server_type': server.type})
-            count = 0
             try:
                 if server.type == 'imap':
                     imap_server = None
@@ -170,7 +169,7 @@ class email_server(osv.osv):
                         result, data = imap_server.fetch(num, '(RFC822)')
                         res_id = email_tool.process_email(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+                            action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
 
                             imap_server.store(num, '+FLAGS', '\\Seen')
                         count += 1
@@ -187,7 +186,7 @@ class email_server(osv.osv):
                         msg = '\n'.join(msges)
                         res_id = email_tool.process_email(cr, user, server.object_id.model, msg, attach=server.attach, context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+                            action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
 
                         pop_server.dele(num)
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 70b227136e9..cc5f8da627c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -118,6 +118,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
             <field name="context">{'search_default_to_invoice': 1}</field>
+ 			<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>            
             <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
         </record>
         <menuitem
diff --git a/addons/outlook/README b/addons/outlook/README
index d8d7c5d8187..703aeca2475 100644
--- a/addons/outlook/README
+++ b/addons/outlook/README
@@ -8,6 +8,7 @@ Pre requirements :
             http://starship.python.net/crew/mhammond/win32/
     3.If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)". It can be downloaded from 
             http://www.microsoft.com/downloads/en/details.aspx?familyid=2714320d-c997-4de1-986f-24f081725d36&displaylang=en
+      and With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook. 
 
 How to install openerp-outlook plug-in?
 ======================================================================================
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 3718b3687a0..40f15e06c53 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -55,7 +55,8 @@ class outlook_installer(osv.osv_memory):
 Pre-requirements :
     1. Python 2.6+ .
     2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
-    3. If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)".
+    3. If With MS Outlook 2007 it is required to install externally "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)".
+       and With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook.
 
 How to install openerp-outlook plug-in?
     1. Save the executable plug-in file.
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
index 544adcb2848..39ea41d7f16 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -151,8 +151,10 @@ class OutlookAddin:
         activeExplorer = application.ActiveExplorer()
         if activeExplorer is not None:
             bars = activeExplorer.CommandBars
+            new_bar = bars.Add('Open ERP',0,0,0)
 
             menu_bar = bars.Item("Menu Bar")
+
             tools_menu = menu_bar.Controls(5)
             tools_menu = CastTo(tools_menu, "CommandBarPopup")
 
@@ -171,8 +173,15 @@ class OutlookAddin:
             item.Enabled = True
 
             toolbar = bars.Item("Standard")
+            openerp_bar = bars.Item('Open ERP')
 
-            item = toolbar.Controls.Add(Type=constants.msoControlButton, Temporary=True)
+            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+            item = self.toolbarButtonConfig = DispatchWithEvents(item, Configuration)
+            item.Caption = "Configuration"
+            item.TooltipText = "Click to configure OpenERP."
+            item.Enabled = True
+
+            item = openerp_bar.Controls.Add(Type=constants.msoControlButton, Temporary=True)
             # Hook events for the item
             item = self.toolbarButton = DispatchWithEvents(item, ArchiveEvent)
             item.Caption="Push"
@@ -182,19 +191,21 @@ class OutlookAddin:
             # Adding Menu in Menu Bar to the Web Menu of the Outlook
             toolbarweb = bars.Item("Web")
 
-            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
             item = self.toolbarButtonOpenPartner = DispatchWithEvents(item, OpenPartner)
             item.Caption = "Partner"
             item.TooltipText = "Click to Open OpenERP Partner Contact Information."
             item.Enabled = True
 
 
-            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+            item = openerp_bar.Controls.Add(Type = constants.msoControlButton, Temporary = True)
             item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
             item.Caption = "Document"
             item.TooltipText = "Click to Open Document that has been pushed to server."
             item.Enabled = True
 
+
+
             # Hook events for the item
 #            item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
 #            item = self.toolbarButtonPartner = DispatchWithEvents(item, ViewPartners)
@@ -225,10 +236,10 @@ class OutlookAddin:
             item.Enabled = True
 
     def OnDisconnection(self, mode, custom):
-        self.item.close()
         mngr = manager.GetManager()
         mngr.config['login'] = False
         mngr.SaveConfig()
+        self.item.close()
         pass
     def OnAddInsUpdate(self, custom):
         pass
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index a645270eb49..140c100f229 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -205,6 +205,8 @@ def resetConnAttribs(window):
     NewConn.setitem('_uname', config['uname'])
     NewConn.setitem('_pwd', config['pwd'])
     NewConn.setitem('_login', str(config['login']))
+    NewConn.setitem('_webserver',manager.config['webserver'])
+    NewConn.setitem('_webport',manager.config['webport'])
     return
 
 def setConnAttribs(server, port, manager):
@@ -224,6 +226,8 @@ def setConnAttribs(server, port, manager):
     NewConn.setitem('_pwd', manager.config['pwd'])
     NewConn.setitem('_login', str(manager.config['login']))
     NewConn.setitem('_obj_list', manager.config['objects'])
+    NewConn.setitem('_webserver',manager.config['webserver'])
+    NewConn.setitem('_webport',manager.config['webport'])
     return
 
 def getConnAttributes(manager):
@@ -235,6 +239,13 @@ def getConnAttributes(manager):
     manager.config['uname'] = NewConn.getitem('_uname')
     manager.config['pwd'] = NewConn.getitem('_pwd')
     manager.config['login'] = NewConn.getitem('_login')
+    manager.config['webserver'] = NewConn.getitem('_webserver')
+    manager.config['webport'] = NewConn.getitem('_webport')
+    return
+def setWebConnAttribs(server, port, manager):
+    manager.config = manager.LoadConfig()
+    NewConn.setitem('_webserver',server)
+    NewConn.setitem('_webport',port)
     return
 
 def getMessage(e):
@@ -306,6 +317,7 @@ class WEBOKButtonProcessor(ButtonProcessor):
         if server.strip() == "" or server.strip() == "http:\\\\":
             win32ui.MessageBox("Invalid web Server address.", "OpenERP Connection", flag_excl)
             return
+        setWebConnAttribs(server, port, self.mngr)
         web_server = server
         web_server_port = port
         win32gui.EndDialog(self.window.hwnd, id)
@@ -831,6 +843,7 @@ def CreateContact(btnProcessor,*args):
         win32ui.MessageBox("Contact name or Email id is Missing\nPlease fill those information", "Create Contact", flag_error)
         return
     try:
+        NewConn.CreateContact(str(res))
         if not partner:
             msg="New contact created."
         else:
@@ -848,15 +861,23 @@ def SetAllText(txtProcessor,*args):
     # Set values for url, uname, pwd from config file
     global web_server
     global web_server_port
-    serverBox = txtProcessor.GetControl(txtProcessor.other_ids[2])
-    win32gui.SendMessage(serverBox, win32con.WM_SETTEXT, 0, "http:\\\\"+str(web_server)+":"+str(web_server_port))
     url = NewConn.getitem('_uri')
     tbox = txtProcessor.GetControl()
     win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(url))
+
     uname = NewConn.getitem('_uname')
     tbox = txtProcessor.GetControl(txtProcessor.other_ids[0])
     win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(uname))
 
+    passbox = txtProcessor.GetControl(txtProcessor.other_ids[1])
+    pwd = NewConn.getitem('_pwd')
+    win32gui.SendMessage(passbox, win32con.WM_SETTEXT, 0, str(pwd))
+    serverBox = txtProcessor.GetControl(txtProcessor.other_ids[2])
+    web_server = NewConn.getitem('_webserver')
+    web_server_port = NewConn.getitem('_webport')
+    webstr = "http:\\\\"+str(web_server)+":"+str(web_server_port)
+    win32gui.SendMessage(serverBox, win32con.WM_SETTEXT, 0, str(webstr))
+
 def SetDefaultList(listProcessor,*args):
     import win32api
     hwndList = listProcessor.GetControl()
@@ -956,6 +977,9 @@ def SetDefaultContact(txtProcessor,*args):
     txtProcessor.init_done = True
 
 def setCheckList(groupProcessor,*args):
+    b = check()
+    if not b:
+        return
     try:
         hinst = win32gui.dllhandle
         objs = groupProcessor.window.manager.config['objects']
@@ -1382,8 +1406,11 @@ def OpenPartnerForm(txtProcessor,*args):
     	txtProcessor.init_done=True
     	return
     try:
-    	linktopartner = "http:\\\\"+web_server+":"+str(web_server_port)+"\\openerp\\form\\view?model=res.partner&id="+str(vals)
-    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, linktopartner)
+        import urllib
+        next =  urllib.urlencode({'next' : '/openerp/form/view?model=res.partner&id=' +str(vals) })
+        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        linktopartner = weburl + '?' + next
+        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, str(linktopartner))
     except Exception,e:
     	win32ui.MessageBox("Error While Opening Partner.\n"+str(e),"Open Partner", flag_error)
     webbrowser.open_new(linktopartner)
@@ -1439,7 +1466,10 @@ def SerachOpenDocuemnt(txtProcessor,*args):
         txtProcessor.init_done=True
         return
     try:
-        linktodoc = "http:\\\\" +web_server+ ":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
+        import urllib
+        next =  urllib.urlencode({'next' : '/openerp/form/view?model='+vals[0][1]+'&id='+str(vals[1][1])})
+        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        linktodoc = weburl + '?' + next
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
     except Exception,e:
         win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
index 85c15fe1e7c..1b7461953a1 100644
Binary files a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png and b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png differ
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
index faab23a1446..31afaf3c732 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/manager.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
@@ -140,7 +140,7 @@ class OpenERPManager:
     def LoadConfig(self):
         import win32ui
         path = os.path.join(self.data_directory, 'tiny.ini')
-        data = {'server' : 'localhost', 'port' : '8069', 'protocol' : 'http://', 'database' : '', 'objects' : self.default_objects, 'uname':'admin', 'pwd':'a', 'login':False}
+        data = {'server' : 'localhost', 'port' : '8069', 'protocol' : 'http://', 'database' : '', 'objects' : self.default_objects, 'uname':'admin', 'pwd':'a', 'login':False,'webserver':'localhost','webport':'8080'}
         if os.path.exists(path):
             fp = open(path, 'r')
             data = fp.readlines()
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 85abe755bd7..653ad229e1d 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -64,10 +64,12 @@ class XMLRpcConn(object):
     _reg_clsid_ = "{C6399AFD-763A-400F-8191-7F9D0503CAE2}"
     _reg_progid_ = "Python.OpenERP.XMLRpcConn"
     _reg_policy_spec_ = "win32com.server.policy.EventHandlerPolicy"
-    def __init__(self,server='localhost',port=8069,uri='http://localhost:8069'):
+    def __init__(self,server='localhost',port=8069,uri='http://localhost:8069',webserver='localhost', webport=8080):
         self._server=server
         self._port=port
         self._uri=uri
+        self._webserver=webserver
+        self._webport=webport
         self._obj_list=[]
         self._dbname=''
         self._uname='admin'
@@ -79,6 +81,7 @@ class XMLRpcConn(object):
         self.partner_id_list=None
         self.protocol=None
 
+
     def getitem(self, attrib):
         v=self.__getattribute__(attrib)
         return str(v)
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
index 5775648d8f1..03dae91ee6d 100644
--- a/addons/project/board_project_manager_view.xml
+++ b/addons/project/board_project_manager_view.xml
@@ -14,7 +14,6 @@
             id="act_my_project" name="My projects" 
             res_model="project.project" view_mode="tree,form" 
             view_type="form"/>
-
         <act_window 
             id="act_my_account"
             name="My accounts to invoice"
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index ffc28ddf2db..42cae0e9680 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1430,7 +1430,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
-msgid "A project contains a set of tasks or issues that will be performed by your resources assigned on it. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to  design large project structure with different phases spread over the project duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on."
+msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel.  A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section."
 msgstr ""
 
 #. module: project
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1496d478a99..7a65129af2c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -160,7 +160,7 @@
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{'search_default_Current':1}</field>
-            <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned on it. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to  design large project structure with different phases spread over the project duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on.</field>
+            <field name="help">A project contains a set of tasks or issues that will be performed by your assigned personnel. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section.</field>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 90bef42b452..a3c9d48476b 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -106,7 +106,7 @@ class project_task(osv.osv):
         timebox_obj = self.pool.get('project.gtd.timebox')
         access_pool = self.pool.get('ir.model.access')
         if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"):
-            tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
+            tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]), context=context)
             search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done'))
             search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
             search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Getting things done" string="%s"/>''' % (_('GTD'),)
@@ -125,7 +125,7 @@ class project_task(osv.osv):
         if search_extended:
             res['arch'] = unicode(res['arch'], 'utf8').replace('</search>', search_extended)
             attrs_sel = self.pool.get('project.gtd.context').name_search(cr, uid, '', [], context=context)
-            context_id_info = self.pool.get('project.task').fields_get(cr, uid, ['context_id'])
+            context_id_info = self.pool.get('project.task').fields_get(cr, uid, ['context_id'], context=context)
             context_id_info['context_id']['selection'] = attrs_sel
             res['fields'].update(context_id_info)
         return res
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index b3a2358809d..2e28070c646 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -500,7 +500,7 @@ msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Period"
+msgid "Working Time"
 msgstr ""
 
 #. module: project_long_term
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 39d9d1cfa8b..0cdb7af5ad7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -377,7 +377,7 @@
         src_model="project.phase"
         view_mode="tree,form"
         context="{'search_default_phase_id': [active_id]}"
-        domain="[('phase_id', '=', active_id)]"
+        domain="[('phase_id', '=', active_id),('project_id','=',project_id)]"
         />
 
     <act_window
@@ -386,8 +386,21 @@
         name="Phases"
         res_model="project.phase"
         src_model="project.project"
+		domain="[('project_id', '=', active_id)]"
         view_mode="tree,form"
-        view_type="form" />
+        view_type="form" 
+		/>
+
+	<act_window
+		context="{'search_default_user_id': [user_id]}"
+        id="act_project_resource"
+        name="Resources"
+        res_model="resource.resource"
+        src_model="project.project"
+		domain="[('user_id', '=',user_id)]"
+        view_mode="tree,form"
+        view_type="form" 
+		/>
 
     # ------------------------------------------------------
     # Menu Items
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index dd9967cb0e0..d349292b997 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -19,6 +19,18 @@
             </field>
         </record>
 
+	<record id="project_invoice_form_cutomer" model="ir.ui.view">
+            <field name="name">Inherit project form : Customer</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project_invoice_form"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="replace">
+                    <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>
+                </field>
+            </field>
+        </record>
+
         <record id="project_invoice_search" model="ir.ui.view">
             <field name="name">Inherit project search view : Invoicing Data</field>
             <field name="model">project.project</field>
@@ -64,10 +76,58 @@
                 </field>
             </field>
         </record>
+        <record id="view_account_analytic_line_filter_inherit_buttons" model="ir.ui.view">
+            <field name="name">account.analytic.line.inherit.select</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">search</field>
+			<field name="priority">10</field>
+            <field name="arch" type="xml">
+                <search string="Search Analytic Lines">
+                    <group col='6' colspan='4'>
+                        <field name="name"/>
+						<field name="date"/>
+                        <field name="account_id"/>
+                        <field name="user_id">
+                            <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
+                        </field>
+                    </group>
+					<newline/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="journal_id" widget="selection"/>
+                        <field name="product_id" widget="selection"/>
+                        <field name="amount" select="1"/>
+                    </group>
+                    <newline/>
+                    <group string="Group By..." expand="0">
+                        <filter string="Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-green"/>
+                        <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
+                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+ 		<!-- Menus -->
+        <record id="action_project_timesheet_bill_task" model="ir.actions.act_window">
+            <field name="name">Bill Tasks Works</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[]</field>
+            <field name="context">{'search_default_to_invoice': 1}</field>
+			<field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
+			<field name="search_view_id" ref="view_account_analytic_line_filter_inherit_buttons"/>
+            <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
+        </record>
+
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>
         <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
-            parent="menu_project_billing" action="hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree"/>
+            parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
                 parent="base.menu_main_pm" sequence="5"/>
     </data>
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index 8e704e446f0..8e2da3bcf83 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -88,7 +88,7 @@ msgstr ""
 
 #. module: resource
 #: view:resource.calendar:0
-msgid "Search Working Period"
+msgid "Search Working Time"
 msgstr ""
 
 #. module: resource
@@ -187,7 +187,7 @@ msgstr ""
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
 #: view:resource.calendar:0
-msgid "Working Period"
+msgid "Working Time"
 msgstr ""
 
 #. module: resource
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 9012dfa7e38..5c3ec8bacb8 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -203,8 +203,8 @@ class resource_calendar_attendance(osv.osv):
         'name' : fields.char("Name", size=64, required=True),
         'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week'),
         'date_from' : fields.date('Starting date'),
-        'hour_from' : fields.float('Work from', size=8, required=True),
-        'hour_to' : fields.float("Work to", size=8, required=True),
+        'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from"),
+        'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
     _order = 'dayofweek, hour_from'
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 2a20f101b0f..1840c2a5f27 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -37,7 +37,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Working Period">
+                <search string="Search Working Time">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
                        <field name="manager"/>
@@ -76,7 +76,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Working Period">
+                <form string="Working Time">
                     <field name="name"/>
                     <field name="manager"/>
                     <field name="company_id" groups="base.group_multi_company"/>
@@ -91,7 +91,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Working Period">
+                <tree string="Working Time">
                     <field name="name"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1" groups="base.group_multi_company"/>
@@ -100,7 +100,7 @@
         </record>
 
         <record id="action_resource_calendar_form" model="ir.actions.act_window">
-            <field name="name">Working Period</field>
+            <field name="name">Working Time</field>
             <field name="res_model">resource.calendar</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -116,8 +116,8 @@
                 <tree string="Working Time">
                     <field name="name"/>
                     <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time"/>
-                    <field name="hour_to" widget="float_time"/>
+                    <field name="hour_from" widget="float_time" />
+                    <field name="hour_to" widget="float_time" />
                 </tree>
             </field>
         </record>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 31ba2fc92d5..207355c47c8 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -92,9 +92,13 @@ class survey(osv.osv):
     def survey_cancel(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, {'state': 'cancel' })
         return True
-
-    def copy(self, cr, uid, id, default=None,context={}):
-        raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
+        
+    def copy(self, cr, uid, ids, default=None, context={}):
+        vals = {}
+        current_rec = self.read(cr, uid, ids, context=context)
+        title = current_rec.get('title') + ' (Copy)'
+        vals.update({'title':title})
+        return super(survey, self).copy(cr, uid, ids, vals, context=context)
 
     def action_print_survey(self, cr, uid, ids, context=None):
         """
@@ -196,8 +200,12 @@ class survey_page(osv.osv):
             'context': context
         }
 
-    def copy(self, cr, uid, id, default=None, context={}):
-        raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
+    def copy(self, cr, uid, ids, default=None, context={}):
+        vals = {}
+        current_rec = self.read(cr, uid, ids, context=context)
+        title = current_rec.get('title') + ' (Copy)'
+        vals.update({'title':title})
+        return super(survey_page, self).copy(cr, uid, ids, vals, context=context)
 
 survey_page()
 
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index a6b6a0dd0b8..14964cb92a0 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 2e1be02ec67..302e9d7e39d 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
index 0aeb4a9f16b..71a4baf0872 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
@@ -3,101 +3,104 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/create.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
-	title="&title.label;" onload="myPrefObserver.createContact();" height="460" width="860">
+	title="&title.label;" onload="myPrefObserver.createContact();" height="415" width="720">
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/loaddata.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/static.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 <tabpanel id="contact">
-  <groupbox id="contact" style="border:1px solid black">
-    <separator class="groove-thin" orient="horizontal" width="94"/> 
-    <hbox>
-        <label  align="right" id="partner"  value="&selectpartner.value;" width="97" />
-    	<textbox id="txtselectpartner" readonly="true" value="" width="270"/>
-		<button label="&bsearch.label;" oncommand="Select.onMenuItemCommand(event);" image="&imagesearch.value;"/> 
-        <button label="Create Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
-	</hbox>
-	<hbox>
-        <label  align="right" id="name"  value="&name.value;" width="80" />
-		<textbox id="txtname" align="right" width="270"/>
-	</hbox>
-    <separator class="groove-thin" orient="horizontal" width="94"/> 
-    </groupbox>
-    </tabpanel>    
-  <separator class="groove-thin" orient="horizontal" width="94"/> 
- <tabpanel id="address">
-  <groupbox id="address" style="border:1px solid black">
-    <hbox>
-        <caption label="&postaladdress.value;" />
-    </hbox>
-     <separator class="groove-thin" orient="horizontal" width="94"/> 
-     <hbox>
-        <label  align="right" id="street"  value="&street.value;" width="97" />
-		<textbox id="txtstreet" width="270" align="right"/>
-       <spacer width="33"/>
-	</hbox>
+  <groupbox id="contact" >
+        <separator class="groove-thin" orient="horizontal" width="94"/> 
+            <hbox>
+                <label  align="right" id="partner"  value="&selectpartner.value;" width="97" />
+            	<textbox id="txtselectpartner" readonly="true" value="" width="270"/>
+		        <button label="&bsearch.label;" oncommand="Select.onMenuItemCommand(event);" image="&imagesearch.value;"/> 
+                <button label="Create Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
+        </hbox>
 
-     <hbox>
-        <label  align="right" id="street2"  value="&street2.value;" width="97" />
-		<textbox id="txtstreet2" width="270" align="right"/>
-        <spacer width="35"/>
-	</hbox>
-   <hbox>
-        <label  align="right" id="zip"  value="&zip.value;" width="97" />
-		<textbox id="txtzip" align="right" />
-        <spacer width="114"/>
-	</hbox>
+         <separator class="groove-thin" orient="horizontal" width="80"/> 
+            </groupbox>
+            </tabpanel>    
+        <tabpanel id="address">
+        
+        <groupbox id="address" style="border:1px solid black">
+            <hbox>
+                <caption label="&postaladdress.value;" />
+            </hbox>
+            <separator class="groove-thin" orient="horizontal" width="94"/> 
+            <hbox>
+                <label  align="right" id="name"  value="&name.value;" width="97" />
+                <textbox id="txtname" align="right" />
+            </hbox>
+            <hbox>
+                <label  align="right" id="street"  value="&street.value;" width="97" />
+                <textbox id="txtstreet" align="right"/>
+                <spacer width="33"/>
+            </hbox>
 
-     <hbox>
-        <label  align="right" id="city"  value="&city.value;" width="97"/>
-		<textbox id="txtcity" align="right" />
-        <spacer width="112"/>
-	</hbox>
- 
-    <hbox>
-         <label  align="right" id="countryname"  value="&country.value;" width="97" />
-         <menulist id="country" width="190" oncommand= "getAllState();" >
-           <menupopup>
-	     <menuitem label="" value=""/>
-   	    </menupopup>
-      	  </menulist>
-	</hbox>
+            <hbox>
+                <label  align="right" id="street2"  value="&street2.value;" width="97" />
+                <textbox id="txtstreet2"  align="right"/>
+                <spacer width="33"/>
+            </hbox>
+            <hbox>
+                <label  align="right" id="zip"  value="&zip.value;" width="97" />
+                <textbox id="txtzip" align="right" />
+                <spacer width="33"/>
+            </hbox>
 
-     <hbox>
-         <label  align="right" id="statename"  value="&state.value;" width="97" />
-         <menulist id="state" width="190">
-           <menupopup>
-	     <menuitem label="" value=""/>
-   	    </menupopup>
-      	  </menulist>
-	</hbox>
-  <separator class="groove-thin" orient="horizontal" width="94"/> 
-</groupbox>
-<groupbox id="communication" style="border:1px solid black">
-   <vbox>
-        <caption label="&communication.value;" />
-     </vbox>
-     <separator class="groove-thin" orient="horizontal" width="94"/> 
-     <hbox>
-        <label  align="right" id="office"  value="&office.value;" width="97" />
-	    <textbox id="txtoffice" align="right" />
-    </hbox>
-    <hbox>
-        <label  align="right" id="mobile"  value="&mobile.value;" width="97" />
-	    <textbox id="txtmobile" align="right"/>
-    </hbox> 
-    <hbox>
-        <label  align="right" id="fax"  value="&fax.value;" width="97" />
-	    <textbox id="txtfax" align="right" />
-    </hbox> 
-    <hbox>
-        <label  align="right" id="emailid"  value="&email.value;" width="97" />
-	    <textbox id="txtemail" width="280" align="right"/>
-    </hbox>
-  </groupbox>
-</tabpanel>
-<description></description>
+            <hbox>
+                <label  align="right" id="city"  value="&city.value;" width="97"/>
+                <textbox id="txtcity" align="right" />
+                <spacer width="33"/>
+            </hbox>
+
+            <hbox>
+                <label  align="right" id="countryname"  value="&country.value;" width="97" />
+                <menulist id="country" width="190" oncommand= "getAllState();" >
+                    <menupopup>
+                        <menuitem label="" value=""/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+
+            <hbox>
+             <label  align="right" id="statename"  value="&state.value;" width="97" />
+                 <menulist id="state" width="190">
+                    <menupopup>
+                        <menuitem label="" value=""/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+            <separator class="groove-thin" orient="horizontal" width="60"/> 
+        </groupbox>
+        
+        <groupbox id="communication" style="border:1px solid black">
+           <vbox>
+                <caption label="&communication.value;" />
+             </vbox>
+             <separator class="groove-thin" orient="horizontal" width="94"/> 
+             <hbox>
+                <label  align="right" id="office"  value="&office.value;" width="97" />
+	            <textbox id="txtoffice" align="right" />
+            </hbox>
+            <hbox>
+                <label  align="right" id="mobile"  value="&mobile.value;" width="97" />
+	            <textbox id="txtmobile" align="right"/>
+            </hbox> 
+            <hbox>
+                <label  align="right" id="fax"  value="&fax.value;" width="97" />
+	            <textbox id="txtfax" align="right" />
+            </hbox> 
+            <hbox>
+                <label  align="right" id="emailid"  value="&email.value;" width="97" />
+	            <textbox id="txtemail" align="right"/>
+	            <spacer width="30"/>
+            </hbox>
+          </groupbox>
+    </tabpanel>
+    <description></description>
 <hbox align="right">
   <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
   <button label="&ok.label;" image="&imageok.value;" oncommand="createContact();"/>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
index cba4b450ca9..598abb8fb61 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
@@ -6,185 +6,185 @@ var name = new Array();
 var test = new Array();
 
 var MBstrBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-			getService(Components.interfaces.nsIStringBundleService);
+            getService(Components.interfaces.nsIStringBundleService);
 var mboximportbundle = MBstrBundleService.createBundle("chrome://mboximport/locale/mboximport.properties"); 
 //function to get the required details of the selected email
 
 function check()
 {
     setTimeout("createConnection()",5000)
-	if (getconnect_server() == "false")
-	{
-		alert("Please Login To The Database First !")
-		return false;
-	}
-	setTimeout("module_install()", 10000)
-	if (getmodule_install() == "no")
-	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
-		return false
-	}
+    if (getconnect_server() == "false")
+    {
+        alert("Please Login To The Database First !")
+        return false;
+    }
+    setTimeout("module_install()", 10000)
+    if (getmodule_install() == "no")
+    {
+        alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
+        return false
+    }
     if(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
-		alert("You must select only one mail to archive");
-		return false
-	}
-	return true
+        alert("You must select only one mail to archive");
+        return false
+    }
+    return true
 
 }
 
 function searchmail()
-{	
-	if (check() == false){
+{   
+    if (check() == false){
         return true
     }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
-	var version_obj = prefService.getBranch("extensions.");
-	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
-	version = version_obj.getCharPref("lastAppVersion");
-	version = parseInt(version[0])
-	
-	file = getPredefinedFolder(2);
-	
-	if (version > 2)
-	{
-		var emlsArray = gFolderDisplay.selectedMessages;
-	}
-	else
-	{
-		var emlsArray = GetSelectedMessages();
-	}
+    var version_obj = prefService.getBranch("extensions.");
+    version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+    version = version_obj.getCharPref("lastAppVersion");
+    version = parseInt(version[0])
+    
+    file = getPredefinedFolder(2);
+    
+    if (version > 2)
+    {
+        var emlsArray = gFolderDisplay.selectedMessages;
+    }
+    else
+    {
+        var emlsArray = GetSelectedMessages();
+    }
 
-	IETtotal = emlsArray.length;
-	IETexported = 0;
-	var msguri = emlsArray[0];
+    IETtotal = emlsArray.length;
+    IETexported = 0;
+    var msguri = emlsArray[0];
 
-	
-	//gives the selected email uri
-	var messageUri= gDBView.URIForFirstSelectedMessage;
+    
+    //gives the selected email uri
+    var messageUri= gDBView.URIForFirstSelectedMessage;
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+    var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
 
-	//gives the selected email object
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    //gives the selected email object
+    var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
 
 
-	if (version > 2)
-	{
-		m_uri = message.folder.getUriForMsg(message);
-		saveMsgAsEML(m_uri,file,false,emlsArray,null);
-	}
-	else
-	{
-		saveMsgAsEML(msguri,file,false,emlsArray,null);
-	}
+    if (version > 2)
+    {
+        m_uri = message.folder.getUriForMsg(message);
+        saveMsgAsEML(m_uri,file,false,emlsArray,null);
+    }
+    else
+    {
+        saveMsgAsEML(msguri,file,false,emlsArray,null);
+    }
 
-	//gives the received email date
-	var stdate = new Date(message.date / 1000);
+    //gives the received email date
+    var stdate = new Date(message.date / 1000);
 
-	//functionality to split the author name and email
-	if(message.author.charAt(0) == '"'){
-		sendername = message.author.split('"')[1].split('"')[0];
-	}
-	else if(message.author.indexOf('<')!=-1){
-		sendername = message.author.split('<')[0];
-	}
-	else{
-		sendername = message.author;
-	}
-	if(message.author.indexOf('<')!=-1){
-		senderemail = message.author.split('<')[1].split('>')[0];
-	}
-	else{
-		senderemail = message.author
-	}
+    //functionality to split the author name and email
+    if(message.author.charAt(0) == '"'){
+        sendername = message.author.split('"')[1].split('"')[0];
+    }
+    else if(message.author.indexOf('<')!=-1){
+        sendername = message.author.split('<')[0];
+    }
+    else{
+        sendername = message.author;
+    }
+    if(message.author.indexOf('<')!=-1){
+        senderemail = message.author.split('<')[1].split('>')[0];
+    }
+    else{
+        senderemail = message.author
+    }
 
-	//gives the receiver email address
-	receiveremail = message.mime2DecodedRecipients;
+    //gives the receiver email address
+    receiveremail = message.mime2DecodedRecipients;
 
-	//parsing the received date in the particular format
-	receivedDate = stdate.getFullYear()+'/'+(stdate.getMonth()+1)+'/'+stdate.getDate();
+    //parsing the received date in the particular format
+    receivedDate = stdate.getFullYear()+'/'+(stdate.getMonth()+1)+'/'+stdate.getDate();
 
-	//gives the selected email subject
-	subject = message.subject;
+    //gives the selected email subject
+    subject = message.subject;
 
-	//gives the selected email cclist
-	cclist = message.ccList;
+    //gives the selected email cclist
+    cclist = message.ccList;
 
-	//gives the selected email message body in text format
-	if (version > 2)
-	{
-		var listener = Components.classes["@mozilla.org/network/sync-stream-listener;1"].createInstance(Components.interfaces.nsISyncStreamListener);  
-		var uri = message.folder.getUriForMsg(message);
-		messenger.messageServiceFromURI(uri)  
-		    .streamMessage(uri, listener, null, null, false, "");    
-		var folder = message.folder;  
-		messagebody = folder.getMsgTextFromStream(listener.inputStream,message.Charset,65536,32768,false,true,{})
-	}
-	else
-	{
-		messagebody = getMessageBrowser().docShell.contentViewer.DOMDocument.body.textContent;
-	}
-	//gives the selected email message body in html format
-	msghtmlbody = ""// getMessageBrowser().docShell.contentViewer.DOMDocument.body.innerHTML;
+    //gives the selected email message body in text format
+    if (version > 2)
+    {
+        var listener = Components.classes["@mozilla.org/network/sync-stream-listener;1"].createInstance(Components.interfaces.nsISyncStreamListener);  
+        var uri = message.folder.getUriForMsg(message);
+        messenger.messageServiceFromURI(uri)  
+            .streamMessage(uri, listener, null, null, false, "");    
+        var folder = message.folder;  
+        messagebody = folder.getMsgTextFromStream(listener.inputStream,message.Charset,65536,32768,false,true,{})
+    }
+    else
+    {
+        messagebody = getMessageBrowser().docShell.contentViewer.DOMDocument.body.textContent;
+    }
+    //gives the selected email message body in html format
+    msghtmlbody = ""// getMessageBrowser().docShell.contentViewer.DOMDocument.body.innerHTML;
 
-	//set the initial information for the selected email
-	setSenderEmail(senderemail);
-	setSenderName(sendername);
-	setReceiverEmail(receiveremail);
-	setSubject(subject);
-	setReceivedDate(receivedDate);
-	setCCList(cclist);
-	setMessageBody(messagebody);
-	getPref().setCharPref('displayName','');
-	getPref().setCharPref('attachmentdata','');
-	name = [];
-	test = [];
-	getPref().setCharPref('attachmentlength',currentAttachments.length);
-	//retrieving the information for the selected email's attachment
-	if(currentAttachments.length > 0){
-		for(i=0;i<currentAttachments.length;i++){
-			contentType[i] = currentAttachments[i].contentType;
-			uri = currentAttachments[i].uri;
-			url[i] = currentAttachments[i].url;
-			name[i] = currentAttachments[i].displayName;
-			var obj = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-			if(navigator.userAgent.indexOf('Linux')!= -1){
-				obj.initWithPath("/tmp/");
-			}
-			else if(navigator.userAgent.indexOf('Win')!= -1){
-				obj.initWithPath("c:\\");
-			}
-			else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-				obj.initWithPath("/tmp/");
-			} 
-			else{
-				alert("Not Compatible for this Operating System");
-				false();
-			}
-			//saving the attachment files in system's temp folder
-			test[i] = messenger.saveAttachmentToFolder(contentType[i],url[i],name[i],uri,obj);
-		}
-		//function to read the attachment file contents
-		att =getAttachValue()
-		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
-		createInstance(name,test)
+    //set the initial information for the selected email
+    setSenderEmail(senderemail);
+    setSenderName(sendername);
+    setReceiverEmail(receiveremail);
+    setSubject(subject);
+    setReceivedDate(receivedDate);
+    setCCList(cclist);
+    setMessageBody(messagebody);
+    getPref().setCharPref('displayName','');
+    getPref().setCharPref('attachmentdata','');
+    name = [];
+    test = [];
+    getPref().setCharPref('attachmentlength',currentAttachments.length);
+    //retrieving the information for the selected email's attachment
+    if(currentAttachments.length > 0){
+        for(i=0;i<currentAttachments.length;i++){
+            contentType[i] = currentAttachments[i].contentType;
+            uri = currentAttachments[i].uri;
+            url[i] = currentAttachments[i].url;
+            name[i] = currentAttachments[i].displayName;
+            var obj = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+            if(navigator.userAgent.indexOf('Linux')!= -1){
+                obj.initWithPath("/tmp/");
+            }
+            else if(navigator.userAgent.indexOf('Win')!= -1){
+                obj.initWithPath("c:\\");
+            }
+            else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+                obj.initWithPath("/tmp/");
+            } 
+            else{
+                alert("Not Compatible for this Operating System");
+                false();
+            }
+            //saving the attachment files in system's temp folder
+            test[i] = messenger.saveAttachmentToFolder(contentType[i],url[i],name[i],uri,obj);
+        }
+        //function to read the attachment file contents
+        att =getAttachValue()
+        window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+        createInstance(name,test)
 
-	}
-	else
-	{
-		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
-	}
+    }
+    else
+    {
+        window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+    }
 }
-
-
+
+
 var openPartnerHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
      //  var sendername = getSenderEmail();
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
-		var count = arrIdList.Count();
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
+        for (var i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
             var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
             var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
             if(strlSearchResult=="email" && strlSearchResultValue=='')
@@ -192,246 +192,286 @@ var openPartnerHandler = {
                 alert("Partner is not Available.");
                 return;
             } 
-            if(strlSearchResult=="partner_id"){
-                partner_id = strlSearchResultValue;
-                weburl = getWebServerURL();
-
-                if (parseInt(partner_id) > 0){
-                  var t = weburl + "/openerp/form/view?model=res.partner&id="+partner_id;
-                  window.open(t, "", "chrome","resizable=yes,scrollbars=yes,status=yes");
-                
+            if(strlSearchResult=="partner_id"){
+                partner_id = strlSearchResultValue;
+                weburl = getWebServerURL();
+
+                if (parseInt(partner_id) > 0){
+                    //Encode the url and form an url to have menu in webclient
+                    var encoded = encodeURIComponent("/openerp/form/view?model=res.partner&id="+partner_id)
+                    var t = weburl + "?next=" + encoded
+                    var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+                    messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
+                    messenger.launchExternalURL(t);
                 }
                 else{
                     alert("Partner is not Available.");
                     return;
                 }
             }
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 
 }
 
 function searchPartner(email)
 {
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
     var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_contact';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = email;
-	xmlRpcClient.asyncCall(openPartnerHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
+    strobj.data = 'thunderbird.partner';
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_contact';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = email;
+    xmlRpcClient.asyncCall(openPartnerHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
 }
+
+
 function open_partner()
 {
     if (check() == false){
         return true
     }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
-	var version_obj = prefService.getBranch("extensions.");
-	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
-	version = version_obj.getCharPref("lastAppVersion");
-	version = parseInt(version[0])
-	
-	file = getPredefinedFolder(2);
-	
-	if (version > 2)
-	{
-		var emlsArray = gFolderDisplay.selectedMessages;
-	}
-	else
-	{
-		var emlsArray = GetSelectedMessages();
-	}
+    var version_obj = prefService.getBranch("extensions.");
+    version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+    version = version_obj.getCharPref("lastAppVersion");
+    version = parseInt(version[0])
+    
+    file = getPredefinedFolder(2);
+    
+    if (version > 2)
+    {
+        var emlsArray = gFolderDisplay.selectedMessages;
+    }
+    else
+    {
+        var emlsArray = GetSelectedMessages();
+    }
 
-	IETtotal = emlsArray.length;
-	IETexported = 0;
-	var msguri = emlsArray[0];
+    IETtotal = emlsArray.length;
+    IETexported = 0;
+    var msguri = emlsArray[0];
 
-	
-	//gives the selected email uri
-	var messageUri= gDBView.URIForFirstSelectedMessage;
+    
+    //gives the selected email uri
+    var messageUri= gDBView.URIForFirstSelectedMessage;
+    
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+    var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
 
-	//gives the selected email object 
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    //gives the selected email object 
+    var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
 
-	//functionality to split the author name and email
-	if(message.author.charAt(0) == '"'){
-		sendername = message.author.split('"')[1].split('"')[0];
-	}
-	else if(message.author.indexOf('<')!=-1){
-		sendername = message.author.split('<')[0];
-	}
-	else{
-		sendername = message.author;
-	}
-	if(message.author.indexOf('<')!=-1){
-		senderemail = message.author.split('<')[1].split('>')[0];
-	}
-	else{
-		senderemail = message.author
-	}
+    //functionality to split the author name and email
+    if(message.author.charAt(0) == '"'){
+        sendername = message.author.split('"')[1].split('"')[0];
+    }
+    else if(message.author.indexOf('<')!=-1){
+        sendername = message.author.split('<')[0];
+    }
+    else{
+        sendername = message.author;
+    }
+    if(message.author.indexOf('<')!=-1){
+        senderemail = message.author.split('<')[1].split('>')[0];
+    }
+    else{
+        senderemail = message.author
+    }
     searchPartner(senderemail);
 }
-
-
+
+
 var listDocumentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var res = result.QueryInterface(Components.interfaces.nsISupportsArray);
-        res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
-		model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); 
-        weburl = getWebServerURL();
-        if(res_id==0)
-        {
-            alert("Document is not available.");
-            return;
-        }
-        else
-        {
-            var t = weburl + "/openerp/form/view?model=" + model +"&id=" + res_id;
-            window.open(t, "", "chrome","resizable=yes,scrollbars=yes,status=yes,"); 
-        }
-
-	},
-	onFault: function (client, ctxt, fault) {
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var res = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
+        model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); 
+        weburl = getWebServerURL();
+        if(res_id==0)
+        {
+            alert("Document is not available.");
+            return;
+        }
+        else
+        {
+    
+            var encoded = encodeURIComponent("/openerp/form/view?model=" + model +"&id=" + res_id)
+            var t = weburl + "?next=" + encoded
+            var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+            messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
+            messenger.launchExternalURL(t);
+        }
 
-	},
+    },
+    onFault: function (client, ctxt, fault) {
 
-	onError: function (client, ctxt, status, errorMsg) {
+    },
 
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+
+    }
 } 
-
-
+
+//function to archive the mail content through xmlrpc request
+function parse_eml(){
+    var fpath =""
+    if(navigator.userAgent.indexOf('Linux')!= -1){
+        fpath ="/tmp/"
+    }
+    else if(navigator.userAgent.indexOf('Win')!= -1){
+        fpath ="C:\\"
+    }
+    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+        fpath ="/tmp/"
+    } 
+    name = fpath + getPref().getCharPref('fname') +".eml"
+    var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+    file.initWithPath( name );
+    if ( file.exists() == false ) {
+        return null;
+    } else {
+        var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
+        is.init( file,0x01, 00004, null);
+        var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
+        sis.init( is );
+        var output = sis.read( sis.available() );
+        return output
+    }
+    
+}
 function open_document()
-{
+{
     if (check() == false){
         return true
-    }
+    }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
-	var version_obj = prefService.getBranch("extensions.");
-	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
-	version = version_obj.getCharPref("lastAppVersion");
-	version = parseInt(version[0])
-	
-	file = getPredefinedFolder(2);
-	
-	if (version > 2)
-	{
-		var emlsArray = gFolderDisplay.selectedMessages;
-	}
-	else
-	{
-		var emlsArray = GetSelectedMessages();
-	}
-
-	IETtotal = emlsArray.length;
-	IETexported = 0;
-	var msguri = emlsArray[0];
-
+    var version_obj = prefService.getBranch("extensions.");
+    version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+    version = version_obj.getCharPref("lastAppVersion");
+    version = parseInt(version[0])
+    file = getPredefinedFolder(2);
+    if (version > 2)
+    {
+        var emlsArray = gFolderDisplay.selectedMessages;
+    }
+    else
+    {
+        var emlsArray = GetSelectedMessages();
+    }
+    IETtotal = emlsArray.length;
+    IETexported = 0;
+    var msguri = emlsArray[0];
     //gives the selected email uri
-	var messageUri= gDBView.URIForFirstSelectedMessage;
+    var messageUri= gDBView.URIForFirstSelectedMessage;
+    var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+    //gives the selected email object
+    var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    if (version > 2)
+    {
+        m_uri = message.folder.getUriForMsg(message);
+        saveMsgAsEML(m_uri,file,false,emlsArray,null);
+    }
+    else
+    {
+        saveMsgAsEML(msguri,file,false,emlsArray,null);
+    }
+    //gives the received email date
+    var stdate = new Date(message.date / 1000);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_message';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var eml_string = parse_eml()
+    var a = ['message'];
+    var b = [eml_string];
+    var arrofarr = dictcontact(a,b); 
+    xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+}
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
-
-	//gives the selected email object 
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
-    
-	
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_message';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var a = ['message_id'];
-	var b = ['<'+message.messageId+'>'];
-	var arrofarr = dictcontact(a,b); 
-	xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-}
-
 function open_contact()
-{	
-	if (check() == false){
+{   
+    if (check() == false){
         return true
     }
     
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
-	var version_obj = prefService.getBranch("extensions.");
-	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
-	version = version_obj.getCharPref("lastAppVersion");
-	version = parseInt(version[0])
-	
-	file = getPredefinedFolder(2);
-	
-	if (version > 2)
-	{
-		var emlsArray = gFolderDisplay.selectedMessages;
-	}
-	else
-	{
-		var emlsArray = GetSelectedMessages();
-	}
+    var version_obj = prefService.getBranch("extensions.");
+    version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+    version = version_obj.getCharPref("lastAppVersion");
+    version = parseInt(version[0])
+    
+    file = getPredefinedFolder(2);
+    
+    if (version > 2)
+    {
+        var emlsArray = gFolderDisplay.selectedMessages;
+    }
+    else
+    {
+        var emlsArray = GetSelectedMessages();
+    }
 
-	IETtotal = emlsArray.length;
-	IETexported = 0;
-	var msguri = emlsArray[0];
+    IETtotal = emlsArray.length;
+    IETexported = 0;
+    var msguri = emlsArray[0];
 
-	
-	//gives the selected email uri
-	var messageUri= gDBView.URIForFirstSelectedMessage;
+    
+    //gives the selected email uri
+    var messageUri= gDBView.URIForFirstSelectedMessage;
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+    var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
 
-	//gives the selected email object 
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    //gives the selected email object 
+    var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
 
-	//functionality to split the author name and email
-	if(message.author.charAt(0) == '"'){
-		sendername = message.author.split('"')[1].split('"')[0];
-	}
-	else if(message.author.indexOf('<')!=-1){
-		sendername = message.author.split('<')[0];
-	}
-	else{
-		sendername = message.author;
-	}
-	if(message.author.indexOf('<')!=-1){
-		senderemail = message.author.split('<')[1].split('>')[0];
-	}
-	else{
-		senderemail = message.author
-	}
+    //functionality to split the author name and email
+    if(message.author.charAt(0) == '"'){
+        sendername = message.author.split('"')[1].split('"')[0];
+    }
+    else if(message.author.indexOf('<')!=-1){
+        sendername = message.author.split('<')[0];
+    }
+    else{
+        sendername = message.author;
+    }
+    if(message.author.indexOf('<')!=-1){
+        senderemail = message.author.split('<')[1].split('>')[0];
+    }
+    else{
+        senderemail = message.author
+    }
 
-	//set the initial information for the selected email
+    //set the initial information for the selected email
     setSenderEmail(senderemail);
     setSenderName(sendername);
     setPartnerName("");
@@ -461,61 +501,61 @@ window.addEventListener("load", function(e) { Config.onLoad(e); }, false);
 
 //function to open the plugin window for searching the records for a particular object
 var Plugin = {
-	onLoad: function() {
-	this.initialized = true;
-	},
+    onLoad: function() {
+    this.initialized = true;
+    },
 
-	onMenuItemCommand: function() {
-		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
-	}
+    onMenuItemCommand: function() {
+        window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+    }
 };
 window.addEventListener("load", function(e) { Plugin.onLoad(e); }, false);
 
 //function to open the window for creating a new partner contact
 var Create = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-		window.open("chrome://openerp_plugin/content/create.xul", "", "chrome");
-	}
+    onMenuItemCommand: function(){
+        window.open("chrome://openerp_plugin/content/create.xul", "", "chrome");
+    }
 };
 window.addEventListener("load", function(e) { Create.onLoad(e); }, false);
 
 var Address = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-       open_contact();
+    onMenuItemCommand: function(){
+       open_contact();
        
-	}
+    }
 };
 
 
 //function to open the window for selecting the partner for a new contact creation
 var Select = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-        // document.getElementById("txtselectpartner").value="";
-		 window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
+    onMenuItemCommand: function(){
+        // document.getElementById("txtselectpartner").value="";
+         window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
     }
-};
-
+};
+
 
 var CreatePartner = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-		window.open("chrome://openerp_plugin/content/createpartner.xul", "", "chrome");
-	}
+    onMenuItemCommand: function(){
+        window.open("chrome://openerp_plugin/content/createpartner.xul", "", "chrome");
+    }
 };
 window.addEventListener("load", function(e) { CreatePartner.onLoad(e); }, false);
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
index e2c3b3b7cee..93ba843b947 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
@@ -8,54 +8,89 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
 
-<menupopup id="taskPopup">
-    <menuitem id="tiny-plugin2" label="&tinyplugin;"
-          oncommand="Config.onMenuItemCommand(event);"
-          image="&menuicon.value;"
-          class="menuitem-iconic"
-          tooltiptext="&pluginconfig.value;"/>
-</menupopup>
+<menubar id="mail-menubar" >
+    <menu insertafter="messageMenu" id="menu_openerp" label="&openerpMenu.label;" accesskey="&openerpMenu.accesskey;"> 
+        <menupopup id="taskPopup">
+            <menuitem id="tiny-plugin3" label="&tinyplugin;"
+                      oncommand="Config.onMenuItemCommand(event);"
+                      image="&menuicon.settings;"
+                      class="menuitem-iconic"
+                      tooltiptext="&pluginconfig.value;"
+                      />
+            <menuseparator/>
+            <menuitem id="tiny-plugin4" label="&tinypluginconfig;"
+                      oncommand="searchmail();"
+                      image="&menuicon.value;"
+                      class="menuitem-iconic"
+                      tooltiptext="&pluginconfigvalue.value;"
+                      />
+            <menuseparator/>
+            <menuitem id="tiny-openpartner" label="&openpartner.value;"
+                      oncommand="open_partner();"
+                      image="&menuicon.value;"
+                      class="menuitem-iconic"
+                      tooltiptext="&openpartnertooltip.value;"
+                      />
 
-<menupopup id="taskPopup">
-    <menuitem id="tiny-plugin1" label="&tinypluginconfig;"
-          oncommand="searchmail();"
-          image="&menuicon.value;"
-          class="menuitem-iconic"
-          tooltiptext="&pluginconfigvalue.value;"/>
-</menupopup>
+            <menuitem id="tiny-opendocument" label="&opendocument.value;"
+                      oncommand="open_document();"
+                      image="&menuicon.value;"
+                      class="menuitem-iconic"
+                      tooltiptext="&opendocumenttooltip.value;"
+                      />
+            
+        </menupopup>
+    </menu>
+</menubar>
+
+<!--<menupopup id="taskPopup">-->
+<!--    <menuitem id="tiny-plugin2" label="&tinyplugin;"-->
+<!--          oncommand="Config.onMenuItemCommand(event);"-->
+<!--          image="&menuicon.value;"-->
+<!--          class="menuitem-iconic"-->
+<!--          tooltiptext="&pluginconfig.value;"/>-->
+<!--</menupopup>-->
+
+<!--<menupopup id="taskPopup">-->
+<!--    <menuitem id="tiny-plugin1" label="&tinypluginconfig;"-->
+<!--          oncommand="searchmail();"-->
+<!--          image="&menuicon.value;"-->
+<!--          class="menuitem-iconic"-->
+<!--          tooltiptext="&pluginconfigvalue.value;"/>-->
+<!--</menupopup>-->
 
 <popup id="threadPaneContext">
-	<menuitem id="threadPaneContext-saveAsMultiple"
-		insertbefore="threadPaneContext-print"
-		class="menuitem-iconic"
-		image="&menuicon.value;"
-		label="Archive To OpenERP"
-		accesskey="T"
-		oncommand="searchmail();"/>
+    <menuitem id="threadPaneContext-saveAsMultiple"
+        insertbefore="threadPaneContext-print"
+        class="menuitem-iconic"
+        image="&menuicon.value;"
+        label="Archive To OpenERP"
+        accesskey="T"
+        oncommand="searchmail();"/>
 </popup>
 
 <toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button"
-		class="toolbarbutton-1"
-		image="&menuicon.value;"
-		label= "Push To OpenERP"
-		oncommand="searchmail();" />
+    <toolbarbutton id="GA-button"
+        class="toolbarbutton-1"
+        image="&menuicon.value;"
+        label= "Push"
+        oncommand="searchmail();" />
 </toolbarpalette> 
 
 <toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button2"
-		class="toolbarbutton-1"
-		image="&partnericon.value;"
-		label= "Open Partner"
+    <toolbarbutton id="GA-button2"
+        class="toolbarbutton-1"
+        image="&partnericon.value;"
+        label= "Partner"
         oncommand="open_partner();"
-		  />
+          />
 </toolbarpalette>
 <toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button3"
-		class="toolbarbutton-1"
-		image="&imagearchive.value;"
-		label= "Open Document"
-		oncommand="open_document();"  />
+    <toolbarbutton id="GA-button3"
+        class="toolbarbutton-1"
+        image="&imagearchive.value;"
+        label= "Document"
+        oncommand="open_document();"  />
 </toolbarpalette> 
-
+
 </overlay>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
index afe02875931..fc6802d9b9c 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
@@ -3,7 +3,7 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/plugin.dtd">
 <window id="pluginwindows" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
-	title="&title.label;" onload="myPrefObserver.loaddata()" height="650" width="1000">
+	title="&title.label;" onload="myPrefObserver.loaddata()" height="560" width="960">
 
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
@@ -12,11 +12,9 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
 <description></description>
-<hbox id="root" height="10" width="800" style="padding:12px;border:1px solid black">
-    
-        <caption label="&title.label;" />
+<hbox id="root" height="10" width="800" >
 </hbox>
-<hbox id="root1" height="380" width="800" style="padding:12px;border:1px solid black">
+<hbox id="root1" height="380" width="800" >
 <vbox>
       <caption label="&gptinyobj.label;" />
       <groupbox id="existsobjectgroup" width="400" style="border:1px solid black">
@@ -42,6 +40,7 @@
 	        <listbox height="250" width="100%" id="listSearchBox" style="border:1px solid red" seltype="multiple">
 	            <listhead>
 	    	        <listheader label="&listSearchBox.header;"/>
+<!--	    	        <listheader label="&listSearchBox.header2;"/>-->
 	            </listhead>
 	            <listcols>
 	    	        <listcol flex="1"/>
@@ -58,42 +57,42 @@
 
    <vbox> 
     <caption label="&newobject.label;" />
-   <groupbox id="newobjectgroup" width="400" align="left" style="border:1px solid black;">
-        
-        <separator class="groove-thin" orient="horizontal" width="400"/> 
-	       <hbox align="left">
-                <vbox>
-                    <label id="lblex3" align="right" width="135" control="section" value="&object.label;"/>
-                </vbox>
-                <vbox>
-                    <menulist id="section" width="150">
-                    <menupopup>
-	                    <menuitem label="" value=""/>
-   	                </menupopup>
-      	            </menulist>
-                </vbox>
-                <vbox>
-      	            <button width="50" label="&archive.label;" accesskey="c" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('create');"/>
-                </vbox>
-	        </hbox>
+	<groupbox id="newobjectgroup" width="400" align="left" style="border:1px solid black;">
+		<separator class="groove-thin" orient="horizontal" width="400" height="30"/> 
+		<hbox align="left">
+			<vbox>
+				<label id="lblex3" align="right" width="135" control="section" value="&object.label;"/>
+			</vbox>
+			<vbox>
+				<menulist id="section" width="150">
+					<menupopup>
+						<menuitem label="" value=""/>
+					</menupopup>
+				</menulist>
+			</vbox>
+			<vbox>
+				<button width="50" label="&archive.label;" accesskey="c" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('create');"/>
+			</vbox>
+		</hbox>
+		<separator class="groove-thin" orient="horizontal" width="180" height="100"/>
+	</groupbox>
+ 		<caption label="&newcontact.label;" />
+		<groupbox id="newcontactgroup" width="400" align="left" style="border:1px solid black;">
+			<separator class="groove-thin" orient="horizontal" width="400" height="30"/>
+		    <hbox align="left">
+			    <vbox>
+				    <label align="right" width="135" id="lblsection" control="section" value="&partner.label;"/>
+			    </vbox>
+			    <vbox>
+				    <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+			    </vbox>
+		    </hbox> 
+	        <separator class="groove-thin" orient="horizontal" width="180" height="215"/>
+		</groupbox>
 
-	        <separator class="groove-thin" orient="horizontal" width="180"/>
-   
-            <hbox align="left">
-                <vbox>
-	                <label align="right" width="135" id="lblsection" control="section" value="&partner.label;"/>
-                </vbox>
-                <vbox>
-	                <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
-                </vbox>
-            </hbox> 
-        <separator class="groove-thin" orient="horizontal" width="480"/> 
- </groupbox>
-</vbox>
-  
-  
-</hbox>
-<hbox height="60" align="right" width="800">
-	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
-   </hbox> 
+	</vbox>
+	</hbox>
+		<hbox height="60" align="right" width="800">
+			<button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+		</hbox> 
 </window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
index 23038f29860..f1dff41bd77 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -37,187 +37,187 @@ var name = new Array();
 var attach_eml ="no";
 var popup_display = "yes"
 var rpc= {
-	servers: {},
-	addserver: function(name,ip,port,path) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		this.servers[name]= {
-			ip: ip,
-			port: port,
-			path: path,
-			avaible: true,
-			sock: Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient)};
-	},
-	getany: function(rpcval,n) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var t = ['PRUint8','PRUint16','PRInt16','PRInt32','PRBool','Char','CString','Float','Double','PRTime','InputStream','Array','Dictionary'];
-		for (var i=0; i<t.length; i++)
-			try { return [t[i],this.Iget(rpcval,Components.interfaces[((i==10 || i==12)? 'nsI': 'nsISupports')+t[i]],n)]; } catch(e) {}
-		return [false,'error getany','Undefined type'];
-	},
-	onfault: function(t) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		return (t.constructor==Array && t.length==3 && !t[0] && (t[1].substr(0,5)=='error' || t[1].substr(0,5)=='fault'))?
-			true : false;
-	},
-	getall: function(rpcval,n) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var t = this.getany(rpcval,n);
-		if (this.onfault(t)) return t;
-		if (t[0]=='PRBool') return (t[1]=='true');
-		if (t[0]=='PRInt32') return parseInt(t[1]+'');
-		if (t[0]=='PRTime') {
-			dte= new Date("January 1, 1970, 00:00:00");
-			dte.setUTCMilliseconds(t[1]+'');
-			return dte; }
-		if (t[0]=='Double' || t[0]=='Float') return parseFloat(t[1]+'');
-		if (t[0]=='Char' || t[0]=='CString') return (t[1]+'').replace(/¬/g,'€');
-		if (t[0]=='Array') {
-			var a=[];
-			for (var i=0; i<t[1].Count(); i++) a[i]= this.getall(t[1],i);
-		} else if (t[0]=='Dictionary') {
-			var a={};
-			var keys = t[1].getKeys({});
-			for (var k = 0; k < keys.length; k++)
-				a[keys[k]]= this.getall(t[1],keys[k]);
-		} else return t[1];
-		return a;
-	},
-	Iget: function(rpcval,itype,n) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (n == undefined) return rpcval.QueryInterface(itype);
-		else if (n==parseInt(n)) return rpcval.QueryElementAt(n,itype);
-		else return rpcval.getValue(n).QueryInterface(itype);
-	},
-	checktype: function(val) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (val != undefined) {
-			switch (val.constructor) {
-				case Number: return (val==parseInt(val))? 1:4;
-				case Boolean: return 2;
-				case String: return 3;
-				case Date: return 5;
-				case Object: return 7;
-				case Array: return 6;
+    servers: {},
+    addserver: function(name,ip,port,path) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        this.servers[name]= {
+            ip: ip,
+            port: port,
+            path: path,
+            avaible: true,
+            sock: Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient)};
+    },
+    getany: function(rpcval,n) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var t = ['PRUint8','PRUint16','PRInt16','PRInt32','PRBool','Char','CString','Float','Double','PRTime','InputStream','Array','Dictionary'];
+        for (var i=0; i<t.length; i++)
+            try { return [t[i],this.Iget(rpcval,Components.interfaces[((i==10 || i==12)? 'nsI': 'nsISupports')+t[i]],n)]; } catch(e) {}
+        return [false,'error getany','Undefined type'];
+    },
+    onfault: function(t) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        return (t.constructor==Array && t.length==3 && !t[0] && (t[1].substr(0,5)=='error' || t[1].substr(0,5)=='fault'))?
+            true : false;
+    },
+    getall: function(rpcval,n) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var t = this.getany(rpcval,n);
+        if (this.onfault(t)) return t;
+        if (t[0]=='PRBool') return (t[1]=='true');
+        if (t[0]=='PRInt32') return parseInt(t[1]+'');
+        if (t[0]=='PRTime') {
+            dte= new Date("January 1, 1970, 00:00:00");
+            dte.setUTCMilliseconds(t[1]+'');
+            return dte; }
+        if (t[0]=='Double' || t[0]=='Float') return parseFloat(t[1]+'');
+        if (t[0]=='Char' || t[0]=='CString') return (t[1]+'').replace(/¬/g,'€');
+        if (t[0]=='Array') {
+            var a=[];
+            for (var i=0; i<t[1].Count(); i++) a[i]= this.getall(t[1],i);
+        } else if (t[0]=='Dictionary') {
+            var a={};
+            var keys = t[1].getKeys({});
+            for (var k = 0; k < keys.length; k++)
+                a[keys[k]]= this.getall(t[1],keys[k]);
+        } else return t[1];
+        return a;
+    },
+    Iget: function(rpcval,itype,n) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (n == undefined) return rpcval.QueryInterface(itype);
+        else if (n==parseInt(n)) return rpcval.QueryElementAt(n,itype);
+        else return rpcval.getValue(n).QueryInterface(itype);
+    },
+    checktype: function(val) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (val != undefined) {
+            switch (val.constructor) {
+                case Number: return (val==parseInt(val))? 1:4;
+                case Boolean: return 2;
+                case String: return 3;
+                case Date: return 5;
+                case Object: return 7;
+                case Array: return 6;
 
-			}
-		}
-		return 7;
+            }
+        }
+        return 7;
 
-	},
-	set: function(rpcobj,param) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (param==undefined) return [false,'error set','Undefined parameter'];
-		var itype= this.checktype(param);
-		if (this.onfault(itype)) return itype;
-		var p = this.servers[rpcobj].sock.createType(itype,{});
-		if (itype==6) {
-			if (param.length>0)
-				for (var i=0; i<param.length; i++) p.AppendElement( this.set(rpcobj,param[i]) );
-		} else if (itype==7) {
-			for (var i in param) p.setValue( i, this.set(rpcobj,param[i]) );
-		} else if (itype==4) {
-			p.data=(''+param).replace(',','.');
-		} else p.data=param;
-		return p;
-	},
-	ask: function(rpcobj,method,params,func_out) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var a=this.disableNset(rpcobj) ;
-		if (this.onfault(a)) return a;
-		var handler = {
-			onResult: function(client, async, result) {
-				rpc.servers[rpcobj].avaible= true;
-				func_out(rpc.getall(result)); },
-			onFault: function (client, async, faute) {alert("in ask infault"+result)
-				 rpc.servers[rpcobj].avaible= true; func_out([false,'fault',faute]); },
-			onError: function (client, async, status, msg) {
-				rpc.servers[rpcobj].avaible= true;
-				if (status=='2147500037') {
-					status= "no network or no server";
-					msg= "1. Check your network connection.";
-					msg+= "\n2. Check your server connection parameters:";
-					msg+= "\n\t"+rpc.servers[rpcobj].ip+":"+rpc.servers[rpcobj].port+"=>"+params[0];
-					msg+= "\n3. Your server may not be launched or connected to the network.";
-				}
-				func_out([false,'error '+status,msg]);
-				} };
-		var p = [];
-		for (var i=0; i<params.length; i++)
-			p[i]= this.set(rpcobj,params[i]);
-		try { this.servers[rpcobj].sock.asyncCall(handler, null, method, p, p.length);
-		} catch(e) {
-			this.servers[rpcobj].avaible= true;
-			this.servers[rpcobj].sock= Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient) ;
-			func_out([false,'error catch',e]); }
-		return true;
-	},
-	disableNset: function(rpcobj) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (this.servers[rpcobj]) {
-			this.servers[rpcobj].avaible= false;//alert('http://'+this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path);
-			server_path=this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path
-			this.servers[rpcobj].sock.init(server_path);
-			
-			return true; }
-		return [false,'error disableNset','Server vars not set'];
-	}
+    },
+    set: function(rpcobj,param) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (param==undefined) return [false,'error set','Undefined parameter'];
+        var itype= this.checktype(param);
+        if (this.onfault(itype)) return itype;
+        var p = this.servers[rpcobj].sock.createType(itype,{});
+        if (itype==6) {
+            if (param.length>0)
+                for (var i=0; i<param.length; i++) p.AppendElement( this.set(rpcobj,param[i]) );
+        } else if (itype==7) {
+            for (var i in param) p.setValue( i, this.set(rpcobj,param[i]) );
+        } else if (itype==4) {
+            p.data=(''+param).replace(',','.');
+        } else p.data=param;
+        return p;
+    },
+    ask: function(rpcobj,method,params,func_out) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var a=this.disableNset(rpcobj) ;
+        if (this.onfault(a)) return a;
+        var handler = {
+            onResult: function(client, async, result) {
+                rpc.servers[rpcobj].avaible= true;
+                func_out(rpc.getall(result)); },
+            onFault: function (client, async, faute) {alert("in ask infault"+result)
+                 rpc.servers[rpcobj].avaible= true; func_out([false,'fault',faute]); },
+            onError: function (client, async, status, msg) {
+                rpc.servers[rpcobj].avaible= true;
+                if (status=='2147500037') {
+                    status= "no network or no server";
+                    msg= "1. Check your network connection.";
+                    msg+= "\n2. Check your server connection parameters:";
+                    msg+= "\n\t"+rpc.servers[rpcobj].ip+":"+rpc.servers[rpcobj].port+"=>"+params[0];
+                    msg+= "\n3. Your server may not be launched or connected to the network.";
+                }
+                func_out([false,'error '+status,msg]);
+                } };
+        var p = [];
+        for (var i=0; i<params.length; i++)
+            p[i]= this.set(rpcobj,params[i]);
+        try { this.servers[rpcobj].sock.asyncCall(handler, null, method, p, p.length);
+        } catch(e) {
+            this.servers[rpcobj].avaible= true;
+            this.servers[rpcobj].sock= Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient) ;
+            func_out([false,'error catch',e]); }
+        return true;
+    },
+    disableNset: function(rpcobj) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (this.servers[rpcobj]) {
+            this.servers[rpcobj].avaible= false;//alert('http://'+this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path);
+            server_path=this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path
+            this.servers[rpcobj].sock.init(server_path);
+            
+            return true; }
+        return [false,'error disableNset','Server vars not set'];
+    }
 }
 function handler_function( result ) {
-	if ( rpc.onfault( result ) ) { alert( result[0] + "\n" + result[1] ); return; }
-	else{
-		alert("got result"+result)	
-	}
+    if ( rpc.onfault( result ) ) { alert( result[0] + "\n" + result[1] ); return; }
+    else{
+        alert("got result"+result)  
+    }
 }
 
 //Sets the preference service
 function getPref(){
-	var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+    var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
     var branchobj = prefService.getBranch("extensions.tiny.");
     branchobj.QueryInterface(Components.interfaces.nsIPrefBranch2);
-	return branchobj
+    return branchobj
 }
 
 function setFileName(fname){
-	getPref().setCharPref('fname',fname);
+    getPref().setCharPref('fname',fname);
 }
 
 //set attachment file save or not
 function setAttachment(argAttac){
-	getPref().setCharPref('attachment',argAttac);
+    getPref().setCharPref('attachment',argAttac);
 }
 
 //set preference value for server url
 function setServer(argServer){
-	getPref().setCharPref('serverurl',argServer);
+    getPref().setCharPref('serverurl',argServer);
 }
 
 //set preference value for server port
 function setPort(argPort){
-	getPref().setCharPref('serverport',argPort)
+    getPref().setCharPref('serverport',argPort)
 }
 
 //set preference value of database name for data searching and selection
 function setDbName(argDbName){
-	getPref().setCharPref('serverdbname',argDbName);
+    getPref().setCharPref('serverdbname',argDbName);
 }
 
 //set webserver url
 function setWebServerURL(argWebServerURL){
-	getPref().setCharPref('webserverurl',argWebServerURL);
+    getPref().setCharPref('webserverurl',argWebServerURL);
 }
 //set preference value of username for login
 function setUsername(argUsername){
-	getPref().setCharPref('username',argUsername);
+    getPref().setCharPref('username',argUsername);
 }
 
 //set preference value of password for login
 function setPassword(argPassword){
-	getPref().setCharPref('password',argPassword);
+    getPref().setCharPref('password',argPassword);
 }
 
 //set preference value for storing partner id
 function setPartnerId(argPartnerId){
-	getPref().setCharPref('partnerid',argPartnerId)
+    getPref().setCharPref('partnerid',argPartnerId)
 }
 
 //set preference value for Resource Id
@@ -226,17 +226,17 @@ function setResourceId(argResourceId){
 }
 //set server service
 function setServerService(argServerService){
-	strServerService = argServerService;
+    strServerService = argServerService;
 }
 
 //set preference value for sender email
 function setSenderEmail(argSenderEmail){
-	getPref().setCharPref('senderemail',argSenderEmail)
+    getPref().setCharPref('senderemail',argSenderEmail)
 }
 
 //set preference value for receiver email
 function setReceiverEmail(argReceiverEmail){
-	getPref().setCharPref('receiveremail',argReceiverEmail)
+    getPref().setCharPref('receiveremail',argReceiverEmail)
 }
 
 //set preference value for sender name
@@ -246,202 +246,202 @@ function setSenderName(argSenderName){
 
 //set preference value for email subject
 function setSubject(argSubject){
-	getPref().setCharPref('subject',argSubject)
+    getPref().setCharPref('subject',argSubject)
 }
 
 //set preference value for email received date
 function setReceivedDate(argReceivedDate){
-	getPref().setCharPref('receiveddate',argReceivedDate)
+    getPref().setCharPref('receiveddate',argReceivedDate)
 }
 
 //set preference value for storing contact id which is used while storing mail contents after creating a new partner contact
 function setContactId(argContactId){
-	getPref().setCharPref('contactid',argContactId)
+    getPref().setCharPref('contactid',argContactId)
 }
 
 //set preference value for storing attachment option in config
 function setAttachValue(argAttachValue){
-	getPref().setCharPref('attachvalue',argAttachValue)
+    getPref().setCharPref('attachvalue',argAttachValue)
 }
 
 //set preference value for email cclist
 function setCCList(argCCList){
-	getPref().setCharPref('cclist',argCCList)
+    getPref().setCharPref('cclist',argCCList)
 }
 
 //set preference value for email message body
 function setMessageBody(argMessageBody){
-	getPref().setCharPref('messagebody',argMessageBody)
+    getPref().setCharPref('messagebody',argMessageBody)
 }
 
 //set preference value for Partner Name
 function setPartnerName(argPartnerName){
-	getPref().setCharPref('partnername',argPartnerName)
+    getPref().setCharPref('partnername',argPartnerName)
 }
 
 //set preference value for Contact Name
 function setContactName(argContactName){
-	getPref().setCharPref('contactname',argContactName)
+    getPref().setCharPref('contactname',argContactName)
 }
 
 //set preference value for street
 function setStreet(argStreet){
-	getPref().setCharPref('street',argStreet)
+    getPref().setCharPref('street',argStreet)
 }
 
 //set preference value for street2
 function setStreet2(argStreet2){
-	getPref().setCharPref('street2',argStreet2)
+    getPref().setCharPref('street2',argStreet2)
 }
 
 //set preference value for zipcode
 function setZipCode(argZipcode){
-	getPref().setCharPref('zipcode',argZipcode)
+    getPref().setCharPref('zipcode',argZipcode)
 }
 
 //set preference value for Office Number
 function setOfficenumber(argOfficenumber){
-	getPref().setCharPref('officeno',argOfficenumber)
+    getPref().setCharPref('officeno',argOfficenumber)
 }
 
 //set preference value for Phone Number
 function setMobilenumber(argMobilenumber){
-	getPref().setCharPref('phoneno',argMobilenumber)
+    getPref().setCharPref('phoneno',argMobilenumber)
 }
 
 //set preference value for Fax
 function setFax(argFax){
-	getPref().setCharPref('fax',argFax)
+    getPref().setCharPref('fax',argFax)
 }
 
 //set preference value for city
 function setCity(argCity){
-	getPref().setCharPref('city',argCity)
+    getPref().setCharPref('city',argCity)
 }
 
 //set preference value for country
 function setCountry(argCountry){
-	getPref().setCharPref('country',argCountry)
+    getPref().setCharPref('country',argCountry)
 }
 
 //set preference value for state
 function setState(argState){
-	getPref().setCharPref('state',argState)
+    getPref().setCharPref('state',argState)
 }
 
 
 //set the value for the whole server url
 function setServerUrl(argServerUrl)
 {
-	var seperateUrl = argServerUrl.split(':');
-	setServer(seperateUrl.slice(0,seperateUrl.length-1).join(":"));
-	setPort(seperateUrl[seperateUrl.length-1]);
+    var seperateUrl = argServerUrl.split(':');
+    setServer(seperateUrl.slice(0,seperateUrl.length-1).join(":"));
+    setPort(seperateUrl[seperateUrl.length-1]);
 }
 
 //set preference value for storing user id
 function setUserId(argUserId){
-	getPref().setIntPref('userid',argUserId);
+    getPref().setIntPref('userid',argUserId);
 }
 
 //set database list is displaye or not
 function setDBList(argDBList){
-	getPref().setCharPref('db_list',argDBList)
+    getPref().setCharPref('db_list',argDBList)
 }
 
 //set server connect or not
 function setconnect_server(argconnect_server){
-	getPref().setCharPref('connect_server',argconnect_server)
+    getPref().setCharPref('connect_server',argconnect_server)
 }
 
 //set module install or not
 function setmodule_install(argconnect_module){
-	getPref().setCharPref('module_install',argconnect_module)
+    getPref().setCharPref('module_install',argconnect_module)
 }
 
 //get module install or not
 function getmodule_install(){
-	return getPref().getCharPref('module_install');
+    return getPref().getCharPref('module_install');
 }
 
 
 //get server connect or not
 function getconnect_server(){
-	return getPref().getCharPref('connect_server');
+    return getPref().getCharPref('connect_server');
 }
 
 
 //get partner id
 function getPartnerId(){
-	return getPref().getCharPref('partnerid');
+    return getPref().getCharPref('partnerid');
 }
 //get database list is displaye or not
 function getDBList(){
-	return getPref().getCharPref('db_list');
+    return getPref().getCharPref('db_list');
 }
 
 function getFileName(){
-	return getPref().getCharPref('fname');
+    return getPref().getCharPref('fname');
 }
 
 //get attachment save or not
 function getAttachment(){
-	return getPref().getCharPref('attachment');
+    return getPref().getCharPref('attachment');
 }
 
 //get serverurl
 function getServer(){
-	return getPref().getCharPref('serverurl');
+    return getPref().getCharPref('serverurl');
 }
 
 //get server port
 function getPort(){
-	return getPref().getCharPref('serverport');
+    return getPref().getCharPref('serverport');
 }
 
 //get database name
 function getDbName(){
-	return getPref().getCharPref('serverdbname');
+    return getPref().getCharPref('serverdbname');
 }
 
 //get webserver url
 function getWebServerURL(){
-	return getPref().getCharPref('webserverurl');
+    return getPref().getCharPref('webserverurl');
 }
 
 //get webserver port
 function getwebPort(){
-	return getPref().getCharPref('webserverport');
+    return getPref().getCharPref('webserverport');
 }
 
 //get username from config settings
 function getUsername(){
-	return getPref().getCharPref('username');
+    return getPref().getCharPref('username');
 }
 
 //get password from config settings
 function getPassword(){
-	return getPref().getCharPref('password');
+    return getPref().getCharPref('password');
 }
 
 //get serverservice
 function getServerService(){
-	return strServerService;
+    return strServerService;
 
 }
 
 //get sender email
 function getSenderEmail(){
-	return getPref().getCharPref('senderemail');
+    return getPref().getCharPref('senderemail');
 }
 
 //get receiver email
 function getReceiverEmail(){
-	return getPref().getCharPref('receiveremail');
+    return getPref().getCharPref('receiveremail');
 }
 
 //get resource id
 function getResourceId(){
-	return getPref().getCharPref('res_id');
+    return getPref().getCharPref('res_id');
 }
 
 
@@ -460,49 +460,49 @@ function getSenderName(){
             var utftext = "";
             var encoded_string = "";
             var convertedString = "";
-		    for (var n = 0; n < string.length; n++)
+            for (var n = 0; n < string.length; n++)
             {
-        		var c = string.charCodeAt(n);
-			    if (c < 128) {
-				    utftext += String.fromCharCode(c);
-			    }
-		    }
+                var c = string.charCodeAt(n);
+                if (c < 128) {
+                    utftext += String.fromCharCode(c);
+                }
+            }
 
             encoded_string = encode64(utftext);
-		   return encoded_string;
+           return encoded_string;
         }
 }
 
 
 //get partner name
 function getPartnerName(){
-	return getPref().getCharPref('partnername');
+    return getPref().getCharPref('partnername');
 }
 
 //get contact name
 function getContactName(){
-	return getPref().getCharPref('contactname');
+    return getPref().getCharPref('contactname');
 }
 
 
 //get street name
 function getStreet(){
-	return getPref().getCharPref('street');
+    return getPref().getCharPref('street');
 }
 
 //get street2 name
 function getStreet2(){
-	return getPref().getCharPref('street2');
+    return getPref().getCharPref('street2');
 }
 
 //get zip code
 function getZipCode(){
-	return getPref().getCharPref('zipcode');
+    return getPref().getCharPref('zipcode');
 }
 
 //get city name
 function getCity(){
-	return getPref().getCharPref('city');
+    return getPref().getCharPref('city');
 }
 
 //get country name
@@ -512,375 +512,375 @@ function getCountry(){
 
 //get state name
 function getState(){
-	return getPref().getCharPref('state');
+    return getPref().getCharPref('state');
 }
 
 //get office no
 function getOfficenumber(){
-	return getPref().getCharPref('officeno');
+    return getPref().getCharPref('officeno');
 }
 
 //get mobile no
 function getMobilenumber(){
-	return getPref().getCharPref('phoneno');
+    return getPref().getCharPref('phoneno');
 }
 
 //get fax no
 function getFax(){
-	return getPref().getCharPref('fax');
+    return getPref().getCharPref('fax');
 }
 
 
 //get email subject
 function getSubject(){
-	return getPref().getCharPref('subject');
+    return getPref().getCharPref('subject');
 }
 
 //get email received date
 function getReceivedDate(){
-	return getPref().getCharPref('receiveddate');
+    return getPref().getCharPref('receiveddate');
 }
 
 //get contact id which is used while storing mail contents after creating a new partner contact
 function getContactId(){
-	return getPref().getCharPref('contactid');
+    return getPref().getCharPref('contactid');
 }
 
 //get attachment option information from the configuration settings
 function getAttachValue(){
-	return getPref().getCharPref('attachvalue');
+    return getPref().getCharPref('attachvalue');
 }
 
 //get email cclist information
 function getCCList(){
-	return getPref().getCharPref('cclist');
+    return getPref().getCharPref('cclist');
 }
 
 //get email message body
 function getMessageBody(){
-	return getPref().getCharPref('messagebody');
+    return getPref().getCharPref('messagebody');
 }
 
 //get the whole server path
 function getServerUrl(){
-	return getServer()+":"+getPort()+"/"+getServerService();
+    return getServer()+":"+getPort()+"/"+getServerService();
 }
 
 //get user id for the xmlrpc request
 function getUserId(){
-	return getPref().getIntPref('userid');
+    return getPref().getIntPref('userid');
 }
 
 //Creates and returns and instance of the XML-RPC client
 function getClient() {
-	// Enable correct security
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	return Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient);
+    // Enable correct security
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    return Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient);
 }
 
 //returns the xmlrpc client instance
 function getXmlRpc() {
-	if (!xmlRpcClient) {
-		xmlRpcClient = getClient();
-	}
+    if (!xmlRpcClient) {
+        xmlRpcClient = getClient();
+    }
 
-	// Initialize the client with the URL
-	xmlRpcClient.init(getServerUrl());
-	return xmlRpcClient;
+    // Initialize the client with the URL
+    xmlRpcClient.init(getServerUrl());
+    return xmlRpcClient;
 }
 
 // function to get all basic parameters
 function getBasicList(){
-	var branchobj = getPref();
-	arrBasicList = [];
-	arrBasicList[0] = branchobj.getCharPref("serverdbname");
-	arrBasicList[1] = branchobj.getIntPref('userid');
-	arrBasicList[2] = branchobj.getCharPref("password");
-	arrBasicList[3] = getServer()
-	arrBasicList[4] = getPort()
-	return arrBasicList
+    var branchobj = getPref();
+    arrBasicList = [];
+    arrBasicList[0] = branchobj.getCharPref("serverdbname");
+    arrBasicList[1] = branchobj.getIntPref('userid');
+    arrBasicList[2] = branchobj.getCharPref("password");
+    arrBasicList[3] = getServer()
+    arrBasicList[4] = getPort()
+    return arrBasicList
 }
 
 function createMenuItem_db(aLabel) {
-  	const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-  	var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
-  	item.setAttribute("label", aLabel);
-	item.setAttribute("value", aLabel);
-  	return item;
+    const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
+    item.setAttribute("label", aLabel);
+    item.setAttribute("value", aLabel);
+    return item;
 }
 
 //xmlrpc request handler for getting the list of database
 var listDbHandler = {
-	onResult: function(client, context, result) {
-		setconnect_server("true")
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        setconnect_server("true")
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrMethodList.Count();
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlDbName = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
+        var count = arrMethodList.Count();
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlDbName = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
                         arrDbList[i] = strlDbName.data;
-		}
-		var database = ""
-		if (count > 0)
-		{
-			setDBList("true")
-			var label = document.getElementById("database_option");
-			var vbox = document.createElement("vbox");
-			var hbox = document.createElement("hbox");
-			var label1 = document.createElement("label");
-			label1.setAttribute("width","80");
-			label1.setAttribute("value","Database:");
-			label1.setAttribute("id","label111");
-			var menu1 = document.createElement("menulist");
-			var menupopup1 = document.createElement("menupopup");
-			menu1.setAttribute("id","DBlist");
-			menu1.setAttribute("width","300");
-			var menuitem1 = document.createElement("menuitem");
-			database = arrDbList[0]
-		  	menuitem1.setAttribute("label", arrDbList[0]);
-			menuitem1.setAttribute("value", arrDbList[0]);
-			menupopup1.appendChild(menuitem1);
-			menu1.appendChild(menupopup1)
-			hbox.appendChild(label1);
-			hbox.appendChild(menu1);
-			vbox.appendChild(hbox);
-			label.appendChild(vbox);
+        }
+        var database = ""
+        if (count > 0)
+        {
+            setDBList("true")
+            var label = document.getElementById("database_option");
+            var vbox = document.createElement("vbox");
+            var hbox = document.createElement("hbox");
+            var label1 = document.createElement("label");
+            label1.setAttribute("width","80");
+            label1.setAttribute("value","Database:");
+            label1.setAttribute("id","label111");
+            var menu1 = document.createElement("menulist");
+            var menupopup1 = document.createElement("menupopup");
+            menu1.setAttribute("id","DBlist");
+            menu1.setAttribute("width","300");
+            var menuitem1 = document.createElement("menuitem");
+            database = arrDbList[0]
+            menuitem1.setAttribute("label", arrDbList[0]);
+            menuitem1.setAttribute("value", arrDbList[0]);
+            menupopup1.appendChild(menuitem1);
+            menu1.appendChild(menupopup1)
+            hbox.appendChild(label1);
+            hbox.appendChild(menu1);
+            vbox.appendChild(hbox);
+            label.appendChild(vbox);
 
-			var d = document.getElementById("first"); 
-			var d_nested = document.getElementById("lbldb_list1"); 
-			var throwawayNode = d.removeChild(d_nested);
-			var d_nested = document.getElementById("DBlist_text"); 
-			var throwawayNode = d.removeChild(d_nested);
+            var d = document.getElementById("first"); 
+            var d_nested = document.getElementById("lbldb_list1"); 
+            var throwawayNode = d.removeChild(d_nested);
+            var d_nested = document.getElementById("DBlist_text"); 
+            var throwawayNode = d.removeChild(d_nested);
 
 
-		}
-		else
-		{
-			setDBList("false")
-		}
-		// Loop through the results, adding items to the list
-		if (count)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-			var popup = document.getElementById("DBlist"); // a <menupopup> element
-			var arrsec=new Array()
-			for (var i=0;i<popup.menupopup.childNodes.length;i++) {
-				arrsec.push(popup.menupopup.childNodes[i].label)
-			}
-			for (i=0;i<arrDbList.length;i++){
-				
-				if (arrsec.indexOf(arrDbList[i])==-1) {
- 					if (arrDbList[i] != database){
-						popup.menupopup.appendChild(createMenuItem_db(arrDbList[i]));
-					}
-				}
-			}
-		}
-	},
+        }
+        else
+        {
+            setDBList("false")
+        }
+        // Loop through the results, adding items to the list
+        if (count)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+            var popup = document.getElementById("DBlist"); // a <menupopup> element
+            var arrsec=new Array()
+            for (var i=0;i<popup.menupopup.childNodes.length;i++) {
+                arrsec.push(popup.menupopup.childNodes[i].label)
+            }
+            for (i=0;i<arrDbList.length;i++){
+                
+                if (arrsec.indexOf(arrDbList[i])==-1) {
+                    if (arrDbList[i] != database){
+                        popup.menupopup.appendChild(createMenuItem_db(arrDbList[i]));
+                    }
+                }
+            }
+        }
+    },
 
 
-	onFault: function (client, ctxt, fault) {
-		
-	},
+    onFault: function (client, ctxt, fault) {
+        
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        
+    }
 };
 //function to get the database list
 function getDbList(argControl)
 {
-	setDBList("false")
-	setconnect_server("false")
-	// Enable correct security
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	// Get the instance of the XML-RPC client
-	var xmlRpcClient = getXmlRpc();
-	arrDbList = [];
-	var cmbDbList = document.getElementById(argControl);
+    setDBList("false")
+    setconnect_server("false")
+    // Enable correct security
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    // Get the instance of the XML-RPC client
+    var xmlRpcClient = getXmlRpc();
+    arrDbList = [];
+    var cmbDbList = document.getElementById(argControl);
 
-	xmlRpcClient.asyncCall(listDbHandler,cmbDbList,'list',[],0);
-	return arrDbList;
+    xmlRpcClient.asyncCall(listDbHandler,cmbDbList,'list',[],0);
+    return arrDbList;
 }
 
 function createMenuItem_partner(aLabel, aValue) {
-  	const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-  	var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
-  	item.setAttribute("label", aLabel);
-	item.setAttribute("value", aValue);
-  	return item;
+    const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
+    item.setAttribute("label", aLabel);
+    item.setAttribute("value", aValue);
+    return item;
 }
 
 //xmlrpc request handler for getting the list of All objects
 var listAllDocumentHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrIdList.Count();
+        var count = arrIdList.Count();
 
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList[i] = arrDataPair;
-		}
-		if (context)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-			var popup = document.getElementById("section"); // a <menupopup> element
-			for (i=0;i<arrPartnerList.length;i++){
-				popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
-			}
-		}
-		popup_display = "no"
-		searchCheckbox()
-	},
-	onFault: function (client, ctxt, fault) {
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList[i] = arrDataPair;
+        }
+        if (context)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+            var popup = document.getElementById("section"); // a <menupopup> element
+            for (i=0;i<arrPartnerList.length;i++){
+                popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
+            }
+        }
+        popup_display = "no"
+        searchCheckbox()
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 var listAllCountryHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
-		var count = arrIdList.Count();
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
           
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList[i] = arrDataPair;
-		}
-		if (!context)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-			var popup = document.getElementById("country"); // a <menupopup> element
-			for (i=0;i<arrPartnerList.length;i++){
-				popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
-			}
-		}
-	       
-	},
-	onFault: function (client, ctxt, fault) {
-		
-	},
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList[i] = arrDataPair;
+        }
+        if (!context)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+            var popup = document.getElementById("country"); // a <menupopup> element
+            for (i=0;i<arrPartnerList.length;i++){
+                popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
+            }
+        }
+           
+    },
+    onFault: function (client, ctxt, fault) {
+        
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        
+    }
 }
 
 var listAllStateHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrIdList.Count();
+        var count = arrIdList.Count();
         
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList1[i] = arrDataPair;
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList1[i] = arrDataPair;
 
           
-		}
-		if (!context)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+        }
+        if (!context)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-			var popup = document.getElementById("state"); 
+            var popup = document.getElementById("state"); 
             // a <menupopup> element
-			for (i=0;i<arrPartnerList1.length;i++){
-				popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList1[i][1],arrPartnerList1[i][0]));
+            for (i=0;i<arrPartnerList1.length;i++){
+                popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList1[i][1],arrPartnerList1[i][0]));
 
-			}
+            }
           //  popup.menupopup.selectedItem = popup.menupopup.firstChild;
-		}
-	
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 
 //function to get the list of All object
 function getAllDocument(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList = [];
-	var end = document.getElementById("section")
-	length = end.itemCount
-	for (i = 0; i < length; i++) {
-		end.removeItemAt(0)
-	}
-	var cmdObjectList = document.getElementById("section");
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'list_alldocument';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = ""
-	xmlRpcClient.asyncCall(listAllDocumentHandler,cmdObjectList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList = [];
+    var end = document.getElementById("section")
+    length = end.itemCount
+    for (i = 0; i < length; i++) {
+        end.removeItemAt(0)
+    }
+    var cmdObjectList = document.getElementById("section");
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'list_alldocument';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = ""
+    xmlRpcClient.asyncCall(listAllDocumentHandler,cmdObjectList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 function getAllCountry(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList = [];
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'list_allcountry';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = document.getElementById("country").value;
-	xmlRpcClient.asyncCall(listAllCountryHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList = [];
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'list_allcountry';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = document.getElementById("country").value;
+    xmlRpcClient.asyncCall(listAllCountryHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 function getAllState(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList1 = [];
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList1 = [];
     var state = document.getElementById('state').menupopup;
     while (state.firstChild) 
      {
@@ -889,40 +889,40 @@ function getAllState(){
     };
 
 
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'list_allstate';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = document.getElementById("country").value;
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'list_allstate';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = document.getElementById("country").value;
     xmlRpcClient.asyncCall(listAllStateHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 
 //function to create array object to pass as an parameter for xmlrpc request
 function dictcreation(value,checkboxobj){
-	var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strkey.data = value;
-	test.AppendElement(strkey);
-	temp.AppendElement(test);
-	var test1 = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	for(i=0;i<checkboxobj.length;i++){
-		var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strvalue.data = checkboxobj[i];
-		test1.AppendElement(strvalue);
-	}
-	if(checkboxobj.length>0){
-		temp.AppendElement(test1);
-	}
-	return temp;
+    var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strkey.data = value;
+    test.AppendElement(strkey);
+    temp.AppendElement(test);
+    var test1 = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    for(i=0;i<checkboxobj.length;i++){
+        var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strvalue.data = checkboxobj[i];
+        test1.AppendElement(strvalue);
+    }
+    if(checkboxobj.length>0){
+        temp.AppendElement(test1);
+    }
+    return temp;
 }
 
 //function to search and fillup section selection box
@@ -937,41 +937,41 @@ function createMenuItem(aLabel) {
 
 var listinstallmodulehandler = {
     onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
-		var count = arrIdList.Count();
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
         if (count > 0) 
         { 
-	        setmodule_install('yes')
+            setmodule_install('yes')
         }
-	
-	},
-	onFault: function (client, ctxt, fault) {
+    
+    },
+    onFault: function (client, ctxt, fault) {
         setmodule_install('no')
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
         setmodule_install('no')
-	}
+    }
 }
 
 function module_install()
 {
-	setmodule_install("no")
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
+    setmodule_install("no")
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
     var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'name_search';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'ir.model';
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'name_search';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'ir.model';
     var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
     strvalue.data = 'thunderbird.partner';
     xmlRpcClient.asyncCall(listinstallmodulehandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod, strvalue],6);
@@ -980,13 +980,13 @@ function module_install()
 
 
 var listSearchContactHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
         var sendername = getSenderEmail();
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
-		var count = arrIdList.Count();
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
             var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
             var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
             if(strlSearchResult=="partner_name"){
@@ -1037,27 +1037,27 @@ var listSearchContactHandler = {
             if(strlSearchResult=="res_id"){
                  setResourceId(strlSearchResultValue);
                  var t = getResourceId();}
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 
 }
 
 var listSearchContactdetailHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
      //  var sendername = getSenderEmail();
         var sendername = document.getElementById("txtemail").value
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
-		var count = arrIdList.Count();
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
             var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
             var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
             if(strlSearchResult=="email" && strlSearchResultValue=='')
@@ -1098,316 +1098,316 @@ var listSearchContactdetailHandler = {
                  setResourceId(strlSearchResultValue);
                  var t = getResourceId();}
 
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 
 }
 
 function searchContactdetail()
 {
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var cmbSearchList = document.getElementById('listSearchBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var cmbSearchList = document.getElementById('listSearchBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
     var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_contact';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = document.getElementById("txtemail").value;
-	xmlRpcClient.asyncCall(listSearchContactdetailHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
+    strobj.data = 'thunderbird.partner';
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_contact';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = document.getElementById("txtemail").value;
+    xmlRpcClient.asyncCall(listSearchContactdetailHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
 }
 
 //xmlrpc request handler for getting the search results for the particular selected check box object
 var listSearchCheckboxHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrMethodList.Count();
-		var close=0;
-		if(count == 0  && popup_display != "no"){
-			alert("No Records Found");
-			return false;
-		}
-		else if(count ==2 )
-		{
-			if (arrMethodList.QueryElementAt(0, Components.interfaces.nsISupportsCString)=="error")
-			{
-				close =1;
-			}
-		}
-		popup_display = "yes"
-		// Loop through the results, adding items to the list
-		var arr1 = new Array();
-		var arr2 = new Array();
-		var flag1 = 0;
-		var flag2 = 0;
-		var er ="";
-		var er_val =new Array();
-		for (i = 0; i < count; i++) 
-		{
-			if(i%2==0){
-				if (arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString)=="error")
-				{
-					er = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
-					er_val[0] =arrMethodList.QueryElementAt(i+1, Components.interfaces.nsISupportsArray);
-					i +=1;
-					continue;
-				}
-				arr1[flag1] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
-				flag1++;
-			}
-			else{
-				arr2[flag2] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-				flag2++;
-			}
-		}
-		if (er)
-		{
-			var arrSearchList1 = new Array();
-			for(j=0;j<er_val[0].Count();j++)
-			{
-				var arrDataPair = new Array();
-				arrDataPair[0] = er_val[0].QueryElementAt(j, Components.interfaces.nsISupportsCString)
-				arrSearchList1[j]=arrDataPair;
-			}
-			alert( arrSearchList1 + "  Model not exists")
-			if (close == 1)
-			{
-				alert("No Records Found");
-				return false;
-			}
-		}
-		for (i = 0; i < arr2.length; i++) {
-			var arrSearchList1 = new Array();
-			for(j=0;j<arr2[i].Count();j++){
-				var strlSearchResult = arr2[i].QueryElementAt(j, Components.interfaces.nsISupportsArray);
-				var resultcount = strlSearchResult.Count();
-				var arrDataPair = new Array();
-				arrDataPair[0] = strlSearchResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
-				arrDataPair[1] = strlSearchResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-				arrDataPair[2] = arr1[i];
-				arrSearchList1[j] = arrDataPair;
-			}
-			arrFinalList[i]=arrSearchList1;
-		}
-		if (context)
-		{
+        var count = arrMethodList.Count();
+        var close=0;
+        if(count == 0  && popup_display != "no"){
+            alert("No Records Found");
+            return false;
+        }
+        else if(count ==2 )
+        {
+            if (arrMethodList.QueryElementAt(0, Components.interfaces.nsISupportsCString)=="error")
+            {
+                close =1;
+            }
+        }
+        popup_display = "yes"
+        // Loop through the results, adding items to the list
+        var arr1 = new Array();
+        var arr2 = new Array();
+        var flag1 = 0;
+        var flag2 = 0;
+        var er ="";
+        var er_val =new Array();
+        for (i = 0; i < count; i++) 
+        {
+            if(i%2==0){
+                if (arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString)=="error")
+                {
+                    er = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
+                    er_val[0] =arrMethodList.QueryElementAt(i+1, Components.interfaces.nsISupportsArray);
+                    i +=1;
+                    continue;
+                }
+                arr1[flag1] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
+                flag1++;
+            }
+            else{
+                arr2[flag2] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+                flag2++;
+            }
+        }
+        if (er)
+        {
+            var arrSearchList1 = new Array();
+            for(j=0;j<er_val[0].Count();j++)
+            {
+                var arrDataPair = new Array();
+                arrDataPair[0] = er_val[0].QueryElementAt(j, Components.interfaces.nsISupportsCString)
+                arrSearchList1[j]=arrDataPair;
+            }
+            alert( arrSearchList1 + "  Model not exists")
+            if (close == 1)
+            {
+                alert("No Records Found");
+                return false;
+            }
+        }
+        for (i = 0; i < arr2.length; i++) {
+            var arrSearchList1 = new Array();
+            for(j=0;j<arr2[i].Count();j++){
+                var strlSearchResult = arr2[i].QueryElementAt(j, Components.interfaces.nsISupportsArray);
+                var resultcount = strlSearchResult.Count();
+                var arrDataPair = new Array();
+                arrDataPair[0] = strlSearchResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+                arrDataPair[1] = strlSearchResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+                arrDataPair[2] = arr1[i];
+                arrSearchList1[j] = arrDataPair;
+            }
+            arrFinalList[i]=arrSearchList1;
+        }
+        if (context)
+        {
 
-			var row_count = context.getRowCount();
-			var cmbSearchList = document.getElementById('listSearchBox');
-			for (i=0;i<row_count;i++)
-			{
-				context.removeItemAt(0);
-			}
-			for (i=0;i<arrFinalList.length;i++)
-			{
-				for(j=0;j<arrFinalList[i].length;j++){
-				//creates the dynamic listbox which shows the searched records for the selected object in checkbox
-					var listcell = document.createElement("listcell");
-					var	listItem = document.createElement("listitem");
+            var row_count = context.getRowCount();
+            var cmbSearchList = document.getElementById('listSearchBox');
+            for (i=0;i<row_count;i++)
+            {
+                context.removeItemAt(0);
+            }
+            for (i=0;i<arrFinalList.length;i++)
+            {
+                for(j=0;j<arrFinalList[i].length;j++){
+                //creates the dynamic listbox which shows the searched records for the selected object in checkbox
+                    var listcell = document.createElement("listcell");
+                    var listItem = document.createElement("listitem");
 
-					var objectcharpref = getPref().getCharPref("object").split(',');
-					var imagecharpref = getPref().getCharPref("imagename").split(',');
-					var imagename = ''
-					for(k=0;k<objectcharpref.length;k++){
-						if(arr1[i] == objectcharpref[k]){
-							imagename = imagecharpref[k]
-						}
-					}
+                    var objectcharpref = getPref().getCharPref("object").split(',');
+                    var imagecharpref = getPref().getCharPref("imagename").split(',');
+                    var imagename = ''
+                    for(k=0;k<objectcharpref.length;k++){
+                        if(arr1[i] == objectcharpref[k]){
+                            imagename = imagecharpref[k]
+                        }
+                    }
 
-					listcell.setAttribute("image",imagename); // stores the image of the object
-					listcell.setAttribute("class","listcell-iconic");
-					listcell.setAttribute("width",12);
-					listcell.setAttribute("height",12);
-					listcell.setAttribute("label",arrFinalList[i][j][1]); //stores the name ofthe record
-		  			listItem.appendChild(listcell);
-		  			listItem.value = arrFinalList[i][j][0]; //stores the id of the record
-		  			listItem.label = arr1[i]; // stores the value of the object   
-					cmbSearchList.appendChild(listItem);
-		  		}
-			}
-		}
-	},
+                    listcell.setAttribute("image",imagename); // stores the image of the object
+                    listcell.setAttribute("class","listcell-iconic");
+                    listcell.setAttribute("width",12);
+                    listcell.setAttribute("height",12);
+                    listcell.setAttribute("label",arrFinalList[i][j][1]); //stores the name ofthe record
+                    listItem.appendChild(listcell);
+                    listItem.value = arrFinalList[i][j][0]; //stores the id of the record
+                    listItem.label = arr1[i]; // stores the value of the object   
+                    cmbSearchList.appendChild(listItem);
+                }
+            }
+        }
+    },
 
-	onFault: function (client, ctxt, fault) {
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 };
 
 //function to search the records of selected checkbox object
 function searchCheckbox()
 {
-	var checkboxlist = getnamesearch();
-	if(checkboxlist.length == 0){
-		alert("Please Select One or More Document");
-		return false;
-	}
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var end = document.getElementById('listSearchBox').getRowCount();
-	for(i=0; i< end; i++){
-		document.getElementById('listSearchBox').removeItemAt(0);
-	}
-	var cmbSearchList = document.getElementById('listSearchBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_checkbox';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = document.getElementById('txtvalueobj').value;
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var arrofarr = dictcreation(strname,checkboxlist);
-	xmlRpcClient.asyncCall(listSearchCheckboxHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,arrofarr ],6);
+    var checkboxlist = getnamesearch();
+    if(checkboxlist.length == 0){
+        alert("Please Select One or More Document");
+        return false;
+    }
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var end = document.getElementById('listSearchBox').getRowCount();
+    for(i=0; i< end; i++){
+        document.getElementById('listSearchBox').removeItemAt(0);
+    }
+    var cmbSearchList = document.getElementById('listSearchBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_checkbox';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = document.getElementById('txtvalueobj').value;
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var arrofarr = dictcreation(strname,checkboxlist);
+    xmlRpcClient.asyncCall(listSearchCheckboxHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,arrofarr ],6);
 }
 
 function searchContact()
 {
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var cmbSearchList = document.getElementById('listSearchBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var cmbSearchList = document.getElementById('listSearchBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
     var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_contact';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = getSenderEmail();
-  	
-	xmlRpcClient.asyncCall(listSearchContactHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
+    strobj.data = 'thunderbird.partner';
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_contact';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = getSenderEmail();
+    
+    xmlRpcClient.asyncCall(listSearchContactHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
 }
 
 //xmlrpc request handler for getting the list of partners
 var listPartnerHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrIdList.Count();
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList[i] = arrDataPair;
-		}
-		if (context)
-		{
-			var row_count = context.getRowCount();
-			var cmdPartnerList = document.getElementById('listPartnerBox');
-			for (i=0;i<row_count;i++)
-			{
-				context.removeItemAt(0);
-			}
-			for (i=0;i<arrPartnerList.length;i++)
-			{
-				var listcell = document.createElement("listcell");
-				var listItem = document.createElement("listitem");
-				listcell.setAttribute("label",arrPartnerList[i][1]);
-	  			listItem.appendChild(listcell);
-	  			listItem.value = arrPartnerList[i][0];
-	  			cmdPartnerList.appendChild(listItem);
-			}
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        var count = arrIdList.Count();
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList[i] = arrDataPair;
+        }
+        if (context)
+        {
+            var row_count = context.getRowCount();
+            var cmdPartnerList = document.getElementById('listPartnerBox');
+            for (i=0;i<row_count;i++)
+            {
+                context.removeItemAt(0);
+            }
+            for (i=0;i<arrPartnerList.length;i++)
+            {
+                var listcell = document.createElement("listcell");
+                var listItem = document.createElement("listitem");
+                listcell.setAttribute("label",arrPartnerList[i][1]);
+                listItem.appendChild(listcell);
+                listItem.value = arrPartnerList[i][0];
+                cmdPartnerList.appendChild(listItem);
+            }
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to get the list of partners
 function getPartnerList(){
-	var branchobj = getPref();
-	window.opener.document.getElementById('txtselectpartner').setAttribute('value','');
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList = [];
-	var end = document.getElementById('listPartnerBox').getRowCount();
-	for(i=0; i< end; i++){
-		document.getElementById('listPartnerBox').removeItemAt(0);
-	}
-	var cmdPartnerList = document.getElementById('listPartnerBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'name_search';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'res.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = document.getElementById('txtselectpartner').value;
-	xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
+    var branchobj = getPref();
+    window.opener.document.getElementById('txtselectpartner').setAttribute('value','');
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList = [];
+    var end = document.getElementById('listPartnerBox').getRowCount();
+    for(i=0; i< end; i++){
+        document.getElementById('listPartnerBox').removeItemAt(0);
+    }
+    var cmdPartnerList = document.getElementById('listPartnerBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'name_search';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'res.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = document.getElementById('txtselectpartner').value;
+    xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 
 //function to create the xmlrpc supported variables for xmlrpc request
 function dictcontact(a,b){
-	var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	for(i=0;i<a.length;i++){
-		var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strkey.data = a[i]
-		var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strvalue.data = b[i]
-		var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-		test.AppendElement(strkey);
-		test.AppendElement(strvalue);
-		temp.AppendElement(test);
-	}
-	return temp;
+    var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    for(i=0;i<a.length;i++){
+        var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strkey.data = a[i]
+        var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strvalue.data = b[i]
+        var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+        test.AppendElement(strkey);
+        test.AppendElement(strvalue);
+        temp.AppendElement(test);
+    }
+    return temp;
 }
 
 //xmlrpc request handler for creating the record of mail
 var listArchiveHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
         list_documents = document.getElementById('listSearchBox')
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
         createId = parseInt(createId);
         if(createId==0)
         {
@@ -1425,42 +1425,42 @@ var listArchiveHandler = {
         }
     window.close();
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to archive the mail content through xmlrpc request
 
 function parse_eml(){
-	var fpath =""
-	if(navigator.userAgent.indexOf('Linux')!= -1){
-		fpath ="/tmp/"
-	}
-	else if(navigator.userAgent.indexOf('Win')!= -1){
-		fpath ="C:\\"
-	}
-	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-		fpath ="/tmp/"
-	} 
+    var fpath =""
+    if(navigator.userAgent.indexOf('Linux')!= -1){
+        fpath ="/tmp/"
+    }
+    else if(navigator.userAgent.indexOf('Win')!= -1){
+        fpath ="C:\\"
+    }
+    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+        fpath ="/tmp/"
+    } 
 
-	name = fpath + getFileName() +".eml"
-	var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-	file.initWithPath( name );
-	if ( file.exists() == false ) {
-		return null;
-	} else {
-		var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
-		is.init( file,0x01, 00004, null);
-		var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
-		sis.init( is );
-		var output = sis.read( sis.available() );
-		return output
+    name = fpath + getFileName() +".eml"
+    var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+    file.initWithPath( name );
+    if ( file.exists() == false ) {
+        return null;
+    } else {
+        var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
+        is.init( file,0x01, 00004, null);
+        var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
+        sis.init( is );
+        var output = sis.read( sis.available() );
+        return output
     }
     
 }
@@ -1471,33 +1471,33 @@ function upload_archivemail()
     var cnt = list_documents.selectedCount
     var ref_ids = "";
     var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'history_message';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'history_message';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
 
-	for(i=0;i<cnt;i++)
-	{	
+    for(i=0;i<cnt;i++)
+    {   
         var object = list_documents.getSelectedItem(i);
-		var eml_string = parse_eml();
+        var eml_string = parse_eml();
         ref_ids += object.label;
         ref_ids += ",";
         ref_ids += object.value;
         if (i < cnt-1){ref_ids += ";";}
-		
+        
     }
     var a = ['ref_ids','message'];
-	var b = [ref_ids, eml_string];
+    var b = [ref_ids, eml_string];
     var arrofarr = dictcontact(a,b);
 
     xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
@@ -1505,154 +1505,154 @@ function upload_archivemail()
 }
 
 var listArchiveDocumentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
         var popup = document.getElementById("section").selectedItem; 
         alert("Document Created Successfully For " +" " + ":" + " "+ popup.label);
-		window.close();
+        window.close();
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 function create_archivemail(){
-	var popup = document.getElementById("section").selectedItem; 
+    var popup = document.getElementById("section").selectedItem; 
     // a <menupopup> element
 
-	if (String(popup) != "null"){
-		object=popup.value;
-		if (object == undefined) { alert("select At Least one Document !")}
-		else{
-		var branchobj = getPref();
-		setServerService('xmlrpc/object');
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var xmlRpcClient = getXmlRpc();
-		var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strDbName.data = branchobj.getCharPref("serverdbname");
-		var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-		struids.data = branchobj.getIntPref('userid');
-		var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strpass.data = branchobj.getCharPref("password");
-		var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strmethod.data = 'process_email';
-		var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strobj.data = 'thunderbird.partner';
+    if (String(popup) != "null"){
+        object=popup.value;
+        if (object == undefined) { alert("select At Least one Document !")}
+        else{
+        var branchobj = getPref();
+        setServerService('xmlrpc/object');
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var xmlRpcClient = getXmlRpc();
+        var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strDbName.data = branchobj.getCharPref("serverdbname");
+        var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+        struids.data = branchobj.getIntPref('userid');
+        var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strpass.data = branchobj.getCharPref("password");
+        var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strmethod.data = 'process_email';
+        var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strobj.data = 'thunderbird.partner';
         var eml_string = parse_eml()
-		var a = ['model', 'message'];
-		var b = [object, eml_string];
-		var arrofarr = dictcontact(a,b);
-		xmlRpcClient.asyncCall(listArchiveDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+        var a = ['model', 'message'];
+        var b = [object, eml_string];
+        var arrofarr = dictcontact(a,b);
+        xmlRpcClient.asyncCall(listArchiveDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
         //alert("Document Created Successfully For " +" " + ":" + " "+ popup.label);
-		}
-    	//window.close();
-	}
-	else
-	{
-		alert(" select At Least one Document !")
-	}
+        }
+        //window.close();
+    }
+    else
+    {
+        alert(" select At Least one Document !")
+    }
 }
 
 
 //xmlrpc request handler for creating a new contact
 var listCreateContactHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-		setContactId(createId);
-		alert("Contact Created Successfully.");	
-		window.close();
-	},
-	onFault: function (client, ctxt, fault) {
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        setContactId(createId);
+        alert("Contact Created Successfully."); 
+        window.close();
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 var listUpdateContactHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
         alert("Contact Update Successfully.");
         window.close();
-		var partnerId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-		setResourceId(partnerId);
-		window.close();
-	},
-	onFault: function (client, ctxt, fault) {
+        var partnerId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        setResourceId(partnerId);
+        window.close();
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to create a new contact
 function createContact(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'create_contact';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var a = ['partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
-	var b = [getPartnerId(),document.getElementById("txtname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'create_contact';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var a = ['partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
+    var b = [getPartnerId(),document.getElementById("txtname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 function UpdateContact(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'update_contact';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var a = ['res_id','partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
-	var b = [getResourceId(),document.getElementById("txtselectpartner").value,document.getElementById("txtcontactname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listUpdateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'update_contact';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var a = ['res_id','partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
+    var b = [getResourceId(),document.getElementById("txtselectpartner").value,document.getElementById("txtcontactname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listUpdateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 //xmlrpc request handler for creating a attachment record
 var listAttachHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 
@@ -1729,30 +1729,30 @@ return output;
 
 //function to read the contents of the attachment files from the temp folder
 function createInstance(name,test){
-	var encoded_string = '';
-	var file_name = ''
+    var encoded_string = '';
+    var file_name = ''
 
-	for(i=0;i<test.length;i++){
-		var stream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
-		stream.init(test[i], 0x01, 00004, 0);
-		var bstream = Components.classes["@mozilla.org/binaryinputstream;1"].createInstance(Components.interfaces.nsIBinaryInputStream);
-		bstream.setInputStream(stream);
-		var r = new Array();
-	    	var fileContents = bstream.readByteArray(bstream.available(),r);
-		bstream.close();
-		var printstring = '';
-		for(j=0;j<fileContents.length;j++)
-		{
-			printstring += String.fromCharCode(fileContents[j]);
-		}
-		encoded_string += encode64(printstring)+',';
-		file_name += name[i]+',';
-		test[i].remove(true);
-	}
-	encoded_string = encoded_string.substring(0,encoded_string.length-1);
-	file_name = file_name.substring(0,file_name.length-1);
-	getPref().setCharPref('displayName',file_name);
-	getPref().setCharPref('attachmentdata',encoded_string);
+    for(i=0;i<test.length;i++){
+        var stream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+        stream.init(test[i], 0x01, 00004, 0);
+        var bstream = Components.classes["@mozilla.org/binaryinputstream;1"].createInstance(Components.interfaces.nsIBinaryInputStream);
+        bstream.setInputStream(stream);
+        var r = new Array();
+            var fileContents = bstream.readByteArray(bstream.available(),r);
+        bstream.close();
+        var printstring = '';
+        for(j=0;j<fileContents.length;j++)
+        {
+            printstring += String.fromCharCode(fileContents[j]);
+        }
+        encoded_string += encode64(printstring)+',';
+        file_name += name[i]+',';
+        test[i].remove(true);
+    }
+    encoded_string = encoded_string.substring(0,encoded_string.length-1);
+    file_name = file_name.substring(0,file_name.length-1);
+    getPref().setCharPref('displayName',file_name);
+    getPref().setCharPref('attachmentdata',encoded_string);
 
 
 }
@@ -1769,348 +1769,351 @@ function check_module_install(count){
 }
     
 var listLoginHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
-		if(login.type == 12){
-			login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
-			setUserId(login.data);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
+        if(login.type == 12){
+            login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
+            setUserId(login.data);
             module_install();
             alert('Successfully Login To OpenERP.');
             window.close();
-		}
-		else{
-			alert("Login Failed");
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+        else{
+            alert("Login Failed");
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		alert("Database does not Exist!\n\n Please specify proper database name.");
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        alert("Database does not Exist!\n\n Please specify proper database name.");
+    }
 }
 
 
 //function to check the login information
 function testConnection(){
-	if (getconnect_server() == "false")
-	{
-		alert("Server is Not Running...Please check it!!"+" "+getServer())
-		return false;
-	}
-	if (getDBList()=="false")
-	{
-		if (document.getElementById('DBlist_text').value =='')
-		{
-			alert("You Must Enter Database Name.");
-			return false;
-		}
-		setDbName(document.getElementById('DBlist_text').value);
-	}
-	else
-	{
-		if (document.getElementById('DBlist').value == 0 || document.getElementById('DBlist').value =="--select--")
-		{
-			alert("You Must Select Database Name.");
-			return false;
-		}
-		setDbName(document.getElementById('DBlist').value);
-	}
-	var branchobj = getPref();
-	setServer(document.getElementById('txturl').value);
-    	var s = document.getElementById('txturl').value;
-	var a =s.split(':');
-	setPort(a[a.length-1]);
-	setUsername(document.getElementById('txtusername').value);
-	setPassword(document.getElementById('txtpassword').value);
-	setServerService('xmlrpc/common');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = getPref().getCharPref('serverdbname');
-	var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strusername.data = getPref().getCharPref('username');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = getPref().getCharPref('password');
-	xmlRpcClient.asyncCall(listLoginHandler,null,'login',[strDbName,strusername,strpass],3);
+    if (getconnect_server() == "false")
+    {
+        alert("Server is Not Running...Please check it!!"+" "+getServer())
+        return false;
+    }
+    if (getDBList()=="false")
+    {
+        if (document.getElementById('DBlist_text').value =='')
+        {
+            alert("You Must Enter Database Name.");
+            return false;
+        }
+        setDbName(document.getElementById('DBlist_text').value);
+    }
+    else
+    {
+        if (document.getElementById('DBlist').value == 0 || document.getElementById('DBlist').value =="--select--")
+        {
+            alert("You Must Select Database Name.");
+            return false;
+        }
+        setDbName(document.getElementById('DBlist').value);
+    }
+    var branchobj = getPref();
+    setServer(document.getElementById('txturl').value);
+        var s = document.getElementById('txturl').value;
+    var a =s.split(':');
+    setPort(a[a.length-1]);
+    setUsername(document.getElementById('txtusername').value);
+    setPassword(document.getElementById('txtpassword').value);
+    setServerService('xmlrpc/common');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = getPref().getCharPref('serverdbname');
+    var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strusername.data = getPref().getCharPref('username');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = getPref().getCharPref('password');
+    xmlRpcClient.asyncCall(listLoginHandler,null,'login',[strDbName,strusername,strpass],3);
     
 }
 
 function testConnection_web(){
-	var branchobj = getPref();
+    var branchobj = getPref();
     weburl = getWebServerURL();
-    window.open(weburl, "", "chrome","resizable=yes,scrollbars=yes,status=yes");
+//    window.open(weburl, "", "chrome","resizable=yes,scrollbars=yes,status=yes");
+    var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+    messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
+    messenger.launchExternalURL(weburl);
     
 }
 
 //xmlrpc request handler for handling the login information
 var listcreateLoginHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
-		setconnect_server("true")		
-		if(login.type == 12){
-			login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
-			setUserId(login.data);
-		}
-		else{
-			alert("Login Failed.");
-		}
-	},
-	onFault: function (client, ctxt, fault) {
-		
-	},
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
+        setconnect_server("true")       
+        if(login.type == 12){
+            login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
+            setUserId(login.data);
+        }
+        else{
+            alert("Login Failed.");
+        }
+    },
+    onFault: function (client, ctxt, fault) {
+        
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		setconnect_server("false")
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        setconnect_server("false")
+    }
 }
 
 //function to check the login information
 function createConnection(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/common');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = getPref().getCharPref('serverdbname');
-	var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strusername.data = getPref().getCharPref('username');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = getPref().getCharPref('password');
-	xmlRpcClient.asyncCall(listcreateLoginHandler,null,'login',[strDbName,strusername,strpass],3);
+    var branchobj = getPref();
+    setServerService('xmlrpc/common');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = getPref().getCharPref('serverdbname');
+    var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strusername.data = getPref().getCharPref('username');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = getPref().getCharPref('password');
+    xmlRpcClient.asyncCall(listcreateLoginHandler,null,'login',[strDbName,strusername,strpass],3);
 }
 
 //xmlrpc request handler for handling the partner information
 var listCreatePartnerHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
         setPartnerId(createId);
         txtselectpartner = document.getElementById('txtselectpartner')
-		if(typeof(createId.data) == 'number' && createId!=0){
+        if(typeof(createId.data) == 'number' && createId!=0){
          window.opener.document.getElementById('txtselectpartner').setAttribute('value',txtselectpartner.value);
-			window.close();
-		}
-		if(createId == 0){
-			alert("Partner Already Exist.");
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+            window.close();
+        }
+        if(createId == 0){
+            alert("Partner Already Exist.");
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 //function to create the tiny partner object
 function createPartner(){
-	var branchobj = getPref();
+    var branchobj = getPref();
     txtselectpartner = document.getElementById('txtselectpartner')
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'create_partner';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	if(document.getElementById('txtselectpartner').value ==''){
-		alert("You Must Enter Partner Name.");
-		return false;
-	}
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'create_partner';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    if(document.getElementById('txtselectpartner').value ==''){
+        alert("You Must Enter Partner Name.");
+        return false;
+    }
     setPartnerId(txtselectpartner.value)
-	var a = ['partner_id','name'];
-	var b = [getPartnerId(),txtselectpartner.value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listCreatePartnerHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var a = ['partner_id','name'];
+    var b = [getPartnerId(),txtselectpartner.value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listCreatePartnerHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 //xmlrpc request handler for handling the object information
 var listSearchDocumentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var searchResult = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-		if(searchResult.data == 0){
-			alert("Document Does Not Exist.");
-			return false;
-		}
-		var objvalue = getPref().getCharPref("listobject");
-		var objectvalue = getPref().getCharPref("object");
-		var imagevalue = getPref().getCharPref("imagename");
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var searchResult = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        if(searchResult.data == 0){
+            alert("Document Does Not Exist.");
+            return false;
+        }
+        var objvalue = getPref().getCharPref("listobject");
+        var objectvalue = getPref().getCharPref("object");
+        var imagevalue = getPref().getCharPref("imagename");
 
-		var objcharpref = getPref().getCharPref("listobject").split(',');
-		var objectcharpref = getPref().getCharPref("object").split(',');
-		var imagecharpref = getPref().getCharPref("imagename").split(',');
+        var objcharpref = getPref().getCharPref("listobject").split(',');
+        var objectcharpref = getPref().getCharPref("object").split(',');
+        var imagecharpref = getPref().getCharPref("imagename").split(',');
 
 
-		if(objectcharpref.indexOf(document.getElementById("txtobject").value) != -1){
-			alert("Document already in List.");
-		}
-		else{
-			var	listItem = document.createElement("listitem");
-			var listcell1 = document.createElement("listcell");
-			var listcell2 = document.createElement("listcell");
-			var listcell3 = document.createElement("listcell");
-			listcell1.setAttribute("label",document.getElementById("txtobj").value);
-			listcell2.setAttribute("label",document.getElementById("txtobject").value);
-			listcell3.setAttribute("image",'file://'+document.getElementById("txtimagename").value);
-			listcell3.setAttribute("class","listcell-iconic")
-			listcell3.setAttribute("width",16)
-			listcell3.setAttribute("height",16)
-			listItem.appendChild(listcell1);
-		  	listItem.appendChild(listcell2);
-		  	listItem.appendChild(listcell3);
-		  	document.getElementById("listObjectListBox").appendChild(listItem)
-			if(getPref().getCharPref("object")!=''){
-				getPref().setCharPref("listobject",objvalue+','+document.getElementById("txtobj").value);
-				getPref().setCharPref("object",objectvalue+','+document.getElementById("txtobject").value);
-				getPref().setCharPref("imagename",imagevalue+','+"file://"+document.getElementById("txtimagename").value);
-			}
-			else{
-				getPref().setCharPref("listobject",document.getElementById("txtobj").value);
-				getPref().setCharPref("object",document.getElementById("txtobject").value);
-				getPref().setCharPref("imagename","file://"+document.getElementById("txtimagename").value);
-			}
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        if(objectcharpref.indexOf(document.getElementById("txtobject").value) != -1){
+            alert("Document already in List.");
+        }
+        else{
+            var listItem = document.createElement("listitem");
+            var listcell1 = document.createElement("listcell");
+            var listcell2 = document.createElement("listcell");
+            var listcell3 = document.createElement("listcell");
+            listcell1.setAttribute("label",document.getElementById("txtobj").value);
+            listcell2.setAttribute("label",document.getElementById("txtobject").value);
+            listcell3.setAttribute("image",'file://'+document.getElementById("txtimagename").value);
+            listcell3.setAttribute("class","listcell-iconic")
+            listcell3.setAttribute("width",16)
+            listcell3.setAttribute("height",16)
+            listItem.appendChild(listcell1);
+            listItem.appendChild(listcell2);
+            listItem.appendChild(listcell3);
+            document.getElementById("listObjectListBox").appendChild(listItem)
+            if(getPref().getCharPref("object")!=''){
+                getPref().setCharPref("listobject",objvalue+','+document.getElementById("txtobj").value);
+                getPref().setCharPref("object",objectvalue+','+document.getElementById("txtobject").value);
+                getPref().setCharPref("imagename",imagevalue+','+"file://"+document.getElementById("txtimagename").value);
+            }
+            else{
+                getPref().setCharPref("listobject",document.getElementById("txtobj").value);
+                getPref().setCharPref("object",document.getElementById("txtobject").value);
+                getPref().setCharPref("imagename","file://"+document.getElementById("txtimagename").value);
+            }
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to search the tiny objects for configuration settings
 function searchDocument(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_document';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	if(document.getElementById('txtobj').value =='' ){
-		alert("You Must Enter Document.");
-		return false;
-	}
-	if(document.getElementById('txtobject').value =='' ){
-		alert("You Must Enter Document Name.");
-		return false;
-	}
-	var a = ['model'];
-	var b = [document.getElementById('txtobject').value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listSearchDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_document';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    if(document.getElementById('txtobj').value =='' ){
+        alert("You Must Enter Document.");
+        return false;
+    }
+    if(document.getElementById('txtobject').value =='' ){
+        alert("You Must Enter Document Name.");
+        return false;
+    }
+    var a = ['model'];
+    var b = [document.getElementById('txtobject').value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listSearchDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 //xmlrpc request handler for list of search object exist in database or not.
 var listsearchAttachmentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var objectlist = result.QueryInterface(Components.interfaces.nsISupportsCString);
-		getPref().setCharPref('tempobject',objectlist)
-		document.getElementById("txtvalueobj").value= getSenderEmail();
-		var checkbox = document.getElementById("checkbox-dynamic");
-		
-		var object = preferenceBranch.getCharPref("listobject").split(',');
-		var obj = preferenceBranch.getCharPref("tempobject").split(',');
-		var imagelist = preferenceBranch.getCharPref("imagename").split(',');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var objectlist = result.QueryInterface(Components.interfaces.nsISupportsCString);
+        getPref().setCharPref('tempobject',objectlist)
+        //document.getElementById("txtvalueobj").value= getSenderEmail();
+        var checkbox = document.getElementById("checkbox-dynamic");
+        
+        var object = preferenceBranch.getCharPref("listobject").split(',');
+        var obj = preferenceBranch.getCharPref("tempobject").split(',');
+        var imagelist = preferenceBranch.getCharPref("imagename").split(',');
 
-		count = 0
-		if (object[0]!=''){
-			for(var i=0; i<object.length; i++){
-				if (obj[i] == "null")
-				{
-					continue
-				}
+        count = 0
+        if (object[0]!=''){
+            for(var i=0; i<object.length; i++){
+                if (obj[i] == "null")
+                {
+                    continue
+                }
 
-				if(count%3==0){
-					var vbox = document.createElement("hbox");
-				}
-				count += 1
-				var hbox = document.createElement("vbox");
-				var checkbox1 = document.createElement("checkbox");
+                if(count%3==0){
+                    var vbox = document.createElement("hbox");
+                }
+                count += 1
+                var hbox = document.createElement("vbox");
+                var checkbox1 = document.createElement("checkbox");
             
-				checkbox1.setAttribute("label",object[i]);
-				checkbox1.setAttribute("id","cbx"+(i+1));
-				checkbox1.setAttribute("width",150)
-				if (obj[i] =="res.partner.address")
-				{
-					checkbox1.setAttribute("checked",true);
-				}
-				if(i==0){
-					checkbox1.setAttribute("checked",true);
-				}
+                checkbox1.setAttribute("label",object[i]);
+                checkbox1.setAttribute("id","cbx"+(i+1));
+                checkbox1.setAttribute("width",150)
+                if (obj[i] =="res.partner.address")
+                {
+                    checkbox1.setAttribute("checked",true);
+                }
+                if(i==0){
+                    checkbox1.setAttribute("checked",true);
+                }
 
-				var image1 = document.createElement("image");
-				image1.setAttribute("src",imagelist[i]);
-				image1.setAttribute("width",16)
-				image1.setAttribute("height",16)
+                var image1 = document.createElement("image");
+                image1.setAttribute("src",imagelist[i]);
+                image1.setAttribute("width",16)
+                image1.setAttribute("height",16)
 
-				vbox.appendChild(image1);
-				hbox.appendChild(checkbox1);
-				vbox.appendChild(hbox);
-				checkbox.appendChild(vbox);
-			}
-		}
-		setTimeout("getAllDocument()", 0)
-		exis_grp = document.getElementById("existsobjectgroup")
-		new_grp = document.getElementById("newobjectgroup")
+                vbox.appendChild(image1);
+                hbox.appendChild(checkbox1);
+                vbox.appendChild(hbox);
+                checkbox.appendChild(vbox);
+            }
+        }
+        setTimeout("getAllDocument()", 0)
+        exis_grp = document.getElementById("existsobjectgroup")
+        new_grp = document.getElementById("newobjectgroup")
 
-		new_grp.height = parseInt(parseInt(new_grp.height) + parseInt((count /3) * 23.5))
-		win = document.getElementById("pluginwindows").setAttribute("height",1000)
+        new_grp.height = parseInt(parseInt(new_grp.height) + parseInt((count /3) * 23.5))
+        win = document.getElementById("pluginwindows").setAttribute("height",1000)
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to create a new attachment record
 function listSearchDocumentAttachment(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_document_attachment';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	var popup = document.getElementById("section").selectedItem; // a <menupopup> element
-	object=popup.value;
-	resobj.data = object;
-	var a = ['object'];
-	var b = [getPref().getCharPref("object")];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listsearchAttachmentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_document_attachment';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    var popup = document.getElementById("section").selectedItem; // a <menupopup> element
+    object=popup.value;
+    resobj.data = object;
+    var a = ['object'];
+    var b = [getPref().getCharPref("object")];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listsearchAttachmentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 
@@ -2118,57 +2121,57 @@ function listSearchDocumentAttachment(){
 
 function win_close()
 {
-	var fpath =""
-	if(navigator.userAgent.indexOf('Linux')!= -1){
-		fpath ="/tmp/"
-	}
-	else if(navigator.userAgent.indexOf('Win')!= -1){
-		fpath ="C:\\"
-	}
-	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-		fpath ="/tmp/"
-	} 
-	try
-	  {
-		name = fpath + getFileName() +".eml"
+    var fpath =""
+    if(navigator.userAgent.indexOf('Linux')!= -1){
+        fpath ="/tmp/"
+    }
+    else if(navigator.userAgent.indexOf('Win')!= -1){
+        fpath ="C:\\"
+    }
+    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+        fpath ="/tmp/"
+    } 
+    try
+      {
+        name = fpath + getFileName() +".eml"
 
-		var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-		file.initWithPath( name );
-		file.remove(true);
-		window.close();
-	  }
-	catch(err)
-	  {
-		window.close();
-	  }
+        var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+        file.initWithPath( name );
+        file.remove(true);
+        window.close();
+      }
+    catch(err)
+      {
+        window.close();
+      }
 }
 
 function attachmentWidnowOpen(msg)
 {
 
-		if (msg=="create")
-		{
-			var popup = document.getElementById("section").selectedItem; // a <menupopup> element
-			if (String(popup) != "null"){
-				object=popup.value;
-				if (object=="" || object == undefined) { alert("select at least one document !")}
-				else{
-					create_archivemail()
-				}
-			}
-			else
-			{
-				alert("select at least one Document !")
-			}
-		}
-		else if (msg=="upload")
-		{	
-			if(document.getElementById('listSearchBox').selectedItem)
-			{	
-				upload_archivemail()
-			}
-			else{
-				alert("Please select at least one record");
-			}
-		}
+        if (msg=="create")
+        {
+            var popup = document.getElementById("section").selectedItem; // a <menupopup> element
+            if (String(popup) != "null"){
+                object=popup.value;
+                if (object=="" || object == undefined) { alert("select at least one document !")}
+                else{
+                    create_archivemail()
+                }
+            }
+            else
+            {
+                alert("select at least one Document !")
+            }
+        }
+        else if (msg=="upload")
+        {   
+            if(document.getElementById('listSearchBox').selectedItem)
+            {   
+                upload_archivemail()
+            }
+            else{
+                alert("Please select at least one record");
+            }
+        }
 }
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
index fb257d70c95..e649eb92ced 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -1,11 +1,18 @@
-<!ENTITY tinyplugin "OpenERP Configuration">
-<!ENTITY tinypluginconfig "Push To OpenERP">
+<!ENTITY tinyplugin "Configuration">
+<!ENTITY tinypluginconfig "Push">
 <!ENTITY tinyarchive "Push to OpenERP">
-<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
-<!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp-icon.png">
-<!ENTITY partnericon.value "chrome://openerp_plugin/skin/partner_icon.png">
-<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/openerp.png">
+<!ENTITY menuicon.settings "chrome://openerp_plugin/skin/settings.png">
+<!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp.png">
+<!ENTITY partnericon.value "chrome://openerp_plugin/skin/openerp.png">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/openerp.png">
 <!ENTITY tooltip.value "Add To Archive">
 <!ENTITY pluginconfig.value "OpenERP Configuration Settings">
 <!ENTITY pluginconfigvalue.value "Archieve To OpenERP Settings">
+<!ENTITY openerpMenu.label "OpenERP">
+<!ENTITY openerpMenu.accesskey "OE">
+<!ENTITY openpartner.value "Partner">
+<!ENTITY openpartnertooltip.value "Click to Open Partner Realted to Sender Eamil address.">
+<!ENTITY opendocument.value "Document">
+<!ENTITY opendocumenttooltip.value "Click to See the Mail if it is archived to OpenERP.">
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
index 2f1a06ed341..cd00045c22a 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
@@ -1,6 +1,6 @@
 <!ENTITY title.label "Push To OpenERP">
 <!ENTITY gptinyobj.label "Link to an Existing Document">
-<!ENTITY newobject.label "New Documents">
+<!ENTITY newobject.label "Create a New Documents">
 <!ENTITY document.label "Documents">
 <!ENTITY bsearch.label "Search">
 <!ENTITY close.label "Close">
@@ -27,3 +27,5 @@
 <!ENTITY imagearchive.value "chrome://openerp_plugin/skin/Archive.png">
 <!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
 <!ENTITY gptinyobjexe.label "Documents">
+<!ENTITY newcontact.label "Create a New Contact">
+<!ENTITY listSearchBox.header2 "Document Type">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png
index 01ebf3f448f..b13f2b0f523 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png
index a2000121f88..5aa6a958d37 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png
index 8be68620e07..9b950b8ea9d 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png
index a0cc2cf0b56..9bd6f9f6059 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png
index 44b5213b203..1ab240c32cb 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png
index d4c977731ac..4551107ec3b 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png
index 666ee49a452..3761ff1e747 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png
index 6b7f01c996a..031d7532673 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png
deleted file mode 100644
index 023d9f84b48..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png
deleted file mode 100644
index 813342bdbe0..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png
index 07724103a56..c661339598e 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png
index 1903bf6a9e2..51451e422ae 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png
index c99badabbe3..0f8ea2af8f5 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png
index e594cd5a18d..1b0b44f890e 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png
index dfdbff2b1e5..52056b1e713 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png
index d770eda704a..54dc465b421 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png
deleted file mode 100644
index 1dd63b98787..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png
deleted file mode 100644
index cb20b0bdfc4..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png
new file mode 100644
index 00000000000..326798df2ec
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png
deleted file mode 100644
index f4450323c93..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png
new file mode 100644
index 00000000000..1b77bed23dd
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
index b1e78c0047e..0057dc4c879 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
index 90d73d94caf..741f4896fe9 100755
--- a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
+++ b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
@@ -24,7 +24,7 @@ pref("extensions.tiny.partnername","");
 pref("extensions.tiny.officeno","");
 pref("extensions.tiny.phoneno","");
 pref("extensions.tiny.address","");
-pref("extensions.tiny.listobject","Partner,Accout Invoice,Product,Sale Order,Lead and opportunities");
+pref("extensions.tiny.listobject","Partner,Account Invoice,Product,Sale Order,Lead and opportunities");
 pref("extensions.tiny.object","res.partner,account.invoice,product.product,sale.order,crm.lead");
 pref("extensions.tiny.imagename","chrome://openerp_plugin/skin/Partner.png,chrome://openerp_plugin/skin/Invoice.png,chrome://openerp_plugin/skin/Product.png,chrome://openerp_plugin/skin/Sale.png,chrome://openerp_plugin/skin/Case.png");
 pref("extensions.tiny.attachmentlength","");
diff --git a/addons/web_uservoice/LICENSE b/addons/web_uservoice/LICENSE
new file mode 100644
index 00000000000..27a1a4cf453
--- /dev/null
+++ b/addons/web_uservoice/LICENSE
@@ -0,0 +1,15 @@
+OpenERP, Open Source Management Solution
+Copyright © 2010 OpenERP SA (<http://openerp.com>).
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public Lice
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/web_uservoice/__init__.py b/addons/web_uservoice/__init__.py
new file mode 100644
index 00000000000..723a87ab410
--- /dev/null
+++ b/addons/web_uservoice/__init__.py
@@ -0,0 +1,19 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py
new file mode 100644
index 00000000000..974da96ef0d
--- /dev/null
+++ b/addons/web_uservoice/__openerp__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+{
+    'name': 'Add uservoice button in header',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': "",
+    'author': 'OpenERP s.a.',
+    'website': 'http://openerp.com',
+    'depends': ['base'],
+    'data': [],
+    'installable': True,
+    'active': False,
+    'web': True,
+    'certificate': '0040452504963885',
+}
diff --git a/addons/web_uservoice/web/__init__.py b/addons/web_uservoice/web/__init__.py
new file mode 100644
index 00000000000..c651b91f353
--- /dev/null
+++ b/addons/web_uservoice/web/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import editors
+import controllers
+
diff --git a/addons/web_uservoice/web/controllers.py b/addons/web_uservoice/web/controllers.py
new file mode 100644
index 00000000000..af3730b07b0
--- /dev/null
+++ b/addons/web_uservoice/web/controllers.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from openerp.controllers import SecuredController
+from openerp.utils import rpc
+from openobject.tools import expose
+import cherrypy
+
+class Root(SecuredController):
+
+    _cp_path = "/openerp"
+
+    @expose(mark_only=True)
+    def menu(self, active=None, next=None):
+        try:
+            menu_id = int(active)
+        except (TypeError, ValueError):
+            menu_id = False
+
+        menus = rpc.RPCProxy("ir.ui.menu")
+        ids = menus.search([('parent_id', '=', False)])
+        if next or active:
+            if not menu_id and ids:
+                menu_id = ids[0]
+
+        menu = ''
+        if menu_id:
+            ctx = dict(lang='NO_LANG')  # force loading original string even if the english have been translated...
+            menu = menus.read([menu_id], ['name'], ctx)[0]['name'] or ''
+
+        general_forum = 77459
+        forum = {
+            'accounting': 87921,
+            'administration': 87935,
+            'human resources': 87923,
+            'knowledge': 87927,
+            'manufacturing': 87915,
+            'marketing': 87925,
+            'point of sale': 87929,
+            'project': 87919,
+            'purchases': 87911,
+            'sales': 87907,
+            'tools': 87933,
+            'warehouse': 87913,
+        }.get(menu.lower().strip(), general_forum)
+
+        cherrypy.request.uservoice_forum = forum
+        return super(Root, self).menu(active, next)
+
+
diff --git a/addons/web_uservoice/web/editors.py b/addons/web_uservoice/web/editors.py
new file mode 100644
index 00000000000..36086d5d8b6
--- /dev/null
+++ b/addons/web_uservoice/web/editors.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import openobject.templating
+
+class BaseTemplateEditor(openobject.templating.TemplateEditor):
+    templates = ['/openobject/controllers/templates/base.mako']
+
+    def edit(self, template, template_text):
+        output = super(BaseTemplateEditor, self).edit(template, template_text)
+
+        end_head = output.index('</head>')
+
+        output = output[:end_head] + """
+<link rel="stylesheet" type="text/css" href="/web_uservoice/static/css/uservoice.css"/>
+        """ + output[end_head:]
+
+
+        end_body = output.index('</body>')
+
+        # testing forum: 84397
+        output = output[:end_body] + """
+<script type="text/javascript">
+  var uservoiceOptions = {
+    key: 'openerpsa',
+    host: 'feedback.openerp.com',
+    forum: '${getattr(cp.request, 'uservoice_forum', 77459)}',
+    lang: 'en',
+    showTab: false
+  };
+  function _loadUserVoice() {
+    var s = document.createElement('script');
+    s.src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js";
+    document.getElementsByTagName('head')[0].appendChild(s);
+  }
+  _loadSuper = window.onload;
+  window.onload = (typeof window.onload != 'function') ? _loadUserVoice : function() { _loadSuper(); _loadUserVoice(); };
+</script>
+        """ + output[end_body:]
+
+        return output
+
+
+class HeaderTemplateEditor(openobject.templating.TemplateEditor):
+    templates = ['/openerp/controllers/templates/header.mako']
+
+    def edit(self, template, template_text):
+        output = super(HeaderTemplateEditor, self).edit(template, template_text)
+
+        PAT = '<ul class="tools">'
+
+        ul = output.index(PAT)
+        output = output[:ul] + """
+            <p class="logout feedback"><a href="#" onclick="UserVoice.Popin.show(uservoiceOptions); return false;"><img src="/web_uservoice/static/images/uv_favicon.png" />feedback</a></p>
+        """ + output[ul:]
+
+        return output
+
diff --git a/addons/web_uservoice/web/static/css/uservoice.css b/addons/web_uservoice/web/static/css/uservoice.css
new file mode 100644
index 00000000000..9ca2af55678
--- /dev/null
+++ b/addons/web_uservoice/web/static/css/uservoice.css
@@ -0,0 +1,7 @@
+#corner p.feedback a {
+    /*color: #9a0404;*/
+}
+#corner p.feedback img {
+    vertical-align: middle;
+    margin-right: 0.5em;
+}