diff --git a/addons/account/account.py b/addons/account/account.py
index 5fc97a13697..17237211581 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -138,7 +138,6 @@ class account_payment_term_line(osv.osv):
 
 account_payment_term_line()
 
-
 class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
@@ -639,8 +638,8 @@ class account_journal(osv.osv):
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
-        'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
-            help="The sequence used for invoice numbers in this journal."),
+#        'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
+#            help="The sequence used for invoice numbers in this journal."),
         'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
     }
 
@@ -648,7 +647,7 @@ class account_journal(osv.osv):
         'user_id': lambda self,cr,uid,context: uid,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
-    
+
     def write(self, cr, uid, ids, vals, context=None):
         obj=[]
         if 'company_id' in vals:
@@ -674,21 +673,21 @@ class account_journal(osv.osv):
             'purchase_refund':'seq_out_refund',
             'sale_refund':'seq_in_refund'
         }
-        
+
         seq_pool = self.pool.get('ir.sequence')
         seq_typ_pool = self.pool.get('ir.sequence.type')
         date_pool = self.pool.get('ir.model.data')
-        
+
         result = True
-        
+
         journal = self.browse(cr, uid, ids[0], context)
-        code = journal.code.lower()     
+        code = journal.code.lower()
         types = {
             'name':journal.name,
             'code':code
         }
         type_id = seq_typ_pool.create(cr, uid, types)
-        
+
         seq = {
             'name':journal.name,
             'code':code,
@@ -698,25 +697,25 @@ class account_journal(osv.osv):
             'number_increment':1
         }
         seq_id = seq_pool.create(cr, uid, seq)
-        
+
         res = {}
         if not journal.sequence_id:
             res.update({
                 'sequence_id':seq_id
             })
 
-        if journal.type in journal_type and not journal.invoice_sequence_id:
-            res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
-            inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
-            inv_seq_id
-            res.update({
-                'invoice_sequence_id':inv_seq_id
-            })
-        
+#        if journal.type in journal_type and not journal.invoice_sequence_id:
+#            res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
+#            inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
+#            inv_seq_id
+#            res.update({
+#                'invoice_sequence_id':inv_seq_id
+#            })
+
         result = self.write(cr, uid, [journal.id], res)
-            
+
         return result
-        
+
     def create(self, cr, uid, vals, context={}):
         journal_id = super(account_journal, self).create(cr, uid, vals, context)
         self.create_sequence(cr, uid, [journal_id], context)
@@ -732,20 +731,26 @@ class account_journal(osv.osv):
 #           })
         return journal_id
 
-    def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=100):
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []
+        if context is None:
+            context = {}
         ids = []
+        if context.get('journal_type', False):
+            args += [('type','=',context.get('journal_type'))]
         if name:
-            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit, context=context)
+            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
         if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+#            ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
+            ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator
+
         return self.name_get(cr, user, ids, context=context)
 
     def onchange_type(self, cr, uid, ids, type, currency):
         data_pool = self.pool.get('ir.model.data')
         user_pool = self.pool.get('res.users')
-        
+
         type_map = {
             'sale':'account_sp_journal_view',
             'sale_refund':'account_sp_refund_journal_view',
@@ -757,23 +762,23 @@ class account_journal(osv.osv):
             'general':'account_journal_view',
             'situation':'account_journal_view'
         }
-        
+
         res = {}
-        
+
         view_id = type_map.get(type, 'general')
-        
+
         user = user_pool.browse(cr, uid, uid)
         if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
             view_id = 'account_journal_bank_view_multi'
-        
+
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
         data = data_pool.browse(cr, uid, data_id[0])
-    
+
         res.update({
             'centralisation':type == 'situation',
             'view_id':data.res_id,
         })
-        
+
         return {
             'value':res
         }
@@ -850,9 +855,9 @@ class account_fiscalyear(osv.osv):
             context = {}
         ids = []
         if name:
-            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit)
         if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+            ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
 account_fiscalyear()
@@ -1031,18 +1036,18 @@ class account_move(osv.osv):
         """
         Returns a list of tupples containing id, name, as internally it is called {def name_get}
         result format : {[(id, name), (id, name), ...]}
-        
+
         @param cr: A database cursor
         @param user: ID of the user currently logged in
-        @param name: name to search 
+        @param name: name to search
         @param args: other arguments
         @param operator: default operator is 'ilike', it can be changed
         @param context: context arguments, like lang, time zone
         @param limit: Returns first 'n' ids of complete result, default is 80.
-        
+
         @return: Returns a list of tupples containing id and name
         """
-        
+
         if not args:
           args=[]
         if not context:
@@ -1050,10 +1055,12 @@ class account_move(osv.osv):
         ids = []
 
         if name:
-          ids += self.search(cr, user, [('state','=','draft'), ('id','=',name)], limit=limit)
+            ids += self.search(cr, user, [('name','=',name)], limit=limit)
+        if not ids:
+            ids += self.search(cr, user, [('id','=',name)], limit=limit)
 
         return self.name_get(cr, user, ids, context=context)
-    
+
     def name_get(self, cursor, user, ids, context=None):
         if not len(ids):
             return []
@@ -1153,18 +1160,24 @@ class account_move(osv.osv):
             'You cannot create entries on different periods/journals in the same move',
             ['line_id']),
     ]
-    
+
     def post(self, cr, uid, ids, context=None):
+        invoice = context.get('invoice', False)
         if self.validate(cr, uid, ids, context) and len(ids):
             for move in self.browse(cr, uid, ids):
                 if move.name =='/':
                     new_name = False
                     journal = move.journal_id
-                    if journal.sequence_id:
-                        c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
-                        new_name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id, context=c)
+                    
+                    if invoice and invoice.internal_number:
+                        new_name = invoice.internal_number
                     else:
-                        raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
+                        if journal.sequence_id:
+                            c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
+                            new_name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id, context=c)
+                        else:
+                            raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
+
                     if new_name:
                         self.write(cr, uid, [move.id], {'name':new_name})
 
@@ -1212,7 +1225,7 @@ class account_move(osv.osv):
                         'balance':False,
                         'account_tax_id':False,
                     })
-            
+
             if 'journal_id' in vals and vals.get('journal_id', False):
                 for l in vals['line_id']:
                     if not l[0]:
@@ -1661,15 +1674,15 @@ class account_tax(osv.osv):
         """
         Returns a list of tupples containing id, name, as internally it is called {def name_get}
         result format : {[(id, name), (id, name), ...]}
-        
+
         @param cr: A database cursor
         @param user: ID of the user currently logged in
-        @param name: name to search 
+        @param name: name to search
         @param args: other arguments
         @param operator: default operator is 'ilike', it can be changed
         @param context: context arguments, like lang, time zone
         @param limit: Returns first 'n' ids of complete result, default is 80.
-        
+
         @return: Returns a list of tupples containing id and name
         """
         if not args:
@@ -1679,10 +1692,10 @@ class account_tax(osv.osv):
         ids = []
         ids = self.search(cr, user, args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
-    
+
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         journal_pool = self.pool.get('account.journal')
-        
+
         if context and context.has_key('type'):
             if context.get('type') in ('out_invoice','out_refund'):
                 args += [('type_tax_use','in',['sale','all'])]
@@ -1693,7 +1706,7 @@ class account_tax(osv.osv):
             journal = journal_pool.browse(cr, uid, context.get('journal_id'))
             if journal.type in ('sale', 'purchase'):
                 args += [('type_tax_use','in',[journal.type,'all'])]
-        
+
         return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
 
     def name_get(self, cr, uid, ids, context={}):
@@ -1710,7 +1723,7 @@ class account_tax(osv.osv):
         if user.company_id:
             return user.company_id.id
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-        
+
     _defaults = {
         'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
         'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
@@ -1830,11 +1843,11 @@ class account_tax(osv.osv):
         tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
         for r in tin:
             totalex -= r['amount']
-        totlex_qty=0.0            
+        totlex_qty=0.0
         try:
             totlex_qty=totalex/quantity
         except:
-            pass    
+            pass
         tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
         for r in tex:
             totalin += r['amount']
@@ -2140,11 +2153,10 @@ class account_subscription_line(osv.osv):
         'date': fields.date('Date', required=True),
         'move_id': fields.many2one('account.move', 'Entry'),
     }
-    _defaults = {
-    }
-    def move_create(self, cr, uid, ids, context={}):
+
+    def move_create(self, cr, uid, ids, context=None):
         tocheck = {}
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             datas = {
                 'date': line.date,
             }
@@ -2153,7 +2165,8 @@ class account_subscription_line(osv.osv):
             self.write(cr, uid, [line.id], {'move_id':ids[0]})
         if tocheck:
             self.pool.get('account.subscription').check(cr, uid, tocheck.keys(), context)
-        return True
+        return ids
+
     _rec_name = 'date'
 account_subscription_line()
 
@@ -2335,6 +2348,7 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
+        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Surplus Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
     }
 
 account_chart_template()
@@ -2616,7 +2630,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
         data = data_pool.browse(cr, uid, data_id[0])
         view_id = data.res_id
-        
+
         seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
 
         if obj_multi.seq_journal:
@@ -2657,7 +2671,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = data_pool.browse(cr, uid, data_id[0])
         view_id_cash = data.res_id
-       
+
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
         data = data_pool.browse(cr, uid, data_id[0])
         ref_acc_bank = data.res_id
@@ -2718,7 +2732,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             ('property_account_expense_categ','product.category','account.account'),
             ('property_account_income_categ','product.category','account.account'),
             ('property_account_expense','product.template','account.account'),
-            ('property_account_income','product.template','account.account')
+            ('property_account_income','product.template','account.account'),
+            ('property_reserve_and_surplus_account','res.company','account.account')
         ]
         for record in todo_list:
             r = []
@@ -2731,6 +2746,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'fields_id': field[0],
                 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
             }
+
             if r:
                 #the property exist: modify it
                 property_obj.write(cr, uid, r, vals)
@@ -2767,15 +2783,15 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                         'position_id' : new_fp,
                     }
                     obj_ac_fp.create(cr, uid, vals_acc)
-        
+
         #fially inactive the demo chart of accounts
         data_id = data_pool.search(cr, uid, [('model','=','account.account'), ('name','=','chart0')])
         if data_id:
             data = data_pool.browse(cr, uid, data_id[0])
             account_id = data.res_id
-            if account_id:
-                cr.execute("update account_account set active='f' where id=%s" % (account_id))
-        
+            acc_ids = obj_acc._get_children_and_consol(cr, uid, [account_id])
+            if acc_ids:
+                cr.execute("update account_account set active='f' where id in " + str(tuple(acc_ids)))
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 59637edb546..8a8f5556aff 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 import time
+
 import netsvc
 from osv import fields, osv
-
 from tools.misc import currency
 from tools.translate import _
 import decimal_precision as dp
@@ -52,13 +52,13 @@ class account_bank_statement(osv.osv):
         journal_pool = self.pool.get('account.journal')
         journal_type = context.get('journal_type', False)
         journal_id = False
-        
+
         if journal_type:
             ids = journal_pool.search(cr, uid, [('type', '=', journal_type)])
             if ids:
                 journal_id = ids[0]
-            
-        return journal_id 
+
+        return journal_id
 
     def _default_balance_start(self, cr, uid, context={}):
         cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
@@ -126,7 +126,7 @@ class account_bank_statement(osv.osv):
             currency_id = res[statement_id]
             res[statement_id] = (currency_id, currency_names[currency_id])
         return res
-        
+
     _order = "date desc"
     _name = "account.bank.statement"
     _description = "Bank Statement"
@@ -185,7 +185,7 @@ class account_bank_statement(osv.osv):
             context.update({
                 'period_id':pids[0]
             })
-        
+
         return {
             'value':res,
             'context':context,
@@ -194,7 +194,7 @@ class account_bank_statement(osv.osv):
     def button_dummy(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {}, context)
         return True
-        
+
     def button_confirm_bank(self, cr, uid, ids, context={}):
         done = []
         res_currency_obj = self.pool.get('res.currency')
@@ -370,7 +370,7 @@ class account_bank_statement(osv.osv):
 
                 if st.journal_id.entry_posted:
                     account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
-                    
+
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
 
@@ -610,45 +610,22 @@ account_bank_statement_reconcile_line()
 
 class account_bank_statement_line(osv.osv):
 
-    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context={}):
+    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context=None):
         res = {'value': {}}
-        
+        obj_partner = self.pool.get('res.partner')
+        if context is None:
+            context = {}
         if not partner_id:
             return res
+
         line = self.browse(cursor, user, line_id)
-  
         if not line or (line and not line[0].account_id):
-            part = self.pool.get('res.partner').browse(cursor, user, partner_id,
-                context=context)
+            part = obj_partner.browse(cursor, user, partner_id, context=context)
             if type == 'supplier':
                 account_id = part.property_account_payable.id
             else:
                 account_id = part.property_account_receivable.id
             res['value']['account_id'] = account_id
-
-        if not line or (line and not line[0].amount):
-            res_users_obj = self.pool.get('res.users')
-            res_currency_obj = self.pool.get('res.currency')
-            company_currency_id = res_users_obj.browse(cursor, user, user,
-                    context=context).company_id.currency_id.id
-            if not currency_id:
-                currency_id = company_currency_id
-
-            cursor.execute('SELECT sum(debit-credit) \
-                FROM account_move_line \
-                WHERE (reconcile_id is null) \
-                    AND partner_id = %s \
-                    AND account_id=%s', (partner_id, account_id))
-            pgres = cursor.fetchone()
-            balance = pgres and pgres[0] or 0.0
-
-            balance = res_currency_obj.compute(cursor, user, company_currency_id,
-                currency_id, balance, context=context)
-            res['value']['amount'] = balance
-        
-        if context.get('amount', 0) > 0:
-            res['value']['amount'] = context.get('amount')
-            
         return res
 
     def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
@@ -707,7 +684,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index e5298fa2f9d..572144ccf6c 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -28,14 +28,14 @@ from tools.translate import _
 import decimal_precision as dp
 
 class account_cashbox_line(osv.osv):
-    
+
     """ Cash Box Details """
-    
+
     _name = 'account.cashbox.line'
     _description = 'CashBox Line'
 
     def _sub_total(self, cr, uid, ids, name, arg, context=None):
-       
+
         """ Calculates Sub total
         @param name: Names of fields.
         @param arg: User defined arguments
@@ -51,7 +51,7 @@ class account_cashbox_line(osv.osv):
         """ Calculates Sub total on change of number
         @param pieces: Names of fields.
         @param number:
-        """           
+        """
         sub=pieces*number
         return {'value':{'subtotal': sub or 0.0}}
 
@@ -65,9 +65,9 @@ class account_cashbox_line(osv.osv):
 account_cashbox_line()
 
 class account_cash_statement(osv.osv):
-    
+
     _inherit = 'account.bank.statement'
-    
+
     def _get_starting_balance(self, cr, uid, ids, context=None):
 
         """ Find starting balance
@@ -78,23 +78,23 @@ class account_cash_statement(osv.osv):
         res ={}
         for statement in self.browse(cr, uid, ids):
             amount_total=0.0
-            
+
             if statement.journal_id.type not in('cash'):
                 continue
-            
+
             for line in statement.starting_details_ids:
                 amount_total+= line.pieces * line.number
             res[statement.id] = {
                 'balance_start':amount_total
             }
         return res
-    
+
     def _balance_end_cash(self, cr, uid, ids, name, arg, context=None):
         """ Find ending balance  "
         @param name: Names of fields.
         @param arg: User defined arguments
         @return: Dictionary of values.
-        """          
+        """
         res ={}
         for statement in self.browse(cr, uid, ids):
             amount_total=0.0
@@ -102,7 +102,7 @@ class account_cash_statement(osv.osv):
                 amount_total+= line.pieces * line.number
             res[statement.id]=amount_total
         return res
-        
+
     def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
 
         """ Find encoding total of statements "
@@ -120,9 +120,9 @@ class account_cash_statement(osv.osv):
 
 #    def _default_journal_id(self, cr, uid, context={}):
 
-#        """ To get default journal for the object" 
+#        """ To get default journal for the object"
 #        @param name: Names of fields.
-#        @return: journal 
+#        @return: journal
 #        """
 #        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
 #        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
@@ -130,7 +130,7 @@ class account_cash_statement(osv.osv):
 #            return journal[0]
 #        else:
 #            return False
-    
+
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
@@ -163,7 +163,7 @@ class account_cash_statement(osv.osv):
         for r in res:
             res[r] = round(res[r], 2)
         return res
-    
+
     def _get_company(self, cr, uid, ids, context={}):
         user_pool = self.pool.get('res.users')
         company_pool = self.pool.get('res.company')
@@ -171,7 +171,7 @@ class account_cash_statement(osv.osv):
         company_id = user.company_id and user.company_id.id
         if not company_id:
             company_id = company_pool.search(cr, uid, [])[0]
-        
+
         return company_id
 
     def _get_cash_open_box_lines(self, cr, uid, ids, context={}):
@@ -195,14 +195,14 @@ class account_cash_statement(osv.osv):
             }
             res.append((0, 0, dct))
         return res
-        
+
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'cash')]),
         'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
-            ('confirm', 'Confirm'),
+            ('confirm', 'Confirmed'),
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
         'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
         'closing_date':fields.datetime("Closed On"),
@@ -226,8 +226,8 @@ class account_cash_statement(osv.osv):
         company_id = vals and vals.get('company_id',False)
         if company_id:
             sql = [
-                ('company_id', '=', vals['company_id']), 
-                ('journal_id', '=', vals['journal_id']), 
+                ('company_id', '=', vals['company_id']),
+                ('journal_id', '=', vals['journal_id']),
                 ('state', '=', 'open')
             ]
             open_jrnl = self.search(cr, uid, sql)
@@ -247,112 +247,112 @@ class account_cash_statement(osv.osv):
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
         self.write(cr, uid, [res_id], {})
         return res_id
-    
+
     def write(self, cr, uid, ids, vals, context=None):
         """
         Update redord(s) comes in {ids}, with new value comes as {vals}
         return True on success, False otherwise
-    
+
         @param cr: cursor to database
         @param user: id of current user
         @param ids: list of record ids to be update
         @param vals: dict of new values to be set
         @param context: context arguments, like lang, time zone
-        
+
         @return: True on success, False otherwise
         """
-        
+
         super(account_cash_statement, self).write(cr, uid, ids, vals)
         res = self._get_starting_balance(cr, uid, ids)
         for rs in res:
             super(account_cash_statement, self).write(cr, uid, rs, res.get(rs))
         return True
-    
+
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
-        """ Changes balance start and starting details if journal_id changes" 
+        """ Changes balance start and starting details if journal_id changes"
         @param statement_id: Changed statement_id
         @param journal_id: Changed journal_id
         @return:  Dictionary of changed values
         """
-        
+
         cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
 
         res = {}
         balance_start = 0.0
-        
+
         if not journal_id:
             res.update({
                 'balance_start': balance_start
             })
             return res
-        
-        
+
+
         res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
         return res
-    
+
     def _equal_balance(self, cr, uid, ids, statement, context={}):
         if statement.balance_end != statement.balance_end_cash:
             return False
         else:
             return True
-    
+
     def _user_allow(self, cr, uid, ids, statement, context={}):
         return True
-    
+
     def button_open(self, cr, uid, ids, context=None):
-        
+
         """ Changes statement state to Running.
-        @return: True 
+        @return: True
         """
         cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
 
         statement = statement_pool.browse(cr, uid, ids[0])
         vals = {}
-        
+
         if not self._user_allow(cr, uid, ids, statement, context={}):
             raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
-        
+
         if statement.name and statement.name == '/':
             number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
             vals.update({
                 'name':number
             })
-        
-#        if len(statement.starting_details_ids) > 0:
-#            sid = []
-#            for line in statement.starting_details_ids:
-#                sid.append(line.id)
-#            cash_pool.unlink(cr, uid, sid)
-#        
-#        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
-#        rs = cr.fetchone()
-#        rs = rs and rs[0] or None
-#        if rs:
-#            statement = statement_pool.browse(cr, uid, rs)
-#            balance_start = statement.balance_end_real or 0.0
-#            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
-#            for sid in open_ids:
-#                default = {
-#                    'ending_id': False,
-#                    'starting_id':ids[0]
-#                }
-#                cash_pool.copy(cr, uid, sid, default)
-#            
+
+        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
+        rs = cr.fetchone()
+        rs = rs and rs[0] or None
+        if rs:
+            if len(statement.starting_details_ids) > 0:
+                sid = []
+                for line in statement.starting_details_ids:
+                    sid.append(line.id)
+                cash_pool.unlink(cr, uid, sid)
+
+            statement = statement_pool.browse(cr, uid, rs)
+            balance_start = statement.balance_end_real or 0.0
+            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
+            for sid in open_ids:
+                default = {
+                    'ending_id': False,
+                    'starting_id':ids[0]
+                }
+                cash_pool.copy(cr, uid, sid, default)
+
         vals.update({
-            'date':time.strftime("%Y-%m-%d %H:%M:%S"), 
+            'date':time.strftime("%Y-%m-%d %H:%M:%S"),
             'state':'open',
-            
+
         })
-        
+
         self.write(cr, uid, ids, vals)
         return True
 
     def button_confirm_cash(self, cr, uid, ids, context={}):
-        
-        """ Check the starting and ending detail of  statement 
-        @return: True 
+
+        """ Check the starting and ending detail of  statement
+        @return: True
         """
         done = []
         res_currency_obj = self.pool.get('res.currency')
@@ -360,20 +360,20 @@ class account_cash_statement(osv.osv):
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
-        
+
         company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
 
         for st in self.browse(cr, uid, ids, context):
-            
+
             self.write(cr, uid, [st.id], {'balance_end_real':st.balance_end})
             st.balance_end_real = st.balance_end
-            
+
             if not st.state == 'open':
                 continue
-                
+
             if not self._equal_balance(cr, uid, ids, st, context):
                 raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !'))
-            
+
 #            if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
 #                raise osv.except_osv(_('Error !'),
 #                        _('The statement balance is incorrect !\n') +
@@ -519,7 +519,7 @@ class account_cash_statement(osv.osv):
                 if st.journal_id.entry_posted:
                     account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
             done.append(st.id)
-        
+
         vals = {
             'state':'confirm',
             'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")
diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index a8a1d1405cd..5ef0ee4992d 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         
         <!--
-    Fiscal year
-    -->    
+        Fiscal year
+        -->    
         
         <record id="data_fiscalyear" model="account.fiscalyear">
             <field eval="'Fiscal Year '+time.strftime('%Y')" name="name"/>
@@ -15,11 +15,12 @@
         </record>
         
         <!--
-    Fiscal Periods
-    -->    
+        Fiscal Periods
+        -->    
         
         <record id="period_1" model="account.period">
-            <field eval="'Jan.'+time.strftime('%Y')" name="name"/>
+            <field eval="'01/'+time.strftime('%Y')" name="code"/>
+            <field eval="'01/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
@@ -27,7 +28,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_2" model="account.period">
-            <field eval="'Feb.'+time.strftime('%Y')" name="name"/>
+            <field eval="'02/'+time.strftime('%Y')" name="code"/>
+            <field eval="'02/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
@@ -35,7 +37,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_3" model="account.period">
-            <field eval="'Mar.'+time.strftime('%Y')" name="name"/>
+            <field eval="'03/'+time.strftime('%Y')" name="code"/>
+            <field eval="'03/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
@@ -43,7 +46,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_4" model="account.period">
-            <field eval="'Apr.'+time.strftime('%Y')" name="name"/>
+            <field eval="'04/'+time.strftime('%Y')" name="code"/>
+            <field eval="'04/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
@@ -51,7 +55,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_5" model="account.period">
-            <field eval="'May.'+time.strftime('%Y')" name="name"/>
+            <field eval="'05/'+time.strftime('%Y')" name="code"/>
+            <field eval="'05/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
@@ -59,7 +64,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_6" model="account.period">
-            <field eval="'Jun.'+time.strftime('%Y')" name="name"/>
+            <field eval="'06/'+time.strftime('%Y')" name="code"/>
+            <field eval="'06/'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="True" name="special"/>
             <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
@@ -67,7 +73,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_7" model="account.period">
-            <field eval="'Jul.'+time.strftime('%Y')" name="name"/>
+            <field eval="'07/'+time.strftime('%Y')" name="code"/>
+            <field eval="'07/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
@@ -75,7 +82,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_8" model="account.period">
-            <field eval="'Aug.'+time.strftime('%Y')" name="name"/>
+            <field eval="'08/'+time.strftime('%Y')" name="code"/>
+            <field eval="'08/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
@@ -83,7 +91,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_9" model="account.period">
-            <field eval="'Sep.'+time.strftime('%Y')" name="name"/>
+            <field eval="'09/'+time.strftime('%Y')" name="code"/>
+            <field eval="'09/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
@@ -91,7 +100,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_10" model="account.period">
-            <field eval="'Oct.'+time.strftime('%Y')" name="name"/>
+            <field eval="'10/'+time.strftime('%Y')" name="code"/>
+            <field eval="'10/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
@@ -99,7 +109,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_11" model="account.period">
-            <field eval="'Nov.'+time.strftime('%Y')" name="name"/>
+            <field eval="'11/'+time.strftime('%Y')" name="code"/>
+            <field eval="'11/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
@@ -107,7 +118,8 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_12" model="account.period">
-            <field eval="'Dec.'+time.strftime('%Y')" name="name"/>
+            <field eval="'12/'+time.strftime('%Y')" name="code"/>
+            <field eval="'12/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index fe7b6e682fe..a33544ffacc 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -14,7 +14,7 @@
             action="action_account_period_tree"
             id="menu_action_account_period_close_tree"
             parent="account.menu_account_end_year_treatments"
-            sequence="0"/>
+            sequence="0" groups="base.group_extended"/>
         
     </data>
 </openerp>
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 5b57ab130fd..6d067a31a9f 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -1,143 +1,139 @@
 <openerp>
-  <data>
-    <record id="view_account_configuration_installer" model="ir.ui.view">
-      <field name="name">account.installer.form</field>
-      <field name="model">account.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Accounting System Configuration</attribute>
-          </form>
+    <data>
+        <record id="view_account_configuration_installer" model="ir.ui.view">
+            <field name="name">account.installer.form</field>
+            <field name="model">account.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+            <data>
+                <form position="attributes">
+                    <attribute name="string">Accounting System Configuration</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                    <attribute name="string">Configure Your Accounting System</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs.</attribute>
+                </xpath>
+                <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='rowspan'>23</attribute>
+                    <attribute name='string'></attribute>
+                </xpath>
+                <group colspan="8">
+                    <group colspan="4" height="450" width="600">
+                        <field name="charts"/>
+                            <group colspan="4">
+                                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
+                                <field name="date_start" on_change="on_change_start_date(date_start)"/>
+                                <field name="date_stop"/>
+                                <field name="period" colspan="4"/>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+                                <separator col="4" colspan="4" string="Bank and Cost Account"/>
+                                <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+                                    <form string="">
+                                        <field name="acc_name"/>
+                                        <field name="account_type"/>
+                                        <field name="currency_id" widget="selection"/>
+                                    </form>
+                                    <tree editable="bottom" string="">
+                                        <field name="acc_name"/>
+                                        <field name="account_type"/>
+                                        <field name="currency_id" widget="selection"/>
+                                    </tree>
+                                </field>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+                                <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
+                                <field name="purchase_tax" colspan="2" />
+                            </group>
+                        </group>
+                    </group>
+                </data>
+            </field>
+        </record>
 
-          <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Configure Your Accounting System</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs.</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-                <attribute name="string">Configure</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-              <attribute name='rowspan'>23</attribute>
-              <attribute name='string'></attribute>
-          </xpath>
-          <group colspan="8">
-          <group colspan="4" height="450" width="600">
-            <field name="charts"/>
-             <group colspan="4">
-                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                <field name="date_start" on_change="on_change_start_date(date_start)"/>
-                <field name="date_stop"/>
-                <field name="period" colspan="4"/>
-            </group>
-             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                <separator col="4" colspan="4" string="Bank and Cost Account"/>
-                 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-                     <form string="">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
+        <record id="view_account_modules_installer" model="ir.ui.view">
+            <field name="name">account.installer.modules.form</field>
+            <field name="model">account.installer.modules</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">Extra Accounting Modules Installation</attribute>
                     </form>
-                    <tree editable="bottom" string="">
-                      <field name="acc_name"/>
-                      <field name="account_type"/>
-                      <field name="currency_id" widget="selection"/>
-                    </tree>
-                  </field>
-            </group>
-            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
-                <field name="purchase_tax" colspan="2" />
-            </group>
-          </group>
-          </group>
-        </data>
-      </field>
-    </record>
+                    <separator string="title" position="attributes">
+                        <attribute name="string">Install Extra Accounting Modules In Your Accounting System</attribute>
+                    </separator>
+                    <xpath expr="//label[@string='description']" position="attributes">
+                        <attribute name="string">From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
+                    </xpath>
+                    <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                        <attribute name='rowspan'>23</attribute>
+                        <attribute name='string'></attribute>
+                    </xpath>
+                    <group colspan="8">
+                        <group colspan="4" height="450" width="600">
+                            <group colspan="4">
+                                <field name="account_analytic_plans"/>
+                                <field name="account_payment"/>
+                                <field name="account_followup"/>
+                                <field name="account_voucher"/>
+                                <field name="account_voucher_payment"/>
+                            </group>
+                        </group>
+                    </group>
+                </data>
+            </field>
+        </record>
 
-    <record id="view_account_modules_installer" model="ir.ui.view">
-      <field name="name">account.installer.modules.form</field>
-      <field name="model">account.installer.modules</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Extra Accounting Modules Installation</attribute>
-          </form>
-			<separator string="title" position="attributes">
-            <attribute name="string"
-                       >Install Extra Accounting Modules In Your Accounting System</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-              <attribute name='rowspan'>23</attribute>
-              <attribute name='string'></attribute>
-          </xpath>
-          	<group colspan="8">
-          	<group colspan="4" height="450" width="600">
-            <group colspan="4">
-                <field name="account_analytic_plans"/>
-                <field name="account_payment"/>
-                <field name="account_followup"/>
-            </group>
-            </group>
-            </group>
-        </data>
-      </field>
-    </record>
+        <record id="action_account_configuration_installer" model="ir.actions.act_window">
+            <field name="name">Accounting Chart Configuration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.installer</field>
+            <field name="view_id" ref="view_account_configuration_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-	<record id="action_account_configuration_installer" model="ir.actions.act_window">
-      <field name="name">Accounting Chart Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">account.installer</field>
-      <field name="view_id" ref="view_account_configuration_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
+        <record id="action_account_installer" model="ir.actions.act_window">
+            <field name="name">Accounting Modules Installation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.installer.modules</field>
+            <field name="view_id" ref="view_account_modules_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-    <record id="action_account_installer" model="ir.actions.act_window">
-      <field name="name">Accounting Modules Installation</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">account.installer.modules</field>
-      <field name="view_id" ref="view_account_modules_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
+        <record id="account_configuration_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_account_configuration_installer"/>
+            <field name="sequence">3</field>
+            <field name="restart">onskip</field>
+        </record>
 
-    <record id="account_configuration_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_account_configuration_installer"/>
-      <field name="sequence">3</field>
-      <field name="restart">onskip</field>
-    </record>
+        <record id="account_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_account_installer"/>
+            <field name="sequence">5</field>
+            <field name="restart">always</field>
+        </record>
 
-    <record id="account_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_account_installer"/>
-      <field name="sequence">5</field>
-      <field name="restart">always</field>
-    </record>
-
-    <record id="account_ir_actions_todo_tree" model="ir.ui.view">
-        <field name="model">ir.actions.todo</field>
-        <field name="name">account_installer_action_replace</field>
-        <field name="type">tree</field>
-        <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-          <field name="arch" type="xml">
-            <xpath expr="//button[@string='Launch']" position="replace">
-            <button name="%(action_account_configuration_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
-      </xpath>
-        </field>
-    </record>
-
-  </data>
+        <record id="account_ir_actions_todo_tree" model="ir.ui.view">
+            <field name="model">ir.actions.todo</field>
+            <field name="name">account_installer_action_replace</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@string='Launch']" position="replace">
+                    <button name="%(action_account_configuration_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 22df9059305..99575c08375 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -16,7 +16,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_invoice_graph">
             <field name="name">account.invoice.graph</field>
             <field name="model">account.invoice</field>
@@ -28,7 +28,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record id="view_invoice_line_tree" model="ir.ui.view">
             <field name="name">account.invoice.line.tree</field>
             <field name="model">account.invoice.line</field>
@@ -45,7 +45,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_invoice_line_form" model="ir.ui.view">
             <field name="name">account.invoice.line.form</field>
             <field name="model">account.invoice.line</field>
@@ -62,7 +62,7 @@
                             <field colspan="4" name="name"/>
                             <field colspan="4" name="origin" groups="base.group_extended"/>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="account.group_account_user"/>
                             <newline/>
                             <field name="price_subtotal"/>
 
@@ -76,7 +76,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_invoice_tax_tree" model="ir.ui.view">
             <field name="name">account.invoice.tax.tree</field>
             <field name="model">account.invoice.tax</field>
@@ -92,7 +92,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_invoice_tax_form" model="ir.ui.view">
             <field name="name">account.invoice.tax.form</field>
             <field name="model">account.invoice.tax</field>
@@ -119,13 +119,13 @@
             <field name="model">account.invoice</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('paid','cancel')" string="Invoice">
+                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
                     <field name="name"/>
                     <field name="journal_id" invisible="1"/>
-                    <field name="period_id" invisible="1"/>
+                    <field name="period_id" invisible="1" groups="account.group_account_user"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="user_id"/>
                     <field name="date_due"/>
@@ -137,10 +137,7 @@
                     <field name="state"/>
 
                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
+                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
                 </tree>
             </field>
         </record>
@@ -164,14 +161,14 @@
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
                         <field name="date_invoice"/>
-                        <field name="period_id" groups="base.group_user"/>
-                        <group colspan="2" col="1" groups="base.group_user">
+                        <field name="period_id" groups="account.group_account_user"/>
+                        <group colspan="2" col="1" groups="account.group_account_user">
                             <label align="0.0" string="(keep empty to use the current period)"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
+                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
                             <field name="reference_type" nolabel="1" size="0"/>
                             <field name="reference" nolabel="1"/>
                             <field name="date_due"/>
@@ -213,9 +210,9 @@
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
                                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
-                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
+                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                 </group>
@@ -232,7 +229,7 @@
                             <field name="origin" groups="base.group_extended"/>
                             <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
                             <field name="user_id"/>
-                            <field name="move_id"/>
+                            <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
@@ -273,14 +270,14 @@
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
                     <field name="date_invoice"/>
-                    <field name="period_id" groups="base.group_user"/>
-                    <group colspan="2" col="1" groups="base.group_user">
+                    <field name="period_id" groups="account.group_account_user"/>
+                    <group colspan="2" col="1" groups="account.group_account_user">
                         <label align="0.0" string="(keep empty to use the current period)"/>
                     </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
                             <field name="name"/>
                             <field name="payment_term" widget="selection"/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
@@ -307,9 +304,9 @@
                                 <group col="7" colspan="4" groups="base.group_user">
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
-                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                 </group>
@@ -326,8 +323,8 @@
                             <field name="origin"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
                                 groups="base.group_extended"/>
-                            <field name="move_id" groups="base.group_user"/>
-                            <separator colspan="4" string="Additionnal Information"/>
+                            <field name="move_id" groups="account.group_account_user"/>
+                            <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                         <page string="Payments">
@@ -417,7 +414,7 @@
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
-        
+
         <record id="action_invoice_tree_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -437,13 +434,13 @@
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
         </record>
-        
+
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
-        
+
         <record id="action_invoice_tree1_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -474,7 +471,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">A customer refund is a credit note to your customer that cancel  invoice or a part of it.</field>
+            <field name="help">A customer refund is a credit note to your customer that cancel invoice or a part of it.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -510,7 +507,7 @@
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
-        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Entries" res_model="account.move.line" src_model="account.invoice"/>
+        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Journal Items" res_model="account.move.line" src_model="account.invoice"/>
 
     </data>
 </openerp>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index e5912a8b763..f07eebd4b41 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -7,14 +7,14 @@
         <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
-        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_invoice,group_account_manager,group_account_user"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
@@ -22,8 +22,8 @@
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
-        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
-        <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
+        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
 <!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
 <!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
@@ -31,17 +31,18 @@
 <!--        <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
 
 <!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="base.group_system,group_account_manager"/>
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
         groups="group_account_user,group_account_manager,base.group_system"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"
+            groups="base.group_extended"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
 <!--            sequence="3"-->
 <!--            groups="group_account_user"/>-->
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index d122da7d19e..30e40f56a7c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -144,7 +144,26 @@ class account_move_line(osv.osv):
             del(data['account_tax_id'])
         return data
 
+    def convert_to_period(self, cr, uid, context={}):
+        period_obj = self.pool.get('account.period')
+        
+        #check if the period_id changed in the context from client side
+        if context.get('period_id', False):
+            period_id = context.get('period_id')
+            if type(period_id) == str:
+                ids = period_obj.search(cr, uid, [('name','ilike',period_id)])
+                context.update({
+                    'period_id':ids[0]
+                })
+
+        return context
+        
     def _default_get(self, cr, uid, fields, context={}):
+    
+        period_obj = self.pool.get('account.period')
+
+        context = self.convert_to_period(cr, uid, context)
+        
         # Compute simple values
         data = super(account_move_line, self).default_get(cr, uid, fields, context)
         # Starts: Manual entry from account.move form
@@ -185,8 +204,6 @@ class account_move_line(osv.osv):
         if not 'move_id' in fields: #we are not in manual entry
             return data
 
-        period_obj = self.pool.get('account.period')
-
         # Compute the current move
         move_id = False
         partner_id = False
@@ -320,7 +337,7 @@ class account_move_line(osv.osv):
             invoice_id = res[line_id]
             res[line_id] = (invoice_id, invoice_names[invoice_id])
         return res
-
+   
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
@@ -783,6 +800,7 @@ class account_move_line(osv.osv):
         return r_id
 
     def view_header_get(self, cr, user, view_id, view_type, context):
+        context = self.convert_to_period(cr, user, context)
         if context.get('account_id', False):
             cr.execute('select code from account_account where id=%s', (context['account_id'],))
             res = cr.fetchone()
@@ -824,16 +842,28 @@ class account_move_line(osv.osv):
         }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+        journal_pool = self.pool.get('account.journal')
+        
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         if view_type != 'tree':
-            return result
+            #Remove the toolbar from the form view
+            if view_type == 'form':
+                result['toolbar']['action'] = []
 
+            #Restrict the list of journal view in search view
+            if view_type == 'search':
+                journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
+                result['fields']['journal_id']['selection'] = journal_list
+            return result
+        
+        if context.get('view_mode', False):
+            return result
+            
         fld = []
         fields = {}
         flds = []
         title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
         xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write">\n\t''' % (title)
-        journal_pool = self.pool.get('account.journal')
 
         ids = journal_pool.search(cr, uid, [])
         journals = journal_pool.browse(cr, uid, ids)
@@ -889,7 +919,7 @@ class account_move_line(osv.osv):
             elif field == 'account_tax_id':
                 attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
                 attrs.append("context=\"{'journal_id':journal_id}\"")
-                
+            
             elif field == 'account_id' and journal.id:
                 attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 68e9cc3ba7e..67576d406da 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -273,9 +273,6 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="field" select="1"/>
                     <field name="sequence"/>
-<!--                    <newline/>-->
-<!--                    <field name="readonly"/>-->
-<!--                    <field name="required"/>-->
                 </form>
             </field>
         </record>
@@ -287,8 +284,6 @@
                 <tree string="Journal Column">
                     <field name="sequence"/>
                     <field name="name"/>
-<!--                    <field name="required"/>-->
-<!--                    <field name="readonly"/>-->
                 </tree>
             </field>
         </record>
@@ -394,7 +389,7 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Invoicing Data" colspan="4"/>
-                                <field name="invoice_sequence_id"/>
+<!--                                <field name="invoice_sequence_id"/>-->
                                 <field name="group_invoice_lines"/>
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
@@ -428,7 +423,7 @@
                 <search string="Search Bank Statements">
                     <group col="8" colspan="4">
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                        <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                        <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="name"/>
@@ -472,9 +467,9 @@
                 <search string="Search Bank Statements">
                     <group col="8" colspan="4">
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                        <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                        <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="journal_id" widget="selection"/>      
+                        <field name="journal_id" widget="selection"/>
                         <field name="date"/>
                         <field name="name"/>
                     </group>
@@ -493,13 +488,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank Statement">
-                    <group col="6" colspan="4">
+                    <group col="7" colspan="4">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date)"/>
                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <newline/>
                         <field name="period_id"/>
                         <field name="balance_start"/>
                         <field name="balance_end_real"/>
+                        <button name="%(action_view_account_statement_from_invoice_lines)d"
+                            string="Import Invoices" type="action" icon="gtk-dnd"
+                            attrs="{'invisible':[('state','=','confirm')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Transaction">
@@ -538,10 +537,6 @@
                     <group col="8" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
-                        
-                        <button name="%(action_view_account_statement_from_invoice_lines)d"
-                            string="Import Invoice" type="action" icon="gtk-dnd" attrs="{'invisible':[('state','=','confirm')]}"/>
-                        
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
                         <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
@@ -903,9 +898,9 @@
                     <field name="analytic_account_id"/>
                     <field name="amount_currency" groups="base.group_extended"/>
                     <field name="currency_id" groups="base.group_extended"/>
-                    <field name="state"/>
-                    <field name="reconcile_id"/>
                     <field name="reconcile_partial_id" groups="base.group_extended"/>
+                    <field name="reconcile_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -921,7 +916,7 @@
                         <field name="name" select="1"/>
                         <field name="ref"/>
                         <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-                        
+
                         <field name="journal_id"/>
                         <field name="period_id"/>
                         <field name="company_id" required="1" groups="base.group_multi_company"/>
@@ -935,7 +930,7 @@
                                 <field name="credit"/>
                                 <field name="quantity"/>
                             </group>
-                            
+
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Accounting Documents"/>
                                 <field name="invoice"/>
@@ -949,14 +944,14 @@
                                 <field name="date_maturity"/>
                                 <field name="date_created"/>
                             </group>
-                            
+
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Taxes"/>
                                 <field name="tax_code_id"/>
                                 <field name="tax_amount"/>
                                 <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                             </group>
-                            
+
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Currency"/>
                                 <field name="currency_id"/>
@@ -974,7 +969,7 @@
                                 <field name="state"/>
                                 <field name="blocked"/>
                             </group>
-                            
+
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Analytic"/>
                                 <field name="analytic_account_id"/>
@@ -1049,7 +1044,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Entry Lines</field>
             <field name="model">account.move.line</field>
@@ -1064,9 +1059,8 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_symbol-selection" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Entry Lines"/>
                         <separator orientation="vertical"/>
-                        <field name="ref" select="1" string="Reference"/>
                         <field name="move_id" select="1" string="Number (Move)"/>
-                        <field name="name" select="1"/>
+                        <field name="date" select='1'/>
                         <field name="account_id" select='1'/>
                         <field name="partner_id" select='1'>
                             <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
@@ -1076,9 +1070,19 @@
                     <group col="10" colspan="4">
                         <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
                         <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
-                        <separator orientation="vertical"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="ref" select="1" string="Reference"/>
+                        <field name="name" select="1"/>
                         <field name="narration" select="1"/>
-                        <field name="date" select='1'/>
+
                         <field name="balance" string="Debit/Credit" select='1'/>
                     </group>
                 </search>
@@ -1090,7 +1094,6 @@
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
 
@@ -1114,7 +1117,7 @@
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('account_id', 'child_of', active_id)]</field>
         </record>
-        
+
         <record id="ir_account_move_line_select" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">account.account</field>
@@ -1182,7 +1185,7 @@
                                         <field name="name" select="1"/>
                                         <field name="ref"/>
                                         <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-                                        
+
                                         <field name="journal_id"/>
                                         <field name="period_id"/>
                                         <field name="company_id" required="1" groups="base.group_multi_company"/>
@@ -1196,7 +1199,7 @@
                                                 <field name="credit"/>
                                                 <field name="quantity"/>
                                             </group>
-                                            
+
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Accounting Documents"/>
                                                 <field name="invoice"/>
@@ -1210,14 +1213,14 @@
                                                 <field name="date_maturity"/>
                                                 <field name="date_created"/>
                                             </group>
-                                            
+
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Taxes"/>
                                                 <field name="tax_code_id"/>
                                                 <field name="tax_amount"/>
                                                 <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                             </group>
-                                            
+
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Currency"/>
                                                 <field name="currency_id"/>
@@ -1235,7 +1238,7 @@
                                                 <field name="state"/>
                                                 <field name="blocked"/>
                                             </group>
-                                            
+
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Analytic"/>
                                                 <field name="analytic_account_id"/>
@@ -1294,7 +1297,7 @@
                         <separator orientation="vertical"/>
                         <field name="ref" select="1"/>
                         <field name="name" select="1"/>
-                        <field name="partner_id" select='1'/>   
+                        <field name="partner_id" select='1'/>
                         <field name="date" select='1'/>
                         <field name="narration" select="1"/>
                     </group>
@@ -1514,15 +1517,16 @@
   <!--        <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> -->
     <!--     <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>   -->
 
-<!--  bank reconsilation  -->
-        <menuitem action="action_account_bank_reconcile_tree"
-            id="menu_action_account_bank_reconcile_check_tree"
-            parent="periodical_processing_reconciliation" groups="group_account_user" />
+<!--  bank reconciliation  -->
+<!--        <menuitem action="action_account_bank_reconcile_tree"-->
+<!--            id="menu_action_account_bank_reconcile_check_tree"-->
+<!--            parent="periodical_processing_reconciliation" groups="group_account_user" />-->
 
         <act_window
-            context="{'search_default_next_partner':1}"
+            context="{'search_default_next_partner':1,'view_mode':True}"
             id="action_account_manual_reconcile" name="Entry Lines"
             res_model="account.move.line"
+            view_id="view_move_line_tree"/>
             />
 
         <menuitem
@@ -1577,7 +1581,7 @@
             <field name="view_type">tree</field>
             <field name="help">You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line.</field>
         </record>
-        <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>
+<!--        <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>-->
 
 
         <!--
@@ -1660,7 +1664,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc"/>
+        <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc" groups="base.group_extended"/>
 
         <!--
             # Payment Terms
@@ -1800,15 +1804,15 @@
                         <separator colspan="4" string="Starts on"/>
                         <field name="date_start" select="1"/>
                         <field name="period_total"/>
-                        
+
                     </group>
-                    
+
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Valid Up to"/>
                         <field name="period_nbr"/>
                         <field name="period_type"/>
                     </group>
-                    
+
                     <group col="2" colspan="2">
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
@@ -1829,7 +1833,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_subscription_form" id="menu_action_subscription_form" sequence="5" parent="account.menu_configuration_misc"/>
+        <menuitem name="Define Recurring Entries" action="action_subscription_form" id="menu_action_subscription_form" sequence="1" parent="account.menu_finance_recurrent_entries"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -2076,6 +2080,7 @@
                     <field name="property_account_income_categ"/>
                     <field name="property_account_expense"/>
                     <field name="property_account_income"/>
+                    <field name="property_reserve_and_surplus_account"/>
                     </group>
                 </form>
             </field>
@@ -2417,23 +2422,6 @@
             id="menu_action_account_fiscal_position_form_template"
             parent="account_template_folder" sequence="20"/>
 
-<!--        <record id="action_account_moves_all" model="ir.actions.act_window">-->
-<!--            <field name="name">Journal Items</field>-->
-<!--            <field name="res_model">account.move.line</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form,graph</field>-->
-<!--            <field name="view_id" ref="view_move_line_tree"/>-->
-<!--            <field name="search_view_id" ref="view_account_move_line_filter"/>-->
-<!--        </record>-->
-
-<!--        <menuitem-->
-<!--            action="action_account_moves_all"-->
-<!--            icon="STOCK_JUSTIFY_FILL"-->
-<!--            id="menu_eaction_account_moves_all"-->
-<!--            parent="account.menu_finance_entries"-->
-<!--            sequence="4"-->
-<!--        />-->
-
         <!-- Cash Statement -->
         <record id="view_cash_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 7fe7ff7a779..d7a879cdf20 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -8,10 +8,6 @@
 <!--            keyword="client_print_multi"-->
 <!--            id="wizard_account_balance_compare_report"/>-->
 
-     <!--     <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>   -->
-
- <!--    <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>-->
-
 <!--  for test only -->
 
 
diff --git a/addons/account/company.py b/addons/account/company.py
index 613c702a46e..0fe56fca859 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -25,6 +25,15 @@ class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
         'overdue_msg' : fields.text('Overdue Payments Message', translate=True),
+        'property_reserve_and_surplus_account': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Reserve and Surplus Account",
+            method=True,
+            view_load=True,
+            domain="[('type', '=', 'payable')]",
+            help="This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
     }
 
     _defaults = {
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 7892fceee91..a3a1ec0080a 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -15,5 +15,21 @@
              </notebook>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_company_inherit_1_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                  <group col="2" colspan="2">
+                      <separator string="Reserve And Surplus Account" colspan="2"/>
+                      <field name="property_reserve_and_surplus_account" colspan="2"/>
+                  </group>
+                </page>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index b9e063dc509..eba0e31f106 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-         <!-- Types -->
-     <record model="account.account.type" id="conf_account_type_receivable" >
+        <!-- Types -->
+        <record model="account.account.type" id="conf_account_type_receivable" >
           <field name="name">Receivable</field>
           <field name="code">receivable</field>
+          <field name="report_type">income</field>
           <field name="close_method">unreconciled</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_payable" >
           <field name="name">Payable</field>
           <field name="code">payable</field>
+          <field name="report_type">expense</field>
           <field name="close_method">unreconciled</field>
         </record>
 
@@ -21,65 +22,101 @@
           <field name="close_method">none</field>
         </record>
 
+	    <record model="account.account.type" id="account_type_income_view1">
+	        <field name="name">Income View</field>
+	        <field name="code">view</field>
+	        <field name="report_type">income</field>
+	    </record>
+	    <record model="account.account.type" id="account_type_expense_view1">
+	        <field name="name">Expense View</field>
+	        <field name="code">expense</field>
+	        <field name="report_type">expense</field>
+	    </record>
+	    <record model="account.account.type" id="account_type_asset_view1">
+	        <field name="name">Asset View</field>
+	        <field name="code">asset</field>
+	        <field name="report_type">asset</field>
+	    </record>
+	    <record model="account.account.type" id="account_type_liability_view1">
+	        <field name="name">Liability View</field>
+	        <field name="code">liability</field>
+	        <field name="report_type">liability</field>
+	    </record>
+
         <record model="account.account.type" id="conf_account_type_income" >
           <field name="name">Income</field>
           <field name="code">income</field>
+          <field name="report_type">income</field>
           <field name="close_method">none</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_expense">
           <field name="name">Expense</field>
           <field name="code">expense</field>
+          <field name="report_type">expense</field>
           <field name="close_method">none</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_tax">
           <field name="name">Tax</field>
           <field name="code">tax</field>
+          <field name="report_type">expense</field>
           <field name="close_method">unreconciled</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_cash">
           <field name="name">Cash</field>
           <field name="code">cash</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
+        <record model="account.account.type" id="conf_account_type_liability">
+            <field name="name">Liability</field>
+            <field name="code">liability</field>
+            <field name="report_type">liability</field>
+            <field name="close_method">balance</field>
+        </record>
+
         <record model="account.account.type" id="conf_account_type_asset">
           <field name="name">Asset</field>
           <field name="code">asset</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
         <record model="account.account.type" id="conf_account_type_equity">
           <field name="name">Equity</field>
           <field name="code">equity</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
          <record model="account.account.type" id="conf_account_type_bnk">
           <field name="name">Bank</field>
           <field name="code">bank</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
          <record model="account.account.type" id="conf_account_type_chk">
           <field name="name">Check</field>
           <field name="code">check</field>
+          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
         </record>
 
 
 
-        <!-- Account Templates-->
-        <record id="conf_chart0" model="account.account.template">
-            <field name="code">0</field>
-            <field name="name">Configurable Account Chart</field>
-            <field eval="0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
+		<!-- Account Templates-->
+		<record id="conf_chart0" model="account.account.template">
+		    <field name="code">0</field>
+		    <field name="name">Configurable Account Chart</field>
+		    <field eval="0" name="parent_id"/>
+		    <field name="type">view</field>
+		    <field name="user_type" ref="conf_account_type_view"/>
+		</record>
 
-        <!-- Balance Sheet -->
+       	<!-- Balance Sheet -->
 
         <record id="conf_bal" model="account.account.template">
             <field name="code">1</field>
@@ -88,113 +125,123 @@
             <field name="type">view</field>
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
-
-        <record id="conf_fas" model="account.account.template">
-            <field name="code">10</field>
-            <field name="name">Fixed Assets</field>
-            <field ref="conf_bal" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_xfa" model="account.account.template">
-            <field name="code">100</field>
-            <field name="name">Fixed Asset Account</field>
-            <field ref="conf_fas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_asset"/>
-        </record>
-
-        <record id="conf_nca" model="account.account.template">
-            <field name="code">11</field>
-            <field name="name">Net Current Assets</field>
-            <field ref="conf_bal" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_cas" model="account.account.template">
-            <field name="code">110</field>
-            <field name="name">Current Assets</field>
-            <field ref="conf_nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_stk" model="account.account.template">
-            <field name="code">1101</field>
-            <field name="name">Purchased Stocks</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_asset"/>
-        </record>
-
-        <record id="conf_a_recv" model="account.account.template">
-            <field name="code">1102</field>
-            <field name="name">Debtors</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="conf_account_type_receivable"/>
-        </record>
-
-        <!-- <record id="account.property_account_receivable" model="ir.property">
-            <field eval="'account.account,'+str(a_recv)" name="value"/>
-        </record> -->
-
-        <record id="conf_ova" model="account.account.template">
-            <field name="code">1103</field>
-            <field name="name">Output VAT</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_tax"/>
-        </record>
-
-        <record id="conf_bnk" model="account.account.template">
-            <field name="code">1104</field>
-            <field name="name">Bank Current Account</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_cash"/>
-        </record>
-
-        <record id="conf_cash" model="account.account.template">
-            <field name="code">1105</field>
-            <field name="name">Cash</field>
-            <field ref="conf_cas" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_cash"/>
-        </record>
-
-        <record id="conf_cli" model="account.account.template">
-            <field name="code">111</field>
-            <field name="name">Current Liabilities</field>
-            <field ref="conf_nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_a_pay" model="account.account.template">
-            <field name="code">1111</field>
-            <field name="name">Creditors</field>
-            <field ref="conf_cli" name="parent_id"/>
-            <field name="type">payable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="conf_account_type_payable"/>
-        </record>
-
-        <!-- <record id="account.property_account_payable" model="ir.property">
-            <field eval="'account.account,'+str(a_pay)" name="value"/>
-        </record>-->
-
-        <record id="conf_iva" model="account.account.template">
-            <field name="code">1112</field>
-            <field name="name">Input VAT</field>
-            <field ref="conf_cli" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_tax"/>
-        </record>
-
+	
+	        <record id="conf_fas" model="account.account.template">
+	            <field name="code">10</field>
+	            <field name="name">Fixed Assets</field>
+	            <field ref="conf_bal" name="parent_id"/>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="account_type_asset_view1"/>
+	        </record>
+	
+		        <record id="conf_xfa" model="account.account.template">
+		            <field name="code">100</field>
+		            <field name="name">Fixed Asset Account</field>
+		            <field ref="conf_fas" name="parent_id"/>
+		            <field name="type">other</field>
+		            <field name="user_type" ref="account_type_asset_view1"/>
+		        </record>
+		
+	        <record id="conf_nca" model="account.account.template">
+	            <field name="code">11</field>
+	            <field name="name">Net Current Assets</field>
+	            <field ref="conf_bal" name="parent_id"/>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="account_type_asset_view1"/>
+	        </record>
+		
+		        <record id="conf_cas" model="account.account.template">
+		            <field name="code">110</field>
+		            <field name="name">Current Assets</field>
+		            <field ref="conf_nca" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="account_type_asset_view1"/>
+		        </record>
+			
+			        <record id="conf_stk" model="account.account.template">
+			            <field name="code">1101</field>
+			            <field name="name">Purchased Stocks</field>
+			            <field ref="conf_cas" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="conf_account_type_asset"/>
+			        </record>
+			
+			        <record id="conf_a_recv" model="account.account.template">
+			            <field name="code">1102</field>
+			            <field name="name">Debtors</field>
+			            <field ref="conf_cas" name="parent_id"/>
+			            <field name="type">receivable</field>
+			            <field eval="True" name="reconcile"/>
+			            <field name="user_type" ref="conf_account_type_asset"/>
+			        </record>
+				
+			        <!-- <record id="account.property_account_receivable" model="ir.property">
+			            <field eval="'account.account,'+str(a_recv)" name="value"/>
+			        </record> -->
+			
+			        <record id="conf_ova" model="account.account.template">
+			            <field name="code">1103</field>
+			            <field name="name">Output VAT</field>
+			            <field ref="conf_cas" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="conf_account_type_asset"/>
+			        </record>
+			
+			        <record id="conf_bnk" model="account.account.template">
+			            <field name="code">1104</field>
+			            <field name="name">Bank Current Account</field>
+			            <field ref="conf_cas" name="parent_id"/>
+			            <field name="type">view</field>
+			            <field name="user_type" ref="conf_account_type_bnk"/>
+			        </record>
+			
+		<!--        <record id="conf_cash" model="account.account.template">-->
+		<!--            <field name="code">1105</field>-->
+		<!--            <field name="name">Cash</field>-->
+		<!--            <field ref="conf_cas" name="parent_id"/>-->
+		<!--            <field name="type">view</field>-->
+		<!--            <field name="user_type" ref="conf_account_type_cash"/>-->
+		<!--        </record>-->
+			
+		        <record id="conf_cli" model="account.account.template">
+		            <field name="code">111</field>
+		            <field name="name">Current Liabilities</field>
+		            <field ref="conf_nca" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="account_type_liability_view1"/>
+		        </record>
+		
+			        <record id="conf_a_pay" model="account.account.template">
+			            <field name="code">1111</field>
+			            <field name="name">Creditors</field>
+			            <field ref="conf_cli" name="parent_id"/>
+			            <field name="type">payable</field>
+			            <field eval="True" name="reconcile"/>
+			            <field name="user_type" ref="conf_account_type_liability"/>
+			        </record>
+			
+			        <!-- <record id="account.property_account_payable" model="ir.property">
+			            <field eval="'account.account,'+str(a_pay)" name="value"/>
+			        </record>-->
+			
+			        <record id="conf_iva" model="account.account.template">
+			            <field name="code">1112</field>
+			            <field name="name">Input VAT</field>
+			            <field ref="conf_cli" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="conf_account_type_liability"/>
+			        </record>
+			
+			        <record id="conf_a_reserve_and_surplus" model="account.account.template">
+			            <field name="code">1113</field>
+			            <field name="name">Reserve and Surplus Account</field>
+			            <field ref="conf_cli" name="parent_id"/>
+			            <field name="type">payable</field>
+			            <field eval="True" name="reconcile"/>
+			            <field name="user_type" ref="conf_account_type_liability"/>
+			        </record>
+	
+	
         <!-- Profit and Loss -->
 
         <record id="conf_gpf" model="account.account.template">
@@ -205,312 +252,358 @@
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
 
-        <record id="conf_rev" model="account.account.template">
-            <field name="code">20</field>
-            <field name="name">Revenue</field>
-            <field ref="conf_gpf" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_a_sale" model="account.account.template">
-            <field name="code">200</field>
-            <field name="name">Product Sales</field>
-            <field ref="conf_rev" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_income"/>
-        </record>
-
-        <!-- <record id="account.property_account_income_categ" model="ir.property">
-            <field eval="'account.account,'+str(a_sale)" name="value"/>
-        </record> -->
-
-        <record id="conf_cos" model="account.account.template">
-            <field name="code">21</field>
-            <field name="name">Cost of Sales</field>
-            <field ref="conf_gpf" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_cog" model="account.account.template">
-            <field name="code">210</field>
-            <field name="name">Cost of Goods Sold</field>
-            <field ref="conf_cos" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_expense"/>
-        </record>
-
-        <record id="conf_ovr" model="account.account.template">
-            <field name="code">22</field>
-            <field name="name">Overheads</field>
-            <field ref="conf_gpf" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
-        </record>
-
-        <record id="conf_a_expense" model="account.account.template">
-            <field name="code">220</field>
-            <field name="name">Expenses</field>
-            <field ref="conf_ovr" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="conf_account_type_expense"/>
-        </record>
+	        <record id="conf_rev" model="account.account.template">
+	            <field name="code">20</field>
+	            <field name="name">Revenue</field>
+	            <field ref="conf_gpf" name="parent_id"/>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="account_type_income_view1"/>
+	        </record>
+	
+		        <record id="conf_a_sale" model="account.account.template">
+		            <field name="code">200</field>
+		            <field name="name">Product Sales</field>
+		            <field ref="conf_rev" name="parent_id"/>
+		            <field name="type">other</field>
+		            <field name="user_type" ref="conf_account_type_income"/>
+		        </record>
+	
+	        <!-- <record id="account.property_account_income_categ" model="ir.property">
+	            <field eval="'account.account,'+str(a_sale)" name="value"/>
+	        </record> -->
+	
+	        <record id="conf_cos" model="account.account.template">
+	            <field name="code">21</field>
+	            <field name="name">Cost of Sales</field>
+	            <field ref="conf_gpf" name="parent_id"/>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="account_type_income_view1"/>
+	        </record>
+	
+		        <record id="conf_cog" model="account.account.template">
+		            <field name="code">210</field>
+		            <field name="name">Cost of Goods Sold</field>
+		            <field ref="conf_cos" name="parent_id"/>
+		            <field name="type">other</field>
+		            <field name="user_type" ref="conf_account_type_expense"/>
+		        </record>
+	
+	        <record id="conf_ovr" model="account.account.template">
+	            <field name="code">22</field>
+	            <field name="name">Overheads</field>
+	            <field ref="conf_gpf" name="parent_id"/>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="account_type_expense_view1"/>
+	        </record>
+	
+		        <record id="conf_a_expense" model="account.account.template">
+		            <field name="code">220</field>
+		            <field name="name">Expenses</field>
+		            <field ref="conf_ovr" name="parent_id"/>
+		            <field name="type">other</field>
+		            <field name="user_type" ref="conf_account_type_expense"/>
+		        </record>
 
         <!-- <record id="account.property_account_expense_categ" model="ir.property">
             <field eval="'account.account,'+str(a_expense)" name="value"/>
         </record> -->
 
         <!-- Taxes -->
-          <!-- VAT Code Definitions -->
+          <!-- TAX Code Definitions -->
 
-        <!-- Invoiced VAT -->
+        <!-- Invoiced TAX -->
 
-        <!-- Input VAT -->
-
-        <record id="vat_code_chart_root" model="account.tax.code.template">
+        <record id="tax_code_chart_root" model="account.tax.code.template">
             <field name="name">Plan Fees </field>
         </record>
 
-        <record id="vat_code_balance_net" model="account.tax.code.template">
-            <field name="name">VAT Balance to Pay</field>
-            <field name="parent_id" ref="vat_code_chart_root"/>
-        </record>
+	        <record id="tax_code_balance_net" model="account.tax.code.template">
+	            <field name="name">Tax Balance to Pay</field>
+	            <field name="parent_id" ref="tax_code_chart_root"/>
+	        </record>
 
-        <record id="vat_code_input" model="account.tax.code.template">
-            <field name="name">Input VAT</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
-            <field eval="-1" name="sign"/>
-        </record>
+			<!-- Input TAX -->
+	        <record id="tax_code_input" model="account.tax.code.template">
+	            <field name="name">Input TAX</field>
+	            <field name="parent_id" ref="tax_code_balance_net"/>
+	            <field eval="-1" name="sign"/>
+	        </record>
 
-        <record id="vat_code_input_S" model="account.tax.code.template">
-            <field name="name">Input VAT Rate S (15%)</field>
-            <field name="parent_id" ref="vat_code_input"/>
-        </record>
+		        <record id="tax_code_input_S" model="account.tax.code.template">
+		            <field name="name">Input TAX Rate S (15%)</field>
+		            <field name="parent_id" ref="tax_code_input"/>
+		        </record>
+	
+		        <record id="tax_code_input_R" model="account.tax.code.template">
+		            <field name="name">Input TAX Rate R (5%)</field>
+		            <field name="parent_id" ref="tax_code_input"/>
+		        </record>
 
-        <record id="vat_code_input_R" model="account.tax.code.template">
-            <field name="name">Input VAT Rate R (5%)</field>
-            <field name="parent_id" ref="vat_code_input"/>
-        </record>
+		        <record id="tax_code_input_X" model="account.tax.code.template">
+		            <field name="name">Input TAX Rate X (Exempt)</field>
+		            <field name="parent_id" ref="tax_code_input"/>
+		        </record>
+	
+		        <record id="tax_code_input_O" model="account.tax.code.template">
+		            <field name="name">Input TAX Rate O (Out of scope)</field>
+		            <field name="parent_id" ref="tax_code_input"/>
+		        </record>
 
-        <!-- Output VAT -->
+	        <!-- Output TAX -->
+	
+	        <record id="tax_code_output" model="account.tax.code.template">
+	            <field name="name">Output TAX</field>
+	            <field name="parent_id" ref="tax_code_balance_net"/>
+	        </record>
 
-        <record id="vat_code_output" model="account.tax.code.template">
-            <field name="name">Output VAT</field>
-            <field name="parent_id" ref="vat_code_balance_net"/>
-        </record>
+		        <record id="tax_code_output_S" model="account.tax.code.template">
+		            <field name="name">Output TAX Rate S (15%)</field>
+		            <field name="parent_id" ref="tax_code_output"/>
+		        </record>
+		
+		        <record id="tax_code_output_R" model="account.tax.code.template">
+		            <field name="name">Output TAX Rate R (5%)</field>
+		            <field name="parent_id" ref="tax_code_output"/>
+		        </record>
 
-        <record id="vat_code_output_S" model="account.tax.code.template">
-            <field name="name">Output VAT Rate S (15%)</field>
-            <field name="parent_id" ref="vat_code_output"/>
-        </record>
+		        <record id="tax_code_output_X" model="account.tax.code.template">
+		            <field name="name">Output TAX Rate X (Exempt)</field>
+		            <field name="parent_id" ref="tax_code_output"/>
+		        </record>
+		
+		        <record id="tax_code_output_O" model="account.tax.code.template">
+		            <field name="name">Output TAX Rate O (Out of scope)</field>
+		            <field name="parent_id" ref="tax_code_output"/>
+		        </record>
 
-        <record id="vat_code_output_R" model="account.tax.code.template">
-            <field name="name">Output VAT Rate R (5%)</field>
-            <field name="parent_id" ref="vat_code_output"/>
-        </record>
 
-        <!-- Invoiced Base of VAT -->
+	        <!-- Invoiced Base of TAX -->
+	
+	        <!-- Purchases -->
+	
+	        <record id="tax_code_base_net" model="account.tax.code.template">
+	            <field name="name">Tax Bases</field>
+	            <field name="parent_id" ref="tax_code_chart_root"/>
+	        </record>
 
-        <!-- Purchases -->
+		        <record id="tax_code_base_purchases" model="account.tax.code.template">
+		            <field name="name">Taxable Purchases Base</field>
+		            <field name="parent_id" ref="tax_code_base_net"/>
+		        </record>
 
-        <record id="vat_code_base_net" model="account.tax.code.template">
-            <field name="name">Tax Bases</field>
-            <field name="parent_id" ref="vat_code_chart_root"/>
-        </record>
+			        <record id="tax_code_purch_S" model="account.tax.code.template">
+			            <field name="name">Taxable Purchases Rated S (15%)</field>
+			            <field name="parent_id" ref="tax_code_base_purchases"/>
+			        </record>
+	
+			        <record id="tax_code_purch_R" model="account.tax.code.template">
+			            <field name="name">Taxable Purchases Rated R (5%)</field>
+			            <field name="parent_id" ref="tax_code_base_purchases"/>
+			        </record>
 
-        <record id="vat_code_base_purchases" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Base</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
-        </record>
+			        <record id="tax_code_purch_X" model="account.tax.code.template">
+			            <field name="name">Taxable Purchases Type X (Exempt)</field>
+			            <field name="parent_id" ref="tax_code_base_purchases"/>
+			        </record>
+			
+			        <record id="tax_code_purch_O" model="account.tax.code.template">
+			            <field name="name">Taxable Purchases Type O (Out of scope)</field>
+			            <field name="parent_id" ref="tax_code_base_purchases"/>
+			        </record>
 
-        <record id="vat_code_purch_S" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated S (15%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_R" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated R (5%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_Z" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Rated Z (0%)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_X" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Type X (Exempt)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <record id="vat_code_purch_O" model="account.tax.code.template">
-            <field name="name">Taxable Purchases Type O (Out of scope)</field>
-            <field name="parent_id" ref="vat_code_base_purchases"/>
-        </record>
-
-        <!-- Sales -->
-
-        <record id="vat_code_base_sales" model="account.tax.code.template">
-            <field name="name">Base of Taxable Sales</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
-        </record>
-
-        <record id="vat_code_sales_S" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated S (15%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_R" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated R (5%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_Z" model="account.tax.code.template">
-            <field name="name">Taxable Sales Rated Z (0%)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_X" model="account.tax.code.template">
-            <field name="name">Taxable Sales Type X (Exempt)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
-
-        <record id="vat_code_sales_O" model="account.tax.code.template">
-            <field name="name">Taxable Sales Type O (Out of scope)</field>
-            <field name="parent_id" ref="vat_code_base_sales"/>
-        </record>
+		        <!-- Sales -->
+		
+		        <record id="tax_code_base_sales" model="account.tax.code.template">
+		            <field name="name">Base of Taxable Sales</field>
+		            <field name="parent_id" ref="tax_code_base_net"/>
+		        </record>
+	
+			        <record id="tax_code_sales_S" model="account.tax.code.template">
+			            <field name="name">Taxable Sales Rated S (15%)</field>
+			            <field name="parent_id" ref="tax_code_base_sales"/>
+			        </record>
+			
+			        <record id="tax_code_sales_R" model="account.tax.code.template">
+			            <field name="name">Taxable Sales Rated R (5%)</field>
+			            <field name="parent_id" ref="tax_code_base_sales"/>
+			        </record>
+			
+			        <record id="tax_code_sales_X" model="account.tax.code.template">
+			            <field name="name">Taxable Sales Type X (Exempt)</field>
+			            <field name="parent_id" ref="tax_code_base_sales"/>
+			        </record>
+			
+			        <record id="tax_code_sales_O" model="account.tax.code.template">
+			            <field name="name">Taxable Sales Type O (Out of scope)</field>
+			            <field name="parent_id" ref="tax_code_base_sales"/>
+			        </record>
 
         <record id="configurable_chart_template" model="account.chart.template">
             <field name="name">Configurable Account Chart Template</field>
             <field name="account_root_id" ref="conf_chart0"/>
-            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
-              <field name="bank_account_view_id" ref="conf_bnk"/>
+            <field name="tax_code_root_id" ref="tax_code_chart_root"/>
+            <field name="bank_account_view_id" ref="conf_bnk"/>
             <field name="property_account_receivable" ref="conf_a_recv"/>
             <field name="property_account_payable" ref="conf_a_pay"/>
             <field name="property_account_expense_categ" ref="conf_a_expense"/>
             <field name="property_account_income_categ" ref="conf_a_sale"/>
+            <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
         </record>
 
-     <!-- VAT Codes -->
-        <!-- Purchases + Input VAT -->
+     	<!-- VAT Codes -->
+        <!-- Purchases + Output VAT -->
 
-        <record id="ivats" model="account.tax.template">
-                <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">IVAT S</field>
-            <field eval="0.15" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_iva"/>
-            <field name="account_paid_id" ref="conf_iva"/>
-            <field name="base_code_id" ref="vat_code_purch_S"/>
-            <field name="tax_code_id" ref="vat_code_input_S"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_S"/>
-            <field name="ref_tax_code_id" ref="vat_code_input_S"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivatr" model="account.tax.template">
-               <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">IVAT R</field>
-            <field eval="0.005" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="conf_iva"/>
-            <field name="account_paid_id" ref="conf_iva"/>
-            <field name="base_code_id" ref="vat_code_purch_R"/>
-            <field name="tax_code_id" ref="vat_code_input_R"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_R"/>
-            <field name="ref_tax_code_id" ref="vat_code_input_R"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivatz" model="account.tax.template">
+        <record id="otaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">IVAT Z</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_purch_Z"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_Z"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivatx" model="account.tax.template">
-            <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">IVAT X</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_purch_X"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_X"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="ivato" model="account.tax.template">
-            <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">IVAT O</field>
-            <field eval="0.0" name="amount"/>
-            <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_purch_O"/>
-            <field name="ref_base_code_id" ref="vat_code_purch_O"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <!-- Sales + Output VAT -->
-
-        <record id="ovats" model="account.tax.template">
-            <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">OVAT S</field>
+            <field name="name">OTAX S</field>
             <field eval="0.15" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="conf_ova"/>
             <field name="account_paid_id" ref="conf_ova"/>
-            <field name="base_code_id" ref="vat_code_sales_S"/>
-            <field name="tax_code_id" ref="vat_code_output_S"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_S"/>
-            <field name="ref_tax_code_id" ref="vat_code_output_S"/>
-            <field name="type_tax_use">sale</field>
+            <field name="base_code_id" ref="tax_code_purch_S"/>
+            <field name="tax_code_id" ref="tax_code_output_S"/>
+            <field name="ref_base_code_id" ref="tax_code_purch_S"/>
+            <field name="ref_tax_code_id" ref="tax_code_output_S"/>
+            <field name="type_tax_use">purchase</field>
         </record>
 
-        <record id="ovatr" model="account.tax.template">
+        <record id="otaxr" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">OVAT R</field>
-            <field eval="0.005" name="amount"/>
+            <field name="name">OTAX R</field>
+            <field eval="0.05" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="conf_ova"/>
             <field name="account_paid_id" ref="conf_ova"/>
-            <field name="base_code_id" ref="vat_code_sales_R"/>
-            <field name="tax_code_id" ref="vat_code_output_R"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_R"/>
-            <field name="ref_tax_code_id" ref="vat_code_output_R"/>
+            <field name="base_code_id" ref="tax_code_purch_R"/>
+            <field name="tax_code_id" ref="tax_code_output_R"/>
+            <field name="ref_base_code_id" ref="tax_code_purch_R"/>
+            <field name="ref_tax_code_id" ref="tax_code_output_R"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="otaxx" model="account.tax.template">
+            <field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">OTAX X</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="tax_code_purch_X"/>
+            <field name="tax_code_id" ref="tax_code_output_X"/>
+            <field name="ref_base_code_id" ref="tax_code_purch_X"/>
+            <field name="ref_tax_code_id" ref="tax_code_output_X"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="otaxo" model="account.tax.template">
+            <field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">OTAX O</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="tax_code_purch_O"/>
+            <field name="tax_code_id" ref="tax_code_output_O"/>
+            <field name="ref_base_code_id" ref="tax_code_purch_O"/>
+            <field name="ref_tax_code_id" ref="tax_code_output_O"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- Sales + Input VAT -->
+
+        <record id="itaxs" model="account.tax.template">
+            <field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">ITAX S</field>
+            <field eval="0.15" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
+            <field name="base_code_id" ref="tax_code_sales_S"/>
+            <field name="tax_code_id" ref="tax_code_input_S"/>
+            <field name="ref_base_code_id" ref="tax_code_sales_S"/>
+            <field name="ref_tax_code_id" ref="tax_code_input_S"/>
             <field name="type_tax_use">sale</field>
         </record>
 
-        <record id="ovatz" model="account.tax.template">
+        <record id="itaxr" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">OVAT Z</field>
-            <field eval="0.0" name="amount"/>
+            <field name="name">ITAX R</field>
+            <field eval="0.05" name="amount"/>
             <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_sales_Z"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_Z"/>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
+            <field name="base_code_id" ref="tax_code_sales_R"/>
+            <field name="tax_code_id" ref="tax_code_input_R"/>
+            <field name="ref_base_code_id" ref="tax_code_sales_R"/>
+            <field name="ref_tax_code_id" ref="tax_code_input_R"/>
             <field name="type_tax_use">sale</field>
         </record>
 
-        <record id="ovatx" model="account.tax.template">
+        <record id="itaxx" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">OVAT X</field>
+            <field name="name">ITAX X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_sales_X"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_X"/>
+            <field name="base_code_id" ref="tax_code_sales_X"/>
+            <field name="tax_code_id" ref="tax_code_input_X"/>
+            <field name="ref_base_code_id" ref="tax_code_sales_X"/>
+            <field name="ref_tax_code_id" ref="tax_code_input_X"/>
             <field name="type_tax_use">sale</field>
         </record>
 
-        <record id="ovato" model="account.tax.template">
+        <record id="itaxo" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
-            <field name="name">OVAT O</field>
+            <field name="name">ITAX O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_sales_O"/>
-            <field name="ref_base_code_id" ref="vat_code_sales_O"/>
+            <field name="base_code_id" ref="tax_code_sales_O"/>
+            <field name="tax_code_id" ref="tax_code_input_O"/>
+            <field name="ref_base_code_id" ref="tax_code_sales_O"/>
+            <field name="ref_tax_code_id" ref="tax_code_input_O"/>
             <field name="type_tax_use">sale</field>
         </record>
+        
+        
+        
+	    <!-- = = = = = = = = = = = = = = = -->
+	     <!-- Fiscal Position Templates     -->
+	    <!-- = = = = = = = = = = = = = = = -->
+        
+        
+        <record id="fiscal_position_normal_taxes_template1" model="account.fiscal.position.template">
+            <field name="name">Normal Taxes</field>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
+        </record>
+        
+        <record id="fiscal_position_tax_exempt_template2" model="account.fiscal.position.template">
+            <field name="name">Tax Exempt</field>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
+        </record>
+
+	    <!-- = = = = = = = = = = = = = = = -->
+	    <!-- Fiscal Position Tax Templates -->
+	    <!-- = = = = = = = = = = = = = = = -->
+
+
+    	<record id="fiscal_position_normal_taxes" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_normal_taxes_template1" />
+            <field name="tax_src_id" ref="itaxs" />
+            <field name="tax_dest_id" ref="otaxs" />
+        </record>
+
+    	<record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tax_exempt_template2" />
+            <field name="tax_src_id" ref="itaxx" />
+            <field name="tax_dest_id" ref="otaxx" />
+        </record>
+
+
+		<!--  Assigned Default Taxes For Different Account -->
+		
+		<record id="conf_a_sale" model="account.account.template">
+			<field name="tax_ids" eval="[(6,0,[ref('itaxs')])]"/>
+		</record>
+
+		<record id="conf_a_expense" model="account.account.template">
+			<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
+		</record>
+		
+		
     </data>
 </openerp>
diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml
index 74428196bfd..54f5ed6de91 100644
--- a/addons/account/data/account_invoice.xml
+++ b/addons/account/data/account_invoice.xml
@@ -27,8 +27,8 @@
         </record>
         
         <!--
-    Sequences for invoices
-    -->
+        Sequences for invoices
+        -->
         <record id="seq_out_invoice" model="ir.sequence">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>
@@ -55,16 +55,16 @@
         </record>
         
         <!--
-    Sequences types for analytic account 
-    -->
+        Sequences types for analytic account 
+        -->
         <record id="seq_type_analytic_account" model="ir.sequence.type">
             <field name="name">Analytic account</field>
             <field name="code">account.analytic.account</field>
         </record>
         
         <!-- 
-    Sequence for analytic account 
-    -->
+        Sequence for analytic account 
+        -->
         <record id="seq_analytic_account" model="ir.sequence">
             <field name="name">Analytic account sequence</field>
             <field name="code">account.analytic.account</field>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index d7a85753ab1..cfcd6d0033d 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -4,6 +4,7 @@
         <!--
         Account Type
         -->
+
         <record id="account_type_root" model="account.account.type">
             <field name="name">View</field>
             <field name="code">view</field>
@@ -89,15 +90,6 @@
             <field name="parent_id" ref="bal"/>
         </record>
 
-        <record model="account.account" id="liabilities_view">
-            <field name="name">Liabilities - (test)</field>
-            <field name="code">X11</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_liability"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="bal"/>
-        </record>
-
         <record id="fas" model="account.account">
             <field name="code">X100</field>
             <field name="name">Fixed Assets - (test)</field>
@@ -144,7 +136,7 @@
             <field ref="cas" name="parent_id"/>
             <field name="type">receivable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
+            <field name="user_type" ref="account_type_asset"/>
         </record>
 
         <record id="ova" model="account.account">
@@ -152,7 +144,7 @@
             <field name="name">Output VAT - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_receivable"/>
+            <field name="user_type" ref="account_type_asset"/>
         </record>
 
         <record id="bnk" model="account.account">
@@ -171,6 +163,15 @@
             <field name="user_type" ref="account_type_asset"/>
         </record>
 
+        <record model="account.account" id="liabilities_view">
+            <field name="name">Liabilities - (test)</field>
+            <field name="code">X11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
+        </record>
+
         <record id="cli" model="account.account">
             <field name="code">X110</field>
             <field name="name">Current Liabilities - (test)</field>
@@ -185,7 +186,7 @@
             <field ref="cli" name="parent_id"/>
             <field name="type">payable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
+            <field name="user_type" ref="account_type_liability"/>
         </record>
 
         <record id="iva" model="account.account">
@@ -193,7 +194,15 @@
             <field name="name">Input VAT - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_payable"/>
+            <field name="user_type" ref="account_type_liability"/>
+        </record>
+
+        <record id="rsa" model="account.account">
+            <field name="code">X1113</field>
+            <field name="name">Reserve and Surplus - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="user_type" ref="account_type_liability"/>
         </record>
 
         <!-- Profit and Loss -->
@@ -224,15 +233,6 @@
             <field name="parent_id" ref="income_view"/>
         </record>
 
-        <record model="account.account" id="expense_view">
-            <field name="name">Expense - (test)</field>
-            <field name="code">X21</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="gpf"/>
-        </record>
-
         <record id="rev" model="account.account">
             <field name="code">X200</field>
             <field name="name">Revenue - (test)</field>
@@ -249,6 +249,16 @@
             <field name="user_type" ref="account_type_income"/>
         </record>
 
+        <record model="account.account" id="expense_view">
+            <field name="name">Expense - (test)</field>
+            <field name="code">X21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+
+
         <record id="cos" model="account.account">
             <field name="code">X210</field>
             <field name="name">Cost of Sales - (test)</field>
@@ -310,6 +320,13 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
+        <record forcecreate="True" id="property_reserve_and_surplus_account" model="ir.property">
+            <field name="name">property_account_receivable</field>
+            <field name="fields_id" search="[('model','=','res.company'),('name','=','property_reserve_and_surplus_account')]"/>
+            <field eval="'account.account,'+str(rsa)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
 
         <!--
         Account Journal
@@ -381,7 +398,7 @@
         </record>
         <record id="cash_journal" model="account.journal">
             <field name="name">Cash Journal - (test)</field>
-            <field name="code">CHK</field>
+            <field name="code">CSH</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_journal"/>
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index f77e40c7846..c6a9ba4502d 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:27+0000\n"
+"PO-Revision-Date: 2010-08-14 08:40+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index bd37636308e..7a0590e8bfa 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:38+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 9e4855b15c9..805738048f8 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:19+0000\n"
+"PO-Revision-Date: 2010-08-14 08:36+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 305c8d08087..ef40b516c0b 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 08:42+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3283,7 +3283,7 @@ msgstr "Riconcilia registrazioni"
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(Bisogna annullare la riconciliazione per aprire la fattura)"
 
 #. module: account
 #: view:account.invoice:0
@@ -3776,7 +3776,7 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Non riconciliate"
 
 #. module: account
 #: field:account.account,note:0
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index e9252b7339b..d94a1984389 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:34+0000\n"
+"PO-Revision-Date: 2010-08-14 08:27+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index a1f462cba57..2e7c575fe1a 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:34+0000\n"
+"PO-Revision-Date: 2010-08-14 08:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 90cde790881..3fc6fee744e 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:52+0000\n"
+"PO-Revision-Date: 2010-08-14 09:08+0000\n"
 "Last-Translator: bokshas <astritbokshi@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 36320a8fdc1..b736ec3b32b 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:19+0000\n"
+"PO-Revision-Date: 2010-08-14 08:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <> <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index a1199b84fde..69160df8ded 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:38+0000\n"
 "Last-Translator: Omer Barlas <omer@barlas.com.tr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 1c0150d2965..889c6342c32 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:43+0000\n"
+"PO-Revision-Date: 2010-08-14 07:54+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -584,7 +584,7 @@ msgstr "打印日期"
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Mvt"
-msgstr "登账凭证编号"
+msgstr "凭证编号"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
@@ -618,7 +618,7 @@ msgstr "财务结构科目一览表"
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "联系"
 
 #. module: account
 #: selection:account.model.line,date:0
@@ -721,7 +721,7 @@ msgstr "科目.凭证.明细"
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr "辅助核算发票"
+msgstr "发票辅助核算"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -748,17 +748,17 @@ msgstr "采购属性"
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 msgid "Can be draft or validated"
-msgstr "能设为草稿或记账"
+msgstr "能设为草稿或已审核"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr "部分支付"
+msgstr "部分付款"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr "创建的凭证明细"
+msgstr "创建的凭证行"
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -784,7 +784,7 @@ msgstr "业务伙伴科目"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr "之前生成的分录:"
+msgstr "之前生成的凭证:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -792,7 +792,7 @@ msgstr "之前生成的分录:"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr "成本分类帐"
+msgstr "核算项目分类账"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -805,30 +805,30 @@ msgstr "(留空为所有开启的会计年度)"
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr "凭证明细"
+msgstr "凭证行"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr "科目成本与收益的业务类型"
+msgstr "辅助核算项目收支一览"
 
 #. module: account
 #: help:account.account.template,user_type:0
 msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
-msgstr "这些类型的定义根据你的国家. 在类型上包含更多的信息: 科目和它的特点."
+msgstr "按照所在国家定义这些类型，这些类型包含更多的科目和它的具体的信息。"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr "6"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr "银行对账"
+msgstr "出纳对账"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -852,13 +852,13 @@ msgstr "打印业务类型"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "科目.银行.科目.向导"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr "创建日期"
+msgstr "建立日期"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
@@ -868,7 +868,7 @@ msgstr "取消发票"
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr "必需"
+msgstr "必需的"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
@@ -902,7 +902,7 @@ msgstr "新的会计年度"
 msgid ""
 "If a default tax is given in the partner it only overrides taxes from "
 "accounts (or products) in the same group."
-msgstr "如果默认税是业务伙伴只覆盖, 税款科目(或产品)在同一分组"
+msgstr "是否增值税"
 
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -912,7 +912,7 @@ msgstr "打开会计年度"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr "选择科目一览表"
+msgstr "选择科目表"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -943,7 +943,7 @@ msgstr "基础税事务代码的金额"
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "这业务类型用户负责"
+msgstr "这用户负责这业务类型"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -954,12 +954,12 @@ msgstr "默认借方科目"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr "银行凭证"
+msgstr "银行单据凭证"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr "辅助核算发票"
+msgstr "发票辅助核算"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -1040,7 +1040,7 @@ msgstr "新的供应商发票"
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr "已付款金额"
+msgstr "已付金额"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -1085,7 +1085,7 @@ msgstr "补差额金额合计"
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr "含税价计算代码"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -1110,7 +1110,7 @@ msgstr "收入类科目"
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr "新的分析科目"
+msgstr "新的辅助核算项目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1127,22 +1127,22 @@ msgstr "单价"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "期间从："
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr "向导.多.一览表.科目"
+msgstr ""
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr "销售记录集合"
+msgstr "销售业务类型"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "这金额表示一个可选的其他货币"
+msgstr "这金额表示一个可选的其它货币"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -1194,7 +1194,7 @@ msgstr "进项发票"
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr "普通分录"
+msgstr "普通凭证"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1205,7 +1205,7 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"这将选择将要兑换的当前货币汇率. 在大多数国家法定为\"平均\"但只有少数软件系统能够管理.  所以如果你导入另一个软件系统,你可能需要使用当日汇率."
+"将选择要兑换货币的当前汇率。在大多数国家法定为“平均”，但只有少数软件系统能够管理。 所以如果你要导入另一个软件系统，你可能需要使用当日汇率。"
 
 #. module: account
 #: field:account.account,company_currency_id:0
@@ -1225,7 +1225,7 @@ msgstr "上级辅助核算项目"
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr "补差额时对账"
+msgstr "补差额时核销"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -1245,12 +1245,12 @@ msgstr "期末结余"
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr "采购税"
+msgstr "进项税"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr "明细名称"
+msgstr "条款名称"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -1271,7 +1271,7 @@ msgstr "部分核销单号"
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "没对账的交易"
+msgstr "没核销的交易"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1283,7 +1283,7 @@ msgstr "税一览"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr "下一步"
+msgstr "继续"
 
 #. module: account
 #: field:account.payment.term.line,value:0
@@ -1316,12 +1316,12 @@ msgstr "汇总副本"
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "消息"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr "选择你要支付和管理的放款的发票"
+msgstr "选择你要支付和要放款的发票"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1344,7 +1344,7 @@ msgstr "所有"
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr "辅助核算项目明细"
+msgstr "辅助核算行"
 
 #. module: account
 #: help:account.tax,type:0
@@ -1355,7 +1355,7 @@ msgstr "税金的计算方法"
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr "记账分录"
+msgstr "已审核的凭证"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1363,7 +1363,7 @@ msgstr "记账分录"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr "如果进行未对账交易, 你必须检验交易的所有操作. 因为他们不会被禁止."
+msgstr "如果执行反核销, 你必须检验链接该处理的所有操作. 因为他们不会被禁止."
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -1373,7 +1373,7 @@ msgstr "电子文件"
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr "客户贷方"
+msgstr "客户信用"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -1438,7 +1438,7 @@ msgstr "显示科目 "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr "银行凭证核销明细"
+msgstr "银行单据对账明细"
 
 #. module: account
 #: view:account.tax:0
@@ -1518,13 +1518,13 @@ msgstr "正数"
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr "打印普通日记帐"
+msgstr "打印全部业务类型凭证"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr "科目一览表模板"
+msgstr "科目表模板"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1541,7 +1541,7 @@ msgstr "从模板产生科目一览表"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr "正规报表"
+msgstr "按业务类型打印的报表"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -1552,12 +1552,12 @@ msgstr "上级代码"
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
 msgid "Open for reconciliation"
-msgstr "打开对账"
+msgstr "开始核销"
 
 #. module: account
 #: model:account.journal,name:account.bilan_journal
 msgid "Journal d'ouverture"
-msgstr "记录集合开启"
+msgstr "有效的业务类型"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -1579,14 +1579,14 @@ msgstr "留空为使用费用科目"
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
 msgid "Account to reconcile"
-msgstr "科目进行对账"
+msgstr "科目进行核销"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr "业务伙伴"
+msgstr "关联业务伙伴"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -1598,7 +1598,7 @@ msgstr "应收款与应付款科目"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr "周期性分录明细"
+msgstr "周期性凭证明细"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1677,7 +1677,7 @@ msgstr "成本&收入"
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "错误!你不能创建递归的账户"
+msgstr "错误!你不能创建递归的科目"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1707,7 +1707,7 @@ msgstr "重开"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr "你确定创建分录?"
+msgstr "你确定创建凭证?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
@@ -1723,23 +1723,23 @@ msgstr "第三贷方"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr "未对账分录"
+msgstr "反核销凭证"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr "控制预先生成发票"
+msgstr "管理预先生成发票"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr "成本分类账的会计期间"
+msgstr "会计期间的成本分类账"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr "新银行凭证"
+msgstr "新的银行单据"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1751,14 +1751,14 @@ msgstr "从"
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr "发票和付款的对账分录"
+msgstr "发票和付款的核销凭证"
 
 #. module: account
 #: wizard_view:account.central.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr "打印主要的业务类型"
+msgstr "打印汇总的的业务类型"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -1775,7 +1775,7 @@ msgstr "百分比"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "一览表"
+msgstr "表"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1789,7 +1789,7 @@ msgstr "销售"
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr "下一个"
+msgstr "下一步"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -1806,12 +1806,12 @@ msgstr "日期或者代码"
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr "科目管理员"
+msgstr "项目管理员"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "到："
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -1849,7 +1849,7 @@ msgstr "开始日期"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x 费用贷项单记录集合"
+msgstr "x 费用贷记业务类型"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1865,7 +1865,7 @@ msgstr "类型"
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr "科目允许(留空为不限制)"
+msgstr "允许科目(留空为不限制)"
 
 #. module: account
 #: view:account.invoice:0
@@ -1903,7 +1903,7 @@ msgstr "客户发票草稿"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "周期性分录明细的科目"
+msgstr "周期性凭证行的科目"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1911,7 +1911,7 @@ msgstr "周期性分录明细的科目"
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr "没过滤"
+msgstr "不过滤"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -1921,7 +1921,7 @@ msgstr "天数"
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr "该发票的业务伙伴"
+msgstr "该业务伙伴关联的发票"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
@@ -1931,7 +1931,7 @@ msgstr "排序按:"
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr "待复核"
+msgstr "待审核"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -1941,7 +1941,7 @@ msgstr "欠供应商金额合计"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr "7"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -1951,12 +1951,12 @@ msgstr "转移"
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr "Li."
+msgstr ""
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr "科目一览表"
+msgstr "科目表"
 
 #. module: account
 #: help:account.tax,name:0
@@ -2009,7 +2009,7 @@ msgstr "业务类型 - 会计期间名称"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "税务名称"
+msgstr "税事务名称"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2017,7 +2017,7 @@ msgid ""
 "Check this box if you don't want new account moves to pass through the "
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
-msgstr "勾选此项, 如果你不想新的凭证从草稿状态生成而是直接通过手动记账到已登记状态."
+msgstr "勾选此项, 如果你不想新的凭证从草稿状态生成而是直接通过手动审核到已登账状态."
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -2066,19 +2066,19 @@ msgstr "客户发票处理"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "财务状况备注:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr "会计期间的开账分录"
+msgstr "会计期间的启用凭证"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
 #: model:ir.ui.menu,name:account.menu_validate_account_moves
 msgid "Validate Account Moves"
-msgstr "记账凭证"
+msgstr "审核凭证"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -2088,7 +2088,7 @@ msgstr "天"
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr "以前"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2118,13 +2118,13 @@ msgstr "付款对账"
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr "银行凭证对帐"
+msgstr "新建对账单"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr "新周期性分录"
+msgstr "新周期性凭证"
 
 #. module: account
 #: view:account.payment.term:0
@@ -2134,19 +2134,19 @@ msgstr "计算"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "辅助核算分录"
+msgstr "辅助核算凭证"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "逾期付款信息"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr "税一览表"
+msgstr "税表"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -2156,7 +2156,7 @@ msgstr "金额"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "对账分录"
+msgstr "核销凭证"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -2220,23 +2220,23 @@ msgstr "增值税 :"
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "科目一览表"
+msgstr "科目表"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr "x 支票集合"
+msgstr "x 支票业务类型"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr "创建周期性分录"
+msgstr "创建周期性凭证"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "业务类型开账分录"
+msgstr "业务类型的开账凭证"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -2251,7 +2251,7 @@ msgstr "客户税"
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr "发票日期"
+msgstr "开票日期"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2270,7 +2270,7 @@ msgstr "负债"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr "2"
+msgstr ""
 
 #. module: account
 #: wizard_view:account.chart,init:0
@@ -2305,13 +2305,13 @@ msgstr "日期"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Reference Type"
-msgstr "参考类型"
+msgstr "关联类型"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr "未对账"
+msgstr "反核销"
 
 #. module: account
 #: field:account.tax,type:0
@@ -2322,7 +2322,7 @@ msgstr "税类型"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "项"
+msgstr "银行单据凭证"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
@@ -2339,12 +2339,12 @@ msgstr "科目模板"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "科目一览表模板"
+msgstr "科目表模板"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Journal d'extourne"
-msgstr "退款记录集合"
+msgstr "退款业务类型"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -2355,7 +2355,7 @@ msgstr "原始凭证编号"
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr "自动对账"
+msgstr "自动核销"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2380,7 +2380,7 @@ msgstr "凭证行"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr "科目No"
+msgstr "科目编号"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -2418,13 +2418,13 @@ msgstr "结束日期"
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr "分录明细"
+msgstr "凭证行"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr "适用代码(如果类型=代码)"
+msgstr "可用代码(如果类型=代码)"
 
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
@@ -2442,12 +2442,12 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_entries_analytic_entries
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 msgid "Entries Encoding by Line"
-msgstr "分录明细"
+msgstr "凭证行"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr "这向导列出所有必须安装的税"
+msgstr "这向导列出所有要配置的税"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2460,7 +2460,7 @@ msgstr "会计期间从"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "银行银行凭证"
+msgstr "银行单据"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2472,7 +2472,7 @@ msgstr "附加信息"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
-msgstr "分录对账"
+msgstr "凭证核销"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
@@ -2554,12 +2554,12 @@ msgstr "科目类型名称"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr "增值税申报使用这代码"
+msgstr "申报增值税使用的代码"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr "争议"
+msgstr "有争议"
 
 #. module: account
 #: view:account.move.line:0
@@ -2576,12 +2576,12 @@ msgstr "税务报表"
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "应付账"
+msgstr "应付帐"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr "在银行凭证里导入发票"
+msgstr "在银行单据里导入发票"
 
 #. module: account
 #: view:account.invoice:0
@@ -2602,7 +2602,7 @@ msgstr "付款单"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "勾选此项, 如果你想用户在这科目对账分录."
+msgstr "勾选此项, 如果你想用户在这科目用这核销凭证."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2625,7 +2625,7 @@ msgstr "权益"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "逾期付款消息"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2646,7 +2646,8 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
-"这类型在系统中和特效一起用于不同的类型: 视图不能有记录. 合并科目能有多公司合并的子科目, 应收/应付的科目(为计算借方/贷方). 关闭弃用科目."
+"类型在系统用于不同的类型和发挥不同的效果: 视图不能有记录. 合并科目可以有多公司合并的子科目,业务伙伴的 应收/应付的科目(为计算借方/贷方). "
+"关闭停用的科目."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2656,12 +2657,12 @@ msgstr "结束会计年度处理"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "一般报表"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
 msgid "Power"
-msgstr "幂"
+msgstr "强制"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
@@ -2671,14 +2672,14 @@ msgstr "辅助核算明细分析"
 #. module: account
 #: rml:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
-msgstr "-"
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2702,7 +2703,7 @@ msgstr "辅助核算明细视图"
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Select Period and Journal for Validation"
-msgstr "选择会计期间和记账业务类型"
+msgstr "选择会计期间和审核的业务类型"
 
 #. module: account
 #: field:account.invoice,number:0
@@ -2739,7 +2740,7 @@ msgstr "适用类型"
 #. module: account
 #: field:account.invoice,reference:0
 msgid "Invoice Reference"
-msgstr "发票参考"
+msgstr "发票关联"
 
 #. module: account
 #: field:account.account,name:0
@@ -2755,13 +2756,13 @@ msgstr "发票参考"
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr "摘要"
+msgstr "名称"
 
 #. module: account
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Reconciliation transactions"
-msgstr "对账交易"
+msgstr "核销交易"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
@@ -2776,12 +2777,12 @@ msgstr "开始"
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr "公司指业务伙伴"
+msgstr "公司是指业务伙伴"
 
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "凭证日期"
+msgstr "生效日期"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -2807,7 +2808,7 @@ msgstr "贷方汇总"
 #. module: account
 #: rml:account.overdue:0
 msgid "Customer Ref:"
-msgstr "客户参考:"
+msgstr "客户关联单号:"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -2842,7 +2843,7 @@ msgstr "新的客户发票"
 #: wizard_button:account.move.line.reconcile,addendum,reconcile:0
 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0
 msgid "Reconcile"
-msgstr "对账"
+msgstr "核销"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2873,12 +2874,12 @@ msgstr "跳过'草稿'状态创建分录"
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr "税事务"
+msgstr "税科目"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "从银行凭证创建分录"
+msgstr "从银行单据创建凭证"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -2931,20 +2932,20 @@ msgstr "税一览"
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
-msgstr "未对账交易"
+msgstr "反核销处理"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Reconcilation of entries from payment order."
-msgstr "付款单的对账分录"
+msgstr "付款单的核销凭证"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.model,name:account.model_account_move_line
 msgid "Entry lines"
-msgstr "分录明细"
+msgstr "明细"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2955,7 +2956,7 @@ msgstr "分录明细"
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
 msgid "Reconciliation"
-msgstr "对账"
+msgstr "核销"
 
 #. module: account
 #: field:account.move.line,centralisation:0
@@ -3003,7 +3004,7 @@ msgid ""
 "The maturity date of the generated entries for this model. You can chosse "
 "between the date of the creation action or the the date of the creation of "
 "the entries plus the partner payment terms."
-msgstr "这模型在付款到期日产生分录.  你能从创建日期到到付款期限间选择."
+msgstr "这模型在付款到期日产生凭证. 你能选择创建操作的日期或创建凭证的日期,填入业务伙伴的付款条款中."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3020,7 +3021,7 @@ msgstr "单据"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "凭证明细变动"
+msgstr "凭证行的变动"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -3030,20 +3031,20 @@ msgstr "计量单位"
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr ""
+msgstr "应收款科目"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
-msgstr "如果勾选此项, 系统将试图在从发票生成分录明细时分组"
+msgstr "如果勾选此项, 系统将试图在从发票生成凭证时分组"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
 #: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "# 处理"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
@@ -3057,17 +3058,17 @@ msgstr "取消所选发票"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
-msgstr "辅助核算业务类型"
+msgstr "辅助核算类型"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Entry Label"
-msgstr "分录标签"
+msgstr "凭证标签"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Reconcilate the entries from payment"
-msgstr "付款的对账分录"
+msgstr "付款的核销凭证"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -3085,7 +3086,7 @@ msgstr "设为草稿"
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr "发票上单据产品的参考"
+msgstr "发票上产品的关联文档"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3098,7 +3099,7 @@ msgstr "应付的"
 #: rml:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr "基础"
+msgstr "基于"
 
 #. module: account
 #: field:account.model,name:0
@@ -3121,18 +3122,18 @@ msgstr "8"
 #: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
-msgstr "记账"
+msgstr "审核"
 
 #. module: account
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr "说明"
+msgstr "图表"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 msgid "Proposed invoice to be checked, validated and printed"
-msgstr "计划的发票已检验、已记账和已打印"
+msgstr "这发票已检验、已审核和已打印"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
@@ -3160,7 +3161,7 @@ msgstr "科目"
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Journal de Banque CHF"
-msgstr "银行记录集合"
+msgstr ""
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3186,7 +3187,7 @@ msgstr "备注"
 msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
-msgstr "发票凭证与付款凭证对账."
+msgstr "发票凭证与付款凭证核销."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3201,7 +3202,7 @@ msgstr "税"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr "用新分录关闭会计年度"
+msgstr "关闭会计年度的新凭证"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3212,7 +3213,7 @@ msgstr "平均汇率"
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr "产品付款分录银行凭证"
+msgstr "产品付款凭证的银行单据"
 
 #. module: account
 #: field:account.account,code:0
@@ -3249,17 +3250,17 @@ msgstr "无"
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "产生会计年度开账分录"
+msgstr "生成会计年度开账凭证"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
-msgstr "对账分录"
+msgstr "核销凭证"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(如果你想打开它发票应未对账)"
+msgstr "(如果你想打开它发票要反核销)"
 
 #. module: account
 #: view:account.invoice:0
@@ -3281,7 +3282,7 @@ msgstr " 会计年度和会计期间处于关闭状态"
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr "每月30天"
+msgstr "月结束为30天"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -3291,7 +3292,7 @@ msgstr "税事务的根"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr "错误：需要BVR参照"
+msgstr "错误：需要BVR的关联单号"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3308,7 +3309,7 @@ msgstr "凭证"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "源税"
+msgstr "税源自"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@@ -4492,7 +4493,7 @@ msgstr "产生编号"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Valid Entries"
-msgstr "有效分录"
+msgstr "审核的凭证"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_use_model
@@ -5255,7 +5256,7 @@ msgstr "未支付的客户退款"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr "余下的欠款"
+msgstr "剩余的欠款"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
@@ -5935,7 +5936,7 @@ msgstr "勾选, 如果用户可以在这科目对账分录."
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
-msgstr "计算日期"
+msgstr "计算凭证日期"
 
 #. module: account
 #: view:board.board:0
@@ -6278,9 +6279,6 @@ msgstr "未完税金额"
 #~ msgid "x Sales Journal"
 #~ msgstr "x 销售分类帐"
 
-#~ msgid "account.config.wizard"
-#~ msgstr "科目.设置.向导"
-
 #~ msgid "x Sales Credit Note Journal"
 #~ msgstr "x 销售贷项票据分类帐"
 
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 250fb5c782c..c072375aa99 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -53,7 +53,7 @@ class account_installer(osv.osv_memory):
     _columns = {
         # Accounting
         'charts':fields.selection(_get_charts, 'Chart of Accounts',
-            required=True,
+            required=False,
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "
                  "country."),
@@ -340,8 +340,10 @@ class account_installer(osv.osv_memory):
             ('property_account_expense_categ','product.category','account.account'),
             ('property_account_income_categ','product.category','account.account'),
             ('property_account_expense','product.template','account.account'),
-            ('property_account_income','product.template','account.account')
+            ('property_account_income','product.template','account.account'),
+            ('property_reserve_and_surplus_account','res.company','account.account'),
         ]
+
         for record in todo_list:
             r = []
             r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id.id)])
@@ -353,6 +355,7 @@ class account_installer(osv.osv_memory):
                 'fields_id': field[0],
                 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
             }
+
             if r:
                 #the property exist: modify it
                 property_obj.write(cr, uid, r, vals)
@@ -393,6 +396,8 @@ class account_installer(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        data_pool = self.pool.get('ir.model.data')
+        obj_acc = self.pool.get('account.account')
         super(account_installer, self).execute(cr, uid, ids, context=context)
         record = self.browse(cr, uid, ids, context=context)[0]
         company_id = self.pool.get('res.users').browse(cr, uid, [uid], context)[0].company_id
@@ -411,24 +416,24 @@ class account_installer(osv.osv_memory):
                 tax_val = {}
                 default_tax = []
 
-                pur_tax_parent = mod_obj._get_id(cr, uid, 'account', 'vat_code_base_purchases')
+                pur_tax_parent = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_purchases')
                 pur_tax_parent_id = mod_obj.read(cr, uid, [pur_tax_parent], ['res_id'])[0]['res_id']
 
-                sal_tax_parent = mod_obj._get_id(cr, uid, 'account', 'vat_code_base_sales')
+                sal_tax_parent = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_sales')
                 sal_tax_parent_id = mod_obj.read(cr, uid, [sal_tax_parent], ['res_id'])[0]['res_id']
 
                 if s_tax*100 > 0.0:
                     vals_tax_code = {
-                        'name': 'VAT%s%%'%(s_tax*100),
-                        'code': 'VAT%s%%'%(s_tax*100),
+                        'name': 'TAX%s%%'%(s_tax*100),
+                        'code': 'TAX%s%%'%(s_tax*100),
                         'company_id': company_id.id,
                         'sign': 1,
                         'parent_id':sal_tax_parent_id
                         }
                     new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code)
                     sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'VAT%s%%'%(s_tax*100),
-                                            'description':'VAT%s%%'%(s_tax*100),
+                                           {'name':'TAX%s%%'%(s_tax*100),
+                                            'description':'TAX%s%%'%(s_tax*100),
                                             'amount':s_tax,
                                             'base_code_id':new_tax_code,
                                             'tax_code_id':new_tax_code,
@@ -438,16 +443,16 @@ class account_installer(osv.osv_memory):
                     default_tax.append(('taxes_id',sales_tax))
                 if p_tax*100 > 0.0:
                     vals_tax_code = {
-                        'name': 'VAT%s%%'%(p_tax*100),
-                        'code': 'VAT%s%%'%(p_tax*100),
+                        'name': 'TAX%s%%'%(p_tax*100),
+                        'code': 'TAX%s%%'%(p_tax*100),
                         'company_id': company_id.id,
                         'sign': 1,
                         'parent_id':pur_tax_parent_id
                         }
                     new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code)
                     purchase_tax = obj_tax.create(cr, uid,
-                                            {'name':'VAT%s%%'%(p_tax*100),
-                                             'description':'VAT%s%%'%(p_tax*100),
+                                            {'name':'TAX%s%%'%(p_tax*100),
+                                             'description':'TAX%s%%'%(p_tax*100),
                                              'amount':p_tax,
                                              'base_code_id':new_tax_code,
                                             'tax_code_id':new_tax_code,
@@ -478,6 +483,15 @@ class account_installer(osv.osv_memory):
                     res_obj.create_period(cr, uid, [period_id])
                 elif res['period'] == '3months':
                     res_obj.create_period3(cr, uid, [period_id])
+        
+#        #fially inactive the demo chart of accounts
+#        data_id = data_pool.search(cr, uid, [('model','=','account.account'), ('name','=','chart0')])
+#        if data_id:
+#            data = data_pool.browse(cr, uid, data_id[0])
+#            account_id = data.res_id
+#            acc_ids = obj_acc._get_children_and_consol(cr, uid, [account_id])
+#            if acc_ids:
+#                cr.execute("update account_account set active='f' where id in " + str(tuple(acc_ids)))
 
     def modules_to_install(self, cr, uid, ids, context=None):
         modules = super(account_installer, self).modules_to_install(
@@ -531,4 +545,4 @@ class account_installer_modules(osv.osv_memory):
 
 account_installer_modules()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index d3615e651d0..940d9cba0f6 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -231,8 +231,8 @@ class account_invoice(osv.osv):
             ('in_refund','Supplier Refund'),
             ],'Type', readonly=True, select=True, change_default=True),
 
-#        'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
-        'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
+        'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
+        'internal_number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
         'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
         'reference_type': fields.selection(_get_reference_type, 'Reference Type',
             required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -301,7 +301,7 @@ class account_invoice(osv.osv):
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
             }, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
-            help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Parner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
+            help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
         'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
         'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
             store={
@@ -326,6 +326,7 @@ class account_invoice(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
         'reference_type': 'none',
         'check_total': 0.0,
+        'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
     }
 
@@ -405,7 +406,7 @@ class account_invoice(osv.osv):
                     rec_res_id = rec_line_data and int(rec_line_data[0]['value'].split(',')[1]) or False
                     pay_res_id = pay_line_data and int(pay_line_data[0]['value'].split(',')[1]) or False
                     if not rec_res_id and not pay_res_id:
-                        raise osv.except_osv(_('Configration Error !'),
+                        raise osv.except_osv(_('Configuration Error !'),
                             _('Can not find account chart for this company, Please Create account.'))
                     account_obj = self.pool.get('account.account')
                     rec_obj_acc = account_obj.browse(cr, uid, [rec_res_id])
@@ -451,7 +452,7 @@ class account_invoice(osv.osv):
         if curr_id and company_id:
             currency = self.pool.get('res.currency').browse(cr, uid, curr_id)
             if currency.company_id.id != company_id:
-                raise osv.except_osv(_('Configration Error !'),
+                raise osv.except_osv(_('Configuration Error !'),
                         _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
         return {}
 
@@ -464,7 +465,7 @@ class account_invoice(osv.osv):
             date_invoice = time.strftime('%Y-%m-%d')
 
         pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
-    
+
         if pterm_list:
             pterm_list = [line[0] for line in pterm_list]
             pterm_list.sort()
@@ -501,7 +502,7 @@ class account_invoice(osv.osv):
                     rec_res_id = rec_line_data and int(rec_line_data[0]['value'].split(',')[1]) or False
                     pay_res_id = pay_line_data and int(pay_line_data[0]['value'].split(',')[1]) or False
                     if not rec_res_id and not pay_res_id:
-                        raise osv.except_osv(_('Configration Error !'),
+                        raise osv.except_osv(_('Configuration Error !'),
                             _('Can not find account chart for this company, Please Create account.'))
                     if type in ('out_invoice', 'out_refund'):
                         acc_id = rec_res_id
@@ -517,7 +518,7 @@ class account_invoice(osv.osv):
                             if line.account_id.company_id.id != company_id:
                                 result_id = account_obj.search(cr, uid, [('name','=',line.account_id.name),('company_id','=',company_id)])
                                 if not result_id:
-                                    raise osv.except_osv(_('Configration Error !'),
+                                    raise osv.except_osv(_('Configuration Error !'),
                                         _('Can not find account chart for this company in invoice line account, Please Create account.'))
                                 r_id = self.pool.get('account.invoice.line').write(cr, uid, [line.id], {'account_id': result_id[0]})
             else:
@@ -525,7 +526,7 @@ class account_invoice(osv.osv):
                     for inv_line in invoice_line:
                         obj_l = account_obj.browse(cr, uid, inv_line[2]['account_id'])
                         if obj_l.company_id.id != company_id:
-                            raise osv.except_osv(_('Configration Error !'),
+                            raise osv.except_osv(_('Configuration Error !'),
                                 _('invoice line account company is not match with invoice company.'))
                         else:
                             continue
@@ -538,7 +539,7 @@ class account_invoice(osv.osv):
             if journal_ids:
                 val['journal_id'] = journal_ids[0]
             else:
-                raise osv.except_osv(_('Configration Error !'),
+                raise osv.except_osv(_('Configuration Error !'),
                                 _('Can not find account journal for this company in invoice, Please Create journal.'))
             dom = {'journal_id':  [('id', 'in', journal_ids)]}
         else:
@@ -595,15 +596,22 @@ class account_invoice(osv.osv):
         res = map(itemgetter(0), cr.fetchall())
         return res
 
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default = default.copy()
-        default.update({'state':'draft', 'number':False, 'move_id':False, 'move_name':False,})
+    def copy(self, cr, uid, id, default={}, context=None):
+        default.update({
+            'state':'draft', 
+            'number':False, 
+            'move_id':False, 
+            'move_name':False,
+            'internal_number': False,
+        })
         if 'date_invoice' not in default:
-            default['date_invoice'] = False
+            default.update({
+                'date_invoice':False
+            })
         if 'date_due' not in default:
-            default['date_due'] = False
+            default.update({
+                'date_due':False
+            })
         return super(account_invoice, self).copy(cr, uid, id, default, context)
 
     def test_paid(self, cr, uid, ids, *args):
@@ -773,7 +781,7 @@ class account_invoice(osv.osv):
         cur_obj = self.pool.get('res.currency')
         context = {}
         for inv in self.browse(cr, uid, ids):
-            if not inv.journal_id.invoice_sequence_id:
+            if not inv.journal_id.sequence_id:
                 raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal'))
             if not inv.invoice_line:
                 raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
@@ -881,10 +889,10 @@ class account_invoice(osv.osv):
             line = self.finalize_invoice_move_lines(cr, uid, inv, line)
 
             move = {
-                'ref': inv.number, 
-                'line_id': line, 
-                'journal_id': journal_id, 
-                'date': date, 
+                'ref': inv.number,
+                'line_id': line,
+                'journal_id': journal_id,
+                'date': date,
                 'type': entry_type,
                 'narration':inv.comment
             }
@@ -931,48 +939,39 @@ class account_invoice(osv.osv):
         }
 
     def action_number(self, cr, uid, ids, *args):
-#        #TODO: not correct fix but required a frech values before reading it.
-#        self.write(cr, uid, ids, {})
-#        
-        cr.execute('SELECT id, type, number, move_id, reference ' \
-                'FROM account_invoice ' \
-                'WHERE id IN ('+','.join(map(str,ids))+')')
-        obj_inv = self.browse(cr, uid, ids)[0]
+        #TODO: not correct fix but required a frech values before reading it.
+        self.write(cr, uid, ids, {})
         
-        for (id, invtype, number, move_id, reference) in cr.fetchall():
-            if not number:
-                if obj_inv.journal_id.invoice_sequence_id:
-                    sid = obj_inv.journal_id.invoice_sequence_id.id
-                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
-                else:
-                    number = self.pool.get('ir.sequence').get(cr, uid, 'account.invoice.' + invtype)
+        for obj_inv in self.browse(cr, uid, ids):
+            id = obj_inv.id
+            invtype = obj_inv.type
+            number = obj_inv.number
+            move_id = obj_inv.move_id and obj_inv.move_id.id or False
+            reference = obj_inv.reference or ''
 
-                if not number:
-                    raise osv.except_osv(_('Warning !'), _('There is no active invoice sequence defined for the journal !'))
-                
-                if invtype in ('in_invoice', 'in_refund'):
-                    ref = reference
-                else:
-                    ref = self._convert_ref(cr, uid, number)
-                
-                cr.execute('UPDATE account_invoice SET number=%s ' \
-                        'WHERE id=%s', (number, id))
-                cr.execute('UPDATE account_move SET ref=%s ' \
-                        'WHERE id=%s AND (ref is null OR ref = \'\')',
+            self.write(cr, uid, ids, {'internal_number':number})
+            
+            if invtype in ('in_invoice', 'in_refund'):
+                ref = reference
+            else:
+                ref = self._convert_ref(cr, uid, number)
+
+            cr.execute('UPDATE account_move SET ref=%s ' \
+                    'WHERE id=%s AND (ref is null OR ref = \'\')',
+                    (ref, move_id))
+            cr.execute('UPDATE account_move_line SET ref=%s ' \
+                    'WHERE move_id=%s AND (ref is null OR ref = \'\')',
+                    (ref, move_id))
+            cr.execute('UPDATE account_analytic_line SET ref=%s ' \
+                    'FROM account_move_line ' \
+                    'WHERE account_move_line.move_id = %s ' \
+                        'AND account_analytic_line.move_id = account_move_line.id',
                         (ref, move_id))
-                cr.execute('UPDATE account_move_line SET ref=%s ' \
-                        'WHERE move_id=%s AND (ref is null OR ref = \'\')',
-                        (ref, move_id))
-                cr.execute('UPDATE account_analytic_line SET ref=%s ' \
-                        'FROM account_move_line ' \
-                        'WHERE account_move_line.move_id = %s ' \
-                            'AND account_analytic_line.move_id = account_move_line.id',
-                            (ref, move_id))
-                            
+            
             for inv_id, name in self.name_get(cr, uid, [id]):
                 message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
                 self.log(cr, uid, inv_id, message)
-                
+
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -1038,25 +1037,14 @@ class account_invoice(osv.osv):
         for line in lines:
             del line['id']
             del line['invoice_id']
-            if 'account_id' in line:
-                line['account_id'] = line.get('account_id', False) and line['account_id'][0]
-            if 'product_id' in line:
-                line['product_id'] = line.get('product_id', False) and line['product_id'][0]
-            if 'uos_id' in line:
-                line['uos_id'] = line.get('uos_id', False) and line['uos_id'][0]
+            for field in ('company_id', 'partner_id', 'account_id', 'product_id',
+                          'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
+                line[field] = line.get(field, False) and line[field][0]
             if 'invoice_line_tax_id' in line:
                 line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
-            if 'account_analytic_id' in line:
-                line['account_analytic_id'] = line.get('account_analytic_id', False) and line['account_analytic_id'][0]
-            if 'tax_code_id' in line :
-                if isinstance(line['tax_code_id'],tuple)  and len(line['tax_code_id']) >0 :
-                    line['tax_code_id'] = line['tax_code_id'][0]
-            if 'base_code_id' in line :
-                if isinstance(line['base_code_id'],tuple)  and len(line['base_code_id']) >0 :
-                    line['base_code_id'] = line['base_code_id'][0]
         return map(lambda x: (0,0,x), lines)
 
-    def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
+    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
         invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
 
         new_ids = []
@@ -1070,17 +1058,19 @@ class account_invoice(osv.osv):
                 'in_refund': 'in_invoice',   # Supplier Refund
             }
 
-
             invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
             invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines)
 
             tax_lines = self.pool.get('account.invoice.tax').read(cr, uid, invoice['tax_line'])
             tax_lines = filter(lambda l: l['manual'], tax_lines)
             tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
-            if invoice['type'] == 'in_invoice':
+            if journal_id:
+                refund_journal_ids = [journal_id]
+            elif invoice['type'] == 'in_invoice':
                 refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase_refund')])
             else:
                 refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')])
+
             if not date :
                 date = time.strftime('%Y-%m-%d')
             invoice.update({
@@ -1254,7 +1244,7 @@ class account_invoice_line(osv.osv):
         'quantity': fields.float('Quantity', required=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
-        'note': fields.text('Notes', translate=True),
+        'note': fields.text('Notes'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
@@ -1292,7 +1282,7 @@ class account_invoice_line(osv.osv):
             context.update({'lang': part.lang})
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
-        
+
         if company_id:
             property_obj = self.pool.get('ir.property')
             account_obj = self.pool.get('account.account')
@@ -1339,7 +1329,7 @@ class account_invoice_line(osv.osv):
                 in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
                 exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])
                 if not in_res_id and not exp_res_id:
-                    raise osv.except_osv(_('Configration Error !'),
+                    raise osv.except_osv(_('Configuration Error !'),
                         _('Can not find account chart for this company, Please Create account.'))
                 in_obj_acc = account_obj.browse(cr, uid, in_res_id)
                 exp_obj_acc = account_obj.browse(cr, uid, exp_res_id)
@@ -1397,7 +1387,7 @@ class account_invoice_line(osv.osv):
         currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
 
         if not currency.company_id.id == company.id:
-            raise osv.except_osv(_('Configration Error !'),
+            raise osv.except_osv(_('Configuration Error !'),
                         _('Can not select currency that is not related to any company.\nPlease select accordingly !.'))
 
         if company.currency_id.id != currency.id:
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 3fe3e34cfe7..9ebb86c719d 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -145,7 +145,7 @@
         <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>-->
 
         <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
-        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
+<!--        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>-->
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
@@ -354,7 +354,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
+        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries" groups="base.group_extended"/>
         <!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
             <field name="name">Check Register</field>
             <field name="res_model">account.analytic.line</field>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index 204bb7c8de8..82796a75b4f 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -9,7 +9,7 @@
 			<field name="arch" type="xml">
                 <form string="Select period">
 	               <group width="450">
-	                   <separator string="Cost Legder for period" colspan="4"/>
+	                   <separator string="Cost Ledger for period" colspan="4"/>
 	                   <field name="date1"/>
 	                   <field name="date2"/>
 	                   <separator string="and Journals" colspan="4"/>
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index bd9101a3382..521fe37ff4b 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -88,7 +88,7 @@
         <field name="search_view_id" ref="view_account_account_report_search"/>
     </record>
 
-    <menuitem action="action_account_account_report" id="menu_action_account_account_report" parent="account.menu_finance_statistic_report_statement" sequence="6"/>
+<!--    <menuitem action="action_account_account_report" id="menu_action_account_account_report" parent="account.menu_finance_statistic_report_statement" sequence="6"/>-->
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 070b3a8c10a..cb7318fe3e4 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -122,7 +122,7 @@
         <field name="context">{'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_analytic_report_search"/>
     </record>
-    <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statistic_report_statement" sequence="8"/>
+<!--    <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statistic_report_statement" sequence="8"/>-->
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index a40705fd83f..1047453289c 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -51,6 +51,7 @@ class account_entries_report(osv.osv):
                                   help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Posted\' state.'),
         'state_2': fields.selection([('draft','Draft'), ('valid','Valid')], 'State of Move Line', readonly=True,
                                   help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
+        'reconcile_id': fields.many2one('account.move.reconcile', readonly=True),
         'partner_id': fields.many2one('res.partner','Partner', readonly=True),
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
         'quantity': fields.float('Products Quantity', digits=(16,2), readonly=True),
@@ -69,6 +70,42 @@ class account_entries_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
     _order = 'date desc'
+    
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+            context=None, count=False):
+        for arg in args:
+            if arg[0] == 'period_id' and arg[2] == 'current_period':
+                current_period = self.pool.get('account.period').find(cr, uid)[0]
+                args.append(['period_id','in',[current_period]])
+                break
+            elif arg[0] == 'period_id' and arg[2] == 'current_year':
+                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
+                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                args.append(['period_id','in',ids])
+        for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
+            if a in args:
+                args.remove(a)
+        return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
+            context=context, count=count)
+    
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
+        todel=[]
+        for arg in domain:
+            if arg[0] == 'period_id' and arg[2] == 'current_period':
+                current_period = self.pool.get('account.period').find(cr, uid)[0]
+                domain.append(['period_id','in',[current_period]])
+                todel.append(arg)
+                break
+            elif arg[0] == 'period_id' and arg[2] == 'current_year':
+                current_year = self.pool.get('account.fiscalyear').find(cr, uid)
+                ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+                domain.append(['period_id','in',ids])
+                todel.append(arg)
+        for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
+            if a in domain:
+                domain.remove(a)
+        return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context)
+    
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_entries_report')
         cr.execute("""
@@ -81,6 +118,7 @@ class account_entries_report(osv.osv):
                 am.ref as ref,
                 am.state as state,
                 l.state as state_2,
+                l.reconcile_id as reconcile_id,
                 to_char(am.date, 'YYYY') as year,
                 to_char(am.date, 'MM') as month,
                 to_char(am.date, 'YYYY-MM-DD') as day,
@@ -104,6 +142,7 @@ class account_entries_report(osv.osv):
                 left join account_account a on (l.account_id = a.id)
                 left join account_move am on (am.id=l.move_id)
                 left join account_period p on (am.period_id=p.id)
+                where l.state != 'draft'
             )
         """)
 account_entries_report()
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 6db0d9ce8d7..7a1746d2de1 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -17,7 +17,6 @@
                 <field name="credit"/>
                 <field name="balance"/>
                 <field name="state" invisible="1"/>
-                <field name="state_2" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="year"  invisible="1"/>
@@ -26,7 +25,6 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
-                <field name="analytic_account_id" invisible="1"/>
                 <field name="fiscalyear_id" invisible="1"/>
                 <field name="period_id" invisible="1"/>
                 <field name="user_type" invisible="1"/>
@@ -54,23 +52,24 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group colspan="10" col="12">
-                <filter icon="terp-go-year" string="This Year"
-                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Tasks performed in this year"/>
-                <filter icon="terp-go-month" string="This Month"
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in this month"/>
-                <filter icon="terp-go-week"
-                        string="7 Days"
-                        separator="1"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks during last 7 days"/>
+	                <filter icon="terp-go-year" string="This Year"
+	                		name="year"
+							domain="[('period_id','in','current_year')]"        				
+	                        help="Entries created in current year"/>
+	                <filter icon="terp-go-month" string="This Month"
+	                        name="period"
+	                        domain="[('period_id','in','current_period')]"
+	                        help="Entries created in current period"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft entries"/>
                     <filter string="Posted" icon="terp-camera_test" domain="[('state','=','posted')]" help = "Posted entries"/>
                     <separator orientation="vertical"/>
+                    <filter string="Reconciled" icon="terp-document-new" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
+                    <filter string="Unreconciled" icon="terp-stock_symbol-selection" domain="[('reconcile_id','=',False)]" help = "Unreconciled entries"/>
+                    <separator orientation="vertical"/>
                     <field name="account_id"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -89,9 +88,6 @@
                     <filter string="Fiscal Year" icon="terp-go-month" context="{'group_by':'fiscalyear_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic Account" name="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="State of Move Line" icon="terp-stock_effects-object-colorize" context="{'group_by':'state_2'}"/>
                     <newline/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
@@ -103,7 +99,6 @@
                     <field name="period_id"/>
                     <field name="fiscalyear_id"/>
                     <separator orientation="vertical"/>
-                    <field name="analytic_account_id"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
@@ -122,7 +117,7 @@
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_profit': 1,'search_default_group_account':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_profit': 1,'search_default_group_account':1,'search_default_group_journal':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[], 'search_default_year':1, 'search_default_period':1}</field>
         <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>
     <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index a92c1ba7f51..2c4bad0938c 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -5,10 +5,10 @@
 # Copyright (c) 2006-2010 OpenERP S.A
 #
 # WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
+# programmers who take the whole responsibility of assessing all potential
 # consequences resulting from its eventual inadequacies and bugs
 # End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
+# guarantees and support are strongly advised to contract a Free Software
 # Service Company
 #
 # This program is Free Software; you can redistribute it and/or
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 825fdeaa44f..9021878d40a 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -31,10 +31,10 @@ class account_invoice_report(osv.osv):
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+        'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
-        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
         'uom_name': fields.char('Default UoM', size=128, readonly=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
@@ -43,13 +43,13 @@ class account_invoice_report(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
-        'company_id':fields.many2one('res.company', 'Company', readonly=True),
-        'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
-        'price_total':fields.float('Total Price', readonly=True),
-        'price_average':fields.float('Average Price', readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'price_total': fields.float('Total Without Tax', readonly=True),
+        'price_total_tax': fields.float('Total With Tax', readonly=True),
+        'price_average': fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
-        'reconciled':fields.integer('# reconciled lines', readonly=True),
         'type': fields.selection([
             ('out_invoice','Customer Invoice'),
             ('in_invoice','Supplier Invoice'),
@@ -69,8 +69,8 @@ class account_invoice_report(osv.osv):
         'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
-        'residual':fields.float('Total Residual', readonly=True),
-        'delay_to_pay':fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
+        'residual': fields.float('Total Residual', readonly=True),
+        'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
     }
     _order = 'date desc'
     def init(self, cr):
@@ -84,7 +84,6 @@ class account_invoice_report(osv.osv):
                     to_char(ai.date_invoice, 'YYYY-MM-DD') as day,
                     ail.product_id,
                     ai.partner_id as partner_id,
-                    ai.reconciled::integer,
                     ai.payment_term as payment_term,
                     ai.period_id as period_id,
                     u.name as uom_name,
@@ -112,6 +111,11 @@ class account_invoice_report(osv.osv):
                         else
                          ail.quantity*ail.price_unit
                         end) as price_total,
+                    sum(case when ai.type in ('out_refund','in_invoice') then
+                         ai.amount_total * -1
+                        else
+                         ai.amount_total
+                         end) as price_total_tax,
                     sum(ail.quantity*ail.price_unit)/sum(ail.quantity*u.factor)*count(ail.product_id)::decimal(16,2) as price_average,
                     sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
                         from account_move_line as aml
@@ -136,7 +140,6 @@ class account_invoice_report(osv.osv):
                     to_char(ai.date_invoice, 'MM'),
                     to_char(ai.date_invoice, 'YYYY-MM-DD'),
                     ai.partner_id,
-                    ai.reconciled,
                     ai.payment_term,
                     ai.period_id,
                     u.name,
@@ -153,7 +156,11 @@ class account_invoice_report(osv.osv):
                     ai.address_invoice_id,
                     ai.account_id,
                     ai.partner_bank_id,
-                    ai.residual
+                    ai.residual,
+                    ai.amount_total
             )
         """)
+
 account_invoice_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 0da84952a25..b241b725673 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -28,9 +28,10 @@
                 <field name="account_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
-                <field name="reconciled"  sum="# Reconciled"/>
+                <!-- <field name="reconciled"  sum="# Reconciled"/> -->
                 <field name="price_average" sum="Average Price"/>
-                <field name="price_total" sum="Total Price"/>
+                <field name="price_total" sum="Total Without Tax"/>
+                <field name="price_total_tax" sum="Total With Tax"/>
                 <field name="residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
                 <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
             </tree>
@@ -69,21 +70,36 @@
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Invoices during last 7 days"/>
                     <separator orientation="vertical"/>
-                    <filter string="Current"
-                            icon="terp-check"
-                            domain="[('state','in',('draft','open'))]"
-                            help = "Draft and Open Invoices"/>
+                    <filter string="Draft"
+                           icon="terp-check"
+                           domain="[('state','=','draft')]"
+                           help = "Draft Invoices"/>
                     <filter string="Pro-forma"
                            icon="terp-check"
-                           domain="[('state','=','proforma'),('state','=','proforma2')]"
+                           domain="['|', ('state','=','proforma'),('state','=','proforma2')]"
                            help = "Pro-forma Invoices"/>
-                    <filter string="Done"
-                            icon="terp-dialog-close"
-                            domain="[('state','=','paid')]"
-                            help = "Done Invoices"/>
                   <separator orientation="vertical"/>
+                   	<filter icon="terp-check" string="Customer"
+                            domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
+                            help="Customer Invoices And Refunds"/>
+                    <filter icon="terp-check"
+                            string="Supplier"
+                            separator="1"
+                            domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
+                            help="Supplier Invoices And Refunds"/>
+ 				  <separator orientation="vertical"/>
+	               <filter icon="terp-check" string="Invoice"
+	                        domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
+	                        help="Customer And Supplier Invoices"/>
+	               <filter icon="terp-check"
+	                        string="Refund"
+	                        separator="1"
+	                        domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
+	                        help="Customer And Supplier Refunds"/>
+ 				  <separator orientation="vertical"/>
                   <field name="partner_id"/>
-                    <field name="user_id" />
+                  <field name="user_id" />
+                  <field name="categ_id" />
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index d1ef2ea49c2..54a6d87321c 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -125,10 +125,10 @@
 	    <td><para style="P12a">Tax Amount</para></td>
 	  </tr>
 	  <tr>
-	       <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ '...'*len(o['level']) ]]</font> <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font><font>[[ o['code'] ]]  [[ o['name'] ]]</font></para></td>
-	       <td><para style="P6"><font>[[ len(o['level'])&lt;3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]]</font><font>[[ formatLang(o['debit']) ]]</font></para></td>
-	       <td><para style="P6"><font>[[ len(o['level'])&lt;3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]]</font><font>[[ formatLang(o['credit'])]]</font></para></td>
-	       <td><para style="P6"><font>[[ len(o['level'])&lt;3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]]</font><font>[[ formatLang(o['tax_amount']) ]]</font></para></td>
+	       <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]]</font><font>[[ o['code'] ]]  [[ o['name'] ]]</font></para></td>
+           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td>
+           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td>
+           <td><para style="P6"><font>[[ (o['level'])&gt;2 and setTag('para','para',{'fontName':"Helvetica-Bold"})  or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font><font>[[ o['type']&lt;&gt;'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]]</font></para></td>
 	  </tr>
 	  </blockTable>
   </story>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index c43a1edebeb..890d4f505ea 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -38,7 +38,6 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_manager",1,0,0,0
 "access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
@@ -155,3 +154,7 @@
 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
+"access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
+"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
+"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
+"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 5af4787c6a6..a305dd85417 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -47,7 +47,7 @@
   I check the opening entries By using "Entries by Line wizard"
 -
   !record {model: account.move.journal, id: account_move_journal_0}:
-    journal_id: account.sales_journal
+   {}
 -
   I clicked on Open Journal Button to check the entries
 
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index bda89971a3d..75db8250207 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-     <data>
+    <data>
 
         <record id="account_automatic_reconcile_view" model="ir.ui.view">
              <field name="name">Account Automatic Reconcile</field>
@@ -9,28 +9,28 @@
              <field name="arch" type="xml">
                 <form string="Reconciliation">
                     <group width="660" height="430">
-                    <separator string="Options" colspan="4"/>
-                    <group>
-                    <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
-                    <field name="date1"/>
-                    <field name="date2"/>
-                    <field name="power"/>
-                    <field name="allow_write_off"/>
+                        <separator string="Options" colspan="4"/>
+                        <group>
+                            <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
+                            <field name="date1"/>
+                            <field name="date2"/>
+                            <field name="power"/>
+                            <field name="allow_write_off"/>
+                        </group>
+                        <newline/>
+                        <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
+                            <separator string="Write-Off Move" colspan="4"/>
+                            <field name="max_amount"/>
+                            <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                            <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                            <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                        </group>
+                        <separator string ="" colspan="4"/>
+                        <group colspan="2" col="4">
+                             <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
+                         </group>
                     </group>
-                    <newline/>
-                    <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
-                        <separator string="Write-Off Move" colspan="4"/>
-                        <field name="max_amount"/>
-                        <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-                        <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-                        <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-                    </group>
-                    <separator string ="" colspan="4"/>
-                    <group colspan="2" col="4">
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                           <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
-                     </group>
-                  </group>
                 </form>
              </field>
          </record>
@@ -48,11 +48,12 @@
        </record>
 
         <menuitem
-                icon="STOCK_EXECUTE"
-                name="Automatic Reconciliation"
-                action="action_account_automatic_reconcile"
-             id="menu_automatic_reconcile"
-             parent="periodical_processing_reconciliation"/>
+            icon="STOCK_EXECUTE"
+            name="Automatic Reconciliation"
+            action="action_account_automatic_reconcile"
+            id="menu_automatic_reconcile"
+            parent="periodical_processing_reconciliation"
+            groups="base.group_extended"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
@@ -63,9 +64,9 @@
                     <field name="reconciled"/>
                     <newline/>
                     <field name="unreconciled"/>
-                     <group colspan="4" col="6">
-                           <separator colspan="6"/>
-                         <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
+                    <group colspan="4" col="6">
+                        <separator colspan="6"/>
+                        <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
                      </group>
                 </form>
              </field>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 3eae57dfe61..336766a2f42 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-    	<record id="view_account_change_currency" model="ir.ui.view">
+        <record id="view_account_change_currency" model="ir.ui.view">
             <field name="name">Change Currency</field>
             <field name="model">account.change.currency</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Invoice Currency">
-					<separator colspan="4" string="This wizard will change the currency of the invoice"/>
-				    <field name="currency_id"/>
-				    <separator colspan="4"/>
-              		<group colspan="2" col="4">
-            			<button special="cancel" string="Cancel"  icon="gtk-cancel"/>
-            			<button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
-                	</group>
-			</form>
+                <form string="Invoice Currency">
+                    <separator colspan="4" string="This wizard will change the currency of the invoice"/>
+                    <field name="currency_id"/>
+                    <separator colspan="4"/>
+                    <group colspan="2" col="4">
+                        <button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+                        <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_account_change_currency" model="ir.actions.act_window">
+        <record id="action_account_change_currency" model="ir.actions.act_window">
             <field name="name">Change Currency</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.change.currency</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_change_currency"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
-
-
+        </record>
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index d29bffb833d..62f5c225a81 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -14,7 +14,7 @@
                     </group>
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       <label string ="" colspan="2"/>
+                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" />
                     </group>
diff --git a/addons/account/wizard/account_compare_account_balance_report.py b/addons/account/wizard/account_compare_account_balance_report.py
index 629e1ae798e..5378cd2569b 100644
--- a/addons/account/wizard/account_compare_account_balance_report.py
+++ b/addons/account/wizard/account_compare_account_balance_report.py
@@ -32,7 +32,7 @@ class account_compare_account_balance_report(osv.osv_memory):
     _description = 'Account Balance Report'
     _columns = {
         'fiscalyear': fields.many2many('account.fiscalyear', 'account_fiscalyear_rel','account_id','fiscalyear_id','Fiscal year', help='Keep empty for all open fiscal year'),
-        'select_account': fields.many2one('account.account','Select Reference Account(for  % comparision)',help='Keep empty for comparision to its parent'),
+        'select_account': fields.many2one('account.account','Select Reference Account(for  % comparision)',help='Keep empty for comparison to its parent'),
         'account_choice': fields.selection([('all','All accounts'),
                                             ('bal_zero','With balance is not equal to 0'),
                                             ('moves','With movements')],'Show Accounts'),
diff --git a/addons/account/wizard/account_compare_account_balance_report_view.xml b/addons/account/wizard/account_compare_account_balance_report_view.xml
index 2467928a584..22a9ff01cc7 100644
--- a/addons/account/wizard/account_compare_account_balance_report_view.xml
+++ b/addons/account/wizard/account_compare_account_balance_report_view.xml
@@ -1,51 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
      <data>
-
         <record id="account_compare_account_balance_report_view" model="ir.ui.view">
-             <field name="name">account.compare.account.balance.report.form</field>
-             <field name="model">account.compare.account.balance.report</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-              	<form string="Customize Report">
-					    <notebook tabpos="up">
-					        <page string="Report Options">
-					            <separator string="Select Fiscal Year(s)(Maximum Three Years)" colspan="4"/>
-					            <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-					            <field name="fiscalyear" colspan="5" nolabel="1"/>
-					            <field name="landscape" colspan="4"/>
-					            <field name="show_columns" colspan="4"/>
-					            <field name="format_perc" colspan="4"/>
-					            <field name="select_account" colspan="4"/>
-					            <field name="account_choice" colspan="4"/>
-					            <field name="compare_pattern" colspan="4"/>
-
-					        </page>
-
-					        <page string="Select Period">
-					            <field name="period_manner" colspan="4"/>
-					            <separator string="Select Period(s)" colspan="4"/>
-					            <field name="periods" colspan="4" nolabel="1"/>
-					        </page>
-					    </notebook>
-
-				    <newline/>
-     				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- 					</group>
-				</form>
+            <field name="name">account.compare.account.balance.report.form</field>
+            <field name="model">account.compare.account.balance.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Customize Report">
+                    <notebook tabpos="up">
+                        <page string="Report Options">
+                            <separator string="Select Fiscal Year(s)(Maximum Three Years)" colspan="4"/>
+                            <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                            <field name="fiscalyear" colspan="5" nolabel="1"/>
+                            <field name="landscape" colspan="4"/>
+                            <field name="show_columns" colspan="4"/>
+                            <field name="format_perc" colspan="4"/>
+                            <field name="select_account" colspan="4"/>
+                            <field name="account_choice" colspan="4"/>
+                            <field name="compare_pattern" colspan="4"/>
+                        </page>
+                        <page string="Select Period">
+                            <field name="period_manner" colspan="4"/>
+                            <separator string="Select Period(s)" colspan="4"/>
+                            <field name="periods" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <newline/>
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                    </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
-		<act_window name="Account balance-Compare Years"
-				res_model="account.compare.account.balance.report"
-				src_model="account.account"
-				view_mode="form"
-				target="new"
-				key2="client_print_multi"
-			id="action_view_account_compare_account_balance_report"/>
+        <act_window name="Account balance-Compare Years"
+            res_model="account.compare.account.balance.report"
+            src_model="account.account"
+            view_mode="form"
+            target="new"
+            key2="client_print_multi"
+            id="action_view_account_compare_account_balance_report"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 370aacbf2e3..c0944dd8472 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_fiscalyear_close_state" model="ir.ui.view">
+        <record id="view_account_fiscalyear_close_state" model="ir.ui.view">
             <field name="name">account.fiscalyear.close.state.form</field>
             <field name="model">account.fiscalyear.close.state</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods">
-                	<group colspan="4" >
-                		 <field name="fy_id"  domain = "[('state','=','draft')]"/>
-              			 <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
-                		 <field name="sure"/>
+                    <group colspan="4" >
+                        <field name="fy_id"  domain = "[('state','=','draft')]"/>
+                        <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
+                        <field name="sure"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-close" string="Close states" name="data_save" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-close" string="Close states" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
@@ -27,13 +27,13 @@
             <field name="res_model">account.fiscalyear.close.state</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_fiscalyear_close_state"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_fiscalyear_close_state"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem action="action_account_fiscalyear_close_state"
-        	id="menu_wizard_fy_close_state"
-        	parent="menu_account_end_year_treatments" />
+            id="menu_wizard_fy_close_state"
+            parent="menu_account_end_year_treatments" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 20547cde235..b151f7188a9 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_fiscalyear_close" model="ir.ui.view">
+        <record id="view_account_fiscalyear_close" model="ir.ui.view">
             <field name="name">account.fiscalyear.close.form</field>
             <field name="model">account.fiscalyear.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries Close a Fiscal Year with new entries">
-                	<group colspan="4" >
-	                	<field name="fy_id"  domain = "[('state','=','draft')]"/>
-	                	<field name="fy2_id"  domain = "[('state','=','draft')]"/>
-	                	<field name="journal_id" />
-	                	<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
-                	</group>
-                	<group colspan="4" >
-                		<field name="report_name" />
-                	</group>
-                	<group colspan="4" >
-              			 <separator string="Are you sure you want to create entries?" colspan="4"/>
-                		 <field name="sure"/>
+                    <group colspan="4" >
+                        <field name="fy_id"  domain = "[('state','=','draft')]"/>
+                        <field name="fy2_id"  domain = "[('state','=','draft')]"/>
+                        <field name="journal_id" />
+                        <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
                     </group>
-                  	<separator string="" colspan="4" />
+                    <group colspan="4" >
+                        <field name="report_name" />
+                    </group>
+                    <group colspan="4" >
+                    <separator string="Are you sure you want to create entries?" colspan="4"/>
+                    <field name="sure"/>
+                    </group>
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_fiscalyear_close" model="ir.actions.act_window">
+        <record id="action_account_fiscalyear_close" model="ir.actions.act_window">
             <field name="name">Generate Opening Entries</field>
             <field name="res_model">account.fiscalyear.close</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_fiscalyear_close"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_fiscalyear_close"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem action="action_account_fiscalyear_close"
-        	id="menu_wizard_fy_close"
-        	parent="menu_account_end_year_treatments" />
+            id="menu_wizard_fy_close"
+            parent="menu_account_end_year_treatments" />
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 6a19dc988df..50d6770fd3c 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import fields, osv
@@ -26,18 +27,31 @@ import netsvc
 
 class account_invoice_refund(osv.osv_memory):
 
-    """Refunds invoice."""
+    """Refunds invoice"""
 
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
        'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
        'period': fields.many2one('account.period', 'Force period'),
+       'journal_id': fields.many2one('account.journal', 'Journal'),
        'description': fields.char('Description', size=128, required=True),
     }
+
+    def _get_journal(self, cr, uid, context=None):
+        obj_journal = self.pool.get('account.journal')
+        if context is None:
+            context = {}
+        journal = obj_journal.search(cr, uid, [('type', '=', 'sale_refund')])
+        if context.get('type', False):
+            if context['type'] == 'in_invoice':
+                journal = obj_journal.search(cr, uid, [('type', '=', 'purchase_refund')])
+        return journal and journal[0] or False
+
     _defaults = {
         'date': time.strftime('%Y-%m-%d'),
-                }
+        'journal_id': _get_journal
+    }
 
     def compute_refund(self, cr, uid, ids, mode='refund', context=None):
         """
@@ -70,6 +84,8 @@ class account_invoice_refund(osv.osv_memory):
                 else:
                     period = inv.period_id and inv.period_id.id or False
 
+                journal_id = form.get('journal_id', False)
+
                 if form['date'] :
                     date = form['date']
                     if not form['period'] :
@@ -99,7 +115,7 @@ class account_invoice_refund(osv.osv_memory):
                     raise osv.except_osv(_('Data Insufficient !'), \
                                             _('No Period found on Invoice!'))
 
-                refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description)
+                refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description, journal_id)
                 refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
                 inv_obj.write(cr, uid, [refund.id], {'date_due': date,
                                                 'check_total': inv.check_total})
@@ -123,7 +139,7 @@ class account_invoice_refund(osv.osv_memory):
                     for account in to_reconcile_ids :
                         account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
                                         writeoff_period_id=period,
-                                        writeoff_journal_id=inv.journal_id.id,
+                                        writeoff_journal_id = inv.journal_id.id,
                                         writeoff_acc_id=inv.account_id.id
                                         )
                     if mode == 'modify':
@@ -179,15 +195,15 @@ class account_invoice_refund(osv.osv_memory):
             result['res_id'] = created_inv
             return result
 
-    def invoice_refund(self, cr, uid, ids, context={}):
+    def invoice_refund(self, cr, uid, ids, context=None):
         return self.compute_refund(cr, uid, ids, 'refund', context=context)
 
-    def invoice_cancel(self, cr, uid, ids, context={}):
+    def invoice_cancel(self, cr, uid, ids, context=None):
         return self.compute_refund(cr, uid, ids, 'cancel', context=context)
 
-    def invoice_modify(self, cr, uid, ids, context={}):
+    def invoice_modify(self, cr, uid, ids, context=None):
         return self.compute_refund(cr, uid, ids, 'modify', context=context)
 
 account_invoice_refund()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index a48dd1a402e..e4849823d52 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -7,14 +7,15 @@
             <field name="model">account.invoice.refund</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Credit Note">
+                <form string="Refund">
                     <separator string="This wizard is used to refund the invoice" colspan="4"/>
                     <group colspan="4" >
                          <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
                          <newline/>
+                         <field name="description"/>
                          <field name="date"/>
                          <field name="period"/>
-                         <field name="description"/>
+                         <field name="journal_id" />
                     </group>
                     <separator colspan="4"/>
                     <group col="4" colspan="4" fill="1">
@@ -35,7 +36,7 @@
         </record>
 
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
-            <field name="name">Credit Note</field>
+            <field name="name">Refund</field>
             <field name="res_model">account.invoice.refund</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index d41993733df..7fd65d00f4e 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_move_bank_reconcile" model="ir.ui.view">
+        <record id="view_account_move_bank_reconcile" model="ir.ui.view">
             <field name="name">account.move.bank.reconcile.form</field>
             <field name="model">account.move.bank.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank reconciliation">
-                	<group colspan="4" >
-                		 <field name="journal_id"/>
+                    <group colspan="4" >
+                        <field name="journal_id"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/>
                    </group>
                 </form>
             </field>
-    	</record>
+        </record>
 
-    	<record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
+        <record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
             <field name="name">Bank reconciliation</field>
             <field name="res_model">account.move.bank.reconcile</field>
             <field name="view_type">form</field>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 92e8f23da49..79f41ec2d46 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -87,9 +87,11 @@ class account_move_journal(osv.osv_memory):
 
         view = """<?xml version="1.0" encoding="utf-8"?>
         <form string="Standard entries">
-            <separator string="Open a Journal Items" colspan="4"/>
+            <separator string="Open Journal Items !" colspan="4"/>
             <group colspan="4" >
-                <label width="300" string="Going to open a %s Journal(s) for %s Period"/>
+                <label width="300" string="Journal : %s"/>
+                <newline/>
+                <label width="300" string="Period :  %s"/>
             </group>
             <group colspan="4" col="4">
                 <label string ="" colspan="2"/>
@@ -155,10 +157,10 @@ class account_move_journal(osv.osv_memory):
 #            'domain': str([('journal_id', '=', journal_id), ('period_id', '=', period_id)]),
             'name': name,
             'view_type': 'form',
-            'view_mode': 'tree,form,graph',
+            'view_mode': 'tree,graph,form',
             'res_model': 'account.move.line',
             'view_id': False,
-            'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
+            'context': "{'visible_id':%s, 'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, journal_id, period_id),
             'type': 'ir.actions.act_window',
             'search_view_id': res_id
         }
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index fbc160f9eb4..14087d1ff40 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -18,47 +18,48 @@
             <field name="res_model">account.move.journal</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'sale'}</field>
+            <field name="context">{'journal_type':'sale','view_mode':False}</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_account_moves_sale" sequence="4" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>
+        <menuitem action="action_account_moves_sale" sequence="10" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>
 
-        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">
-            <field name="name">Journal Refund Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'purchase_refund'}</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem action="action_account_moves_purchase_refund" sequence="5" id="menu_eaction_account_moves_purchase_refund" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>
+<!--        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
+<!--            <field name="name">Journal Refund Items</field>-->
+<!--            <field name="res_model">account.move.journal</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
+<!--            <field name="context">{'journal_type':'purchase_refund'}</field>-->
+<!--            <field name="target">new</field>-->
+<!--        </record>-->
+<!--        <menuitem action="action_account_moves_purchase_refund" sequence="5" id="menu_eaction_account_moves_purchase_refund" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>-->
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.journal</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'purchase'}</field>
+            <field name="context">{'journal_type':'purchase','view_mode':False}</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_account_moves_purchase" sequence="4" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>
+        <menuitem action="action_account_moves_purchase" sequence="10"
+            id="menu_eaction_account_moves_purchase" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>
 
-        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">
-            <field name="name">Journal Refund Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'sale_refund'}</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>
+<!--        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
+<!--            <field name="name">Journal Refund Items</field>-->
+<!--            <field name="res_model">account.move.journal</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
+<!--            <field name="context">{'journal_type':'sale_refund'}</field>-->
+<!--            <field name="target">new</field>-->
+<!--        </record>-->
+<!--        <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>-->
 
         <record id="action_account_moves_all" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.journal</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'bank'}</field>
+            <field name="context">{'journal_type':'bank','view_mode':False}</field>
             <field name="target">new</field>
         </record>
 
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 1ce7d5f3dab..c4c06dcf28b 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -14,9 +14,7 @@
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="terp-gtk-go-back-rtl"
-                            string="Open for Reconciliation" name="action_open_window"
-                            type="object" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index ae1b069a1dc..33e96b93185 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -1,38 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_move_line_unreconcile_select" model="ir.ui.view">
+        <record id="view_account_move_line_unreconcile_select" model="ir.ui.view">
             <field name="name">account.move.line.unreconcile.select.form</field>
             <field name="model">account.move.line.unreconcile.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Unreconciliation">
-                	<group colspan="4" >
-                		 <field name="account_id"/>
+                    <group colspan="4" >
+                        <field name="account_id"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-						<button icon="terp-gtk-go-back-rtl"
-							string="Open For Unreconciliation" name="action_open_window"
-							type="object" />
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open For Unreconciliation" name="action_open_window" type="object" />
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
         <record id="action_account_unreconcile_select" model="ir.actions.act_window">
             <field name="name">Unreconcile Entries</field>
             <field name="res_model">account.move.line.unreconcile.select</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_move_line_unreconcile_select"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_move_line_unreconcile_select"/>
+            <field name="target">new</field>
         </record>
 
       <!--  <menuitem action="action_account_unreconcile_select"
-        	id="menu_unreconcile_select" parent="periodical_processing_reconciliation" /> -->
+            id="menu_unreconcile_select" parent="periodical_processing_reconciliation" /> -->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 435f15388c1..d4c3509d47e 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_open_closed_fiscalyear" model="ir.ui.view">
+        <record id="view_account_open_closed_fiscalyear" model="ir.ui.view">
             <field name="name">account.open.closed.fiscalyear.form</field>
             <field name="model">account.open.closed.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year ">
-                	<group colspan="4" >
-                		 <field name="fyear_id"  domain = "[('state','=','draft')]"/>
+                    <group colspan="4" >
+                        <field name="fyear_id"  domain = "[('state','=','draft')]"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </group>
                 </form>
             </field>
@@ -25,13 +25,13 @@
             <field name="res_model">account.open.closed.fiscalyear</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_open_closed_fiscalyear"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_open_closed_fiscalyear"/>
+            <field name="target">new</field>
         </record>
 
 <!--        <menuitem action="action_account_open_closed_fiscalyear"-->
-<!--        	id="menu_wizard_open_closed_fy"  sequence="2"-->
-<!--        	parent="account.menu_account_end_year_treatments" />-->
+<!--            id="menu_wizard_open_closed_fy"  sequence="2"-->
+<!--            parent="account.menu_account_end_year_treatments" />-->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
index 3601daaef06..78254a90bbe 100644
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -52,7 +52,7 @@
                         <field name="analytic_id"/>
                     </group>
                     <group colspan="4" col="6">
-                           <label string ="" colspan="2"/>
+                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
                    </group>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 7d1b048546f..161a3f424fc 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -8,21 +8,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Period">
-                	<group colspan="4" >
-                    	 <separator string="Are you sure ?" colspan="4"/>
-                    	 <field name="sure"/>
+                    <group colspan="4" >
+                        <separator string="Are you sure ?" colspan="4"/>
+                        <field name="sure"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_period_close" model="ir.actions.act_window">
+        <record id="action_account_period_close" model="ir.actions.act_window">
             <field name="name">Close a Period</field>
             <field name="res_model">account.period.close</field>
             <field name="view_type">form</field>
@@ -32,14 +32,14 @@
         </record>
 
         <record id="action_idea_post_vote_values" model="ir.values">
-	            <field name="model_id" ref="model_account_period" />
-	            <field name="object" eval="1" />
-	            <field name="name"></field>
-	            <field name="key2">client_action_multi</field>
-	            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
-	            <field name="key">action</field>
-	            <field name="model">account.period</field>
-	    </record>
+            <field name="model_id" ref="model_account_period" />
+            <field name="object" eval="1" />
+            <field name="name"></field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
+            <field name="key">action</field>
+            <field name="model">account.period</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index f119243a470..05a50e671c2 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
      <data>
-
-
-           <record id="account_partner_reconcile_view" model="ir.ui.view">
-             <field name="name">Partner Reconcilation Process</field>
-             <field name="model">account.partner.reconcile.process</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-	       <form string="Partner Reconciliation">
-                  <field name="progress" widget="progressbar" colspan="4"/>
-                  <field name="today_reconciled"/>
-                  <field name="to_reconcile"/>
-                  <newline/>
-                  <field name="next_partner_id" colspan="4"/>
-                  <newline/>
-                  <group colspan="4" col="4">
-     	             <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                     <button name="next_partner" icon="gtk-go-forward" type="object" string="Go to next partner" />
-                  </group>
+        <record id="account_partner_reconcile_view" model="ir.ui.view">
+            <field name="name">Partner Reconcilation Process</field>
+            <field name="model">account.partner.reconcile.process</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Partner Reconciliation">
+                    <field name="progress" widget="progressbar" colspan="4"/>
+                    <field name="today_reconciled"/>
+                    <field name="to_reconcile"/>
+                    <newline/>
+                    <field name="next_partner_id" colspan="4"/>
+                    <newline/>
+                    <group colspan="4" col="4">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="next_partner" icon="gtk-go-forward" type="object" string="Go to next partner" />
+                    </group>
                </form>
-             </field>
-           </record>
+            </field>
+        </record>
 
         <record id="action_account_partner_reconcile" model="ir.actions.act_window">
-             <field name="name">Reconciliation: Go to Next Partner</field>
-             <field name="res_model">account.partner.reconcile.process</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="account_partner_reconcile_view"/>
-             <field name="context">{'record_id':active_id}</field>
-             <field name="target">new</field>
+            <field name="name">Reconciliation: Go to Next Partner</field>
+            <field name="res_model">account.partner.reconcile.process</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="account_partner_reconcile_view"/>
+            <field name="context">{'record_id':active_id}</field>
+            <field name="target">new</field>
        </record>
-                <record model="ir.values" id="action_partner_reconcile_actino">
+            <record model="ir.values" id="action_partner_reconcile_actino">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
             <field name="name">Partner reconciliation</field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 49d194af792..673203478e8 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -141,7 +141,7 @@
                     <separator string="Analytic" colspan="4"/>
                     <field name="analytic_id"/>
                     <group colspan="4" col="6">
-                           <label string ="" colspan="2"/>
+                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
                    </group>
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 548469ebce1..e107b7a2cfb 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -3,46 +3,46 @@
 <openerp>
     <data>
 
-     <record id="account_report_balance_view" model="ir.ui.view">
+         <record id="account_report_balance_view" model="ir.ui.view">
+                <field name="name">Account Balance</field>
+                <field name="model">account.balance.report</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="account_common_report_view" />
+                <field name="arch" type="xml">
+                   <field name="fiscalyear_id" position="after">
+                       <field name="display_account"/>
+                       <newline/>
+                   </field>
+                </field>
+        </record>
+
+        <record id="action_account_balance_menu" model="ir.actions.act_window">
+                <field name="name">Account Balance</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">account.balance.report</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">form</field>
+                <field name="view_id" ref="account_report_balance_view"/>
+                <field name="target">new</field>
+            </record>
+
+        <menuitem
+                icon="STOCK_PRINT"
+                name="Account Balance"
+                parent="account.final_accounting_reports"
+                action="action_account_balance_menu"
+                id="menu_general_Balance_report"
+               />
+
+        <record model="ir.values" id="action_account_balance_report_values1">
+            <field name="model_id" ref="account.model_account_account" />
+            <field name="object" eval="1" />
             <field name="name">Account Balance</field>
-            <field name="model">account.balance.report</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account_common_report_view" />
-            <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
-                   <field name="display_account"/>
-                   <newline/>
-               </field>
-            </field>
-    </record>
-
-	<record id="action_account_balance_menu" model="ir.actions.act_window">
-            <field name="name">Account Balance</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.balance.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="account_report_balance_view"/>
-            <field name="target">new</field>
-    	</record>
-
-    <menuitem
-        	icon="STOCK_PRINT"
-	        name="Account Balance"
-	        parent="account.final_accounting_reports"
-	        action="action_account_balance_menu"
-	        id="menu_general_Balance_report"
-	       />
-
-	<record model="ir.values" id="action_account_balance_report_values1">
-        <field name="model_id" ref="account.model_account_account" />
-        <field name="object" eval="1" />
-        <field name="name">Account Balance</field>
-        <field name="key2">client_print_multi</field>
-        <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_menu'))" />
-        <field name="key">action</field>
-        <field name="model">account.account</field>
-	</record>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_menu'))" />
+            <field name="key">action</field>
+            <field name="model">account.account</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 8bb3a43938c..ad9c90b2e36 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -2,33 +2,33 @@
 <openerp>
      <data>
 
-     	<record id="account_aged_balance_view" model="ir.ui.view">
+        <record id="account_aged_balance_view" model="ir.ui.view">
             <field name="name">Aged Partner Balance</field>
             <field name="model">account.aged.trial.balance</field>
             <field name="type">form</field>
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
-            	<form string="Report Options">
-				    <field name="chart_account_id" widget='selection'/>
-				    <field name="fiscalyear_id"/>
-				    <newline/>
-				    <field name="date_from"/>
-				    <field name="period_length"/>
-				    <newline/>
-				    <field name="result_selection"/>
-				    <field name="direction_selection"/>
-				    <field name="journal_ids"/>
-				    <newline/>
-     				<separator colspan="4"/>
+                <form string="Report Options">
+                    <field name="chart_account_id" widget='selection'/>
+                    <field name="fiscalyear_id"/>
+                    <newline/>
+                    <field name="date_from"/>
+                    <field name="period_length"/>
+                    <newline/>
+                    <field name="result_selection"/>
+                    <field name="direction_selection"/>
+                    <field name="journal_ids"/>
+                    <newline/>
+                    <separator colspan="4"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
                         <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/>
- 					</group>
-				</form>
+                     </group>
+                </form>
             </field>
         </record>
 
- 		<record id="action_account_aged_balance_view" model="ir.actions.act_window">
+         <record id="action_account_aged_balance_view" model="ir.actions.act_window">
              <field name="name">Aged Partner Balance</field>
              <field name="res_model">account.aged.trial.balance</field>
              <field name="type">ir.actions.act_window</field>
@@ -37,14 +37,14 @@
              <field name="view_id" ref="account_aged_balance_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
-			<field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
+            <field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Aged Partner Balance"
- 	   		action="action_account_aged_balance_view"
- 			id="menu_aged_trial_balance"
- 			parent="account.next_id_22"/>
+        <menuitem icon="STOCK_PRINT"
+            name="Aged Partner Balance"
+            action="action_account_aged_balance_view"
+            id="menu_aged_trial_balance"
+            parent="account.next_id_22"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 8398731cc5f..91840b51014 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -22,6 +22,7 @@
 from lxml import etree
 
 from osv import osv, fields
+from tools.translate import _
 
 class account_bs_report(osv.osv_memory):
     """
@@ -57,7 +58,11 @@ class account_bs_report(osv.osv_memory):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_type', 'reserve_account_id'])[0])
+        account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'])
+        if not account.company_id.property_reserve_and_surplus_account:
+            raise osv.except_osv(_('Warning'),_('Please define the Reserve and Surplus account for current user company !'))
+        data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
+        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
         if data['form']['display_type']:
             return {
                 'type': 'ir.actions.report.xml',
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index 14e0cc70e0e..3a4bfab0b64 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -2,23 +2,23 @@
 <openerp>
      <data>
 
-		<record id="account_bs_report_view" model="ir.ui.view">
+        <record id="account_bs_report_view" model="ir.ui.view">
             <field name="name">Account Balance Sheet</field>
             <field name="model">account.bs.report</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
-               		<field name="reserve_account_id"/>
-               		<newline/>
-                   <field name="display_account"/>
-                   <field name="display_type"/>
-                   <newline/>
+<!--                <field name="reserve_account_id"/>-->
+<!--                <newline/>-->
+                    <field name="display_account"/>
+                    <field name="display_type"/>
+                    <newline/>
                </field>
             </field>
         </record>
 
- 		<record id="action_account_bs_report" model="ir.actions.act_window">
+        <record id="action_account_bs_report" model="ir.actions.act_window">
              <field name="name">Balance Sheet</field>
              <field name="res_model">account.bs.report</field>
              <field name="type">ir.actions.act_window</field>
@@ -28,11 +28,11 @@
              <field name="target">new</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Balance Sheet"
- 	   		action="action_account_bs_report"
- 			id="menu_account_bs_report"
- 			parent="final_accounting_reports"/>
+       <menuitem icon="STOCK_PRINT"
+            name="Balance Sheet"
+            action="action_account_bs_report"
+            id="menu_account_bs_report"
+            parent="final_accounting_reports"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 9920a5fa80d..91c550dfdca 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,11 +8,11 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
-               		<field name="amount_currency"/>
-               		<newline/>
-                 <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
-               </field>
+                <field name="fiscalyear_id" position="after">
+                    <field name="amount_currency"/>
+                    <newline/>
+                    <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
+                </field>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 5189669f872..46f72e04332 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -34,7 +34,7 @@ class account_common_report(osv.osv_memory):
     _columns = {
         'chart_account_id': fields.many2one('account.account', 'Chart of account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
-        'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by:", required=True),
+        'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
         'period_from': fields.many2one('account.period', 'Start period'),
         'period_to': fields.many2one('account.period', 'End period'),
         'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
@@ -156,4 +156,4 @@ class account_common_report(osv.osv_memory):
 
 account_common_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 519543f37d5..b36f9ee27db 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -8,11 +8,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
-               	<field name="amount_currency"/>
-               	<newline/>
-                 <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
-               </field>
+                <field name="fiscalyear_id" position="after">
+                <field name="amount_currency"/>
+                <newline/>
+                <!-- we don't change the view but have to define a view for this specific object otherelse openerp will try to build a fedault one without using the one from the parent object -->
+                </field>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 68e51e33dcc..87953a367df 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -26,12 +26,12 @@
             <field name="inherit_id" ref="account_report_general_ledger_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="replace">
-               		<field name="fiscalyear_id" on_change="onchange_fiscalyear(fiscalyear_id)"/>
+               <field name="fiscalyear_id" on_change="onchange_fiscalyear(fiscalyear_id)"/>
                </field>
             </field>
         </record>
 
-	<record id="action_account_general_ledger_menu" model="ir.actions.act_window">  <!-- rename id -->
+        <record id="action_account_general_ledger_menu" model="ir.actions.act_window">  <!-- rename id -->
             <field name="name">General Ledger</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.report.general.ledger</field>
@@ -39,9 +39,9 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="account_report_general_ledger_view"/>
             <field name="target">new</field>
-    	</record>
+        </record>
 
-		<record model="ir.values" id="action_account_general_ledger_values">
+        <record model="ir.values" id="action_account_general_ledger_values">
             <field name="model_id" ref="account.model_account_account" />
             <field name="object" eval="1" />
             <field name="name">General Ledger</field>
@@ -49,15 +49,15 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_general_ledger_menu'))" />
             <field name="key">action</field>
             <field name="model">account.account</field>
-		</record>
+        </record>
 
         <menuitem
-        	icon="STOCK_PRINT"
-	        name="General Ledger"
-	        parent="account.final_accounting_reports"
-	        action="action_account_general_ledger_menu"
-	        id="menu_general_ledger"
-	       />
+            icon="STOCK_PRINT"
+            name="General Ledger"
+            parent="account.final_accounting_reports"
+            action="action_account_general_ledger_menu"
+            id="menu_general_ledger"
+           />
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index c78d2f3f594..72e94b767c3 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -2,21 +2,21 @@
 <openerp>
      <data>
 
-     	<record id="account_partner_balance_view" model="ir.ui.view">
+        <record id="account_partner_balance_view" model="ir.ui.view">
             <field name="name">Partner Balance</field>
             <field name="model">account.partner.balance</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
-					<field name="result_selection"/>
-					<field name="initial_balance"/>
-					<newline/>
+                    <field name="result_selection"/>
+                    <field name="initial_balance"/>
+                    <newline/>
                </field>
             </field>
         </record>
 
- 		<record id="action_account_partner_balance" model="ir.actions.act_window">
+         <record id="action_account_partner_balance" model="ir.actions.act_window">
              <field name="name">Partner Balance</field>
              <field name="res_model">account.partner.balance</field>
              <field name="type">ir.actions.act_window</field>
@@ -28,11 +28,11 @@
              <field name="help">This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance.</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Partner Balance"
- 	   		action="action_account_partner_balance"
- 			id="menu_account_partner_balance_report"
- 			parent="account.next_id_22"/>
+        <menuitem icon="STOCK_PRINT"
+            name="Partner Balance"
+            action="action_account_partner_balance"
+            id="menu_account_partner_balance_report"
+            parent="account.next_id_22"/>
 
      </data>
  </openerp>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 7203c05918f..b4098d78083 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -2,24 +2,24 @@
 <openerp>
      <data>
 
-     	<record id="account_partner_ledger_view" model="ir.ui.view">
+         <record id="account_partner_ledger_view" model="ir.ui.view">
             <field name="name">Partner Ledger</field>
             <field name="model">account.partner.ledger</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="after">
-               		<field name="result_selection"/>
-					<field name="initial_balance"/>
-					<field name="reconcil"/>
-					<field name="amount_currency"/>
-					<field name="page_split"/>
-					<newline/>
+                    <field name="result_selection"/>
+                    <field name="initial_balance"/>
+                    <field name="reconcil"/>
+                    <field name="amount_currency"/>
+                    <field name="page_split"/>
+                    <newline/>
                </field>
             </field>
         </record>
 
- 		<record id="action_account_partner_ledger" model="ir.actions.act_window">
+         <record id="action_account_partner_ledger" model="ir.actions.act_window">
              <field name="name">Select Period</field>
              <field name="res_model">account.partner.ledger</field>
              <field name="type">ir.actions.act_window</field>
@@ -31,11 +31,11 @@
              <field name="help">To get detailed information about a partner you can ask for the Partner Ledgers.</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Partner Ledger"
- 	   		action="action_account_partner_ledger"
- 			id="menu_account_partner_ledger"
- 			parent="account.next_id_22"/>
+        <menuitem icon="STOCK_PRINT"
+            name="Partner Ledger"
+            action="action_account_partner_ledger"
+            id="menu_account_partner_ledger"
+            parent="account.next_id_22"/>
 
      </data>
- </openerp>
\ No newline at end of file
+ </openerp>
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
index 86d0c65f975..39937ec59bc 100644
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@@ -2,7 +2,7 @@
 <openerp>
      <data>
 
-		<record id="account_pl_report_view" model="ir.ui.view">
+        <record id="account_pl_report_view" model="ir.ui.view">
             <field name="name">Profit and Loss</field>
             <field name="model">account.pl.report</field>
             <field name="type">form</field>
@@ -33,8 +33,8 @@
         <menuitem icon="STOCK_PRINT"
                 name="Profit And Loss"
                 action="action_account_pl_report"
-             	id="menu_account_pl_report"
-             	parent="final_accounting_reports"/>
+                id="menu_account_pl_report"
+                parent="final_accounting_reports"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 3ed71949b2a..a14d4b66007 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -2,35 +2,34 @@
 <openerp>
     <data>
 
-    	<record id="view_account_state_open" model="ir.ui.view">
+        <record id="view_account_state_open" model="ir.ui.view">
             <field name="name">Account State Open</field>
             <field name="model">account.state.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-					<form string="Open Invoice">
-				    <label string="Are you sure you want to open this invoice ?"/>
-				    <newline/>
-				    <label string="(Invoice should be unreconciled if you want to open it)"/>
-				    <separator colspan="4"/>
-              		<group colspan="2" col="4">
-            			<button special="cancel" string="No"  icon="gtk-no"/>
-            			<button name="change_inv_state" string="Yes" type="object" icon="gtk-yes"/>
-                	</group>
-				</form>
+                    <form string="Open Invoice">
+                    <label string="Are you sure you want to open this invoice ?"/>
+                    <newline/>
+                    <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    <separator colspan="4"/>
+                    <group colspan="2" col="4">
+                        <button special="cancel" string="No"  icon="gtk-no"/>
+                        <button name="change_inv_state" string="Yes" type="object" icon="gtk-yes"/>
+                    </group>
+                </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_account_state_open" model="ir.actions.act_window">
+        <record id="action_account_state_open" model="ir.actions.act_window">
             <field name="name">Account State Open</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.state.open</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_state_open"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
-
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index fce2eb1b18c..2d8d74826f3 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -48,6 +48,7 @@
                </form>
             </field>
         </record>
+        
         <record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
             <field name="name">Import Entries</field>
             <field name="res_model">account.statement.from.invoice.lines</field>
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 8d2727478ae..dccc4bb3c4e 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import fields, osv
@@ -33,11 +34,20 @@ class account_subscription_generate(osv.osv_memory):
         'date': lambda *a: time.strftime('%Y-%m-%d'),
                 }
     def action_generate(self, cr, uid, ids, context={}):
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        moves_created=[]
         for data in  self.read(cr, uid, ids, context=context):
              cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
              ids = map(lambda x: x[0], cr.fetchall())
-             self.pool.get('account.subscription.line').move_create(cr, uid, ids, context=context)
-        return {}
+             moves = self.pool.get('account.subscription.line').move_create(cr, uid, ids, context=context)
+             moves_created.extend(moves)
+        result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_form')
+        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result['domain'] = str([('id','in',moves_created)])
+        return result
 
 account_subscription_generate()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index b272230e89b..f169537be46 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -16,7 +16,7 @@
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="gtk-execute" string="Compute Entry Dates"
+                        <button icon="gtk-execute" string="Generate Entries"
                         name="action_generate" type="object" />
                     </group>
                </form>
@@ -32,7 +32,7 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_recurrent_entries" />
+        <menuitem sequence="3" action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_recurrent_entries" />
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 3ac038329d9..4d5a9da623a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -7,14 +7,14 @@
             <field name="model">account.unreconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Unreconciliation">
-			    <separator string="Unreconciliation transactions" colspan="4"/>
-			    <image name="gtk-dialog-info"/>
-			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-			    <separator colspan="4"/>
+            <form string="Unreconciliation">
+                <separator string="Unreconciliation transactions" colspan="4"/>
+                <image name="gtk-dialog-info"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+                <separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -29,7 +29,7 @@
            <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="account_unreconcile_values">
+        <record model="ir.values" id="account_unreconcile_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
             <field name="name">Unreconcile Entries</field>
@@ -44,31 +44,31 @@
             <field name="model">account.unreconcile.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Unreconciliation">
-			    <separator string="Unreconciliation transactions" colspan="4"/>
-			    <image name="gtk-dialog-info"/>
-			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-			    <separator colspan="4"/>
+            <form string="Unreconciliation">
+                <separator string="Unreconciliation transactions" colspan="4"/>
+                <image name="gtk-dialog-info"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+                <separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_unreconcile_reconcile" model="ir.actions.act_window">
+        <record id="action_account_unreconcile_reconcile" model="ir.actions.act_window">
             <field name="name">Unreconcile Entries</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.unreconcile.reconcile</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="account_unreconcile_reconcile_view"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
-		<record model="ir.values" id="account_unreconcile_reconcile_values">
+        <record model="ir.values" id="account_unreconcile_reconcile_values">
             <field name="model_id" ref="account.model_account_move_reconcile" />
             <field name="object" eval="1" />
             <field name="name">Unreconcile Entries</field>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index f4cd436c9a2..54efb585b95 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -52,8 +52,8 @@
             <field name="arch" type="xml">
                 <form string="Use Model">
                     <group colspan="4" col="6" width="300" height="70">
-                           <label string = "Entry Lines Created." colspan="2"/>
-                           <newline/>
+                        <label string = "Entry Lines Created." colspan="2"/>
+                        <newline/>
                         <button icon="gtk-ok" special="cancel" string="Ok"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="open_moves" type="object" default_focus='1'/>
                    </group>
@@ -68,8 +68,8 @@
             <field name="arch" type="xml">
                 <form string="Use Model">
                     <group colspan="4" col="6" width="300" height="70">
-                           <label string = "Are you sure you want to create entries?" colspan="2"/>
-                           <newline/>
+                        <label string = "Are you sure you want to create entries?" colspan="2"/>
+                        <newline/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 094304d25af..69e26c90f9a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -39,7 +39,7 @@
             id="menu_validate_account_moves"
            />
 
-<!--Account Move lines-->
+        <!--Account Move lines-->
         <record id="validate_account_move_line_view" model="ir.ui.view">
             <field name="name">Validate Ledger Postings</field>
             <field name="model">validate.account.move.lines</field>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index d27a34c0fcb..c8a6645f744 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -2,22 +2,23 @@
 <openerp>
     <data>
 
-		<record id="view_account_vat_declaration" model="ir.ui.view">
+        <record id="view_account_vat_declaration" model="ir.ui.view">
             <field name="name">Account Vat Declaration</field>
             <field name="model">account.vat.declaration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Select Period">
-				    <field name="company_id" groups="base.group_multi_company" widget='selection'/>
-					<newline/>
-				    <field name="based_on"/>
-				    <newline/>
-				    <field name="periods"/>
-			    <group col="2" colspan="4">
-	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
-						<button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
-				</group>
-			</form>
+            <form string="Select Period">
+                <field name="company_id" groups="base.group_multi_company" widget='selection'/>
+                <newline/>
+                <field name="based_on"/>
+                <newline/>
+                <separator string="Select Period(s)" colspan="4"/>
+                <field name="periods" nolabel="1" colspan="2"/>
+                <group col="2" colspan="4">
+                    <button icon='gtk-cancel' special="cancel"  string="Cancel" />
+                    <button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -31,12 +32,12 @@
             <field name="help">This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
-		<menuitem
-	        name="Taxes Report"
-	        parent="menu_tax_report"
-	        action="action_account_vat_declaration"
-	        id="menu_account_vat_declaration"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Taxes Report"
+            parent="menu_tax_report"
+            action="action_account_vat_declaration"
+            id="menu_account_vat_declaration"
+            icon="STOCK_PRINT"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_accountant/__init__.py b/addons/account_accountant/__init__.py
new file mode 100644
index 00000000000..cb3a89eeb3e
--- /dev/null
+++ b/addons/account_accountant/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
new file mode 100644
index 00000000000..ab72c57a229
--- /dev/null
+++ b/addons/account_accountant/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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" : "Accountant",
+    "version" : "1.1",
+    "author" : "OpenERP SA",
+    "category": 'Generic Modules/Accounting',
+    "description": """Account Accountant: This module make the account an Invoicing system but not an
+accounting one.
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    "depends" : ["account"],
+    'update_xml': [
+        'account_security.xml',
+    ],
+    'demo_xml': [
+    ],
+    'test': [
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/account_security.xml b/addons/account_accountant/account_security.xml
new file mode 100644
index 00000000000..80df9ab37a4
--- /dev/null
+++ b/addons/account_accountant/account_security.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <record id="account.menu_action_analytic_account_tree2" model="ir.ui.menu">
+        <field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_periodical_processing" model="ir.ui.menu">
+        <field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_account_bs_report" model="ir.ui.menu">
+        <field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_account_pl_report" model="ir.ui.menu">
+        <field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_tax_report" model="ir.ui.menu">
+        <field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.next_id_40" model="ir.ui.menu">
+        <field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
+    </record>
+
+	<!--
+	 Users Groups
+	-->
+    <record model="res.groups" id="group_accounting_accountant">
+        <field name="name">Accounting / Accountant and Manager</field>
+    </record>
+
+    <record id="account.menu_eaction_account_moves_sale" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_eaction_account_moves_purchase" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_receivables" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_payables" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_invoice_tree1" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_invoice_tree2" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_invoice_tree3" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_invoice_tree4" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_bank_and_cash" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_charts" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_account_tree2" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_tax_code_tree" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_entries" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_move_journal_line_form" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_reporting" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_dashboard_acc" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_board_account" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_legal_statement" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.final_accounting_reports" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_general_ledger" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_general_Balance_report" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_journals_report" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_generic_reporting" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.next_id_22" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_account_journal_period_tree" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_finance_statistic_report_statement" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_account_invoice_report_all" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_account_entries_report_all" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    <record id="account.menu_action_account_account_report" model="ir.ui.menu">
+        <field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
+    </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 37e4d15e1b9..6ae6b59bada 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index 3f35edc72b8..f33c5ebe796 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 8275072723c..f8790c84055 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:28+0000\n"
+"PO-Revision-Date: 2010-08-14 08:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/mn.po b/addons/account_analytic_analysis/i18n/mn.po
index a267452fafa..c9683b281d3 100644
--- a/addons/account_analytic_analysis/i18n/mn.po
+++ b/addons/account_analytic_analysis/i18n/mn.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 10:04+0000\n"
+"PO-Revision-Date: 2010-08-13 09:22+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 86c8557e690..2a38d172cb0 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:04+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 8d64c501f60..33e1e4883c8 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:05+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/mn.po b/addons/account_analytic_default/i18n/mn.po
index 49ff6aecc38..a1703063ea2 100644
--- a/addons/account_analytic_default/i18n/mn.po
+++ b/addons/account_analytic_default/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 10:07+0000\n"
+"PO-Revision-Date: 2010-08-12 06:37+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 05:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index ec430efe367..c8535d51890 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:31+0000\n"
+"PO-Revision-Date: 2010-08-14 09:04+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 22389386bba..722d007373b 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -132,7 +132,7 @@
         res_model="account.analytic.plan.instance"
         src_model="account.analytic.plan"
         id="account_analytic_instance_model_open"/>
-        
+
     <record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
         <field name="name">account.analytic.plan.instance.line.form</field>
         <field name="model">account.analytic.plan.instance.line</field>
@@ -241,7 +241,7 @@
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
             <field name="arch" type="xml">
-                <field name="analytic_id" select="1" required="1" position="replace">
+                <field name="analytic_id" required="1" position="replace">
                     <field name="analytics_id" select="1" required="1"/>
                 </field>
             </field>
@@ -252,7 +252,7 @@
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
             <field name="arch" type="xml">
-                <field name="analytic_id" select="1" required="1" position="replace">
+                <field name="analytic_id" required="1" position="replace">
                     <field name="analytics_id" select="1" required="1"/>
                 </field>
             </field>
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 2276177290d..d3b76f51909 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:30+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 5e5086e979e..ccde4145027 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:05+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 63865147d7c..14372a0c135 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:34+0000\n"
+"PO-Revision-Date: 2010-08-14 08:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 035fb47f949..6429df21062 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -29,7 +29,7 @@
     Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped.
     This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account
     when the invoice is created to transfer this amount to the debtor or creditor account.
-    Secondly, price differences between actual purchase price and fixed product standard price are booked on a seperate account""",
+    Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""",
     "depends"   : ["product", "purchase"],
     "category"  : "Generic Modules/Inventory Control",
     "init_xml"  : [],
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 463cdf4158e..27417c3b340 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:28+0000\n"
+"PO-Revision-Date: 2010-08-14 08:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 1cdc870c0c0..30cc668c2cf 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 898d4276e77..fb8c6d97324 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:46+0000\n"
 "Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_followup/account_followup_report.xml b/addons/account_followup/account_followup_report.xml
index 71780a4d05a..ca1604e2375 100644
--- a/addons/account_followup/account_followup_report.xml
+++ b/addons/account_followup/account_followup_report.xml
@@ -43,12 +43,13 @@
         
 
         <record id="action_followup_stat" model="ir.actions.act_window">
-            <field name="name">Follow-Ups</field>
+            <field name="name">Latest Reminders</field>
             <field name="res_model">account_followup.stat</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_followup_stat" id="menu_action_followup_stat" parent="account.menu_finance_reporting"/>
-        
-        
+        <menuitem string="Partners Follow-Ups" id="menu_action_followup_stat" parent="account.menu_finance_generic_reporting"/>
+
+        <menuitem action="action_followup_stat" id="menu_action_followup_stat_follow" parent="menu_action_followup_stat"/>
+
     </data>
 </openerp>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index b44bdcca22f..09ad945327a 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -138,11 +138,23 @@
 
 <!--        <act_window context="{'search_default_reconcile_id':False}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>-->
 
-        <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
+        <act_window
+            domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]"
+            id="act_account_partner_account_move_all"
+            name="Receivable Items"
+            res_model="account.move.line"
+            src_model=""
+            view="account_move_line_partner_tree"/>
 
         <menuitem action="act_account_partner_account_move_all" id="menu_account_move_open_unreconcile" parent="account_followup.menu_action_followup_stat"/>
 
-        <act_window domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]" id="act_account_partner_account_move_payable_all" name="All payable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
+        <act_window
+            domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]"
+            id="act_account_partner_account_move_payable_all"
+            name="Payable Items"
+            res_model="account.move.line"
+            src_model=""
+            view="account_move_line_partner_tree"/>
 
         <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
 
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index d32de4a622f..b496c2d8616 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:34+0000\n"
+"PO-Revision-Date: 2010-08-14 08:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index c392cffa087..4f7b75955c6 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:31+0000\n"
+"PO-Revision-Date: 2010-08-14 09:04+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index 3e62e778b7c..ccf257b3ecf 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_followup_stat","account_followup.stat","model_account_followup_stat","account.group_account_user",1,0,0,0
 "access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
 "access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
@@ -7,3 +6,4 @@
 "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
 "access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1
 "access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
+"access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index c3fd73370eb..9ff5bde8c1b 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -76,7 +76,7 @@ class account_followup_print_all(osv.osv_memory):
         'partner_ids': fields.many2many('account_followup.stat', 'partner_stat_rel', 'followup_id', 'stat_id', 'Partners', required=True),
         'email_conf': fields.boolean('Send email confirmation'),
         'email_subject': fields.char('Email Subject', size=64),
-        'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configre from company'),
+        'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
         'email_body': fields.text('Email body'),
         'summary': fields.text('Summary', required=True, readonly=True)
                 }
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index 45cee7c2864..6b89131d7ca 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:34+0000\n"
+"PO-Revision-Date: 2010-08-14 08:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index ac4cf39a9c0..1e34028d8a2 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 1eaec699b95..52bad6012bf 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -124,7 +124,7 @@
                                     <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
                                     <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
                                     <separator colspan="2" string="Owner Account"/>
-                                    <separator colspan="2" string="Desitination Account"/>
+                                    <separator colspan="2" string="Destination Account"/>
                                     <field colspan="2" name="info_owner" nolabel="1"/>
                                     <field colspan="2" name="info_partner" nolabel="1"/>
                                     <field colspan="4" name="communication"/>
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index 380b1197e4c..8968ee373ef 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:29+0000\n"
+"PO-Revision-Date: 2010-08-13 11:45+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index e48923b6172..b58824b35c5 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index b12498d7e50..fd4b080ae95 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:44+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
 #: field:payment.order,date_planned:0
 msgid "Scheduled date if fixed"
-msgstr ""
+msgstr "Төлөвлөсөн огноо"
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -40,7 +40,7 @@ msgstr "Хэрэглэх төлбөрийн горимыг сонгох"
 #. module: account_payment
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: account_payment
 #: view:payment.line:0
@@ -55,6 +55,8 @@ msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
 msgstr ""
+"Одоо төлбөл зохих дүнгээс төлбөрийн даалгаварт \n"
+"бичигдсэн дүнг хассан дүн"
 
 #. module: account_payment
 #: help:payment.line,date:0
@@ -62,16 +64,17 @@ msgid ""
 "If no payment date is specified, the bank will treat this payment line "
 "directly"
 msgstr ""
+"Төлбөрийн огноо заагаагүй бол банк уг төлбөрийг шууд гүйцэтгэнэ гэж үзнэ"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr ""
+msgstr "Сонгосон огноо"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr ""
+msgstr "Сул"
 
 #. module: account_payment
 #: wizard_field:populate_payment,search,entries:0
@@ -91,7 +94,7 @@ msgstr "Дансны бичилт"
 #. module: account_payment
 #: wizard_button:populate_payment,search,create:0
 msgid "_Add to payment order"
-msgstr ""
+msgstr "_Төлбөрийн даалгавар руу нэмэх"
 
 #. module: account_payment
 #: rml:payment.order:0
@@ -102,7 +105,7 @@ msgstr "Дүн"
 #. module: account_payment
 #: rml:payment.order:0
 msgid "Execution date:"
-msgstr ""
+msgstr "Гүйцэтгэх огноо:"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -158,12 +161,12 @@ msgstr "Бүгд дүн"
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Баталсан"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
 msgid "Invoice Effective Date"
-msgstr ""
+msgstr "Нэхэмжлэлийн ашигтай огноо"
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -173,12 +176,12 @@ msgstr "Төлбөрийн мөрүүд"
 #. module: account_payment
 #: help:payment.order,date_planned:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr ""
+msgstr "Сонгох огноо тогтмол байх бол огноог заана."
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Structured"
-msgstr ""
+msgstr "Бүтэцтэй"
 
 #. module: account_payment
 #: field:payment.order,state:0
@@ -201,12 +204,12 @@ msgstr "Төлбөрийн горим"
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr ""
+msgstr "Ашигтай огноо"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
 msgid "Invoice Ref."
-msgstr ""
+msgstr "Нэх. ишлэл"
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
@@ -215,6 +218,9 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
+"Төлбөрийн даалгаварыг тохируулах: 'Тогтсон' гэдэг нь таны заасан огноо. "
+"'Шууд' гэдэг нь шууд гүйцэтгэнэ. 'Товлосон огноо' гэдэг нь гүйцэтгэх өдрийг "
+"төлөвлөхийг илэрхийлнэ."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -224,12 +230,12 @@ msgstr "Нийт дебит"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "Гүйцэтгэх огноо"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr ""
+msgstr "Тогтсон огноо"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
@@ -262,17 +268,17 @@ msgstr "Үүссэн"
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
-msgstr ""
+msgstr "Валютын дүн"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr ""
+msgstr "Төлбөр хийх"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr ""
+msgstr "Харилцах төрөл"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
@@ -287,7 +293,7 @@ msgstr "Харилцаа"
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr ""
+msgstr "Товлосон огноо"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
@@ -297,7 +303,7 @@ msgstr "Төлөх дүн"
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
-msgstr ""
+msgstr "Үндсэн харилцагчийн хаяг"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -313,7 +319,7 @@ msgstr "Төлбөрийн төрөл"
 #. module: account_payment
 #: help:payment.line,amount_currency:0
 msgid "Payment amount in the partner currency"
-msgstr ""
+msgstr "Төлбөрийн дүн, харилцагчийн валютаар"
 
 #. module: account_payment
 #: selection:payment.order,state:0
@@ -329,12 +335,12 @@ msgstr "Харилцагч"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr ""
+msgstr "Өмнөх харилцсан мессеж"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr ""
+msgstr "Худалдан авагчийн хаяг"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -344,7 +350,7 @@ msgstr "Нийт кредит"
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
 msgid "Populate payment"
-msgstr ""
+msgstr "Төлбөрийг дүүргэх"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -355,7 +361,7 @@ msgstr "Хэрэглэгч"
 #: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
 #: wizard_field:populate_statement,init,lines:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Төлбөрийн мөрүүд"
 
 #. module: account_payment
 #: rml:payment.order:0
@@ -372,7 +378,7 @@ msgstr "Ишлэл"
 msgid ""
 "This Entry Line will be referred for the information of the ordering "
 "customer."
-msgstr ""
+msgstr "Энэ бичлэг худалдан авагчийн мэдээлэлд тусгагдана."
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -387,7 +393,7 @@ msgstr "Үүссэн огноо"
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Биежих огноо"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -397,7 +403,7 @@ msgstr "Төлөлтүүдийг импортлох"
 #. module: account_payment
 #: help:payment.type,code:0
 msgid "Specify the Code for Payment Type"
-msgstr ""
+msgstr "Төлбөрийн төрлийн кодыг заах"
 
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
@@ -412,7 +418,7 @@ msgstr "Компанийн валютаархи дүн"
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr ""
+msgstr "Худалдан авагч"
 
 #. module: account_payment
 #: field:payment.type,code:0
@@ -422,7 +428,7 @@ msgstr "Код"
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Таны ишлэл"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -489,7 +495,7 @@ msgstr "Компанийн валютаархи төлбөрийн дүн"
 #. module: account_payment
 #: wizard_view:populate_payment,init:0
 msgid "Search Payment lines"
-msgstr ""
+msgstr "Төлөлт хайх"
 
 #. module: account_payment
 #: field:payment.line,amount_currency:0
@@ -499,7 +505,7 @@ msgstr "Харилцагчийн валютаархи дүн"
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr ""
+msgstr "Харилцах 2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
@@ -509,7 +515,7 @@ msgstr "Хүлээн авах банкны данс"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Төлбөрийн горимын касс журнал"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
@@ -520,7 +526,7 @@ msgstr "Банкны данс"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Confirm Payments"
-msgstr ""
+msgstr "Төлбөрийг бататгах"
 
 #. module: account_payment
 #: field:payment.line,company_currency:0
@@ -538,7 +544,7 @@ msgstr "Төлбөр"
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
-msgstr ""
+msgstr "Бичлэг"
 
 #. module: account_payment
 #: help:payment.line,communication:0
@@ -546,6 +552,8 @@ msgid ""
 "Used as the message between ordering customer and current company. Depicts "
 "'What do you want to say to the recipient about this order ?'"
 msgstr ""
+"Компаниас худалдан авагчид хүргэх мессеж. 'Энэ захиалгын талаар худалдан "
+"авагчид  юу хэлэх вэ?' гэсэн үг."
 
 #. module: account_payment
 #: field:payment.mode,name:0
@@ -567,7 +575,7 @@ msgstr "Бичлэгийн мэдээлэл"
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
 msgid "Populate Statement with Payment lines"
-msgstr ""
+msgstr "Тайланг төлөлтөөр дүүргэх"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
@@ -578,7 +586,7 @@ msgstr "Даалгавар"
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_open
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open
 msgid "Payment Orders to Validate"
-msgstr ""
+msgstr "Нягтлах төлбөрийн даалгаварууд"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_type
@@ -599,7 +607,7 @@ msgstr "_Нэмэх"
 #. module: account_payment
 #: help:payment.mode,type:0
 msgid "Select the Payment Type for the Payment Mode."
-msgstr ""
+msgstr "Төлбөрийн горимд тохирох төлбөрийн төрлийг сонго."
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_mode
@@ -610,7 +618,7 @@ msgstr "Төлбөрийн горим"
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr ""
+msgstr "Төлбөрийн горимд тохирох банкны данс"
 
 #. module: account_payment
 #: field:payment.mode,journal:0
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 4db6e1fa724..40a0f69f7fb 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index 168083eb9de..fca15213f1d 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -11,3 +11,5 @@
 "access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
 "access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
 "access_payment_type_system","payment.type system","model_payment_type","base.group_system",1,1,1,1
+"access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
+"access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index f03f235550a..0ad2cf3309d 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:29+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 2536a295789..20937b4d020 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:27+0000\n"
+"PO-Revision-Date: 2010-08-14 08:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 893be305508..34df8a6f73b 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index 81c2fc72856..0c0c7055da5 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 08:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index ed4fffe4be7..cb647af2a23 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index d8f1da5eb4a..f7ed764007e 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 64f209c14b1..03028c39eda 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index a49222c3b96..6091519df53 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -23,9 +23,9 @@
   !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
     - state == 'draft'
 -
-  I change the state of voucher to "proforma" by clicking PRO-FORMA button
+  I compute the voucher to calculate the taxes by clicking Cpmpute button
 -
-  !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucherforaxelor0}
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
 -
   I check that the voucher state is now "proforma"
 -
@@ -83,7 +83,7 @@
 -
   I change the state of voucher to "proforma" by clicking PRO-FORMA button
 -
-  !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucheraxelor0}
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
 -
   I check that the voucher state is now "proforma"
 -
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 4a1d62c4d92..b56853f6323 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -25,12 +25,10 @@ from osv import osv
 from tools.translate import _
 
 journal2type = {
-    'cash':'rec_voucher',
-    'bank':'bank_rec_voucher',
-    'cash':'pay_voucher',
-    'sale':'journal_sale_vou',
-    'purchase':'journal_pur_voucher',
-    'general':'journal_voucher'
+    'bank':'receipt',
+    'cash':'receipt',
+    'sale':'sale',
+    'purchase':'purchase'
 }
 
 type2journal = {
@@ -55,7 +53,7 @@ ir_sequence_type()
 class account_journal(osv.osv):
     _inherit = "account.journal"
     _columns = {
-        'max_amount': fields.float('Verify Transaction', digits=(16, 2), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
+        'max_amount': fields.float('Verify Transaction', digits=(16, 2), help="Validate voucher entry twice before posting it, if transaction amount more then entered here"),
     }
 account_journal()
 
@@ -85,9 +83,7 @@ class account_voucher(osv.osv):
         if context.get('journal_id', False):
             return context.get('journal_id')
 
-        type_inv = context.get('type', 'rec_voucher')
-
-        ttype = type2journal.get(type_inv, type_inv)
+        ttype = context.get('type', 'bank')
         res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
 
         if res:
@@ -108,19 +104,16 @@ class account_voucher(osv.osv):
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
-            ('pay_voucher','Cash Payment'),
-            ('bank_pay_voucher','Bank Payment'),
-            ('rec_voucher','Cash Receipt'),
-            ('bank_rec_voucher','Bank Receipt'),
-            ('journal_sale_vou','Journal Sale'),
-            ('journal_pur_voucher','Journal Purchase'),
-            ('journal_voucher','Journal Voucher'),
-            ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
+            ('payment', 'Payment'),
+            ('receipt', 'Receipt'),
+            ('sale', 'Sales'),
+            ('purchase', 'Purchase')],
+            'Default Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
         'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
-        'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'posted':[('readonly',False)]}),
+        'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -141,8 +134,10 @@ class account_voucher(osv.osv):
         'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True),
         'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
         'move_id':fields.many2one('account.move', 'Account Entry'),
-        'move_ids':fields.many2many('account.move.line', 'voucher_id', 'account_id', 'rel_account_move', 'Real Entry'),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]})
+        'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}),
+        #'move_ids':fields.many2many('account.move.line', 'voucher_id', 'account_id', 'rel_account_move', 'Real Entry', readonly=True, states={'draft':[('readonly',False)]}),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
+        'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
     }
 
     _defaults = {
@@ -153,9 +148,35 @@ class account_voucher(osv.osv):
         'state': lambda *a: 'draft',
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
         'reference_type': lambda *a: "none",
+        'audit': lambda *a: False,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
     }
 
+    def onchange_date(self, cr, user, ids, date, context={}):
+        """
+        Returns a dict that contains new values and context
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param date: latest value from user input for field date
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        @return: Returns a dict which contains new values, and context
+        """
+        res = {}
+        period_pool = self.pool.get('account.period')
+        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+        if pids:
+            res.update({
+                'period_id':pids[0]
+            })
+            context.update({
+                'period_id':pids[0]
+            })
+        return {
+            'value':res,
+            'context':context,
+        }
+
     def onchange_account(self, cr, uid, ids, account_id):
         if not account_id:
             return {
@@ -167,54 +188,142 @@ class account_voucher(osv.osv):
             'value':{'amount':balance}
         }
 
-    def onchange_journal(self, cr, uid, ids, journal_id, type):
+    def onchange_journal(self, cr, uid, ids, journal_id, ttype):
+        res = {'account_id':False}
+
         if not journal_id:
             return {
-                'value':{'account_id':False}
+                'value':res
             }
-        journal = self.pool.get('account.journal')
+        journal_pool = self.pool.get('account.journal')
+        journal = journal_pool.browse(cr, uid, journal_id)
 
-        if journal_id and (type in ('rec_voucher','bank_rec_voucher','journal_pur_voucher','journal_voucher')):
-            account_id = journal.browse(cr, uid, journal_id).default_debit_account_id
-            return {
-                'value':{'account_id':account_id.id}
-            }
-        elif journal_id and (type in ('pay_voucher','bank_pay_voucher','journal_sale_vou')) :
-                account_id = journal.browse(cr, uid, journal_id).default_credit_account_id
-                return {
-                    'value':{'account_id':account_id.id}
-                }
+        if journal_id and (ttype in ('receipt', 'purchase')):
+            account_id = journal.default_debit_account_id
+            res.update({
+                'account_id':account_id.id
+            })
+        elif journal_id and (ttype in ('payment','sale')) :
+                account_id = journal.default_credit_account_id
+                res.update({
+                    'account_id':account_id.id
+                })
         else:
-            account_id = journal.browse(cr, uid, journal_id).default_credit_account_id
-            return {
-                'value':{'account_id':account_id.id}
-            }
+            account_id = journal.default_credit_account_id
+            res.update({
+                'account_id':account_id.id
+            })
 
-    def open_voucher(self, cr, uid, ids, context={}):
-        voucher = self.pool.get('account.voucher').browse(cr, uid, ids)[0]
-        total = 0
+        if journal.type in ('sale', 'purchase') and not ttype:
+            res.update({
+                'type':journal.type
+            })
+
+        return {
+            'value':res
+        }
+
+    def open_voucher(self, dbcr, uid, ids, context={}):
+        cr = 0.0
+        dr = 0.0
+        total = 0.0
+        new_line = []
+
+        position_pool = self.pool.get('account.fiscal.position')
+        voucher_pool = self.pool.get('account.voucher')
+        voucher_line_pool = self.pool.get('account.voucher.line')
+        partner_pool = self.pool.get('res.partner')
+        tax_pool = self.pool.get('account.tax')
+
+        line_ids = voucher_line_pool.search(dbcr, uid, [('voucher_id','=',ids[0]), ('is_tax','=',True)])
+        if line_ids:
+            voucher_line_pool.unlink(dbcr, uid, line_ids)
+
+        voucher = voucher_pool.browse(dbcr, uid, ids[0])
+        if voucher.account_id.tax_ids:
+            if voucher.account_id.tax_ids:
+                for line in voucher.payment_ids:
+
+                    if line.amount <= 0:
+                        raise osv.except_osv(_('Invalid amount !'), _('You can not create Pro-Forma voucher with Total amount <= 0 !'))
+
+                    part = line.partner_id and partner_pool.browse(dbcr, uid, line.partner_id.id) or False
+                    taxes = position_pool.map_tax(dbcr, uid, part and part.property_account_position or False, voucher.account_id.tax_ids)
+                    taxes = tax_pool.browse(dbcr, uid, taxes)
+                    new_price = line.amount
+                    for tax in tax_pool.compute_all(dbcr, uid, taxes, line.amount, 1).get('taxes'):
+                        tax_line = {
+                            'name':"%s / %s" % (line.name, tax.get('name')),
+                            'amount':tax.get('amount'),
+                            'voucher_id': voucher.id,
+                            'is_tax':True
+                        }
+                        crdr = False
+                        account = False
+                        if voucher.type == 'purchase':
+                            crdr = 'dr'
+                            account = tax.get('account_paid_id')
+                        elif voucher.type == 'sale':
+                            crdr = 'cr'
+                            account = tax.get('account_collected_id', account)
+
+                        tax_line.update({
+                            'account_id':account or voucher.account_id.id,
+                            'type':crdr
+                        })
+                        new_line += [tax_line]
+
+
+        if new_line:
+            for line in new_line:
+                voucher_line_pool.create(dbcr, uid, line)
+
+        voucher = voucher_pool.browse(dbcr, uid, ids[0])
         for line in voucher.payment_ids:
-            total += line.amount
-        
+            if line.type == 'cr':
+                cr += line.amount
+            else:
+                dr += line.amount
+
+            if cr > dr:
+                total = cr - dr
+            else:
+                total = dr - cr
+
         if total != 0:
             res = {
-                'amount':total, 
-                'state':'proforma'
+                'amount':total,
+                'state':voucher.state
             }
-            self.write(cr, uid, ids, res)
+            self.write(dbcr, uid, ids, res)
         else:
-            raise osv.except_osv(_('Invalid action !'), _('You can not post to Pro-Forma a voucher with Total amount = 0 !'))
+            raise osv.except_osv(_('Invalid amount !'), _('You can not create Pro-Forma voucher with Total amount <= 0 !'))
+        return True
+    
+    def write(self, cr, uid, ids, vals, context={}):
+        res = super(account_voucher, self).write(cr, uid, ids, vals, context)
+        
+        #If there is state says that method called from the work flow signals
+        if not 'state' in vals.keys():
+            self.open_voucher(cr, uid, ids, context)
+        
+        return res
+        
+    def voucher_recheck(self, cr, uid, ids, context={}):
+        #self.open_voucher(cr, uid, ids, context)
+        self.write(cr, uid, ids, {'state':'recheck'}, context)
         return True
 
     def proforma_voucher(self, cr, uid, ids, context={}):
+        #self.open_voucher(cr, uid, ids, context)
         self.action_move_line_create(cr, uid, ids)
         self.write(cr, uid, ids, {'state':'posted'})
         return True
-    
+
     def action_cancel_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
-    
+
     def audit_pass(self, cr, uid, ids, context={}):
         move_pool = self.pool.get('account.move')
         result = True
@@ -223,22 +332,26 @@ class account_voucher(osv.osv):
             if voucher.move_id and voucher.move_id.state == 'draft':
                 result = result and move_pool.button_validate(cr, uid, [voucher.move_id.id])
             audit_pass += [voucher.id]
-        
+
         self.write(cr, uid, audit_pass, {'state':'audit'})
         return result
-        
+
     def cancel_voucher(self, cr, uid, ids, context={}):
         move_pool = self.pool.get('account.move')
-        
+        voucher_line_pool = self.pool.get('account.voucher.line')
+
         for voucher in self.browse(cr, uid, ids):
             if voucher.move_id:
                 move_pool.button_cancel(cr, uid, [voucher.move_id.id])
                 move_pool.unlink(cr, uid, [voucher.move_id.id])
-        
+
+            line_ids = voucher_line_pool.search(cr, uid, [('voucher_id','=',voucher.id), ('is_tax','=',True)])
+            if line_ids:
+                voucher_line_pool.unlink(cr, uid, line_ids)
+
         res = {
-            'state':'cancel', 
+            'state':'cancel',
             'move_id':False,
-            'move_ids':[(6, 0,[])]
         }
         self.write(cr, uid, ids, res)
         return True
@@ -262,61 +375,55 @@ class account_voucher(osv.osv):
         analytic_pool = self.pool.get('account.analytic.line')
         currency_pool = self.pool.get('res.currency')
         invoice_pool = self.pool.get('account.invoice')
-        
+
         for inv in self.browse(cr, uid, ids):
-            
+
             if inv.move_id:
                 continue
 
             journal = journal_pool.browse(cr, uid, inv.journal_id.id)
-            if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
-                if journal.invoice_sequence_id:
-                    name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
-                else:
-                    raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
+            if journal.sequence_id:
+                name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
             else:
-                if journal.sequence_id:
-                    name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
-                else:
-                    raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
-            
+                raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
+
             ref = False
-            if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
+            if inv.type in ('purchase', 'receipt'):
                 ref = inv.reference
             else:
                 ref = invoice_pool._convert_ref(cr, uid, name)
-            
+
             company_currency = inv.company_id.currency_id.id
             diff_currency_p = inv.currency_id.id <> company_currency
-            
+
             move = {
-                'name':name,
-                'journal_id':journal.id,
-                'type':inv.type,
-                'narration':inv.narration and inv.narration or inv.name,
+                'name' : name,
+                'journal_id': journal.id,
+                'type' : inv.type,
+                'narration' : inv.narration and inv.narration or inv.name,
                 'date':inv.date,
                 'ref':ref
             }
-            
+
             if inv.period_id:
                 move.update({
                     'period_id': inv.period_id.id
                 })
-            
+
             move_id = move_pool.create(cr, uid, move)
-            
+
             #create the first line manually
             move_line = {
-                'name': inv.name,
-                'debit': False,
+                'name':inv.name,
+                'debit':False,
                 'credit':False,
-                'account_id': inv.account_id.id or False,
-                'move_id': move_id ,
-                'journal_id': inv.journal_id.id,
-                'period_id': inv.period_id.id,
-                'partner_id': False,
+                'account_id':inv.account_id.id or False,
+                'move_id':move_id ,
+                'journal_id':inv.journal_id.id,
+                'period_id':inv.period_id.id,
+                'partner_id':False,
                 'ref':ref,
-                'date': inv.date
+                'date':inv.date
             }
             if diff_currency_p:
                 amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
@@ -325,20 +432,22 @@ class account_voucher(osv.osv):
                     'amount_currency':amount_currency,
                     'currency_id':inv.currency_id.id
                 })
-            
-            if inv.type in ('rec_voucher', 'bank_rec_voucher', 'journal_pur_voucher', 'journal_voucher'):
+
+            if inv.type in ('receipt', 'purchase'):
                 move_line['debit'] = inv.amount
             else:
                 move_line['credit'] = inv.amount
-            
+
             line_ids = []
             line_ids += [move_line_pool.create(cr, uid, move_line)]
+            rec_ids = []
+
             for line in inv.payment_ids:
                 amount=0.0
-                
-                if inv.type in ('bank_pay_voucher', 'pay_voucher', 'journal_voucher'):
+
+                if inv.type in ('payment'):
                     ref = line.ref
-                    
+
                 move_line = {
                      'name':line.name,
                      'debit':False,
@@ -352,7 +461,7 @@ class account_voucher(osv.osv):
                      'date':inv.date,
                      'analytic_account_id':False
                 }
-                
+
                 if diff_currency_p:
                     amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
                     line.amount = amount_currency
@@ -360,74 +469,77 @@ class account_voucher(osv.osv):
                         'amount_currency':amount_currency,
                         'currency_id':inv.currency_id.id
                     })
-                
+
                 if line.account_analytic_id:
                     move_line.update({
                         'analytic_account_id':line.account_analytic_id.id
                     })
-                
+
                 if line.type == 'dr':
                     move_line.update({
                         'debit': line.amount or False
                     })
                     amount = line.amount
-                    
+
                 elif line.type == 'cr':
                     move_line.update({
                         'credit': line.amount or False
                     })
-                    amount = line.amount * (-1)
+                    amount = line.amount
 
                 move_line_id = move_line_pool.create(cr, uid, move_line)
                 line_ids += [move_line_id]
-            
+
             rec = {
                 'move_id': move_id,
                 'move_ids':[(6, 0,line_ids)]
             }
-            
+
             message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirmed")
             self.log(cr, uid, inv.id, message)
-            
+
             self.write(cr, uid, [inv.id], rec)
-            
+
         return True
 
     def _convert_ref(self, cr, uid, ref):
         return (ref or '').replace('/','')
 
-    def name_get(self, cr, uid, ids, context={}):
-        if not len(ids):
-            return []
-        types = {
-            'pay_voucher': 'CPV: ',
-            'rec_voucher': 'CRV: ',
-            'cont_voucher': 'CV: ',
-            'bank_pay_voucher': 'BPV: ',
-            'bank_rec_voucher': 'BRV: ',
-            'journal_sale_vou': 'JSV: ',
-            'journal_pur_voucher': 'JPV: ',
-            'journal_voucher':'JV'
+#    def name_get(self, cr, uid, ids, context={}):
+#        if not len(ids):
+#            return []
+#        types = {
+#            'pay_voucher': 'CPV: ',
+#            'rec_voucher': 'CRV: ',
+#            'cont_voucher': 'CV: ',
+#            'bank_pay_voucher': 'BPV: ',
+#            'bank_rec_voucher': 'BRV: ',
+#            'journal_sale_vou': 'JSV: ',
+#            'journal_pur_voucher': 'JPV: ',
+#            'journal_voucher':'JV'
+#        }
+#        return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
+
+#    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+#        if not args:
+#            args=[]
+#        if not context:
+#            context={}
+#        ids = []
+#        if name:
+#            ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context)
+#        if not ids:
+#            ids = self.search(cr, user, [('name',operator,name)]+args, limit=limit, context=context)
+#        return self.name_get(cr, user, ids, context)
+
+    def copy(self, cr, uid, id, default={}, context=None):
+        res = {
+            'state':'draft',
+            'number':False,
+            'move_id':False,
+            'payment_ids':False
         }
-        return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
-
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
-        if not args:
-            args=[]
-        if not context:
-            context={}
-        ids = []
-        if name:
-            ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context)
-        if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+args, limit=limit, context=context)
-        return self.name_get(cr, user, ids, context)
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default = default.copy()
-        default.update({'state':'draft', 'number':False, 'move_id':False, 'move_ids':False, 'payment_ids':False})
+        default.update(res)
         if 'date' not in default:
             default['date'] = time.strftime('%Y-%m-%d')
         return super(account_voucher, self).copy(cr, uid, id, default, context)
@@ -445,62 +557,114 @@ class account_voucher_line(osv.osv):
         'amount':fields.float('Amount'),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'),
         'ref':fields.char('Reference', size=32),
-        'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account')
+        'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
+        'is_tax':fields.boolean('Tax ?', required=False),
     }
     _defaults = {
         'type': lambda *a: 'cr'
     }
 
-    def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1, currency):
+    def onchange_type(self, cr, uid, ids, partner_id, ttype ,type1, currency):
         currency_pool = self.pool.get('res.currency')
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
-        
+
         vals = {
-            'account_id': False, 
+            'account_id': False,
             'type': False ,
             'amount': False
         }
-        
+
         if not partner_id:
             return {
-                'value' : vals
+                'value':vals
             }
-        
+
         partner_pool = self.pool.get('res.partner')
         account_id = False
 
         partner = partner_pool.browse(cr, uid, partner_id)
         balance = 0.0
-        
-        if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
+
+        if ttype == 'cr' and type1 in ('receipt'):
+            account_id = partner.property_account_receivable.id
+            balance = partner.credit
+
+        elif ttype == 'dr' and type1 in ('payment'):
+            account_id = partner.property_account_payable.id
+            balance = partner.debit
+
+        elif ttype == 'dr' and type1 in ('sale'):
+            account_id = partner.property_account_receivable.id
+
+        elif ttype == 'cr' and type1 in ('purchase'):
+            account_id = partner.property_account_payable.id
+
+        else:
+            raise osv.except_osv(_('Invalid Configuration !'), _('You can not encode unbalanced entry !'))
+
+        if company.currency_id != currency:
+            balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
+
+        vals.update({
+            'account_id': account_id,
+            'type': ttype,
+            'amount':balance
+        })
+
+        return {
+            'value':vals
+        }
+
+    def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1, currency):
+        currency_pool = self.pool.get('res.currency')
+        company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+
+        vals = {
+            'account_id': False,
+            'type': False ,
+            'amount': False
+        }
+
+        if not partner_id:
+            return {
+                'value':vals
+            }
+
+        partner_pool = self.pool.get('res.partner')
+        account_id = False
+
+        partner = partner_pool.browse(cr, uid, partner_id)
+        balance = 0.0
+
+        if type1 in ('receipt'):
             account_id = partner.property_account_receivable.id
             balance = partner.credit
             ttype = 'cr'
-            
-        elif type1 in ('pay_voucher', 'bank_pay_voucher', 'journal_voucher') :
+
+        elif type1 in ('payment'):
             account_id = partner.property_account_payable.id
             balance = partner.debit
             ttype = 'dr'
-            
-        elif type1 in ('journal_sale_vou') :
+
+        elif type1 in ('sale'):
             account_id = partner.property_account_receivable.id
             ttype = 'dr'
-            
-        elif type1 in ('journal_pur_voucher') :
+
+        elif type1 in ('purchase'):
             account_id = partner.property_account_payable.id
             ttype = 'cr'
-        
+
         if company.currency_id != currency:
             balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
-        
+
         vals.update({
-            'account_id': account_id, 
-            'type': ttype, 
+            'account_id': account_id,
+            'type': ttype,
             'amount':balance
         })
-        
+
         return {
-            'value' : vals
+            'value':vals
         }
-    
+
 account_voucher_line()
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index de708c671e0..3d7c2a77db5 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -36,12 +36,12 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
-                            <field name="payment_ids" colspan="4" nolabel="1" height="200">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
                                 <tree string="Voucher Lines" editable="top">
                                     <field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="account_id"/>
                                     <field name="name"/>
-                                    <field name="type"/>
+                                    <field name="type" on_change="onchange_type(partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id"/>
                                     <field name="ref"/>
@@ -52,26 +52,29 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
-                                <separator string="Other Informtion" colspan="2"/>
+                                <separator string="Other Information" colspan="2"/>
                                 <field name="reference" select="1"/>
-                                <field name="date" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
                                 <field name="currency_id" select="1"/>
                             </group>
                         </page>
-                        <page string="Accounting Entries">
-                            <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                            <field name="period_id"/>
-                            <separator string="General Entries" colspan="4"/>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
-                        <button name="open_voucher" string="Pro-forma" states="draft" icon="terp-check"/>
-                        <button name="proforma_voucher" string="Create" states="proforma" icon="terp-document-new"/>
+                        <button name="open_voucher" states="draft" attrs="{'readonly':[('type','not in',['sale', 'purchase'])]}" string="Compute" type="object" icon="terp-stock_format-scientific"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
                         <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
-                        <button name="audit_complete" string="Audit Pass" states="posted" icon="terp-check"/>
-                        <button name="cancel_voucher" string="Cancel" states="proforma,recheck,posted"  icon="gtk-cancel"/>
+<!--                        <button name="audit_complete" string="Audit Pass" states="posted" icon="terp-check"/>-->
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
                         <button name="cancel_to_draft" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
@@ -92,26 +95,28 @@
                         <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <field name="reference" select="1"/>
                         <field name="number" select='1'/>
-                        <field name="name" select='1'/>
                         <field name="account_id" select="1"/>
-                        <field name="partner_id" select='1'/>
-                        <newline/>
-                        <field name="narration" select="1"/>
+                        <field name="partner_id" select='1'/>                       
                         <field name="date" select='1'/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
+                    <group col='8' colspan='4'>
+                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
+                        <field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>                        
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." col='8' colspan='4'>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options...">
-                        <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
-                        <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>                        
+                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                        <field name="reference" select="1"/>
+                        <field name="name" select='1'/>
+                        <field name="narration" select="1"/>
                    </group>
                 </search>
             </field>
@@ -130,19 +135,15 @@
                         <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <field name="reference" select="1"/>
                         <field name="number" select='1'/>
-                        <field name="name" select='1'/>
                         <field name="account_id" select="1"/>
                         <field name="partner_id" select='1'/>
-                        <newline/>
-                        <field name="narration" select="1"/>
                         <field name="date" select='1'/>
                     </group>
                     <newline/>
                     <group col='8' colspan='4'>
                         <field name="journal_id" widget="selection" select="1"/>
-                        <field name="period_id" widget="selection" select="1"/>                        
+                        <field name="period_id" select="1"/>                        
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
@@ -151,6 +152,12 @@
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                        <field name="reference" select="1"/>
+                        <field name="name" select='1'/>
+                        <field name="narration" select="1"/>
+                   </group>
                 </search>
             </field>
         </record>
@@ -208,7 +215,7 @@
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
 
         <record id="action_cheque_register" model="ir.actions.act_window">
-            <field name="name">Cheque Register</field>
+            <field name="name">Vouchers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index f1444761c48..1c9d4f28bee 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -7,18 +7,18 @@
             <field name="on_create">True</field>
         </record>
         
-        <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-            <field name="action">write({'state':'draft'})</field>
-            <field name="kind">function</field>
-        </record>
-        
+<!--        <record id="act_draft" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf"/>-->
+<!--            <field name="name">draft</field>-->
+<!--            <field name="kind">function</field>-->
+<!--        </record>-->
+<!--        -->
         <record id="act_proforma" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
+            <field name="flow_start">True</field>
             <field name="name">proforma</field>
-            <field name="action">open_voucher()</field>
+            <field name="action">write({'state':'draft'})</field>
+<!--            <field name="action">open_voucher()</field>-->
             <field name="kind">function</field>
         </record>
         
@@ -27,12 +27,13 @@
             <field name="name">done</field>
             <field name="action">proforma_voucher()</field>
             <field name="kind">function</field>
+            <field name="flow_stop">True</field>
         </record>
         
         <record id="act_recheck" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">recheck</field>
-            <field name="action">write({'state':'recheck'})</field>
+            <field name="action">voucher_recheck()</field>
             <field name="kind">function</field>
         </record>
         
@@ -42,20 +43,20 @@
             <field name="action">cancel_voucher()</field>
             <field name="kind">function</field>
         </record>
+
+<!--        <record id="act_audit" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf"/>-->
+<!--            <field name="name">audit</field>-->
+<!--            <field name="action">audit_pass()</field>-->
+<!--            <field name="flow_stop">True</field>-->
+<!--            <field name="kind">function</field>-->
+<!--        </record>-->
         
-        <record id="act_audit" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">audit</field>
-            <field name="action">audit_pass()</field>
-            <field name="flow_stop">True</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="t1" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_proforma"/>
-            <field name="signal">open_voucher</field>
-        </record>
+<!--        <record id="t1" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_draft"/>-->
+<!--            <field name="act_to" ref="act_proforma"/>-->
+<!--            <field name="signal">open_voucher</field>-->
+<!--        </record>-->
         
         <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_proforma"/>
@@ -77,11 +78,11 @@
             <field name="signal">recheck_voucher</field>
         </record>
         
-        <record id="t10" model="workflow.transition">
-            <field name="act_from" ref="act_done"/>
-            <field name="act_to" ref="act_audit"/>
-            <field name="signal">audit_complete</field>
-        </record>
+<!--        <record id="t10" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_done"/>-->
+<!--            <field name="act_to" ref="act_audit"/>-->
+<!--            <field name="signal">audit_complete</field>-->
+<!--        </record>-->
         
         <record id="t5" model="workflow.transition">
             <field name="act_from" ref="act_recheck"/>
@@ -103,7 +104,7 @@
         
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_cancel"/>
-            <field name="act_to" ref="act_draft"/>
+            <field name="act_to" ref="act_proforma"/>
             <field name="signal">cancel_to_draft</field>
         </record>
     </data>
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index 8c4e3984da4..4af9b1dd5ef 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -43,11 +43,11 @@ class account_invoice(osv.osv):
         if not context:
             context = {}
         ttype = context.get('ttype', False)
-        if ttype and ttype in ('rec_voucher', 'bank_rec_voucher'):
+        if ttype and ttype in ('receipt'):
             args += [('type','in', ['out_invoice', 'in_refund'])]
-        elif ttype and ttype in ('pay_voucher', 'bank_pay_voucher'):
+        elif ttype and ttype in ('payment'):
             args += [('type','in', ['in_invoice', 'out_refund'])]
-        elif ttype and ttype in('journal_sale_vou', 'journal_pur_voucher', 'journal_voucher'):
+        elif ttype and ttype in('sale', 'purchase'):
             raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
             args += [('type','=', 'do_not_allow_search')]
 
@@ -86,19 +86,13 @@ class account_voucher(osv.osv):
                 continue
             
             journal = journal_pool.browse(cr, uid, inv.journal_id.id)
-            if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
-                if journal.invoice_sequence_id:
-                    name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
-                else:
-                    raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
+            if journal.sequence_id:
+                name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
             else:
-                if journal.sequence_id:
-                    name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
-                else:
-                    raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
+                raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
             
             ref = False
-            if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
+            if inv.type in ('purchase', 'receipt'):
                 ref = inv.reference
             else:
                 ref = invoice_pool._convert_ref(cr, uid, name)
@@ -143,7 +137,7 @@ class account_voucher(osv.osv):
                     'currency_id':inv.currency_id.id
                 })
             
-            if inv.type in ('rec_voucher', 'bank_rec_voucher', 'journal_pur_voucher', 'journal_voucher'):
+            if inv.type in ('receipt', 'purchase'):
                 move_line['debit'] = inv.amount
             else:
                 move_line['credit'] = inv.amount
@@ -155,7 +149,7 @@ class account_voucher(osv.osv):
             for line in inv.payment_ids:
                 amount=0.0
 
-                if inv.type in ('bank_pay_voucher', 'pay_voucher', 'journal_voucher'):
+                if inv.type in ('payment'):
                     ref = line.ref
                 
                 move_line = {
@@ -200,7 +194,7 @@ class account_voucher(osv.osv):
                 move_line_id = move_line_pool.create(cr, uid, move_line)
                 line_ids += [move_line_id]
                 
-                if line.invoice_id and inv.type in ('pay_voucher', 'bank_pay_voucher', 'rec_voucher', 'bank_rec_voucher'):
+                if line.invoice_id and inv.type in ('payment', 'receipt'):
                     rec_ids += [move_line_id]
                     for move_line in line.invoice_id.move_id.line_id:
                         if line.account_id.id == move_line.account_id.id:
@@ -211,7 +205,6 @@ class account_voucher(osv.osv):
             
             rec = {
                 'move_id': move_id,
-                'move_ids':[(6, 0,line_ids)]
             }
             
             message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm")
@@ -272,19 +265,19 @@ class account_voucher_line(osv.osv):
         obj = self.pool.get('account.account')
         acc_id = False
 
-        if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
+        if type1 in ('receipt'):
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.credit
             type = 'cr'
-        elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
+        elif type1 in ('payment') :
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.debit
             type = 'dr'
-        elif type1 in ('journal_sale_vou') :
+        elif type1 in ('sale') :
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.credit
             type = 'dr'
-        elif type1 in ('journal_pur_voucher') :
+        elif type1 in ('purchase') :
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.debit
             type = 'cr'
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
index 6da4c7d45e2..6bc1484e81e 100755
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@@ -8,13 +8,13 @@
             <field name="inherit_id" ref="account_voucher.view_voucher_form"/>
             <field name="arch" type="xml">
                 <field name="payment_ids" position="replace">
-                    <field name="voucher_line_ids"  default_get="{'lines': voucher_line_ids}" colspan="4" nolabel="1" height="275">
+                    <field name="voucher_line_ids"  default_get="{'lines': voucher_line_ids}" colspan="4" nolabel="1" height="200">
                         <tree string="Voucher Lines" editable="top">
                             <field name="partner_id" on_change="onchange_partner(partner_id, type, parent.type, parent.currency_id)"/>
                             <field name="account_id" on_change="onchange_line_account(account_id, type, parent.type)"/>
                             <field name="name"/>
                             <field name="invoice_id" context="{'ttype':parent.type}" on_change="onchange_invoice_id(invoice_id, parent.currency_id)" domain="[('partner_id','=',partner_id),('state','=','open'),('residual','&gt;',0.0)]"/>
-                            <field name="type"/>
+                            <field name="type" on_change="onchange_type(partner_id,type,parent.type, parent.currency_id)"/>
                             <field name="amount"/>
                             <field name="account_analytic_id"/>
                             <field name="ref"/>
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index b850089e14c..75ae4be6ae9 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:03+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 15f03fe170c..6ee1c0516a4 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:09+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 88a8c2940d0..6aaea67dd0b 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Install Extra Modules</attribute>
+                  <attribute name="string">Association Profile Configuration</attribute>
                 </form>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
 	          	  <attribute name='string'></attribute>
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 26171c7c78b..61017f5efa9 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:33+0000\n"
+"PO-Revision-Date: 2010-08-14 09:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index be20a86033d..e15e6232eb8 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:29+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 436336b41c0..72873f2e634 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:30+0000\n"
+"PO-Revision-Date: 2010-08-14 09:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 6d9e098c56e..4a80997210b 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:14+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 4ae68c76bb9..195a95b803e 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 09:03+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 9380bfd0605..4256547c7a4 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:40+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 27b68003aa2..7bb7d61d8ee 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -378,7 +378,6 @@ property or property parameter."),
      }
     _defaults = {
         'state': 'needs-action',
-        'user_id': lambda self, cr, uid, ctx: uid,
         'role': 'req-participant',
         'rsvp':  True,
         'cutype': 'individual',
@@ -419,7 +418,11 @@ property or property parameter."),
             event.add('location').value = event_obj.location
         if event_obj.rrule:
             event.add('rrule').value = event_obj.rrule
-        if event_obj.user_id or event_obj.organizer_id:
+        if event_obj.organizer:
+            event_org = event.add('organizer')
+            event_org.params['CN'] = [event_obj.organizer]
+            event_org.value = 'MAILTO:' + (event_obj.organizer)
+        elif event_obj.user_id or event_obj.organizer_id:
             event_org = event.add('organizer')
             organizer = event_obj.organizer_id
             if not organizer:
@@ -1111,6 +1114,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, \
                          string='Timezone', store=True),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
+        'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
         'freq': fields.selection([('None', 'No Repeat'), \
                                 ('secondly', 'Secondly'), \
@@ -1147,6 +1151,14 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'active': fields.boolean('Active', help="If the active field is set to \
 true, it will allow you to hide the event alarm information without removing it.")
     }
+    def default_organizer(self, cr, uid, context=None):
+        user_pool = self.pool.get('res.users')
+        user = user_pool.browse(cr, uid, uid, context=context)
+        res = user.name
+        if user.user_email:
+            res += " <%s>" %(user.user_email)
+        return res
+
     _defaults = {
             'state': 'tentative',
             'class': 'public',
@@ -1156,7 +1168,7 @@ true, it will allow you to hide the event alarm information without removing it.
             'interval': 1,
             'active': 1,
             'user_id': lambda self, cr, uid, ctx: uid,
-            'organizer_id': lambda self, cr, uid, ctx: uid,
+            'organizer': default_organizer,
     }
 
     def open_event(self, cr, uid, ids, context=None):
@@ -1199,33 +1211,6 @@ true, it will allow you to hide the event alarm information without removing it.
 
         return value
 
-    def modify_this(self, cr, uid, event_id, defaults, real_date, context=None, *args):
-        """Modifies only one event record out of virtual recurrent events
-        and creates new event as a specific instance of a Recurring Event",
-        @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 event_id: Id of Recurring Event
-        @param real_date: Date of event recurrence that is being modified
-        @param context: A standard dictionary for contextual values
-        @param *args: Get Tupple Value
-        """
-
-        event_id = base_calendar_id2real_id(event_id)
-        datas = self.read(cr, uid, event_id, context=context)
-        defaults.update({
-                        'recurrent_uid': base_calendar_id2real_id(datas['id']),
-                        'recurrent_id': defaults.get('date') or real_date,
-                        'rrule_type': 'none',
-                        'rrule': ''
-                        })
-        exdate = datas['exdate'] and datas['exdate'].split(',') or []
-        if real_date and defaults.get('date'):
-            exdate.append(real_date)
-        self.write(cr, uid, event_id, {'exdate': ','.join(exdate)}, context=context)
-        new_id = self.copy(cr, uid, event_id, default=defaults, context=context)
-        return new_id
-
     def modify_all(self, cr, uid, event_ids, defaults, context=None, *args):
         """
         Modifies the recurring event
@@ -1235,7 +1220,6 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: True
         """
-
         for event_id in event_ids:
             event_id = base_calendar_id2real_id(event_id)
 
@@ -1270,9 +1254,10 @@ true, it will allow you to hide the event alarm information without removing it.
         else:
             ids = select
         result = []
+        recur_dict = []
         if ids and (base_start_date or base_until_date):
-            cr.execute("select m.id, m.rrule, m.date, m.date_deadline, \
-                            m.exdate, m.exrule from " + self._table + \
+            cr.execute("select m.id, m.rrule, m.date, m.date_deadline, m.duration, \
+                            m.exdate, m.exrule, m.recurrent_id, m.recurrent_uid from " + self._table + \
                             " m where m.id in ("\
                             + ','.join(map(lambda x: str(x), ids))+")")
 
@@ -1293,8 +1278,16 @@ true, it will allow you to hide the event alarm information without removing it.
                     if until_date and (event_date > until_date):
                         continue
                     idval = real_id2base_calendar_id(data['id'], data['date'])
-                    result.append(idval)
-                    count += 1
+                    if not data['recurrent_id']:
+                        result.append(idval)
+                        count += 1
+                    else:
+                        ex_id = real_id2base_calendar_id(data['recurrent_uid'], data['recurrent_id'])
+                        ls = base_calendar_id2real_id(ex_id, with_date=data and data.get('duration', 0) or 0)
+                        if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
+                            if ls[1] == data['recurrent_id']:
+                                result.append(idval)
+                        recur_dict.append(ex_id)
                 else:
                     exdate = data['exdate'] and data['exdate'].split(',') or []
                     rrule_str = data['rrule']
@@ -1329,7 +1322,7 @@ true, it will allow you to hide the event alarm information without removing it.
                         result.append(idval)
                         count += 1
         if result:
-            ids = result
+            ids = list(set(result)-set(recur_dict))
         if isinstance(select, (str, int, long)):
             return ids and ids[0] or False
         return ids
@@ -1390,7 +1383,6 @@ true, it will allow you to hide the event alarm information without removing it.
 
         return rrule_string
 
-
     def search(self, cr, uid, args, offset=0, limit=100, order=None,
             context=None, count=False):
         """
@@ -1424,8 +1416,6 @@ true, it will allow you to hide the event alarm information without removing it.
 
         return self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
 
-
-
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         """
         Overrides orm write method.
@@ -1444,22 +1434,27 @@ true, it will allow you to hide the event alarm information without removing it.
         else:
             select = ids
         new_ids = []
+        res = False
         for event_id in select:
+            real_event_id = base_calendar_id2real_id(event_id)
             if len(str(event_id).split('-')) > 1:
                 data = self.read(cr, uid, event_id, ['date', 'date_deadline', \
                                                     'rrule', 'duration'])
                 if data.get('rrule'):
-                    real_date = data.get('date')
-                    data.update(vals)
-                    new_id = self.modify_this(cr, uid, event_id, data, \
-                                                real_date, context)
+                    vals.update({
+                        'recurrent_uid': real_event_id,
+                        'recurrent_id': data.get('date'),
+                        'rrule_type': 'none',
+                        'rrule': ''
+                        })
+                    new_id = self.copy(cr, uid, real_event_id, default=vals, context=context)
                     context.update({'active_id': new_id, 'active_ids': [new_id]})
                     continue
-            event_id = base_calendar_id2real_id(event_id)
-            if not event_id in new_ids:
-                new_ids.append(event_id)
+            if not real_event_id in new_ids:
+                new_ids.append(real_event_id)
 
-        res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
+        if new_ids:
+            res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
         if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\
                 or (vals.has_key('date') or vals.has_key('duration') or vals.has_key('date_deadline')):
             # change alarm details
@@ -1559,13 +1554,12 @@ true, it will allow you to hide the event alarm information without removing it.
                 continue
             event_id, date_new = event_id.split('-')
             event_id = [int(event_id)]
-            for record in self.read(cr, uid, event_id, ['date', 'rrule', 'exdate']):
+            for record in self.read(cr, uid, event_id, ['date', 'rrule', 'exdate'], context=context):
                 if record['rrule']:
                     # Remove one of the recurrent event
-                    date_new = time.strftime("%Y-%m-%d %H:%M:%S", \
+                    date_new = time.strftime("%Y%m%dT%H%M%S", \
                                  time.strptime(date_new, "%Y%m%d%H%M%S"))
-                    exdate = (record['exdate'] and (record['exdate'] + ',') or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
-                    res = self.write(cr, uid, event_id, {'exdate': exdate})
+                    res = self.write(cr, uid, event_id, {'exdate': date_new})
                 else:
                     res = super(calendar_event, self).unlink(cr, uid, event_id)
                     self.pool.get('res.alarm').do_alarm_unlink(cr, uid, event_id, self._name)
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index bea5ea66a84..494787bbf97 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -10,6 +10,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Invite People">
+                    <separator string="Invite People" colspan="4" />
 					<field name="type" />
 					<field name="send_mail" />
 					<newline />
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 9ed0cd4efd0..5497a8c5f77 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:34+0000\n"
+"PO-Revision-Date: 2010-08-14 08:18+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index b9d65344b3a..8471c852b95 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 09:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index d9fc92b43c5..8fe3c8c94df 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:21+0000\n"
+"PO-Revision-Date: 2010-08-14 08:39+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index cbb0a20ac8a..b397be1bbcd 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:20+0000\n"
+"PO-Revision-Date: 2010-08-14 08:38+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index ac14476ca86..c9d42ecb457 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:33+0000\n"
+"PO-Revision-Date: 2010-08-14 09:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 9f7645fb8d3..73dd2c3bc64 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 09:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 741e6324e24..3343b61e7a3 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:33+0000\n"
+"PO-Revision-Date: 2010-08-14 09:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index d4a125e0415..f4c30e7bae1 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index efdcfe16135..1fa2e7c6557 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -47,7 +47,7 @@ class base_setup_config_choice(osv.osv_memory):
         user_obj = self.pool.get('res.users')
         user_ids = user_obj.search(cr, uid, [])
         users = user_obj.browse(cr, uid, user_ids)
-        user_str = '\n'.join(map(lambda x: '    - %s: %s / %s' % (x.name, x.login, x.password), users))
+        user_str = '\n'.join(map(lambda x: '    - %s:\n\t\tLogin: %s \n\t\tPassword:%s' % (x.name, x.login, x.password), users))
         return _('The following users have been installed : \n')+ user_str
 
     _columns = {
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index f8f38bc644f..eabeef61334 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -6,7 +6,7 @@
       <field name="model">base.setup.config</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-      <form string="Setup">
+      <form string="Information about your new database">
         <group colspan="4" col="8">
           <group colspan="3" width="220">
             <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -15,7 +15,7 @@
           </group>
           <separator string="" orientation="vertical" colspan="1" rowspan="8"/>
           <group colspan="4" width="400">
-            <separator string="Installation Done" colspan="4"/>
+            <separator string="New Database" colspan="4"/>
             <label align="0.0" string="Your database is now created." colspan="4"/>
             <field name="installed_users" nolabel= "1" colspan="4"/>
           </group>
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 80506a88265..5571249d384 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-09 16:10+0000\n"
+"PO-Revision-Date: 2010-08-13 11:58+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index dcc0442fb3e..7ebb6d2b1a9 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:31+0000\n"
+"PO-Revision-Date: 2010-08-14 09:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 62b85c403b8..cf468aafde5 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:28+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 62204969468..79e3ff5dd9d 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="base.reporting_menu"
+        <menuitem id="base.reporting_menu"
+            parent="base.menu_custom"
             name="Reporting" sequence="30" />
-        <menuitem id="menu_dasboard"
-            name="Dashboard" sequence="30" />     
 <!--Board Note Search View  -->
         <record id="view_board_note_search" model="ir.ui.view">
             <field name="name">board.note.search</field>
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 7922b161219..84ccc3e9d52 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:31+0000\n"
+"PO-Revision-Date: 2010-08-14 09:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index b931b0f0328..c6e21c46e77 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -71,8 +71,8 @@ class node_calendar_collection(nodes.node_dir):
         where = [('collection_id','=',self.dir_id)]
         ext = False
         if name and name.endswith('.ics'):
-            name = name[-4]
-            ext = '.ics'
+            name = name[:-4]
+            ext = True
         if name:
             where.append(('name','=',name))
         if not domain:
@@ -81,15 +81,16 @@ class node_calendar_collection(nodes.node_dir):
         fil_obj = dirobj.pool.get('basic.calendar')
         ids = fil_obj.search(cr,uid,where,context=ctx)
         res = []
-        for calender in fil_obj.browse(cr, uid, ids, context=ctx):
-            if not ext:
-                res.append(node_calendar(calender.name, self, self.context, calender))
-            else:
-                res.append(res_node_calendar(name, self, self.context, calender))
+        for cal in fil_obj.browse(cr, uid, ids, context=ctx):
+            if (not name) or not ext:
+                res.append(node_calendar(cal.name, self, self.context, cal))
+            if (not name) or ext:
+                res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
+            # May be both of them!
         return res
 
     def _get_dav_owner(self, cr):
-	# Todo?
+        # Todo?
         return False
 
     def _get_ttag(self, cr):
@@ -205,7 +206,15 @@ class node_calendar(nodes.node_class):
         if name:
             if name.endswith('.ics'):
                 name = name[:-4]
-            where.append(('id','=',int(name)))
+            try:
+                where.append(('id','=',int(name)))
+            except ValueError:
+                # if somebody requests any other name than the ones we
+                # generate (non-numeric), it just won't exist
+                # FIXME: however, this confuses Evolution (at least), which
+                # thinks the .ics node hadn't been saved.
+                return []
+
         if not domain:
             domain = []
         #for opr1, opt, opr2 in domain:
@@ -224,9 +233,21 @@ class node_calendar(nodes.node_class):
             Return the node_* created
         """
         # we ignore the path, it will be re-generated automatically
+        fil_obj = self.context._dirobj.pool.get('basic.calendar')
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        uid = self.context.uid
+
         res = self.set_data(cr, data)
-        
-        # TODO: use the res to create at least one node
+
+        if res and len(res):
+            # We arbitrarily construct only the first node of the data
+            # that have been imported. ICS may have had more elements,
+            # but only one node can be returned here.
+            assert isinstance(res[0], (int, long))
+            fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, 
+                    domain=[('id','=',res[0])], context=ctx)
+            return fnodes[0]
         return None
 
 
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 9184a0aadd2..2e9719efead 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -74,37 +74,45 @@
                     <field name="type"/>
                     <field name="user_id"/>
                     <field name="collection_id" required="1"/>
-                    <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
-                        <form string="Calendar Lines">
-                            <field name="name" required="1" select="1" />
-                            <field name="object_id" required="1" select="1" />
-                            <field name="domain" select="1" />
-                            <field name="mapping_ids" select="1" colspan="4" nolabel="1">
-                                <tree string="Attributes Mapping" editable="bottom">
-                                    <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
-                                    <field name="fn" select="1" />
-                                    <field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
-                                    <field name="expr" />
-                                </tree>
-                                <form string="Attributes Mapping">
-                                    <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
-                                    <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
-                                        required="1" />
-                                    <field name="fn" select="1" required="1" />
-                                    <field name="expr" />
-                                    <separator string="Value Mapping" colspan="4" />
-                                    <field name="mapping" select="1" colspan="4" nolabel="1" />
+                    <notebook colspan="4">
+                        <page string="Calendar Lines">
+                            <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
+                                <form string="Calendar Lines">
+                                    <field name="name" required="1" select="1" />
+                                    <field name="object_id" required="1" select="1" />
+                                    <field name="domain" select="1" />
+                                    <field name="mapping_ids" select="1" colspan="4" nolabel="1">
+                                        <tree string="Attributes Mapping" editable="bottom">
+                                            <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
+                                            <field name="fn" select="1" />
+                                            <field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
+                                            <field name="expr" />
+                                        </tree>
+                                        <form string="Attributes Mapping">
+                                            <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
+                                            <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
+                                                required="1" />
+                                            <field name="fn" select="1" required="1" />
+                                            <field name="expr" />
+                                            <separator string="Value Mapping" colspan="4" />
+                                            <field name="mapping" select="1" colspan="4" nolabel="1" />
+                                        </form>
+                                   </field>
                                 </form>
-                           </field>
-                        </form>
-                        <tree string="Calendar Lines" editable="bottom">
-                            <field name="name" select="1" />
-                            <field name="object_id" select="1" />
-                        </tree>
-                    </field>
-            </form>
-        </field>
-    </record>
+                                <tree string="Calendar Lines" editable="bottom">
+                                    <field name="name" select="1" />
+                                    <field name="object_id" select="1" />
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Other Info">
+                            <separator string="Description" colspan="4" />
+                            <field name="description" colspan="4" nolabel="1" />
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
 
     <record model="ir.ui.view" id="view_caldav_tree">
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 04bcd6eaa22..b4f7c03e5aa 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -83,7 +83,61 @@ def openobjectid2uid(cr, uidval, oomodel):
     value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
     return value
 
-def get_attribute_mapping(cr, uid, calname, context={}):
+def mailto2str(arg):
+    """Take a dict of mail and convert to string.
+    """
+    ret = []
+    if isinstance(arg, dict):
+        args = [arg,]
+    else:
+        args = arg
+    
+    for ard in args:
+        rstr = ard.get('name','')
+        if ard.get('company',False):
+            rstr += ' (%s)' % ard.get('company')
+        if ard.get('email'):
+            rstr += ' <%s>' % ard.get('email')
+        ret.append(rstr)
+    return ', '.join(ret)
+
+def str2mailto(emailstr, multi=False):
+    """Split one email string to a dict of name, company, mail parts
+
+       @param multi Return an array, recognize comma-sep
+    """
+    # TODO: move to tools or sth.
+    mege = re.compile(r'([^\(\<]+) *(\((.*?)\))? *(\< ?(.*?) ?\>)? ?(\((.*?)\))? *$')
+    
+    mailz= [emailstr,]
+    retz = []
+    if multi:
+        mailz = emailstr.split(',')
+    
+    for mas in mailz:
+        m = mege.match(mas.strip())
+        if not m:
+            # one of the rare non-matching strings is "sad" :(
+            # retz.append({ 'name': mas.strip() })
+            # continue
+            raise ValueError("Invalid email address %r" % mas)
+        rd = {  'name': m.group(1).strip(), 
+                'email': m.group(5), }
+        if m.group(2):
+            rd['company'] = m.group(3).strip()
+        elif m.group(6):
+            rd['company'] = m.group(7).strip()
+        
+        if rd['name'].startswith('"') and rd['name'].endswith('"'):
+            rd['name'] = rd['name'][1:-1]
+        retz.append(rd)
+        
+    if multi:
+        return retz
+    else:
+        return retz[0]
+
+def get_attribute_mapping(cr, uid, calname, context=None):
     """ Attribute Mapping with Basic calendar fields and lines
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -220,6 +274,10 @@ class CalDAV(object):
                 self.__attribute__[name][type] = None
         return True
 
+    def format_date_tz(self, date, tz=None):
+        format = tools.DEFAULT_SERVER_DATETIME_FORMAT
+        return tools.server_to_local_timestamp(date, format, format, tz)
+
     def parse_ics(self, cr, uid, child, cal_children=None, context=None):
         """ parse calendaring and scheduling information
         @param self: The object pointer
@@ -228,9 +286,16 @@ class CalDAV(object):
         @param context: A standard dictionary for contextual values """
 
         att_data = []
+        exdates = []
+        _server_tzinfo = pytz.timezone(tools.get_server_timezone())
+        
         for cal_data in child.getChildren():
             if cal_data.name.lower() == 'organizer':
-                self.ical_set(cal_data.name.lower(), {'name': cal_data.params.get('CN') and cal_data.params.get('CN')[0]}, 'value')
+                dmail = { 'name': cal_data.params.get('CN', ['',])[0],
+                            'email': cal_data.value.replace('MAILTO:',''),
+                            # TODO: company? 
+                            }
+                self.ical_set(cal_data.name.lower(), mailto2str(dmail), 'value')
                 continue
             if cal_data.name.lower() == 'attendee':
                 ctx = context.copy()
@@ -249,13 +314,20 @@ class CalDAV(object):
                 self.ical_set(cal_data.name.lower(), vals, 'value')
                 continue
             if cal_data.name.lower() == 'exdate':
-                exval = map(lambda x: str(x), cal_data.value)
-                self.ical_set(cal_data.name.lower(), ','.join(exval), 'value')
+                exdates += cal_data.value
+                exvals = []
+                for exdate in exdates:
+                    exvals.append(datetime.fromtimestamp(time.mktime(exdate.utctimetuple())).strftime('%Y%m%dT%H%M%S'))
+                self.ical_set(cal_data.name.lower(), ','.join(exvals), 'value')
                 continue
             if cal_data.name.lower() in self.__attribute__:
-
                 if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
-                    self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
+                    # since we do convert, do we also need to save the original tzid?
+                    # self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
+                    
+                    date_local = cal_data.value.astimezone(_server_tzinfo)
+                    self.ical_set(cal_data.name.lower(), date_local, 'value')
+                    continue
                 self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
         vals = map_data(cr, uid, self, context=context)
         return vals
@@ -272,6 +344,8 @@ class CalDAV(object):
         timezones = []
         for data in datas:
             tzval = None
+            exfield = None
+            exdates = []
             vevent = ical.add(name)
             for field in self.__attribute__.keys():
                 map_field = self.ical_get(field, 'field')
@@ -305,30 +379,53 @@ class CalDAV(object):
                         alarm_obj = self.pool.get('basic.calendar.alarm')
                         vevent = alarm_obj.export_cal(cr, uid, model, \
                                     data[map_field][0], vevent, context=ctx)
-                    elif field == 'vtimezone' and data[map_field] and data[map_field] not in timezones:
+                    elif field == 'vtimezone' and data[map_field]:
                         tzval = data[map_field]
-                        tz_obj = self.pool.get('basic.calendar.timezone')
-                        ical = tz_obj.export_cal(cr, uid, None, \
-                                     data[map_field], ical, context=context)
-                        timezones.append(data[map_field])
+                        if tzval not in timezones:
+                            tz_obj = self.pool.get('basic.calendar.timezone')
+                            ical = tz_obj.export_cal(cr, uid, None, \
+                                         data[map_field], ical, context=context)
+                            timezones.append(data[map_field])
+                        if exfield:
+                            exfield.params['TZID'] = [tzval.title()]
+                            exdates_updated = []
+                            for exdate in exdates:
+                                date1 = (datetime.strptime(exdate, "%Y%m%dT%H%M%S")).strftime('%Y-%m-%d %H:%M:%S')
+                                dest_date = self.format_date_tz(date1, tzval.title())
+                                ex_date = (datetime.strptime(dest_date, "%Y-%m-%d %H:%M:%S")).strftime('%Y%m%dT%H%M%S')
+                                exdates_updated.append(ex_date)
+                            exfield.value = map(parser.parse, exdates_updated)
                     elif field == 'organizer' and data[map_field]:
+                        organizer = str2mailto(data[map_field])
                         event_org = vevent.add('organizer')
-                        organizer_id = data[map_field][0]
-                        user_obj = self.pool.get('res.users')
-                        organizer = user_obj.browse(cr, uid, organizer_id, context=context)
-                        event_org.params['CN'] = [organizer.name]
-                        event_org.value = 'MAILTO:' + (organizer.user_email or organizer.name)
+                        event_org.params['CN'] = [organizer['name']]
+                        event_org.value = 'MAILTO:' + (organizer.get('email') or '')
+                        # TODO: company?
                     elif data[map_field]:
                         if map_type in ("char", "text"):
                             if field in ('exdate'):
-                                vevent.add(field).value = map(parser.parse, (data[map_field]).split(','))
+                                exfield = vevent.add(field)
+                                exdates = (data[map_field]).split(',')
+                                if tzval:
+                                    exfield.params['TZID'] = [tzval.title()]
+                                    exdates_updated = []
+                                    for exdate in exdates:
+                                        date1 = (datetime.strptime(exdate, "%Y%m%dT%H%M%S")).strftime('%Y-%m-%d %H:%M:%S')
+                                        dest_date = self.format_date_tz(date1, tzval.title())
+                                        ex_date = (datetime.strptime(dest_date, "%Y-%m-%d %H:%M:%S")).strftime('%Y%m%dT%H%M%S')
+                                        exdates_updated.append(ex_date)
+                                    exdates = exdates_updated
+                                exfield.value = map(parser.parse, exdates)
                             else:
                                 vevent.add(field).value = tools.ustr(data[map_field])
                         elif map_type in ('datetime', 'date') and data[map_field]:
                             dtfield = vevent.add(field)
-                            dtfield.value = parser.parse(data[map_field])
                             if tzval:
+                                dest_date = self.format_date_tz(data[map_field], tzval.title())
                                 dtfield.params['TZID'] = [tzval.title()]
+                                dtfield.value = parser.parse(dest_date)
+                            else:
+                                dtfield.value = parser.parse(data[map_field])
                         elif map_type == "timedelta":
                             vevent.add(field).value = timedelta(hours=data[map_field])
                         elif map_type == "many2one":
@@ -344,7 +441,7 @@ class CalDAV(object):
                                         vevent.add(field).value = key1
         return vevent
 
-    def check_import(self, cr, uid, vals, context={}):
+    def check_import(self, cr, uid, vals, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -352,7 +449,8 @@ class CalDAV(object):
             @param vals: Get Values
             @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         ids = []
         model_obj = self.pool.get(context.get('model'))
         recur_pool = {}
@@ -379,8 +477,8 @@ class CalDAV(object):
                         event_id = model_obj.create(cr, uid, val)
                         recur_pool[u_id] = event_id
                         ids.append(event_id)
-        except Exception, e:
-            raise osv.except_osv(('Error !'), (str(e)))
+        except Exception:
+            raise
         return ids
 
     def export_cal(self, cr, uid, datas, vobj=None, context=None):
@@ -451,6 +549,7 @@ class Calendar(CalDAV, osv.osv):
             'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'),
             'create_date': fields.datetime('Created Date', readonly=True),
             'write_date': fields.datetime('Modifided Date', readonly=True),
+            'description': fields.text("description"),
     }
 
     def get_calendar_objects(self, cr, uid, ids, parent=None, domain=None, context=None):
@@ -467,7 +566,7 @@ class Calendar(CalDAV, osv.osv):
                     continue
                 if line.name in ('valarm', 'attendee'):
                     continue
-                line_domain = eval(line.domain)
+                line_domain = eval(line.domain or '[]')
                 line_domain += domain
                 if ctx_res_id:
                     line_domain += [('id','=',ctx_res_id)]
@@ -497,7 +596,7 @@ class Calendar(CalDAV, osv.osv):
                     continue
                 if line.name in ('valarm', 'attendee'):
                     continue
-                domain = eval(line.domain)
+                domain = eval(line.domain or '[]')
                 if ctx_res_id:
                     domain += [('id','=',ctx_res_id)]
                 mod_obj = self.pool.get(line.object_id.model)
@@ -580,7 +679,7 @@ class basic_calendar_line(osv.osv):
         'domain': lambda *a: '[]',
     }
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         """ create calendar's line
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -662,7 +761,7 @@ class basic_calendar_fields(osv.osv):
                 raise osv.except_osv(_('Warning !'), _('Please provide proper configuration of "%s" in Calendar Lines' % (name)))
         return True
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         """ Create Calendar's fields
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -739,7 +838,7 @@ class Event(CalDAV, osv.osv_memory):
         'dtend': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that a calendar component ends.
     }
 
-    def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
+    def export_cal(self, cr, uid, datas, vobj='vevent', context=None):
         """ Export calendar
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -792,7 +891,7 @@ class ToDo(CalDAV, osv.osv_memory):
                 'rrule': None,
             }
 
-    def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
+    def export_cal(self, cr, uid, datas, vobj='vevent', context=None):
         """ Export Calendar
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -842,7 +941,7 @@ class Timezone(CalDAV, osv.osv_memory):
     'x-prop': None, # Use: O-n, Type: Text,
     }
 
-    def get_name_offset(self, cr, uid, tzid, context={}):
+    def get_name_offset(self, cr, uid, tzid, context=None):
         """ Get Name Offset value
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -859,7 +958,7 @@ class Timezone(CalDAV, osv.osv_memory):
         realoffset = (val < 0 and ('-' + realoffset) or ('+' + realoffset))
         return (mydt.tzname(), realoffset)
 
-    def export_cal(self, cr, uid, model, tzid, ical, context={}):
+    def export_cal(self, cr, uid, model, tzid, ical, context=None):
         """ Export Calendar
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -867,7 +966,8 @@ class Timezone(CalDAV, osv.osv_memory):
             @param model: Get Model's name
             @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         ctx = context.copy()
         ctx.update({'model': model})
         cal_tz = ical.add('vtimezone')
@@ -876,7 +976,8 @@ class Timezone(CalDAV, osv.osv_memory):
         tzname, offset = self.get_name_offset(cr, uid, tzid)
         tz_std.add("TZOFFSETFROM").value = offset
         tz_std.add("TZOFFSETTO").value = offset
-        tz_std.add("DTSTART").value = datetime.now() # TODO
+        #TODO: Get start date for timezone
+        tz_std.add("DTSTART").value = datetime.strptime('1970-01-01 00:00:00', '%Y-%m-%d %H:%M:%S')
         tz_std.add("TZNAME").value = tzname
         return ical
 
@@ -915,7 +1016,7 @@ class Alarm(CalDAV, osv.osv_memory):
     'x-prop': None,
     }
 
-    def export_cal(self, cr, uid, model, alarm_id, vevent, context={}):
+    def export_cal(self, cr, uid, model, alarm_id, vevent, context=None):
         """ Export Calendar
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -924,7 +1025,8 @@ class Alarm(CalDAV, osv.osv_memory):
             @param alarm_id: Get Alarm's Id
             @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         valarm = vevent.add('valarm')
         alarm_object = self.pool.get(model)
         alarm_data = alarm_object.read(cr, uid, alarm_id, [])
@@ -1035,7 +1137,7 @@ class Attendee(CalDAV, osv.osv_memory):
         vals = map_data(cr, uid, self, context=context)
         return vals
 
-    def export_cal(self, cr, uid, model, attendee_ids, vevent, context={}):
+    def export_cal(self, cr, uid, model, attendee_ids, vevent, context=None):
         """ Export Calendar
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -1044,7 +1146,8 @@ class Attendee(CalDAV, osv.osv_memory):
             @param attendee_ids: Get Attendee's Id
             @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         attendee_object = self.pool.get(model)
         ctx = context.copy()
         ctx.update({'model': model})
diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
index 0be54df9f56..ea90686b347 100644
--- a/addons/caldav/wizard/calendar_event_export.py
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -33,19 +33,20 @@ class calendar_event_export(osv.osv_memory):
     Export Calendar Event.
     """
 
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """
         Get Default value for Name field.
         """
+        if not context:
+            context = {}
         model = context.get('model', 'basic.calendar')
         model_obj = self.pool.get(model)
-        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
         res = super(calendar_event_export, self).default_get( cr, uid, fields, context=context)
         name = 'OpenERP %s.ics' % (model_obj._description)
         if 'name' in fields:
             res.update({'name': name})
         if 'file_path' in fields:
-            calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+            calendar = model_obj.export_cal(cr, uid, context['active_ids'], context=context)
             res.update({'file_path': base64.encodestring(calendar)})
         return  res
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 3c04006447f..af843666435 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -107,7 +107,7 @@
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Assignment"/>
                             <field name="user_id" />
-                            <field name="organizer_id" groups="base.group_extended"/>
+                            <field name="organizer" groups="base.group_extended"/>
                             <field name="section_id" widget="selection"
                                 groups="base.group_extended"/>
                         </group><group col="2" colspan="2">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 12a2f069cdc..423eba836b6 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -7,7 +7,10 @@
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,base.group_extended,base.group_sale_manager,base.group_sale_salesman"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_base_config" sequence="2" groups="base.group_extended,base.group_system"/>
+            parent="base.menu_base_config" sequence="1" groups="base.group_extended,base.group_system"/>
+
+        <menuitem id="base.menu_sale_config_sales" name="Sales"
+            parent="base.menu_base_config" sequence="0" groups="base.group_system,base.group_extended"/>
 
         <!--menuitem id="menu_crm_config_meeting" name="Meeting"
             parent="base.menu_base_config" sequence="4"/-->
@@ -91,7 +94,7 @@
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act" sequence="4"
-            parent="base.menu_crm_config_lead" />
+            parent="base.menu_sale_config_sales" />
 
 
         <!-- CRM Stage Tree View -->
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 7a2e7128721..c9f4eec606c 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 2fa1cb9ac2e..0df4f4f50c6 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index a81ab97b349..1e26888e2f7 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:56+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index af61185ff7a..1b12055d85f 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-11 05:13+0000\n"
+"PO-Revision-Date: 2010-08-14 08:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 337e6f1d37a..5f19d74cc38 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 520f36de46e..f9446a1345d 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-11 05:44+0000\n"
+"PO-Revision-Date: 2010-08-14 08:56+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index b4112f3a5ee..95b30e4e29d 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-11 04:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py
index 3c3e8b8ae2e..a9430a47225 100644
--- a/addons/crm_caldav/crm_caldav.py
+++ b/addons/crm_caldav/crm_caldav.py
@@ -27,7 +27,7 @@ from datetime import datetime
 class crm_meeting(osv.osv):
     _inherit = 'crm.meeting'
 
-    def export_cal(self, cr, uid, ids, context={}):
+    def export_cal(self, cr, uid, ids, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -35,14 +35,16 @@ class crm_meeting(osv.osv):
             @param ids: List of CRM Meeting’s IDs
             @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         ids = map(lambda x: base_calendar.base_calendar_id2real_id(x), ids)
-        event_data = self.read(cr, uid, ids)
+        event_data = self.read(cr, uid, ids, context=context)
         event_obj = self.pool.get('basic.calendar.event')
-        ical = event_obj.export_cal(cr, uid, event_data, context={'model': self._name})
+        context.update({'model': self._name})
+        ical = event_obj.export_cal(cr, uid, event_data, context=context)
         return ical.serialize()
 
-    def import_cal(self, cr, uid, data, data_id=None, context={}):
+    def import_cal(self, cr, uid, data, data_id=None, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -51,12 +53,13 @@ class crm_meeting(osv.osv):
             @param data_id: calendar's Id
             @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         event_obj = self.pool.get('basic.calendar.event')
         vals = event_obj.import_cal(cr, uid, data, context=context)
         return self.check_import(cr, uid, vals, context=context)
 
-    def check_import(self, cr, uid, vals, context={}):
+    def check_import(self, cr, uid, vals, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -64,6 +67,8 @@ class crm_meeting(osv.osv):
             @param vals: Get Values
             @param context: A standard dictionary for contextual values
         """
+        if not context:
+            context = {}
         ids = []
         model_obj = self.pool.get(context.get('model'))
         recur_pool = {}
@@ -96,8 +101,8 @@ class crm_meeting(osv.osv):
                         event_id = model_obj.create(cr, uid, val)
                         recur_pool[u_id] = event_id
                         ids.append(event_id)
-        except Exception, e:
-            raise osv.except_osv(('Error !'), (str(e)))
+        except Exception:
+            raise
         return ids
     
 crm_meeting()
diff --git a/addons/crm_caldav/crm_caldav_data.xml b/addons/crm_caldav/crm_caldav_data.xml
index 3b74eef123c..692b7e7389e 100644
--- a/addons/crm_caldav/crm_caldav_data.xml
+++ b/addons/crm_caldav/crm_caldav_data.xml
@@ -32,7 +32,7 @@
         <record model="basic.calendar.fields" id="map_event_0">
             <field name="name" ref="caldav.field_event_organizer"/>
             <field name="type_id" ref="base_calendar.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','organizer_id'),('model_id.model','=','calendar.event')]" />
+	        <field name="field_id" search="[('name','=','organizer'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>
 
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index d98eb0e0bbf..1a573f00a1b 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 08:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 4fed9b3e483..ac310fa7df0 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 09:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 564638dcf04..d56a37a0deb 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index d6012e60091..e3b37914f8c 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -98,7 +98,9 @@ class indexer(object):
 
     def _doIndexFile(self,fpath):
         raise NhException("Content not handled here")
-        
+
+    def __repr__(self):
+        return "<indexer %s.%s>" %(self.__module__, self.__class__.__name__)
         
 
 def mime_match(mime, mdict):
@@ -128,7 +130,7 @@ class contentIndex(object):
             f = True
             
         if f:
-            self.__logger.debug('Register content indexer: %s', obj)
+            self.__logger.debug('Register content indexer: %r', obj)
         if not f:
             raise Exception("Your indexer should at least suport a mimetype or extension")
     
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index bec4f25e45d..685df7910f3 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -18,16 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import base64
 
 from osv import osv, fields
-from osv.orm import except_orm
-import urlparse
 
 import netsvc
-import os
+# import os
 import nodes
-import StringIO
+# import StringIO
 
 class document_directory_content_type(osv.osv):
     _name = 'document.directory.content.type'
@@ -83,7 +80,7 @@ class document_directory_content(osv.osv):
         tname = ''
         if content.include_name:
             content_name = node.displayname or ''
-            obj = node.context._dirobj.pool.get(model)
+            # obj = node.context._dirobj.pool.get(model)
             if content_name:
                 tname = (content.prefix or '') + content_name + (content.suffix or '') + (content.extension or '')
         else:
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index a4cd2f45068..657fd39d9a9 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -20,13 +20,7 @@
 #
 ##############################################################################
 
-import base64
-
 from osv import osv, fields
-from osv.orm import except_orm
-import urlparse
-
-import os
 
 class ir_action_report_xml(osv.osv):
     _name="ir.actions.report.xml"
diff --git a/addons/document/document.py b/addons/document/document.py
index c62f62da2d9..46cf6d189c1 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -22,16 +22,10 @@
 import base64
 
 from osv import osv, fields
-import urlparse
 
 import os
 
-import pooler
-import netsvc
-from osv.orm import except_orm
-#import StringIO
-
-from psycopg2 import Binary
+# from psycopg2 import Binary
 #from tools import config
 import tools
 from tools.translate import _
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index f5b9202fc8e..18544b54eac 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -19,11 +19,8 @@
 #
 ##############################################################################
 
-import base64
 
 from osv import osv, fields
-from osv.orm import except_orm
-import urlparse
 
 import os
 import nodes
@@ -141,30 +138,6 @@ class document_directory(osv.osv):
         _parent(dir_id, path)
         return path
 
-    def ol_get_resource_path(self, cr, uid, dir_id, res_model, res_id):
-        # this method will be used in process module
-        # to be need test and Improvement if resource dir has parent resource (link resource)
-        path=[]
-        def _parent(dir_id,path):
-            parent=self.browse(cr, uid, dir_id)
-            if parent.parent_id and not parent.ressource_parent_type_id:
-                _parent(parent.parent_id.id,path)
-                path.append(parent.name)
-            else:
-                path.append(parent.name)
-                return path
-
-        directory=self.browse(cr,uid,dir_id)
-        model_ids=self.pool.get('ir.model').search(cr, uid, [('model','=',res_model)])
-        if directory:
-            _parent(dir_id,path)
-            path.append(self.pool.get(directory.ressource_type_id.model).browse(cr, uid, res_id).name)
-            #user=self.pool.get('res.users').browse(cr,uid,uid)
-            #return "ftp://%s:%s@localhost:%s/%s/%s"%(user.login,user.password,config.get('ftp_server_port',8021),cr.dbname,'/'.join(path))
-            # No way we will return the password!
-            return "ftp://user:pass@host:port/test/this"
-        return False
-
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
@@ -178,8 +151,9 @@ class document_directory(osv.osv):
     _constraints = [
         (_check_recursion, 'Error! You can not create recursive Directories.', ['parent_id'])
     ]
+    
     def __init__(self, *args, **kwargs):
-        res = super(document_directory, self).__init__(*args, **kwargs)
+        super(document_directory, self).__init__(*args, **kwargs)
         #self._cache = {}
 
     def onchange_content_id(self, cr, uid, ids, ressource_type_id):
@@ -223,31 +197,8 @@ class document_directory(osv.osv):
         """ try to locate the node in uri,
             Return a tuple (node_dir, remaining_path)
         """
-        return (nodes.node_database(context=ncontext), uri)         
+        return (nodes.node_database(context=ncontext), uri)
         
-    def old_code():
-        if not uri:
-            return node_database(cr, uid, context=context)
-        turi = tuple(uri)
-        node = node_class(cr, uid, '/', False, context=context, type='database')
-        for path in uri[:]:
-            if path:
-                node = node.child(path)
-                if not node:
-                    return False
-        oo = node.object and (node.object._name, node.object.id) or False
-        oo2 = node.object2 and (node.object2._name, node.object2.id) or False
-        return node
-
-    def ol_get_childs(self, cr, uid, uri, context={}):
-        node = self.get_object(cr, uid, uri, context)
-        if uri:
-            children = node.children()
-        else:
-            children= [node]
-        result = map(lambda node: node.path_get(), children)
-        return result
-
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default ={}
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 419d6c03e37..0ecc01941b4 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -37,7 +37,6 @@ from osv.orm import except_orm
 import random
 import string
 import pooler
-import netsvc
 import nodes
 from content_index import cntIndex
 
@@ -189,7 +188,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
         # we now open a *separate* cursor, to update the data.
         # FIXME: this may be improved, for concurrency handling
         par = self._get_parent()
-        uid = par.context.uid
+        # uid = par.context.uid
         cr = pooler.get_db(par.context.dbname).cursor()
         try:
             if self.mode in ('w', 'w+', 'r+'):
@@ -227,7 +226,7 @@ class nodefd_db(StringIO, nodes.node_descriptor):
                     " WHERE id = %s",
                     (out, len(data), par.file_id))
             cr.commit()
-        except Exception, e:
+        except Exception:
             logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
             raise
         finally:
@@ -262,7 +261,7 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
         # we now open a *separate* cursor, to update the data.
         # FIXME: this may be improved, for concurrency handling
         par = self._get_parent()
-        uid = par.context.uid
+        # uid = par.context.uid
         cr = pooler.get_db(par.context.dbname).cursor()
         try:
             if self.mode in ('w', 'w+', 'r+'):
@@ -288,18 +287,18 @@ class nodefd_db64(StringIO, nodes.node_descriptor):
                 cr.execute('UPDATE ir_attachment SET db_datas = %s::bytea, file_size=%s, ' \
                         'index_content = %s, file_type = %s ' \
                         'WHERE id = %s',
-                        (base64.encodestring(out), len(out), icont_u, mime, par.file_id))
+                        (base64.encodestring(data), len(data), icont_u, mime, par.file_id))
             elif self.mode == 'a':
-                out = self.getvalue()
+                data = self.getvalue()
                 # Yes, we're obviously using the wrong representation for storing our
                 # data as base64-in-bytea
                 cr.execute("UPDATE ir_attachment " \
                     "SET db_datas = encode( (COALESCE(decode(encode(db_datas,'escape'),'base64'),'') || decode(%s, 'base64')),'base64')::bytea , " \
                     "    file_size = COALESCE(file_size, 0) + %s " \
                     " WHERE id = %s",
-                    (base64.encodestring(out), len(out), par.file_id))
+                    (base64.encodestring(data), len(data), par.file_id))
             cr.commit()
-        except Exception, e:
+        except Exception:
             logging.getLogger('document.storage').exception('Cannot update db file #%d for close:', par.file_id)
             raise
         finally:
@@ -500,7 +499,7 @@ class document_storage(osv.osv):
                 # try to fix their directory.
                 if ira.file_size:
                     self._doclog.warning("ir.attachment #%d does not have a filename, trying the name." %ira.id)
-                sfname = ira.name
+                # sfname = ira.name
             fpath = os.path.join(boo.path,ira.store_fname or ira.name)
             if os.path.exists(fpath):
                 return file(fpath,'rb').read()
@@ -695,7 +694,7 @@ class document_storage(osv.osv):
             store_fname = os.path.join(*store_path)
             return { 'name': new_name, 'datas_fname': new_name, 'store_fname': store_fname }
         else:
-            raise TypeError("No %s storage" % boo.type)
+            raise TypeError("No %s storage" % sbro.type)
 
     def simple_move(self, cr, uid, file_node, ndir_bro, context=None):
         """ A preparation for a file move.
@@ -734,7 +733,7 @@ class document_storage(osv.osv):
             fname = fil_bo.store_fname
             if not fname:
                 return ValueError("Tried to rename a non-stored file")
-            path = storage_bo.path
+            path = sbro.path
             oldpath = os.path.join(path, fname)
             
             for ch in ('*', '|', "\\", '/', ':', '"', '<', '>', '?', '..'):
@@ -751,7 +750,7 @@ class document_storage(osv.osv):
             os.rename(oldpath, newpath)
             return { 'name': new_name, 'datas_fname': new_name, 'store_fname': new_name }
         else:
-            raise TypeError("No %s storage" % boo.type)
+            raise TypeError("No %s storage" % sbro.type)
 
 
 document_storage()
diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po
index e2ad9ab2c38..50d8dff0ea6 100644
--- a/addons/document/i18n/hi.po
+++ b/addons/document/i18n/hi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-29 10:10+0000\n"
+"PO-Revision-Date: 2010-08-13 09:58+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 1664fab0eb9..110708e3fe5 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:38+0000\n"
+"PO-Revision-Date: 2010-08-14 08:44+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 0765f559c65..a17256f5a80 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: devcode <klaider@yandex.ru>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 2b88f502479..16591a0a606 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:18+0000\n"
+"PO-Revision-Date: 2010-08-14 08:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 736716e836b..5f16742a546 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 228f104574d..cf590dafdad 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -19,17 +19,14 @@
 #
 ##############################################################################
 
-# import base64
-# import StringIO
-from osv import osv, fields
-from osv.orm import except_orm
 # import urlparse
 import pooler
 from tools.safe_eval import safe_eval
 
 import errno
-import os
+# import os
 import time
+import logging
 
 from StringIO import StringIO
 
@@ -44,6 +41,8 @@ from StringIO import StringIO
 #   root: if we are at the first directory of a ressource
 #
 
+logger = logging.getLogger('doc2.nodes')
+
 def _str2time(cre):
     """ Convert a string with time representation (from db) into time (float)
     
@@ -902,9 +901,8 @@ class node_res_obj(node_class):
 
     def get_dav_eprop(self, cr, ns, prop):
         if ns != 'http://groupdav.org/' or prop != 'resourcetype':
-            print "Who asked for %s:%s?" % (ns, prop)
+            logger.warning("Who asked for %s:%s?" % (ns, prop))
             return None
-        res = {}
         cntobj = self.context._dirobj.pool.get('document.directory.content')
         uid = self.context.uid
         ctx = self.context.context.copy()
@@ -1374,11 +1372,11 @@ class nodefd_content(StringIO, node_descriptor):
             if self.mode in ('w', 'w+', 'r+'):
                 data = self.getvalue()
                 cntobj = par.context._dirobj.pool.get('document.directory.content')
-                cntobj.process_write(cr, uid, parent, data, ctx)
+                cntobj.process_write(cr, uid, par, data, par.context.context)
             elif self.mode == 'a':
                 raise NotImplementedError
             cr.commit()
-        except Exception, e:
+        except Exception:
             logging.getLogger('document.content').exception('Cannot update db content #%d for close:', par.cnt_id)
             raise
         finally:
diff --git a/addons/document/test_cindex.py b/addons/document/test_cindex.py
index 267e0497950..d7ae7c4d160 100644
--- a/addons/document/test_cindex.py
+++ b/addons/document/test_cindex.py
@@ -35,7 +35,7 @@ for fname in args:
             for line in res[:5]:
                 print line
     except Exception,e:
-        import traceback,sys
+        import traceback
         tb_s = reduce(lambda x, y: x+y, traceback.format_exception( sys.exc_type, sys.exc_value, sys.exc_traceback))
         
 
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 2ddfcc2bb7d..952b75d49e1 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -1,9 +1,8 @@
 # -*- encoding: utf-8 -*-
+
 import os
 import time
 from tarfile import filemode
-import StringIO
-import base64
 import logging
 import errno
 
@@ -12,12 +11,11 @@ import fnmatch
 
 import pooler
 import netsvc
-import os
+
 from service import security
 from osv import osv
 #from document.nodes import node_res_dir, node_res_obj
 from document.nodes import get_node_context
-import stat
 
 def _get_month_name(month):
     month=int(month)
@@ -165,7 +163,7 @@ class abstracted_fs(object):
             return ret
         except EnvironmentError:
             raise
-        except Exception,e:
+        except Exception:
             self._log.exception('Cannot create item %s at node %s', objname, repr(node))
             raise OSError(1, 'Operation not permited.')
 
@@ -177,7 +175,7 @@ class abstracted_fs(object):
         try:
             res = node.open_data(cr, mode)
             cr.commit()
-        except TypeError, e:
+        except TypeError:
             raise IOError(errno.EINVAL, "No data")
         return res
 
@@ -188,12 +186,11 @@ class abstracted_fs(object):
         name.  Unlike mkstemp it returns an object with a file-like
         interface.
         """
-        raise NotImplementedError
+        raise NotImplementedError # TODO
 
         text = not 'b' in mode
         # for unique file , maintain version if duplicate file
         if dir:
-	    # TODO
             cr = dir.cr
             uid = dir.uid
             pool = pooler.get_pool(node.context.dbname)
@@ -234,7 +231,7 @@ class abstracted_fs(object):
             cdir = node.create_child_collection(cr, basename)
             self._log.debug("Created child dir: %r", cdir)
             cr.commit()
-        except Exception,e:
+        except Exception:
             self._log.exception('Cannot create dir "%s" at node %s', basename, repr(node))
             raise OSError(1, 'Operation not permited.')
 
@@ -405,7 +402,7 @@ class abstracted_fs(object):
             cr.commit()
         except EnvironmentError:
             raise
-        except Exception, err:
+        except Exception:
             self._log.exception('Cannot rename "%s" to "%s" at "%s"', src, datacr[2], datacr[1])
             raise OSError(1,'Operation not permited.')
 
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index 692abc4aef4..0ca322fca12 100644
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -121,15 +121,9 @@ import tempfile
 import warnings
 import random
 import stat
+from collections import deque
 from tarfile import filemode
 
-try:
-    import pwd
-    import grp
-except ImportError:
-    pwd = grp = None
-
-
 LOG_ACTIVE = True
 
 __all__ = ['proto_cmds', 'Error', 'log', 'logline', 'logerror', 'DummyAuthorizer',
@@ -192,24 +186,6 @@ proto_cmds = {
     }
 
 
-# hack around format_exc function of traceback module to grant
-# backward compatibility with python < 2.4
-if not hasattr(traceback, 'format_exc'):
-    try:
-        import cStringIO as StringIO
-    except ImportError:
-        import StringIO
-
-    def _format_exc():
-        f = StringIO.StringIO()
-        traceback.print_exc(file=f)
-        data = f.getvalue()
-        f.close()
-        return data
-
-    traceback.format_exc = _format_exc
-
-
 def _strerror(err):
     """A wrap around os.strerror() which may be not available on all
     platforms (e.g. pythonCE).
@@ -590,16 +566,6 @@ class ActiveDTP(asyncore.dispatcher):
         self.cmd_channel.respond("425 Can't connect to specified address.")
         self.close()
 
-
-try:
-    from collections import deque
-except ImportError:
-    # backward compatibility with Python < 2.4 by replacing deque with a list
-    class deque(list):
-        def appendleft(self, obj):
-            list.insert(self, 0, obj)
-
-
 class DTPHandler(asyncore.dispatcher):
     """Class handling server-data-transfer-process (server-DTP, see
     RFC-959) managing data-transfer operations involving sending
@@ -1227,21 +1193,9 @@ class AbstractedFS:
             if not nlinks:  # non-posix system, let's use a bogus value
                 nlinks = 1
             size = st.st_size  # file size
-            if pwd and grp:
-                # get user and group name, else just use the raw uid/gid
-                try:
-                    uname = pwd.getpwuid(st.st_uid).pw_name
-                except KeyError:
-                    uname = st.st_uid
-                try:
-                    gname = grp.getgrgid(st.st_gid).gr_name
-                except KeyError:
-                    gname = st.st_gid
-            else:
-                # on non-posix systems the only chance we use default
-                # bogus values for owner and group
-                uname = "owner"
-                gname = "group"
+            uname = st.st_uid or "owner"
+            gname = st.st_gid or "group"
+           
             # stat.st_mtime could fail (-1) if last mtime is too old
             # in which case we return the local time as last mtime
             try:
@@ -1438,7 +1392,7 @@ class FTPHandler(asynchat.async_chat):
         """
         try:
             asynchat.async_chat.__init__(self, conn=conn) # python2.5
-        except TypeError, e:
+        except TypeError:
             asynchat.async_chat.__init__(self, sock=conn) # python2.6
         self.server = server
         self.remote_ip, self.remote_port = self.socket.getpeername()[:2]
@@ -1469,13 +1423,10 @@ class FTPHandler(asynchat.async_chat):
 
         # mlsx facts attributes
         self.current_facts = ['type', 'perm', 'size', 'modify']
-        if os.name == 'posix':
-            self.current_facts.append('unique')
+        self.current_facts.append('unique')
         self.available_facts = self.current_facts[:]
-        if pwd and grp:
-            self.available_facts += ['unix.mode', 'unix.uid', 'unix.gid']
-        if os.name == 'nt':
-            self.available_facts.append('create')
+        self.available_facts += ['unix.mode', 'unix.uid', 'unix.gid']
+        self.available_facts.append('create')
 
         # dtp attributes
         self.data_server = None
@@ -1866,7 +1817,7 @@ class FTPHandler(asynchat.async_chat):
             self.respond('%s %s.' % (str(ret_code), why))
         
             raise FTPExceptionSent(why)
-        except Exception, e:
+        except Exception, err:
             cmdname = function.__name__
             try:
                 logerror(traceback.format_exc())
@@ -2003,7 +1954,7 @@ class FTPHandler(asynchat.async_chat):
                     assert len(octs) == 4
                     for x in octs:
                         assert 0 <= x <= 255
-                except (AssertionError, ValueError, OverflowError), err:
+                except (AssertionError, ValueError, OverflowError):
                     self.respond("501 Invalid EPRT format.")
                 else:
                     self._make_eport(ip, port)
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index d033302f22a..37aba5158f1 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -20,8 +20,9 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
+# from tools.translate import _
 from document_ftp import ftpserver
+
 class document_ftp_browse(osv.osv_memory):
     _name = 'document.ftp.browse'
     _description = 'Document FTP Browse'
@@ -35,8 +36,8 @@ class document_ftp_browse(osv.osv_memory):
         if 'url' in fields:
             user_pool = self.pool.get('res.users')
             current_user = user_pool.browse(cr, uid, uid, context=context)
-            dir_pool = self.pool.get('document.directory')
-            data_pool = self.pool.get('ir.model.data')        
+            # dir_pool = self.pool.get('document.directory')
+            data_pool = self.pool.get('ir.model.data')
             aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
             aid = data_pool.browse(cr, uid, aid, context=context).res_id
             ftp_url = self.pool.get('ir.actions.url').browse(cr, uid, aid, context=context)
@@ -50,12 +51,12 @@ class document_ftp_browse(osv.osv_memory):
 
     def browse_ftp(self, cr, uid, ids, context):
         data_id = ids and ids[0] or False
-        data = self.browse(cr, uid, data_id, context)        
+        data = self.browse(cr, uid, data_id, context)
         final_url = data.url
         return {
         'type': 'ir.actions.act_url',
         'url':final_url,
         'target': 'new'
         }
+
 document_ftp_browse()
-    
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 40926bdf7c9..0522e0348b8 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -19,14 +19,8 @@
 #
 ##############################################################################
 
-import base64
-
 from osv import osv, fields
-from osv.orm import except_orm
 from tools import config
-import urlparse
-
-import os
 
 class document_ftp_configuration(osv.osv_memory):
 
@@ -46,10 +40,10 @@ class document_ftp_configuration(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         conf = self.browse(cr, uid, ids[0], context)
-        dir_pool = self.pool.get('document.directory')
-        data_pool = self.pool.get('ir.model.data')        
+        data_pool = self.pool.get('ir.model.data')
         # Update the action for FTP browse.
         aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
         aid = data_pool.browse(cr, uid, aid, context=context).res_id
         self.pool.get('ir.actions.url').write(cr, uid, [aid], {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/'})
+
 document_ftp_configuration()
diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index ca7c9f02eb0..611c804a62c 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -54,25 +54,16 @@ class document_ics_crm_wizard(osv.osv_memory):
 
     _columns = {
         'name':fields.char('Name', size=64),
-        'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar \
-                     of meetings of the users."),
-        'lead': fields.boolean('Leads', help="Allows you to track and manage leads \
-                    which are pre-sales requests or contacts, the very first contact with a customer request."),
-        'opportunity': fields.boolean('Business Opportunities', help="Tracks identified \
-                         business opportunities for your sales pipeline."),
-        'jobs': fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs\
-                     hiring process: evaluation, meetings, email integration..."),
-        'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise \
-                        your OpenERP calendars with your phone, outlook, Sunbird, ical, ..."),
-        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and \
-                     support requests on software"),
+        'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
+        'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
+        'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
+        'jobs': fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs hiring process: evaluation, meetings, email integration..."),
+        'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
+        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"),
         'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
-        'fund': fields.boolean('Fund Raising Operations', help="This may help associations in \
-                    their fund raising process and tracking."),
-        'claims': fields.boolean('Claims', help="Manages the supplier and customers claims,\
-                     including your corrective or preventive actions."),
-        'phonecall': fields.boolean('Phone Calls', help="Helps you to encode the result of \
-                        a phone call or to plan a list of phone calls to process."),
+        'fund': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
+        'claims': fields.boolean('Claims', help="Manages the supplier and customers claims,including your corrective or preventive actions."),
+        'phonecall': fields.boolean('Phone Calls', help="Helps you to encode the result of a phone call or to plan a list of phone calls to process."),
     }
     _defaults = {
         'meeting': lambda *args: True,
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 43906829579..40fc3a34dcb 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index bac475d5fb3..66a67f5c665 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:56+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index af8738ef0da..5d641cb39c0 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -129,6 +129,7 @@ class openerp_dav_handler(dav_interface):
             raise default_exc(err.strerror)
         except Exception,e:
             import traceback
+            if cr: cr.close()
             self.parent.log_error("Cannot %s: %s", opname, str(e))
             self.parent.log_message("Exc: %s",traceback.format_exc())
             raise default_exc("Operation failed")
@@ -522,7 +523,6 @@ class openerp_dav_handler(dav_interface):
     def put(self, uri, data, content_type=None):
         """ put the object into the filesystem """
         self.parent.log_message('Putting %s (%d), %s'%( misc.ustr(uri), data and len(data) or 0, content_type))
-        parent='/'.join(uri.split('/')[:-1])
         cr, uid, pool,dbname, uri2 = self.get_cr(uri)
         if not dbname:
             if cr: cr.close()
@@ -535,20 +535,44 @@ class openerp_dav_handler(dav_interface):
         objname = uri2[-1]
         ext = objname.find('.') >0 and objname.split('.')[1] or False
 
+        ret = None
         if not node:
             dir_node = self.uri2object(cr, uid, pool, uri2[:-1])
             if not dir_node:
                 cr.close()
                 raise DAV_NotFound('Parent folder not found')
 
-            self._try_function(dir_node.create_child, (cr, objname, data),
+            newchild = self._try_function(dir_node.create_child, (cr, objname, data),
                     "create %s" % objname, cr=cr)
+            if not newchild:
+                cr.commit()
+                cr.close()
+                raise DAV_Error(400, "Failed to create resource")
+            
+            uparts=urlparse.urlparse(uri)
+            fileloc = '/'.join(newchild.full_path())
+            if isinstance(fileloc, unicode):
+                fileloc = fileloc.encode('utf-8')
+            # the uri we get is a mangled one, where the davpath has been removed
+            davpath = self.parent.get_davpath()
+            
+            surl = '%s://%s' % (uparts[0], uparts[1])
+            uloc = urllib.quote(fileloc)
+            hurl = False
+            if uri != ('/'+uloc) and uri != (surl + '/' + uloc):
+                hurl = '%s%s/%s/%s' %(surl, davpath, dbname, uloc)
+            etag = False
+            try:
+                etag = str(newchild.get_etag(cr))
+            except Exception, e:
+                self.parent.log_error("Cannot get etag for node: %s" % e)
+            ret = (hurl, etag)
         else:
             self._try_function(node.set_data, (cr, data), "save %s" % objname, cr=cr)
             
         cr.commit()
         cr.close()
-        return 201
+        return ret
 
     def rmcol(self,uri):
         """ delete a collection """
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 1fd530cbdca..10a7f9db4e6 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -24,8 +24,15 @@ import xml.dom.minidom
 domimpl = xml.dom.minidom.getDOMImplementation()
 import urlparse
 import urllib
-from DAV import utils
-from DAV.propfind import PROPFIND
+from osv import osv
+
+try:
+    from DAV import utils
+    from DAV.propfind import PROPFIND
+except ImportError:
+    raise osv.except_osv('PyWebDAV Import Error!','Please install PyWebDAV \
+from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
+
 import tools
 
 
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 34c255a2b3e..8a83e25456d 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -214,14 +214,21 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
             return self.send_status(ec)
 
         headers = {}
+        etag = None
+        if location and isinstance(location, tuple):
+            etag = location[1]
+            location = location[0]
+            # note that we have allowed for > 2 elems
         if location:
             headers['Location'] = location
-
-        try:
-            etag = dc.get_prop(location or uri, "DAV:", "getetag")
-            headers['ETag'] = etag
-        except:
-            pass
+        else:
+            try:
+                if not etag:
+                    etag = dc.get_prop(location or uri, "DAV:", "getetag")
+                if etag:
+                    headers['ETag'] = str(etag)
+            except Exception:
+                pass
 
         self.send_body(None, '201', 'Created', '', headers=headers)
 
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 6ef2d04e57f..d164645aca7 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-        <menuitem name="Emails" id="base.menu_emails" parent="base.menu_tools" sequence="5"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+        <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
         <record model="ir.ui.view" id="email_template_account_form">
@@ -96,8 +96,8 @@
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 
-        <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20"/>
+        <menuitem name="Configuration" parent="base.marketing_menu"
+         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
         <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 0d8bd245db1..fdf64388a19 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Event',
     'version': '0.1',
     'category': 'Generic Modules/Association',
-    'description': """Organization and management of events.
+    'description': """Oraganization and management of Event.
 
     This module allow you
         * to manage your events and their registrations
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index b2396739116..769e894f1bb 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -26,5 +26,4 @@ import installer
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index ef54e39bc14..70c91fbe362 100755
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     "name": "Human Resources",
     "version": "1.1",
@@ -34,7 +33,7 @@
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process', 'resource','board'],
+    'depends': ['resource', 'board'],
     'init_xml': [],
     'update_xml': [
         'security/hr_security.xml',
@@ -55,4 +54,4 @@
     'active': False,
     'certificate': '0086710558965',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index fd4ddca0955..586fa439c4e 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -33,7 +33,7 @@
             <field name="view_id" ref="board_hr_form"/>
         </record>
 		<menuitem id="menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
-		<menuitem id="menu_hr_dasboard" name="Dashboard" parent="menu_hr_reporting" sequence="0"/>
+		<menuitem id="menu_hr_dasboard" name="Dashboard" parent="menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
         <menuitem
             action="open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index da9f705daad..95355d7c303 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -35,8 +35,6 @@ class hr_employee_category(osv.osv):
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from hr_employee_category where id IN %s', (tuple(ids), ))
@@ -65,8 +63,6 @@ hr_employee_marital_status()
 class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         res = {}
         for emp in self.browse(cr, uid, ids):
             res[emp.id] = len(emp.employee_ids or [])
@@ -136,8 +132,6 @@ class hr_employee(osv.osv):
     }
 
     def _get_photo(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         return open(os.path.join(
             tools.config['addons_path'], 'hr/image', 'photo.png'),
                     'rb') .read().encode('base64')
@@ -157,8 +151,15 @@ class hr_employee(osv.osv):
             level -= 1
         return True
 
+    def _check_department_id(self, cr, uid, ids, context=None):
+        for emp in self.browse(cr, uid, ids, context=context):
+            if emp.department_id.manager_id and emp.id == emp.department_id.manager_id.id:
+                return False
+        return True
+
     _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive Hierarchy of Employees.', ['parent_id'])
+        (_check_recursion, 'Error ! You cannot create recursive Hierarchy of Employees.', ['parent_id']),
+        (_check_department_id, 'Error ! You cannot select a department for which the employee is the manager.', ['department_id']),
     ]
 
 hr_employee()
@@ -168,11 +169,9 @@ class hr_department(osv.osv):
     _inherit = 'hr.department'
     _columns = {
         'manager_id': fields.many2one('hr.employee', 'Manager'),
-#        'member_ids': fields.many2many('hr.employee', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
         'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'),
-#       finding problem to implement one2many field as "hr_departmen_user_rel" is used in another module query
     }
 
 hr_department()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 0bc0b56d42d..fb9dcb4966b 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 import tools
 
 class hr_department(osv.osv):
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index 082aa010e76..433e77a6dd4 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -19,41 +19,37 @@
             <field name="name">Technical department</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="employee1"/>
+            <field name="manager_id" ref="employee3"/>
         </record>
 
         <record id="dep_it" model="hr.department">
             <field name="name">IT</field>
             <field name="parent_id" ref="dep_technical"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="employee1"/>
         </record>
 
         <record id="dep_marketing" model="hr.department">
             <field name="name">Marketing</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="employee1"/>
+            <field name="manager_id" ref="employee2"/>
         </record>
 
         <record id="dep_sales" model="hr.department">
             <field name="name">Sales</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="employee1"/>
             <field name="parent_id" ref="dep_management"/>
         </record>
 
         <record id="dep_sales_europe" model="hr.department">
             <field name="name">Sales Europe</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="employee1"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
 
         <record id="dep_sales_america" model="hr.department">
             <field name="name">Sales America</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="employee1"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
 
@@ -110,7 +106,7 @@
         </record>
 
         <record id="employee3" model="hr.employee">
-            <field name="department_id" ref="hr.dep_technical"/>
+            <field name="department_id" ref="dep_sales"/>
         </record>
 
     </data>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0b95ca073ef..9fa8c5640f0 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" groups="base.group_system,base.group_hr_manager,base.group_hr_user,base.group_extended,base.group_hr_attendance" />
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
@@ -390,7 +390,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager,base.group_system"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 16b35654032..34c84f0e989 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:44+0000\n"
+"PO-Revision-Date: 2010-08-14 08:56+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index c69626cc2a7..590f5f3f1ac 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-07 09:39+0000\n"
+"PO-Revision-Date: 2010-08-12 05:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 05:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 1b5006f6f70..e9dabe5f6cf 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 19:47+0000\n"
-"Last-Translator: Roberto Higashi <Unknown>\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 1bec0496291..6c145f3af51 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:59+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 11e46933149..305d6b7e07d 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 366744f22ff..4f7691f03e9 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -10,9 +10,5 @@
         <field name="name">Human Resources / User</field>
     </record>
 
-    <record id="base.group_hr_attendance" model="res.groups">
-        <field name="name">Human Resources / Attendances User</field>
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index e6e5c5c3c47..1a9331779df 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,17 +1,18 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category","hr.employee.category","model_hr_employee_category","base.group_hr_user",1,0,0,0
-"access_hr_employee","hr.employee","model_hr_employee","base.group_hr_user",1,1,1,1
-"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_department","hr.department","model_hr_department","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
+"access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
+"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
 "access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
-"access_hr_job","hr.job","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
+"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0
 "access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
-"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_department","hr.department","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
+"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,0,0,0
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
-"access_hr_job","hr.job","model_hr_job","base.group_hr_manager",1,1,1,1
-"access_hr_employee","hr.employee","model_hr_employee_category","base.group_system",1,1,1,1
-
+"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,1,1,1
+"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
+"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 383f1dfa8b1..68eb3c20258 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -30,10 +30,10 @@
     actions(Sign in/Sign out) performed by them.
        """,
     'author': 'OpenERP SA',
-    'depends': ['base', 'hr'],
+    'depends': ['hr'],
     'update_xml': [
         'security/hr_security.xml',
-        'security/ir.model.access.csv', 
+        'security/ir.model.access.csv',
         'hr_attendance_view.xml',
         'hr_attendance_wizard.xml',
         'hr_attendance_report.xml',
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 938df72d4e9..842fe409d12 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -34,6 +34,7 @@ class hr_action_reason(osv.osv):
     _defaults = {
         'action_type': 'sign_in',
     }
+
 hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
@@ -59,7 +60,7 @@ class hr_attendance(osv.osv):
     _columns = {
         'name': fields.datetime('Date', required=True, select=1),
         'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
-        'action_desc': fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
+        'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
         'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
     }
@@ -86,6 +87,7 @@ class hr_attendance(osv.osv):
 
     _constraints = [(_altern_si_so, 'Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
     _order = 'name desc'
+
 hr_attendance()
 
 class hr_employee(osv.osv):
@@ -144,16 +146,14 @@ class hr_employee(osv.osv):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
 
             res = {'action': type, 'employee_id': emp['id']}
-
             if dt:
                 res['name'] = dt
             id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
             return id
-
         return True
 
 hr_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 659d27cec9a..fb6911a6656 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -75,7 +75,7 @@
         </record>
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance,base.group_system" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index b11b72f01f1..d300fe2a9aa 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:44+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index 3e7f5932c3d..709bfa47f98 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index d7a5b5b220d..577ff678a00 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:07+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index a22d252448d..67c840a24f2 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,11 +1,12 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_manager",1,1,1,1
-"access_hr_action_reason_employee_user","hr action reason employee user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_action_reason_employee_manager","hr action reason employee manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
-"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","base.group_hr_attendance",1,1,1,1
-"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","base.group_hr_attendance",1,1,1,1
-"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1
-"access_hr_job_attendance","hr_job_attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0
+"access_hr_action_reason_attendance","hr.action.reason.attendance","model_hr_action_reason","base.group_hr_attendance",1,0,0,0
+"access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
+"access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
+"access_hr_attendance_attendance","hr.attendance.attendance","model_hr_attendance","base.group_hr_attendance",1,1,1,1
+"access_hr_employee_attendance","hr.employee.attendance","hr.model_hr_employee","base.group_hr_attendance",1,0,0,0
+"access_resource_resource_attendance","resource.resource.attendance","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1
+"access_hr_job_attendance","hr.job.attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0
 "access_hr_department_attendance","hr.department attendance","hr.model_hr_department","base.group_hr_attendance",1,0,0,0
-"access_hr_action_reason","hr.action.reason","model_hr_action_reason","base.group_system",1,1,1,1
+"access_hr_action_reason_system","hr.action.reason.system","model_hr_action_reason","base.group_system",1,1,1,1
+"access_hr_attendance_system","hr.attendance.system","model_hr_attendance","base.group_system",1,0,0,0
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index f66e7892601..8c41fefcaa6 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -29,11 +29,11 @@ class hr_attendance_bymonth(osv.osv_memory):
     _columns = {
         'month': fields.selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], 'Month', required=True),
         'year': fields.integer('Year', required=True)
-                }
+    }
     _defaults = {
          'month': time.gmtime()[1],
          'year': time.gmtime()[0],
-             }
+    }
 
     def print_report(self, cr, uid, ids, context=None):
         if context is None:
@@ -42,13 +42,13 @@ class hr_attendance_bymonth(osv.osv_memory):
              'ids': [],
              'model': 'hr.employee',
              'form': self.read(cr, uid, ids)[0]
-                 }
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.attendance.bymonth',
             'datas': datas,
-            }
+        }
 
 hr_attendance_bymonth()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 175ebf8a228..e2b071de66a 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -28,11 +28,11 @@ class hr_attendance_byweek(osv.osv_memory):
     _columns = {
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True)
-        }
+    }
     _defaults = {
          'init_date': time.strftime('%Y-%m-%d'),
          'end_date': time.strftime('%Y-%m-%d'),
-        }
+    }
 
     def print_report(self, cr, uid, ids, context=None):
         if context is None:
@@ -41,12 +41,12 @@ class hr_attendance_byweek(osv.osv_memory):
              'ids': [],
              'model': 'hr.employee',
              'form': self.read(cr, uid, ids)[0]
-                 }
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.attendance.allweeks',
             'datas': datas,
-            }
+        }
 hr_attendance_byweek()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index 449fc4ca5c2..24109b11496 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -31,12 +31,12 @@ class hr_attendance_error(osv.osv_memory):
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True),
         'max_delay': fields.integer('Max. Delay (Min)', required=True)
-        }
+    }
     _defaults = {
          'init_date': time.strftime('%Y-%m-%d'),
          'end_date': time.strftime('%Y-%m-%d'),
          'max_delay': 120,
-        }
+    }
 
     def print_report(self, cr, uid, ids, context=None):
         if context is None:
@@ -59,13 +59,13 @@ class hr_attendance_error(osv.osv_memory):
              'ids': [],
              'model': 'hr.employee',
              'form': data_error
-                 }
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.attendance.error',
             'datas': datas,
-            }
+        }
 
 hr_attendance_error()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 635c25940e1..09f9f9364c5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -192,4 +192,4 @@ class hr_sign_in_out(osv.osv_memory):
 
 hr_sign_in_out()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 2bd3f4032b1..5ea6b065928 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 09:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 0df71fbd082..7db79a1de7f 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,17 +1,18 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1
-"access_hr_contract","hr.contract","model_hr_contract","base.group_hr_contract",1,1,1,1
-"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1
-"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1
-"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1
-"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1
-"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_system",1,1,1,1
-"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_system",1,1,1,1
-"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_system",1,1,1,1
-"access_hr_contract","hr.contract","model_hr_contract","base.group_system",1,1,1,1
-"access_hr_contract_type","hr.contract.type","model_hr_employee","base.group_system",1,1,1,1
-
+"access_hr_contract_wage_type_period_manager","hr.contract.wage.type.period.manager","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_manager","hr.contract.wage.type.manager","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_contract","hr.contract.wage.type.contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period.contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1
+"access_hr_contract_contract","hr.contract.contract","model_hr_contract","base.group_hr_contract",1,1,1,1
+"access_hr_employee_contract_contract","hr.employee.contract.contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1
+"access_hr_resource_contract","hr.employee.resource.contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1
+"access_hr_resource_calendar_contract","hr.employee.resource.calendar.contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1
+"access_hr_job_contract","hr.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1
+"access_hr_contract_type_contract","hr.contract.type.contract","model_hr_contract_type","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_system","hr.contract.wage.type.system","model_hr_contract_wage_type","base.group_system",1,1,1,1
+"access_hr_contract_wage_type_period_system","hr.contract.wage.type.period.system","model_hr_contract_wage_type_period","base.group_system",1,1,1,1
+"access_hr_contract_type_system","hr.contract.type.system","model_hr_contract_type","base.group_system",1,1,1,1
+"access_hr_contract_system","hr.contract.system","model_hr_contract","base.group_system",1,0,0,0
+"access_hr_employee_category_contract","hr.employee.category.contract","hr.model_hr_employee_category","base.group_hr_contract",1,1,1,1
+"access_hr_department_contract","hr.department.contract","hr.model_hr_department","base.group_hr_contract",1,1,1,1
+"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,0,0,0
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 44be7549dd3..1ce31942e45 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -62,7 +62,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6" groups="base.group_hr_manager"/>
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
         <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_system"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
@@ -349,9 +349,9 @@
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
-        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests" groups="base.group_hr_manager" 
+        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests" 
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail" groups="base.group_hr_manager"
+        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
            action="action_hr_evaluation_send_mail" sequence="45"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 89ed8f20099..4e37e74ca0f 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,11 +1,14 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_manager",1,0,0,0
-"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","base.group_hr_manager",1,0,0,0
-"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_manager",1,0,0,0
-"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_manager",1,0,0,0
-"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation.manager","model_hr_evaluation_evaluation","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_manager","hr_evaluation.plan.manager","model_hr_evaluation_plan","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase.manager","model_hr_evaluation_plan_phase","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_interview_manager","hr.evaluation.interview.manager","model_hr_evaluation_interview","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
 "access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_plan","base.group_system",1,1,1,1
+"access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1
+"access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0
+"access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 06c33fe46f7..0c6fae435f1 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -161,8 +161,8 @@
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root" groups="base.group_hr_user"/>
-        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
             <field name="name">product.product.expense.form</field>
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 7d83ac03342..c91b16061b5 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:48+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index f87fa7b0b6a..a842bdec9f1 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 7489959057a..83636da5257 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,8 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","base.group_hr_user",1,1,1,1
+"access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
 "access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1
 "access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,0,0,0
 "access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0
 "access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0
 "access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
 "access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
+"access_hr_expense_expense_manager","hr.expense.expense.manager","model_hr_expense_expense","base.group_hr_manager",1,0,0,0
+"access_hr_expense_expense_system","hr.expense.expense.system","model_hr_expense_expense","base.group_system",1,0,0,0
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9c6b48c651d..b29bf56bfb8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -335,7 +335,6 @@
             parent="menu_open_ask_holidays"
             id="menu_open_company_allocation"
             action="open_company_allocation"
-            groups="base.group_hr_manager"
             sequence="40"/>
 
         <!-- holidays status -->
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 9b162ce6e1f..af8e1140255 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index d6ffdad1e6f..19c14584332 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 15d14f0f3e4..280b1793fe6 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index eedc4a78336..38334165a76 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,10 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0
-"access_hr_holidays_user","hr holidays user","model_hr_holidays","base.group_hr_user",1,1,1,0
-"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","base.group_hr_manager",1,0,0,0
-"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","base.group_hr_manager",1,0,0,0
-"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
+"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,0
+"access_hr_holydays_status_manager","hr.holidays.status.manager","model_hr_holidays_status","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_manager","hr.holidays.manager","model_hr_holidays","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
 "access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,0,0,0
-"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_remaining_leaves_manager","hr.hr.holidays.remaining.leaves.manager","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,0,0,0
 "access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,0,0,0
-"access_hr_holydays_status","hr.holidays.status","model_hr_holidays_status","base.group_system",1,1,1,1
+"access_hr_holydays_status_system","hr.holidays.status.system","model_hr_holidays_status","base.group_system",1,1,1,1
+"access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 720ca5e9e84..6a124be59c2 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -1,7 +1,7 @@
 -
   In order to test the hr_holiday module in OpenERP, I will  Allocate leaves for Employee and manage leaves and leaves requests.
 -
-  I create new user "user1" to who makes leave request.
+  I create new user "user1" who will make leave request.
 -
   !record {model: res.users, id: res_users_user0}:
     company_id: base.main_company
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index d6f787dad22..c9d9dbc2d5e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -4,7 +4,7 @@
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll"/>
         <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_system"/>
-        <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
+        <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
         <!-- Passport Views    -->
         <record id="hr_passport_form" model="ir.ui.view">
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index b887cae0651..c605e6f28c2 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -4,7 +4,7 @@
 "aceess_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","group_hr_payroll",1,1,1,1
 "access_hr_passport","hr.passport","model_hr_passport","group_hr_payroll",1,1,1,1
 "access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","group_hr_payroll",1,1,1,1
-"access_hr_contract","hr.contract","model_hr_contract","group_hr_payroll",1,1,1,1
+"access_hr_contract","hr.contract","model_hr_contract","group_hr_payroll",1,0,0,0
 "access_hr_payroll_register","hr.payroll.register","model_hr_payroll_register","group_hr_payroll",1,1,1,1
 "access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","group_hr_payroll",1,1,1,1
 "access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","group_hr_payroll",1,1,1,1
@@ -28,3 +28,7 @@
 "access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_system",1,1,1,1
 "access_company_contribution","company.contribution","model_company_contribution","base.group_system",1,1,1,1
 "access_hr_passport_sys","hr.passport","model_hr_passport","base.group_system",1,1,1,1
+"access_res_partner_payroll","res.partner.payroll","base.model_res_partner","group_hr_payroll",1,1,1,1
+"access_hr_contibution_register_system","hr.contibution.register.system","model_hr_contibution_register","base.group_system",1,1,1,1
+"access_hr_contibution_register_line_system","hr.contibution.register.line.system","model_hr_contibution_register_line","base.group_system",1,1,1,1
+"access_hr_allounce_deduction_category_system","hr.allounce.deduction.category.system","model_hr_allounce_deduction_categoty","base.group_system",1,1,1,1
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5056a0c741e..1a38b8d5a5b 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -96,8 +96,8 @@
                     <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
                     <newline/>
-					<field name="date_action"/>
-					<field name="title_action"/>
+          <field name="date_action"/>
+          <field name="title_action"/>
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">
@@ -106,7 +106,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="terp-mail-replied" type="action"/>
+                                    icon="terp-mail-replied" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
                             <newline/>
                             <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
                             <field name="email_from" colspan="3"/>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index e680fe8e6b9..bc7bc365b00 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,6 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_applicant","hr.applicant","model_hr_applicant","base.group_hr_user",1,1,1,1
+"access_hr_applicant_user","hr.applicant.user","model_hr_applicant","base.group_hr_user",1,1,1,1
 "access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,0,0,0
-"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
+"access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
 "access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_stage","hr.recruitment.stage","model_hr_recruitment_stage","base.group_system",1,1,1,1
+"access_hr_recruitment_stage_system","hr.recruitment.stage.system","model_hr_recruitment_stage","base.group_system",1,1,1,1
+"access_hr_applicant_manager","hr.applicant.manager","model_hr_applicant","base.group_hr_manager",1,0,0,0
+"access_hr_applicant_system","hr.applicant.system","model_hr_applicant","base.group_system",1,0,0,0
+"access_hr_recruitment_stage_manager","hr.recruitment.stage.manager","model_hr_recruitment_stage","base.group_hr_manager",1,0,0,0
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index e64f3628491..f344b60c83e 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -22,8 +22,8 @@
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
-        <record id="working_hours" model="hr.analytic.timesheet">
-            <field name="name">Working Hours For OpenERP SA</field>
+        <record id="working_hours_requirements" model="hr.analytic.timesheet">
+            <field name="name">Requirements analysis and specification</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field eval="0.00" name="unit_amount"/>
@@ -35,5 +35,58 @@
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
+        <record id="working_hours_design" model="hr.analytic.timesheet">
+            <field name="name">Design and specification</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field eval="0.00" name="unit_amount"/>
+            <field name="product_id" ref="product_consultant"/>
+            <field name="product_uom_id" ref="product.uom_hour"/>
+            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field eval="0.00" name="amount"/>
+            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
+
+        <record id="working_hours_coding" model="hr.analytic.timesheet">
+            <field name="name">Coding and module testing</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field eval="0.00" name="unit_amount"/>
+            <field name="product_id" ref="product_consultant"/>
+            <field name="product_uom_id" ref="product.uom_hour"/>
+            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field eval="0.00" name="amount"/>
+            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
+
+        <record id="working_hours_testing" model="hr.analytic.timesheet">
+            <field name="name">Integration and system testing</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field eval="0.00" name="unit_amount"/>
+            <field name="product_id" ref="product_consultant"/>
+            <field name="product_uom_id" ref="product.uom_hour"/>
+            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field eval="0.00" name="amount"/>
+            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
+
+        <record id="working_hours_maintenance" model="hr.analytic.timesheet">
+            <field name="name">Delivery and maintenance</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field eval="0.00" name="unit_amount"/>
+            <field name="product_id" ref="product_consultant"/>
+            <field name="product_uom_id" ref="product.uom_hour"/>
+            <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
+            <field eval="0.00" name="amount"/>
+            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="journal_id" ref="analytic_journal"/>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 34be022bb0f..87d183f2fdc 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -49,6 +49,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col='8' colspan='4'>
+                        <filter icon="terp-personal+"
+                                domain="[('user_id','=',uid)]"
+                                string="My Working Hours" name="my" default="1"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
@@ -70,7 +74,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="filter" eval="True"/>
-            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="context">{"search_default_user_id":uid, "search_default_my": 1}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
 
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 45b27666ba2..0d41ee75e26 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index ad3583bfab9..cab38e5b519 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -5,3 +5,5 @@
 "access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,0,0,0
 "access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,0,0,0
 "access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
+"access_hr_analytic_timesheet_manager","hr.analytic.timesheet.manager","model_hr_analytic_timesheet","base.group_hr_manager",1,0,0,0
+"access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","model_hr_analytic_timesheet","base.group_system",1,0,0,0
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 2d68d94969d..eaa96f8cd92 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f04e9253b7a..486c701fe52 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -235,7 +235,7 @@
               sequence="5"/>
         <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-            groups="base.group_hr_manager" sequence="1"/>
+             sequence="1"/>
 
         <!--
             Company inheritancy
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index d86ccf50346..3b662465a4c 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:01+0000\n"
+"PO-Revision-Date: 2010-08-13 11:17+0000\n"
 "Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index d6ed693227a..5430bf1924d 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:14+0000\n"
+"PO-Revision-Date: 2010-08-14 08:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index ece4ed23b47..431600eb2dd 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index cff67ddca5e..a786a123529 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -122,6 +122,6 @@
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
-                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1"/>
+                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 9411a2db6a2..9c477432e79 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,5 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,0,0,0
+"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
+"access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,0,0,0
+"access_hr_timesheet_sheet_sheet_system","hr_timesheet_sheet.sheet.system","model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
+"access_timesheet_report_manager","timesheet.report.manager","model_timesheet_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 28ab76e8d5e..e7621ff278d 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -36,12 +36,12 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'security/idea_security.xml',
+        'security/ir.model.access.csv',
         'wizard/idea_post_vote_view.xml',
         'idea_view.xml',
         'idea_workflow.xml',
         'report/report_vote_view.xml',
-        'security/idea_security.xml',
-        'security/ir.model.access.csv',
     ],
     'demo_xml': [
         "idea_data.xml"
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index f06b7e37221..fc844c0bdc7 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index ac81db0e36f..4918723caf9 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:57+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 1020e2d03c1..97f48e5b6f6 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -383,7 +383,7 @@
     <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
-        id="menu_idea_vote_stat" action="action_idea_vote_stat" />
+        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
     <!-- Vote For Idea Action  -->
     <record model="ir.actions.act_window" id="action_idea_vote">
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index b78c8c0648c..5b82cb4e396 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -79,12 +79,12 @@
             <field name="name">Idea Vote Analysis</field>
             <field name="res_model">report.vote</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_report_vote_search"/>
             <field name="context">{'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
-        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_survey_manager"/>
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager,base.group_system"/>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 29afc0c875f..2bdad417c2f 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -13,10 +13,10 @@
         <field name="name">Sales / User</field>
     </record>
 
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index cd6f56cf60e..dae5127cc90 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -9,14 +9,17 @@
 "access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
 "access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
 "access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
-"access_idea_category_user","idea.category user","model_idea_category","base.group_survey_user",1,1,1,1
-"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_survey_user",1,1,1,1
-"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_survey_user",1,1,1,1
-"access_idea_category_manager","idea.category manager","model_idea_category","base.group_survey_manager",1,0,0,0
-"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_survey_manager",1,0,0,0
-"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_survey_manager",1,0,0,0
-"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_survey_user",1,1,1,1
-"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_survey_user",1,1,1,1
-"access_report_vote_manager","report.vote manager","model_report_vote","base.group_survey_manager",1,1,1,1
+"access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
+"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
+"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
+"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,0,0,0
+"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,0,0,0
+"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,0,0,0
+"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
+"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
+"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
 "access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
 "access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0
+"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
+"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
+"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
diff --git a/addons/l10n_be/i18n/ca.po b/addons/l10n_be/i18n/ca.po
index ee2d187ff44..131fc6821d6 100644
--- a/addons/l10n_be/i18n/ca.po
+++ b/addons/l10n_be/i18n/ca.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 12:47+0000\n"
+"PO-Revision-Date: 2010-08-13 10:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index b56ba97cc79..617f16efb17 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:45+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index f89e7b6f2d3..eb241bd3cda 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 6390fdb9f71..422a86de63d 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index 01abc1c6fe9..59a073c942f 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index 17eae399ef8..6b89001e167 100644
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -20,130 +20,139 @@
             <field name="type">view</field>
             <field name="user_type" ref="account_type_view"/>
         </record>
-        
-        <record model="account.account.template" id="assets_view">
-            <field name="name">Assets</field>
-            <field name="code">10</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_asset_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="bal"/>
-        </record>
-        
-        <record model="account.account.template" id="liabilities_view">
-            <field name="name">Liabilities</field>
-            <field name="code">11</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_liability_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="bal"/>
-        </record>
-            
-        <record id="fas" model="account.account.template">
-            <field name="code">100</field>
-            <field name="name">Fixed Assets</field>
-            <field ref="assets_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
 
-        <record id="xfa" model="account.account.template">
-            <field name="code">1000</field>
-            <field name="name">Fixed Asset Account</field>
-            <field ref="fas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
+	        <record model="account.account.template" id="liabilities_view">
+	            <field name="name">Liabilities</field>
+	            <field name="code">11</field>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="acct_type_liability_view"/>
+	            <field name="reconcile" eval="False"/>
+	            <field name="parent_id" ref="bal"/>
+	        </record>
 
-        <record id="nca" model="account.account.template">
-            <field name="code">101</field>
-            <field name="name">Net Current Assets</field>
-            <field ref="assets_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+		        <record id="cli" model="account.account.template">
+		            <field name="code">110</field>
+		            <field name="name">Current Liabilities</field>
+		            <field ref="liabilities_view" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="acct_type_liability_view"/>
+		        </record>
+		
+			        <record id="a_pay" model="account.account.template">
+			            <field name="code">1111</field>
+			            <field name="name">Creditors</field>
+			            <field ref="cli" name="parent_id"/>
+			            <field name="type">payable</field>
+			            <field eval="True" name="reconcile"/>
+			            <field name="user_type" ref="account_type_liability"/>
+			        </record>
+			        
+			        <record id="iva" model="account.account.template">
+			            <field name="code">1112</field>
+			            <field name="name">Input VAT</field>
+			            <field ref="cli" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="account_type_liability"/>
+			        </record>
 
-        <record id="cas" model="account.account.template">
-            <field name="code">1100</field>
-            <field name="name">Current Assets</field>
-            <field ref="nca" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+			        <record id="a_reserve_and_surplus" model="account.account.template">
+			            <field name="code">1113</field>
+			            <field name="name">Reserve and Surplus Account</field>
+			            <field ref="cli" name="parent_id"/>
+			            <field name="type">payable</field>
+			            <field name="user_type" ref="account_type_liability"/>
+			        </record>
 
-        <record id="stk" model="account.account.template">
-            <field name="code">11001</field>
-            <field name="name">Purchased Stocks</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
-        </record>
+	        <!-- <record id="account.property_account_payable" model="ir.property">
+	            <field eval="'account.account,'+str(a_pay)" name="value"/>
+	        </record>-->
 
-        <record id="a_recv" model="account.account.template">
-            <field name="code">11002</field>
-            <field name="name">Debtors</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
-        </record>
+	        <record model="account.account.template" id="assets_view">
+	            <field name="name">Assets</field>
+	            <field name="code">10</field>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="acct_type_asset_view"/>
+	            <field name="reconcile" eval="False"/>
+	            <field name="parent_id" ref="bal"/>
+	        </record>
+           
+		        <record id="fas" model="account.account.template">
+		            <field name="code">100</field>
+		            <field name="name">Fixed Assets</field>
+		            <field ref="assets_view" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="acct_type_asset_view"/>
+		        </record>
 
-        <!-- <record id="account.property_account_receivable" model="ir.property">
-            <field eval="'account.account,'+str(a_recv)" name="value"/>
-        </record> -->
+			        <record id="xfa" model="account.account.template">
+			            <field name="code">1000</field>
+			            <field name="name">Fixed Asset Account</field>
+			            <field ref="fas" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="account_type_asset"/>
+			        </record>
+			        
+		        <record id="nca" model="account.account.template">
+		            <field name="code">101</field>
+		            <field name="name">Net Current Assets</field>
+		            <field ref="assets_view" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="acct_type_asset_view"/>
+		        </record>
 
-        <record id="ova" model="account.account.template">
-            <field name="code">11003</field>
-            <field name="name">Output VAT</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_tax"/>
-        </record>
+			        <record id="cas" model="account.account.template">
+			            <field name="code">1100</field>
+			            <field name="name">Current Assets</field>
+			            <field ref="nca" name="parent_id"/>
+			            <field name="type">view</field>
+			            <field name="user_type" ref="acct_type_asset_view"/>
+			        </record>
 
-        <record id="bnk" model="account.account.template">
-            <field name="code">11004</field>
-            <field name="name">Bank Current Account</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_cash"/>
-        </record>
+				        <record id="stk" model="account.account.template">
+				            <field name="code">11001</field>
+				            <field name="name">Purchased Stocks</field>
+				            <field ref="cas" name="parent_id"/>
+				            <field name="type">other</field>
+				            <field name="user_type" ref="account_type_asset"/>
+				        </record>
 
-        <record id="cash" model="account.account.template">
-            <field name="code">11005</field>
-            <field name="name">Cash</field>
-            <field ref="cas" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_cash"/>
-        </record>
+				        <record id="a_recv" model="account.account.template">
+				            <field name="code">11002</field>
+				            <field name="name">Debtors</field>
+				            <field ref="cas" name="parent_id"/>
+				            <field name="type">receivable</field>
+				            <field eval="True" name="reconcile"/>
+				            <field name="user_type" ref="account_type_asset"/>
+				        </record>
 
-        <record id="cli" model="account.account.template">
-            <field name="code">110</field>
-            <field name="name">Current Liabilities</field>
-            <field ref="liabilities_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+				        <!-- <record id="account.property_account_receivable" model="ir.property">
+				            <field eval="'account.account,'+str(a_recv)" name="value"/>
+				        </record> -->
 
-        <record id="a_pay" model="account.account.template">
-            <field name="code">1111</field>
-            <field name="name">Creditors</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">payable</field>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
-        </record>
+				        <record id="ova" model="account.account.template">
+				            <field name="code">11003</field>
+				            <field name="name">Output VAT</field>
+				            <field ref="cas" name="parent_id"/>
+				            <field name="type">other</field>
+				            <field name="user_type" ref="account_type_asset"/>
+				        </record>
 
-        <!-- <record id="account.property_account_payable" model="ir.property">
-            <field eval="'account.account,'+str(a_pay)" name="value"/>
-        </record>-->
+				        <record id="bnk" model="account.account.template">
+				            <field name="code">11004</field>
+				            <field name="name">Bank Current Account</field>
+				            <field ref="cas" name="parent_id"/>
+				            <field name="type">other</field>
+				            <field name="user_type" ref="account_type_cash"/>
+				        </record>
+
+				        <record id="cash" model="account.account.template">
+				            <field name="code">11005</field>
+				            <field name="name">Cash</field>
+				            <field ref="cas" name="parent_id"/>
+				            <field name="type">other</field>
+				            <field name="user_type" ref="account_type_cash"/>
+				        </record>
 
-        <record id="iva" model="account.account.template">
-            <field name="code">1112</field>
-            <field name="name">Input VAT</field>
-            <field ref="cli" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_tax"/>
-        </record>
 
         <!-- Profit and Loss -->
 
@@ -154,98 +163,97 @@
             <field name="type">view</field>
             <field name="user_type" ref="account_type_view"/>
         </record>
-        
-        <record model="account.account.template" id="income_view">
-            <field name="name">Income</field>
-            <field name="code">20</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_income_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="gpf"/>
-        </record>
-        
-        <record model="account.account.template" id="income_fx_income">
-            <field name="name">Foreign Exchange Gain</field>
-            <field name="code">X201</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="acct_type_income_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="income_view"/>
-        </record>
-        
-        <record model="account.account.template" id="expense_view">
-            <field name="name">Expense</field>
-            <field name="code">21</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_expense_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="gpf"/>
-        </record>
-            
-        <record id="rev" model="account.account.template">
-            <field name="code">200</field>        
-            <field name="name">Revenue</field>
-            <field ref="income_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+       
+	        <record model="account.account.template" id="income_view">
+	            <field name="name">Income</field>
+	            <field name="code">20</field>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="acct_type_income_view"/>
+	            <field name="reconcile" eval="False"/>
+	            <field name="parent_id" ref="gpf"/>
+	        </record>
+       
+		        <record model="account.account.template" id="income_fx_income">
+		            <field name="name">Foreign Exchange Gain</field>
+		            <field name="code">X201</field>
+		            <field name="type">other</field>
+		            <field name="user_type" ref="account_type_income"/>
+		            <field name="reconcile" eval="False"/>
+		            <field name="parent_id" ref="income_view"/>
+		        </record>
+		        
+		        <record id="rev" model="account.account.template">
+		            <field name="code">200</field>        
+		            <field name="name">Revenue</field>
+		            <field ref="income_view" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="acct_type_income_view"/>
+		        </record>
+		
+			        <record id="a_sale" model="account.account.template">
+			            <field name="code">2001</field>
+			            <field name="name">Product Sales</field>
+			            <field ref="rev" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="account_type_income"/>
+			        </record>
 
-        <record id="a_sale" model="account.account.template">
-            <field name="code">2001</field>
-            <field name="name">Product Sales</field>
-            <field ref="rev" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
-        </record>
+	        <record model="account.account.template" id="expense_view">
+	            <field name="name">Expense</field>
+	            <field name="code">21</field>
+	            <field name="type">view</field>
+	            <field name="user_type" ref="acct_type_expense_view"/>
+	            <field name="reconcile" eval="False"/>
+	            <field name="parent_id" ref="gpf"/>
+	        </record>
+           
+		        <!-- <record id="account.property_account_income_categ" model="ir.property">
+		            <field eval="'account.account,'+str(a_sale)" name="value"/>
+		        </record> -->
+		
+		        <record id="cos" model="account.account.template">
+		            <field name="code">210</field>
+		            <field name="name">Cost of Sales</field>
+		            <field ref="expense_view" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="acct_type_expense_view"/>
+		        </record>
 
-        <!-- <record id="account.property_account_income_categ" model="ir.property">
-            <field eval="'account.account,'+str(a_sale)" name="value"/>
-        </record> -->
+			        <record id="cog" model="account.account.template">
+			            <field name="code">2100</field>
+			            <field name="name">Cost of Goods Sold</field>
+			            <field ref="cos" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="account_type_expense"/>
+			        </record>
 
-        <record id="cos" model="account.account.template">
-            <field name="code">210</field>
-            <field name="name">Cost of Sales</field>
-            <field ref="expense_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
+		        <record id="ovr" model="account.account.template">
+		            <field name="code">211</field>
+		            <field name="name">Overheads</field>
+		            <field ref="expense_view" name="parent_id"/>
+		            <field name="type">view</field>
+		            <field name="user_type" ref="acct_type_expense_view"/>
+		        </record>
 
-        <record id="cog" model="account.account.template">
-            <field name="code">2100</field>
-            <field name="name">Cost of Goods Sold</field>
-            <field ref="cos" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-
-        <record id="ovr" model="account.account.template">
-            <field name="code">211</field>
-            <field name="name">Overheads</field>
-            <field ref="expense_view" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-        </record>
-
-        <record id="a_expense" model="account.account.template">
-            <field name="code">2110</field>
-            <field name="name">Expenses</field>
-            <field ref="ovr" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-        </record>
-        
-        <record model="account.account.template" id="income_fx_expense">
-            <field name="name">Foreign Exchange Loss - (test)</field>
-            <field name="code">X2111</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="ovr"/>
-        </record>
-        
-        <!-- <record id="account.property_account_expense_categ" model="ir.property">
-            <field eval="'account.account,'+str(a_expense)" name="value"/>
-        </record> -->
-        
+			        <record id="a_expense" model="account.account.template">
+			            <field name="code">2110</field>
+			            <field name="name">Expenses</field>
+			            <field ref="ovr" name="parent_id"/>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="account_type_expense"/>
+			        </record>
+       
+			        <record model="account.account.template" id="income_fx_expense">
+			            <field name="name">Foreign Exchange Loss - (test)</field>
+			            <field name="code">X2111</field>
+			            <field name="type">other</field>
+			            <field name="user_type" ref="account_type_expense"/>
+			            <field name="reconcile" eval="False"/>
+			            <field name="parent_id" ref="ovr"/>
+			        </record>
+			        
+			        <!-- <record id="account.property_account_expense_categ" model="ir.property">
+			            <field eval="'account.account,'+str(a_expense)" name="value"/>
+			        </record> -->
     </data>
 </openerp>
diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml
index 502cea9b0d2..6f02fc22f5f 100644
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/account_tax.xml
@@ -132,6 +132,7 @@
             <field name="property_account_payable" ref="l10n_chart_uk_minimal.a_pay"/>
             <field name="property_account_expense_categ" ref="l10n_chart_uk_minimal.a_expense"/>
             <field name="property_account_income_categ" ref="l10n_chart_uk_minimal.a_sale"/>
+            <field name="property_reserve_and_surplus_account" ref="l10n_chart_uk_minimal.a_reserve_and_surplus"/>
         </record>
 
         <!-- VAT Codes -->
@@ -154,7 +155,7 @@
         <record id="ivatr" model="account.tax.template">
        		<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">IVAT R</field>
-            <field eval="0.005" name="amount"/>
+            <field eval="0.05" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="l10n_chart_uk_minimal.iva"/>
             <field name="account_paid_id" ref="l10n_chart_uk_minimal.iva"/>
@@ -214,7 +215,7 @@
         <record id="ovatr" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">OVAT R</field>
-            <field eval="0.005" name="amount"/>
+            <field eval="0.05" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="l10n_chart_uk_minimal.ova"/>
             <field name="account_paid_id" ref="l10n_chart_uk_minimal.ova"/>
diff --git a/addons/l10n_chart_uk_minimal/account_types.xml b/addons/l10n_chart_uk_minimal/account_types.xml
index 180cf3a9b4a..d9bfb5344ad 100644
--- a/addons/l10n_chart_uk_minimal/account_types.xml
+++ b/addons/l10n_chart_uk_minimal/account_types.xml
@@ -5,14 +5,14 @@
         <record model="account.account.type" id="account_type_receivable" >
           <field name="name">Receivable</field>
           <field name="code">receivable</field>
-          <field name="report_type">asset</field>
+          <field name="report_type">income</field>
           <field name="close_method">unreconciled</field>
         </record>
 
         <record model="account.account.type" id="account_type_payable" >
           <field name="name">Payable</field>
           <field name="code">payable</field>
-          <field name="report_type">liability</field>
+          <field name="report_type">expense</field>
           <field name="close_method">unreconciled</field>
         </record>
 
@@ -22,26 +22,30 @@
           <field name="close_method">none</field>
         </record>
 
-    <record model="account.account.type" id="acct_type_income_view">
-        <field name="name">Income View</field>
-        <field name="code">view</field>
-        <field name="report_type">income</field>
-    </record>
-    <record model="account.account.type" id="acct_type_expense_view">
-        <field name="name">Expense View</field>
-        <field name="code">expense</field>
-        <field name="report_type">expense</field>
-    </record>
-    <record model="account.account.type" id="acct_type_asset_view">
-        <field name="name">Asset View</field>
-        <field name="code">asset</field>
-        <field name="report_type">asset</field>
-    </record>
-    <record model="account.account.type" id="acct_type_liability_view">
-        <field name="name">Liability View</field>
-        <field name="code">liability</field>
-        <field name="report_type">liability</field>
-    </record>
+	    <record model="account.account.type" id="acct_type_income_view">
+	        <field name="name">Income View</field>
+	        <field name="code">view</field>
+	        <field name="report_type">income</field>
+	    </record>
+	    
+	    <record model="account.account.type" id="acct_type_expense_view">
+	        <field name="name">Expense View</field>
+	        <field name="code">expense</field>
+	        <field name="report_type">expense</field>
+	    </record>
+	    
+	    <record model="account.account.type" id="acct_type_asset_view">
+	        <field name="name">Asset View</field>
+	        <field name="code">asset</field>
+	        <field name="report_type">asset</field>
+	    </record>
+	    
+	    <record model="account.account.type" id="acct_type_liability_view">
+	        <field name="name">Liability View</field>
+	        <field name="code">liability</field>
+	        <field name="report_type">liability</field>
+	    </record>
+	    
         <record model="account.account.type" id="account_type_income" >
           <field name="name">Income</field>
           <field name="code">income</field>
@@ -59,6 +63,7 @@
         <record model="account.account.type" id="account_type_tax">
           <field name="name">Tax</field>
           <field name="code">tax</field>
+          <field name="report_type">liability</field>
           <field name="close_method">unreconciled</field>
         </record>
 
@@ -69,6 +74,13 @@
           <field name="close_method">balance</field>
         </record>
 
+        <record model="account.account.type" id="account_type_liability">
+          <field name="name">Liability</field>
+          <field name="code">liability</field>
+          <field name="close_method">balance</field>
+          <field name="report_type">liability</field>
+        </record>
+
         <record model="account.account.type" id="account_type_asset">
           <field name="name">Asset</field>
           <field name="code">asset</field>
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index 5ffff55373f..94dab9a74dd 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index 0f1a361097a..6c79ad8cc94 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_in/account_chart.xml b/addons/l10n_in/account_chart.xml
index 5bdc5df3c50..98817045dc4 100644
--- a/addons/l10n_in/account_chart.xml
+++ b/addons/l10n_in/account_chart.xml
@@ -580,6 +580,7 @@
                     <field name="property_account_payable" ref="IA_AC02131"/>
                     <field name="property_account_expense_categ" ref="IA_AC112"/>
                     <field name="property_account_income_categ" ref="IA_AC122"/>
+                    <field name="property_reserve_and_surplus_account" ref="IA_AC0232"/>
                 </record>
                 
 
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 9ee75f1f67b..50b2ce08916 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:45+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 5d5ab895aa0..e27fba4530f 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -6,14 +6,16 @@
 "access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
 "access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
 "access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
-"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_survey_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_survey_manager",1,0,0,0
-"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_survey_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_survey_manager",1,0,0,0
-"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_survey_manager",1,1,1,1
+"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
+"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,0,0,0
+"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
+"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,0,0,0
+"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
 "access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
 "access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
 "access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
 "access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
 "access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
-"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_survey_manager",1,1,1,1
+"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
+"access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
+"access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index c87ace64801..6c3559fa138 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -5,10 +5,10 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index 903ca7ac72a..ae5cad3d706 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -8,3 +8,6 @@
 "access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
 "access_email_template_user","email.template","model_email_template","base.res_groups_email_template_admin",1,1,1,1
 "access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
+"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
+"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
diff --git a/addons/membership/i18n/mn.po b/addons/membership/i18n/mn.po
new file mode 100644
index 00000000000..8dd1286aef5
--- /dev/null
+++ b/addons/membership/i18n/mn.po
@@ -0,0 +1,527 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-14 08:44+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetoassociate0
+msgid "invoice to associate"
+msgstr ""
+
+#. module: membership
+#: model:process.process,name:membership.process_process_membershipprocess0
+msgid "Membership Process"
+msgstr "Гишүүнчлэх процесс"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Paid Member"
+msgstr "Төлсөн гишүүн"
+
+#. module: membership
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: membership
+#: field:report.partner_member.year,currency:0
+#: field:report.partner_member.year_new,currency:0
+msgid "Currency"
+msgstr "Валют"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_setassociation0
+msgid "Set an associate member of partner."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetopaid0
+msgid "Invoice is be paid."
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_to:0
+msgid "Date to"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_waitingtoinvoice0
+msgid "Waiting to invoice"
+msgstr "Нэхэмжлэл хүлээж байгаа"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_producttomember0
+msgid "Product to member"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,associate_member:0
+msgid "Associate member"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_associatedmember0
+msgid "Member is associated."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_associationpartner0
+msgid "Associated partner."
+msgstr ""
+
+#. module: membership
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Алдаа! Та цикл хэлбэрийн данс үүсгэх боломжгүй."
+
+#. module: membership
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_from:0
+msgid "Date from"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,partner:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_free
+#: model:ir.ui.menu,name:membership.menu_members_free
+msgid "Free members"
+msgstr "Чөлөөт гишүүд"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetopaid0
+msgid "Invoice to paid"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Partners"
+msgstr "Харилцагч"
+
+#. module: membership
+#: field:membership.membership_line,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr "Алдаа, энэ бараа хугацаа хэтэрсэн байна"
+
+#. module: membership
+#: wizard_button:wizard_invoice_membership,init,ok:0
+msgid "Confirm"
+msgstr "Бататгах"
+
+#. module: membership
+#: model:process.transition.action,name:membership.process_transition_action_create0
+msgid "Create"
+msgstr "Үүсгэх"
+
+#. module: membership
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_membership_line
+msgid "Member line"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: membership
+#: field:res.partner,membership_start:0
+msgid "Start membership date"
+msgstr "Гишүүнчлэл эхлэх огноо"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_paidmember0
+msgid "Paid member"
+msgstr "Төлсөн гишүүн"
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_partner_member_year
+#: model:ir.ui.menu,name:membership.menu_report_partner_member_year
+#: view:report.partner_member.year:0
+msgid "Membership by Years"
+msgstr "Гишүүнчлэл, жилээр"
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_reporting
+msgid "Reporting"
+msgstr "Тайлан"
+
+#. module: membership
+#: view:res.partner:0
+msgid "Members"
+msgstr "Гишүүд"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Non Member"
+msgstr "Гишүүн бус"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_invoicedmember0
+msgid "Open invoice."
+msgstr "Нэхэмжлэл нээх."
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_conf
+msgid "Configuration"
+msgstr "Тохиргоо"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_producttomember0
+msgid "Define product for membership."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr ""
+
+#. module: membership
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Алдаа: Борлуулах нэгжийн ангилал хэмжих нэгжийнхээс өөр байх ёстой"
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
+msgid "Membership products"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_members_waiting
+msgid "Future members (invoice not confirmed)"
+msgstr "Ирээдүйн гишүүд (нэхэмжлэл бататгаагүй)"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_setassociation0
+msgid "Set association"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.member_product_1_product_template
+msgid "Membership Product - 2"
+msgstr "Гишүүнчлэлийн бараа - 2"
+
+#. module: membership
+#: model:product.template,name:membership.member_product_0_product_template
+msgid "Membership Product - 1"
+msgstr "Гишүүнчлэлийн бараа - 1"
+
+#. module: membership
+#: field:report.partner_member.year,canceled_amount:0
+#: field:report.partner_member.year,canceled_number:0
+#: field:report.partner_member.year_new,canceled_amount:0
+#: field:report.partner_member.year_new,canceled_number:0
+msgid "Canceled"
+msgstr "Цуцлагдсан"
+
+#. module: membership
+#: model:product.pricelist,name:membership.list1m
+msgid "Member Sale Pricelist"
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,invoiced_amount:0
+#: field:report.partner_member.year,invoiced_number:0
+#: field:report.partner_member.year_new,invoiced_amount:0
+#: field:report.partner_member.year_new,invoiced_number:0
+msgid "Invoiced"
+msgstr "Нэхэмжилсэн"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr "Чөлөөт гишүүн"
+
+#. module: membership
+#: model:product.pricelist.version,name:membership.ver1m
+msgid "Member Sale Pricelist Version"
+msgstr ""
+
+#. module: membership
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
+
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negociated by the partner"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_associatedmember0
+msgid "Associated member"
+msgstr ""
+
+#. module: membership
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_cancel:0
+msgid "Cancel membership date"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_products
+msgid "Membership Products"
+msgstr "Гишүүнчлэлийн бараанууд"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,paid_amount:0
+#: field:report.partner_member.year,paid_number:0
+#: field:report.partner_member.year_new,paid_amount:0
+#: field:report.partner_member.year_new,paid_number:0
+msgid "Paid"
+msgstr "Төлсөн"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr "Нэхэмжлэгдсэн гишүүн"
+
+#. module: membership
+#: model:ir.module.module,shortdesc:membership.module_meta_information
+#: model:ir.ui.menu,name:membership.menu_membership
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr "Гишүүнчлэл"
+
+#. module: membership
+#: help:product.product,membership:0
+msgid "Specify if this product is a membership product"
+msgstr "Энэ бараа гишүүнчлэлийн бараа эсэхийг заана"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Waiting Member"
+msgstr "Хүлээж байгаа гишүүн"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_associationpartner0
+msgid "Association Partner"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_invoiced
+#: model:ir.ui.menu,name:membership.menu_members_invoiced
+msgid "Invoiced members"
+msgstr ""
+
+#. module: membership
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr "Огтлолцсон 2 үнийн жагсаалт байж болохгүй!"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_old
+#: model:ir.ui.menu,name:membership.menu_members_old
+msgid "Old members"
+msgstr "Хуучин гишүүд"
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership amount"
+msgstr "Гишүүнчлэлийн дүн"
+
+#. module: membership
+#: wizard_view:wizard_invoice_membership,init:0
+msgid "Choose invoice details"
+msgstr "Нэхэмжлэлийн дэлгэрэнгүй сонгох"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Old Member"
+msgstr "Хуучин гишүүн"
+
+#. module: membership
+#: field:membership.membership_line,date_to:0
+msgid "To"
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,waiting_amount:0
+#: field:report.partner_member.year,waiting_number:0
+#: field:report.partner_member.year_new,waiting_amount:0
+#: field:report.partner_member.year_new,waiting_number:0
+msgid "Waiting"
+msgstr "Хүлээж байна"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
+msgid "Draft invoice is now open."
+msgstr "Ноорог нэхэмжлэл нээгдлээ"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_waiting
+msgid "Future members"
+msgstr "Ирээдүйн гишүүд"
+
+#. module: membership
+#: wizard_button:wizard_invoice_membership,init,end:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_associated
+#: model:ir.ui.menu,name:membership.menu_members_associated
+msgid "Associated members"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_paid
+#: model:ir.ui.menu,name:membership.menu_members_paid
+msgid "Paid members"
+msgstr "Төлсөн гишүүд"
+
+#. module: membership
+#: view:product.product:0
+msgid "Information"
+msgstr "Мэдээлэл"
+
+#. module: membership
+#: field:membership.membership_line,account_invoice_line:0
+msgid "Account Invoice line"
+msgstr ""
+
+#. module: membership
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_waitingmember0
+msgid "Draft invoice for membership."
+msgstr "Гишүүнчлэлийн ноорог нэхэмжлэл"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Canceled Member"
+msgstr "Цуцлагдсан гишүүн"
+
+#. module: membership
+#: model:product.price.type,name:membership.product_price_type_memberprice
+#: field:product.template,member_price:0
+msgid "Member Price"
+msgstr "Гишүүний үнэ"
+
+#. module: membership
+#: field:res.partner,free_member:0
+msgid "Free member"
+msgstr "Чөлөөт гишүүн"
+
+#. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Stop membership date"
+msgstr "Гишүүнчлэлийг зогсоох огноо"
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
+msgid "Current members"
+msgstr "Одоогийн гишүүд"
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_partner_member_year_new
+#: model:ir.ui.menu,name:membership.menu_report_partner_member_year_new
+#: view:report.partner_member.year_new:0
+msgid "New Membership by Years"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_invoicedmember0
+msgid "Invoiced member"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_cancel:0
+msgid "Cancel date"
+msgstr "Цуцлах огноо"
+
+#. module: membership
+#: model:process.node,name:membership.process_node_waitingmember0
+msgid "Waiting member"
+msgstr "Хүлээж байгаа гишүүн"
+
+#. module: membership
+#: model:ir.actions.wizard,name:membership.wizard_invoice_membership
+msgid "Invoice Membership"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_membershipproduct0
+#: wizard_field:wizard_invoice_membership,init,product:0
+msgid "Membership product"
+msgstr "Гишүүнчлэлийн бараа"
+
+#. module: membership
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Алдаа: Буруу зураасан код"
+
+#. module: membership
+#: field:report.partner_member.year,year:0
+#: field:report.partner_member.year_new,year:0
+msgid "Year"
+msgstr "Жил"
+
+#. module: membership
+#: field:res.partner,membership_state:0
+msgid "Current membership state"
+msgstr ""
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index eeb2f203946..527c35371cc 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index 2ca7b003be0..ad9e02176d7 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:20+0000\n"
+"PO-Revision-Date: 2010-08-13 13:26+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 52cf01149f4..fa7df35cdfd 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index dd1b71fc766..f6de2ef991f 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 08:27+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-13 08:14+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -47,13 +47,13 @@ msgstr "Felaktigt namn för modell i händelsedefinitionen."
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr ""
+msgstr "Revision"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Beräkna minsta lagersaldo regler"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
@@ -80,7 +80,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,picking_id:0
 msgid "Packing list"
-msgstr ""
+msgstr "Packlista"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
@@ -97,7 +97,7 @@ msgstr "Ursprung"
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr "Konfiguration"
+msgstr "Inställningar"
 
 #. module: mrp
 #: field:mrp.production,name:0
@@ -144,7 +144,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Product & Location"
-msgstr ""
+msgstr "Produkt och lagerplats"
 
 #. module: mrp
 #: view:res.company:0
@@ -166,7 +166,7 @@ msgstr "Be om nya produkter"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_reordering
 msgid "Automatic Procurements"
-msgstr ""
+msgstr "Automatiska anskaffningar"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
@@ -174,7 +174,7 @@ msgstr ""
 #: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr "Produktkvantitet"
+msgstr "Produkt antal"
 
 #. module: mrp
 #: field:mrp.production,move_lines:0
@@ -209,12 +209,12 @@ msgstr ""
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Objektsredovisning"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Do nothing"
-msgstr "Gör inget"
+msgstr "Gör ingenting"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -229,7 +229,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in hours"
-msgstr ""
+msgstr "Antal i timmar"
 
 #. module: mrp
 #: field:mrp.production,product_lines:0
@@ -254,7 +254,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Ref."
-msgstr ""
+msgstr "Intern ref."
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -301,7 +301,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_action
 #: view:mrp.production:0
 msgid "Production Orders"
-msgstr ""
+msgstr "Tillverkningsorder"
 
 #. module: mrp
 #: rml:bom.structure:0
@@ -309,7 +309,7 @@ msgstr ""
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
-msgstr "Kvantitet"
+msgstr "Antal"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
@@ -351,7 +351,7 @@ msgstr "Detaljer"
 #. module: mrp
 #: model:process.process,name:mrp.process_process_procurementprocess0
 msgid "Procurement Process"
-msgstr ""
+msgstr "Anskaffningsprocess"
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -373,7 +373,7 @@ msgstr ""
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr ""
+msgstr "Materiallista"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -391,7 +391,7 @@ msgstr "Reservation"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr ""
+msgstr "Materialstruktur"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,product_id:0
@@ -490,12 +490,12 @@ msgstr ""
 #. module: mrp
 #: field:mrp.procurement,message:0
 msgid "Latest error"
-msgstr ""
+msgstr "Senaste fel"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr ""
+msgstr "Materialliste rader"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
@@ -515,7 +515,7 @@ msgstr ""
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Fel! Du kan inte använda rekursiva materiallistor"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -526,7 +526,7 @@ msgstr ""
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturity Lead Time"
-msgstr ""
+msgstr "Tillverkningsledtid"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
@@ -537,7 +537,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Ready"
-msgstr "Redo"
+msgstr "Klar"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -656,23 +656,23 @@ msgstr ""
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
-msgstr ""
+msgstr "Minsta antal"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production orders"
-msgstr ""
+msgstr "Tillverkningsorder"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 #: field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
-msgstr ""
+msgstr "Strukturhierarki"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Lines"
-msgstr ""
+msgstr "Anskaffningsrader"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -709,7 +709,7 @@ msgstr "Ändring"
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr ""
+msgstr "Strukturtyp"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -747,7 +747,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production done"
-msgstr ""
+msgstr "Produktion avslutad"
 
 #. module: mrp
 #: rml:bom.structure:0
@@ -772,7 +772,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr ""
+msgstr "Överliggande struktur"
 
 #. module: mrp
 #: view:mrp.procurement:0
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 0c32b64d9c5..c76292e39d6 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:09+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index ee55ba15a8e..dca241679f5 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:28+0000\n"
+"PO-Revision-Date: 2010-08-14 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp_jit/i18n/mn.po b/addons/mrp_jit/i18n/mn.po
new file mode 100644
index 00000000000..1bce3df93a8
--- /dev/null
+++ b/addons/mrp_jit/i18n/mn.po
@@ -0,0 +1,23 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_jit
+#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
+msgid "MRP JIT"
+msgstr "Бодит цагийн үйлдвэрлэл"
diff --git a/addons/mrp_jit/i18n/sv.po b/addons/mrp_jit/i18n/sv.po
index 569310776bb..c9957b63f40 100644
--- a/addons/mrp_jit/i18n/sv.po
+++ b/addons/mrp_jit/i18n/sv.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-08-13 08:31+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
-msgstr ""
+msgstr "MRP JIT"
diff --git a/addons/mrp_jit/i18n/zh_TW.po b/addons/mrp_jit/i18n/zh_TW.po
index fce5f3ab1c6..02978bf5aaf 100644
--- a/addons/mrp_jit/i18n/zh_TW.po
+++ b/addons/mrp_jit/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-08-13 12:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index 0c8104412ba..818b1c42cbd 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 16:24+0000\n"
+"PO-Revision-Date: 2010-08-13 11:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 3a2ab26052d..7f4f52113d7 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 09a63128099..f2a51abd785 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 08:06+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-13 08:40+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -25,7 +25,7 @@ msgstr ""
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Ref"
-msgstr ""
+msgstr "Referência da Ordem"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -45,12 +45,12 @@ msgstr "Valor sem impostos"
 #. module: mrp_repair
 #: field:mrp.repair,state:0
 msgid "Repair State"
-msgstr ""
+msgstr "Estado do Reparo"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Data de impressão"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -61,7 +61,7 @@ msgstr "Quantidade"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Definir como Rascunho"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -71,40 +71,40 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Endereço de Entrega"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Faturar"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
 #: field:mrp.repair.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Sub-total"
+msgstr "Subtotal"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Invoice address :"
-msgstr "Endereço de faturamento"
+msgstr "Endereço de Faturamento :"
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "Limite de garantia"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Impostos"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total Líquido"
 
 #. module: mrp_repair
 #: rml:repair.order:0
@@ -114,27 +114,27 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr ""
+msgstr "Operações"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Movimento"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 msgid "Repair Orders"
-msgstr "Ordens de Serviços"
+msgstr "Ordens de Reparo"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Cotação / Ordem"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Info. Extra"
 
 #. module: mrp_repair
 #: field:mrp.repair,partner_id:0
@@ -145,39 +145,39 @@ msgstr "Parceiro"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_quotation_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_quotation
 msgid "Repairs in quotation"
-msgstr "Ordens de Serviços em Orçamento"
+msgstr "Reparos em cotação"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Recriar Fatura"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
-msgstr ""
+msgstr "Ordens de Reparo"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Repair Order N° :"
-msgstr ""
+msgstr "Ordem de Reparo N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: rml:repair.order:0
 msgid "Lot Number"
-msgstr "Numero do Lote"
+msgstr "Número do Lote"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Under Repair"
-msgstr ""
+msgstr "Em Reparo"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
@@ -197,33 +197,33 @@ msgstr ""
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Para ser Faturado"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Endereço de Entrega :"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Start Repair"
-msgstr ""
+msgstr "Iniciar Reparo"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Quantidade (UdM)"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Faturar"
 
 #. module: mrp_repair
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_order
 msgid "Repairs"
-msgstr ""
+msgstr "Reparos"
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
@@ -238,29 +238,29 @@ msgstr "Total :"
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Lista de Preços"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
 msgid "Gives the state of the Repair Order"
-msgstr ""
+msgstr "Dá o estado da Ordem de Reparo"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,quotation_notes:0
 msgid "Quotation Notes"
-msgstr ""
+msgstr "Observações da Cotação"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_progress_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_progress
 msgid "Repairs in progress"
-msgstr ""
+msgstr "Reparo em andamento"
 
 #. module: mrp_repair
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para Arquitetura da View"
+msgstr "Invalid XML for View Architecture!"
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -274,7 +274,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr ""
+msgstr "Linha do Reparo"
 
 #. module: mrp_repair
 #: rml:repair.order:0
@@ -284,12 +284,12 @@ msgstr "N° :"
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
 msgid "Invoice Method"
-msgstr ""
+msgstr "Método de Faturamento"
 
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr "Consertado"
+msgstr "Reparado"
 
 #. module: mrp_repair
 #: wizard_field:mrp.repair.make_invoice,init,group:0
@@ -300,101 +300,100 @@ msgstr ""
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Linha da Fatura"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Total amount"
-msgstr ""
+msgstr "Valor total"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr ""
+msgstr "Antes de ser Reparado"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
 msgid "Current Location"
-msgstr ""
+msgstr "Local Atual"
 
 #. module: mrp_repair
 #: wizard_button:mrp.repair.cancel,display,yes:0
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoiced:0
 #: field:mrp.repair.fee,invoiced:0
 #: field:mrp.repair.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Faturado"
 
 #. module: mrp_repair
 #: wizard_button:mrp.repair.cancel,display,end:0
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.make_invoice,init:0
 #: wizard_button:mrp.repair.make_invoice,init,invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Criar faturas"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 #: rml:repair.order:0
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Rascunho"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_form
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_form
 msgid "New Repair"
-msgstr ""
+msgstr "Novo Reparo"
 
 #. module: mrp_repair
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
+"The Object name must start with x_ and not contain any special character !"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Valor sem Impostos"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "Limite de Garantia"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: rml:repair.order:0
 msgid "Product to Repair"
-msgstr ""
+msgstr "Produto para Reparar"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "A tabela de preços vem do parceiro selecionado, por padrão."
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.cancel,display:0
@@ -402,69 +401,71 @@ msgid ""
 "This operation  will  cancel the  Repair process, but  will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Esta operação irá cancelar o processo de reparação, mas não irá cancelar "
+"a(s) fatura(s). Você deseja continuar?"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Cotação"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Compute"
-msgstr ""
+msgstr "Calcular"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr ""
+msgstr "Confirmar Reparo"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Repair Quotation"
-msgstr ""
+msgstr "Cotação do Reparo"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "End Repair"
-msgstr ""
+msgstr "Finalizar Reparo"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repairs Order"
-msgstr ""
+msgstr "Ordens de Reparo"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_ready_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_ready
 msgid "Repairs Ready to Start"
-msgstr ""
+msgstr "Reparo Pronto para Iniciar"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Qty"
-msgstr ""
+msgstr "Qtd"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_2binvoiced_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_2binvoiced
 msgid "Repairs to be invoiced"
-msgstr ""
+msgstr "Reparos a serem faturados"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Nota Fiscal"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -475,32 +476,32 @@ msgstr ""
 #: selection:mrp.repair,state:0
 #: wizard_button:mrp.repair.make_invoice,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Local de Destino"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Operation Line(s)"
-msgstr ""
+msgstr "Linhas de Operação(s)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 msgid "Repair Operations Lines"
-msgstr ""
+msgstr "Linhas de Operações do Reparo"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr ""
+msgstr "Local de Entrega"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module"
-msgstr ""
+msgstr "Módulo de Reparos de Produtos"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -509,41 +510,44 @@ msgid ""
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
 msgstr ""
+"Este campo permite que você mude o fluxo de trabalho(Workflow) da Ordem de "
+"Reparo. Se o valor selecionado for diferente de 'Não Faturar', você poderá "
+"selecionar a Lista de Preços e o endereço de Faturamento."
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
 #: field:mrp.repair.line,price_unit:0
 #: rml:repair.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Preço Unitário"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.make_invoice,init:0
 msgid "Do you really want to create the invoices ?"
-msgstr ""
+msgstr "Você realmente deseja criar as faturas ?"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
 #: field:mrp.repair.line,name:0
 #: rml:repair.order:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr ""
+msgstr "Linhas de Operação"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Fatura Corrigida"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -553,118 +557,125 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Marque esta caixa se você deseja gerenciar a entrega uma vez que o produto "
+"seja reparado. Se marcado, será criado uma embalagem com o produto "
+"selecionado. Observe que você pode selecionar os locais na aba de "
+"Informações, se você tiver a interface configurada para 'Visão "
+"ampliada(Extended view)'."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Price"
-msgstr ""
+msgstr "Preço"
 
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr ""
+msgstr "Entregar"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas Internas"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Impostos:"
 
 #. module: mrp_repair
 #: model:ir.actions.wizard,name:mrp_repair.wizard_mrp_repair_make_invoice
 msgid "Make invoices"
-msgstr ""
+msgstr "Faça faturas"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Ref"
-msgstr ""
+msgstr "Ref do Reparo"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 #: rml:repair.order:0
 msgid "Remove"
-msgstr ""
+msgstr "Remover"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.cancel,display:0
 msgid "Cancel Repair...??"
-msgstr ""
+msgstr "Cancelar Reparo...??"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM do Produto"
 
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr ""
+msgstr "Endereço de Faturamento"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "After Repair"
-msgstr ""
+msgstr "Depois de ser Reparado"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Faturamento"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Local de Origem"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quality"
-msgstr ""
+msgstr "Qualidade"
 
 #. module: mrp_repair
 #: model:ir.actions.wizard,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr ""
+msgstr "Cancelar Reparo"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "No Invoice"
-msgstr ""
+msgstr "Não Faturar"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "States"
-msgstr ""
+msgstr "Status"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
 msgstr ""
+"Este campo permite que você escolha o Parceiro para qual será Faturado e "
+"Entregue"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Ready to Repair"
-msgstr ""
+msgstr "Pronto para Reparar"
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 33c51ec8c36..21e251bee38 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:57+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/mn.po b/addons/mrp_subproduct/i18n/mn.po
new file mode 100644
index 00000000000..a3aa3655d70
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/mn.po
@@ -0,0 +1,91 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_subproduct
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: mrp_subproduct
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "хоёрдогч бүтээгдэхүүнүүд"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Бүтээгдэхүүн"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Mrp Sub Product"
+msgstr "Хоёрдогч бүтээгдэхүүн"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Тоолох төрөл"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Бүтээгдэхүүний тоо"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Бүтээгдэхүүний хэмжих нэгж"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Материалын тооцоо"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Хоёрдогч бүтээгдэхүүнүүд"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Хувьсах"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Тогтсон"
+
+#. module: mrp_subproduct
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+msgid "MRP Sub Product"
+msgstr "Хоёрдогч бүтээгдэхүүн"
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index a1e099676a2..45a79bdd13c 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/multi_company/i18n/mn.po b/addons/multi_company/i18n/mn.po
new file mode 100644
index 00000000000..1e6f184303f
--- /dev/null
+++ b/addons/multi_company/i18n/mn.po
@@ -0,0 +1,198 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-08 11:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:44+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: multi_company
+#: help:multi_company.default,object_id:0
+msgid "Object affect by this rules"
+msgstr "Энэ дүрэмд хамрагдах объект"
+
+#. module: multi_company
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
+
+#. module: multi_company
+#: constraint:res.partner:0
+msgid "The VAT doesn't seem to be correct."
+msgstr "НӨАТ буруу байж магадгүй."
+
+#. module: multi_company
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: multi_company
+#: model:res.company,overdue_msg:multi_company.res_company_odoo
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
+msgid ""
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr "Үндсэн компани"
+
+#. module: multi_company
+#: field:multi_company.default,object_id:0
+msgid "Object"
+msgstr "Объект"
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr "Олон компани"
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid ""
+"This module add the possibility to easily manage \n"
+"    the default value for each object\n"
+"    "
+msgstr ""
+"Энэ модуль нь объект бүрт үндсэн утгыг хялбар \n"
+"     удирдах боломж нэмнэ.\n"
+"    "
+
+#. module: multi_company
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr "Үндсэн компани"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Нөхцөл"
+
+#. module: multi_company
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr "Энэ бичлэгийг хадгалах компани"
+
+#. module: multi_company
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: multi_company
+#: field:multi_company.default,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Алдаа: Борлуулах нэгжийн ангилал хэмжих нэгжийнхээс өөр байх ёстой"
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr "Odoo санал"
+
+#. module: multi_company
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+
+#. module: multi_company
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr "Бичлэгийг хялбар олохын тулд нэрлэх хэрэгтэй"
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi company"
+msgstr "Олон компани"
+
+#. module: multi_company
+#: model:ir.model,name:multi_company.model_multi_company_default
+msgid "multi_company.default"
+msgstr "multi_company.default"
+
+#. module: multi_company
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr "Хэрэглэгч холбогдсон компани"
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
+msgid "Default Company per Object"
+msgstr "Объект бүрийн үндсэн компани"
+
+#. module: multi_company
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr "Илэрхийлэл"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr "Odoo санал"
+
+#. module: multi_company
+#: field:multi_company.default,sequence:0
+msgid "Sequence"
+msgstr "Дугаарлалт"
+
+#. module: multi_company
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Алдаа! Рекурсив ангилал үүсгэж болохгүй."
+
+#. module: multi_company
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Алдаа: Буруу зураасан код"
+
+#. module: multi_company
+#: help:multi_company.default,expression:0
+msgid "Expression, must be True to match"
+msgstr "Тулгахын тулд илэрхийлэл True байх ёстой"
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
+msgid "Default company per Object"
+msgstr "Объект бүрийн үндсэн компани"
+
+#. module: multi_company
+#: code:addons/multi_company/multi_company.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (Хуулах)"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "Тулгалт"
diff --git a/addons/outlook/README b/addons/outlook/README
new file mode 100644
index 00000000000..404f2121c6a
--- /dev/null
+++ b/addons/outlook/README
@@ -0,0 +1,31 @@
+OpenERP Outlook PLUG-IN Installation Guide
+
+Pre requirements :
+======================================================================================
+1.Python 2.6+ . python can be downloaded from http://www.python.org/download/releases/ .
+2.Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. It can be downloaded from http://sourceforge.net/projects/pywin32/files/ or http://starship.python.net/crew/mhammond/win32/ 
+
+How to install openerp-outlook plug-in?
+======================================================================================
+1.Open your Python installation directory (e.g.: C:\Python26).
+2.Create folder named “openerp-outlook-plugin”.
+3.Extract your zip file  “outlook-plugin.zip” to the folder.
+4.Open the folder outlook-plugin.
+5.And Run “Register-plugin.bat” file.
+6.Run Outlook and Check addin has been registered.
+7.Tools->OpenERP Configuration and test your connection.
+8.See User Guide for More. 
+
+How to uninstall openerp-outlook plug-in?
+=====================================================================================
+1.Open the folder outlook-plugin.
+2.And Run “Unregister-plugin.bat” file.
+
+Note : Plug In has been successfully tested with MS Office 2003 and MS Offcie 2007.
+
+
+Enjoy Archiving your Outlook E-mails to OpenERP.
+
+
+
+
diff --git a/addons/outlook/plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
similarity index 100%
rename from addons/outlook/plugin/Register-plugin.bat
rename to addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
diff --git a/addons/outlook/plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
similarity index 100%
rename from addons/outlook/plugin/Unregister-plugin.bat
rename to addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
diff --git a/addons/outlook/plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
similarity index 100%
rename from addons/outlook/plugin/addin.py
rename to addons/outlook/plugin/openerp-outlook-plugin/addin.py
diff --git a/addons/outlook/plugin/chilkat.py b/addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
similarity index 100%
rename from addons/outlook/plugin/chilkat.py
rename to addons/outlook/plugin/openerp-outlook-plugin/chilkat.py
diff --git a/addons/outlook/plugin/dialogs/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/__init__.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/__init__.py
diff --git a/addons/outlook/plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/dialog_map.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
diff --git a/addons/outlook/plugin/dialogs/dlgcore.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/dlgcore.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgcore.py
diff --git a/addons/outlook/plugin/dialogs/dlgutils.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/dlgutils.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/dlgutils.py
diff --git a/addons/outlook/plugin/dialogs/opt_processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/opt_processors.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
diff --git a/addons/outlook/plugin/dialogs/processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/processors.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/processors.py
diff --git a/addons/outlook/plugin/dialogs/resources/OpenERP_Logo.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/OpenERP_Logo.bmp
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
diff --git a/addons/outlook/plugin/dialogs/resources/__init__.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/__init__.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/__init__.py
diff --git a/addons/outlook/plugin/dialogs/resources/dialogs.h b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/dialogs.h
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
diff --git a/addons/outlook/plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/dialogs.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
diff --git a/addons/outlook/plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/dialogs.rc
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
diff --git a/addons/outlook/plugin/dialogs/resources/openerp_logo.png b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/openerp_logo.png
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
diff --git a/addons/outlook/plugin/dialogs/resources/openerp_logo1.bmp b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/openerp_logo1.bmp
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
diff --git a/addons/outlook/plugin/dialogs/resources/rc2py.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/rc2py.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rc2py.py
diff --git a/addons/outlook/plugin/dialogs/resources/rcparser.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
similarity index 100%
rename from addons/outlook/plugin/dialogs/resources/rcparser.py
rename to addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/rcparser.py
diff --git a/addons/outlook/plugin/eml.py b/addons/outlook/plugin/openerp-outlook-plugin/eml.py
similarity index 100%
rename from addons/outlook/plugin/eml.py
rename to addons/outlook/plugin/openerp-outlook-plugin/eml.py
diff --git a/addons/outlook/plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
similarity index 100%
rename from addons/outlook/plugin/manager.py
rename to addons/outlook/plugin/openerp-outlook-plugin/manager.py
diff --git a/addons/outlook/plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
similarity index 100%
rename from addons/outlook/plugin/tiny_xmlrpc.py
rename to addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 35cba529ba3..413e6e2ed65 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:38+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 3fd7c8e4f40..f2d23ac3b10 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/process/i18n/ca.po b/addons/process/i18n/ca.po
index cd6faec77c1..2eb28bd37e2 100644
--- a/addons/process/i18n/ca.po
+++ b/addons/process/i18n/ca.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 06:56+0000\n"
+"PO-Revision-Date: 2010-08-13 10:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/mn.po b/addons/process/i18n/mn.po
new file mode 100644
index 00000000000..285bcc943f6
--- /dev/null
+++ b/addons/process/i18n/mn.po
@@ -0,0 +1,306 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Node"
+msgstr "Процессын зангилаа"
+
+#. module: process
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
+
+#. module: process
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Roles from Workflow"
+msgstr "Ажлын урсгалын дүрүүд"
+
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr "Харгалзах цэс"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: field:process.transition,action_ids:0
+msgid "Buttons"
+msgstr "Товчнууд"
+
+#. module: process
+#: selection:process.node,kind:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Details"
+msgstr "Дэлгэрэнгүй"
+
+#. module: process
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr "Тусламжын вэб сайт"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_node_form
+#: model:ir.model,name:process.model_process_node
+#: model:ir.ui.menu,name:process.menu_process_node_form
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Nodes"
+msgstr "Процессын зангилаа"
+
+#. module: process
+#: view:process.process:0
+#: field:process.process,node_ids:0
+msgid "Nodes"
+msgstr "Зангилаа"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,condition_ids:0
+#: view:process.process:0
+msgid "Conditions"
+msgstr "Нөхцөлүүд"
+
+#. module: process
+#: field:process.condition,node_id:0
+msgid "Node"
+msgstr "Зангилаа"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Workflow Trigger"
+msgstr "Ажлын урсгалын триггер"
+
+#. module: process
+#: field:process.transition,note:0
+msgid "Description"
+msgstr "Тодорхойлолт"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition_action
+msgid "Process Transitions Actions"
+msgstr "Процесс шилжилтийн үйлдлүүд"
+
+#. module: process
+#: field:process.condition,model_id:0
+#: field:process.node,model_id:0
+#: field:process.process,model_id:0
+msgid "Object"
+msgstr "Объект"
+
+#. module: process
+#: field:process.transition,source_node_id:0
+msgid "Source Node"
+msgstr "Гарсан зангилаа"
+
+#. module: process
+#: field:process.transition,transition_ids:0
+msgid "Workflow Transitions"
+msgstr "Ажлын урсгалын шилжилтүүд"
+
+#. module: process
+#: field:process.transition.action,action:0
+msgid "Action ID"
+msgstr "Үйлдлийн ID"
+
+#. module: process
+#: view:process.transition:0
+msgid "Process Transition"
+msgstr "Процессын шилжилт"
+
+#. module: process
+#: model:ir.model,name:process.model_process_condition
+#: view:process.node:0
+#: view:process.process:0
+msgid "Condition"
+msgstr "Нөхцөл"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Dummy"
+msgstr "Хиймэл"
+
+#. module: process
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: process
+#: field:process.condition,name:0
+#: field:process.node,name:0
+#: field:process.process,name:0
+#: field:process.transition,name:0
+#: field:process.transition.action,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: process
+#: field:process.transition,role_ids:0
+msgid "Roles"
+msgstr "Дүрүүд"
+
+#. module: process
+#: field:process.node,transition_in:0
+msgid "Starting Transitions"
+msgstr "Эхлэлийн шилжилт"
+
+#. module: process
+#: field:process.node,note:0
+#: field:process.process,note:0
+#: view:process.transition:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: field:process.transition.action,transition_id:0
+msgid "Transition"
+msgstr "Шилжилт"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Roles Required"
+msgstr "Шаардагдах дүрүүд"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Extra Information"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: process
+#: selection:process.node,kind:0
+#: field:process.node,subflow_id:0
+msgid "Subflow"
+msgstr "Дэд урсгал"
+
+#. module: process
+#: field:process.process,active:0
+msgid "Active"
+msgstr "Идэвхитэй"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Action"
+msgstr "Үйлдэл"
+
+#. module: process
+#: field:process.node,flow_start:0
+msgid "Starting Flow"
+msgstr "Эхлэх урсгал"
+
+#. module: process
+#: field:process.condition,model_states:0
+msgid "Expression"
+msgstr "Илэрхийлэл"
+
+#. module: process
+#: field:process.transition.action,state:0
+msgid "Type"
+msgstr "Төрөл"
+
+#. module: process
+#: field:process.node,transition_out:0
+msgid "Ending Transitions"
+msgstr "Төгсгөлийн шилжилт"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.model,name:process.model_process_process
+#: model:ir.ui.menu,name:process.menu_process_form
+#: field:process.node,process_id:0
+#: view:process.process:0
+msgid "Process"
+msgstr "Процесс"
+
+#. module: process
+#: model:ir.module.module,shortdesc:process.module_meta_information
+msgid "Enterprise Process"
+msgstr "Байгууллагын процесс"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Actions"
+msgstr "Үйлдлүүд"
+
+#. module: process
+#: field:process.node,model_states:0
+msgid "States Expression"
+msgstr "Төлвийн илэрхийлэл"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_transition_form
+#: model:ir.model,name:process.model_process_transition
+#: model:ir.ui.menu,name:process.menu_process_transition_form
+msgid "Process Transitions"
+msgstr "Процессын шилжилт"
+
+#. module: process
+#: field:process.transition,target_node_id:0
+msgid "Target Node"
+msgstr "Хүрэх зангилаа"
+
+#. module: process
+#: field:process.node,kind:0
+msgid "Kind of Node"
+msgstr "Зангилааны төрөл"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Outgoing Transitions"
+msgstr "Гарах шилжилтүүд"
+
+#. module: process
+#: model:ir.ui.menu,name:process.menu_process
+msgid "Enterprise Processes"
+msgstr "Байгууллагын процессууд"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Transitions"
+msgstr "Шилжилтүүд"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Object Method"
+msgstr "Объектын метод"
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index b8b479486f2..c0cc0685e4d 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:14+0000\n"
+"PO-Revision-Date: 2010-08-14 08:48+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index d613b9dcef9..153092bd396 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:47+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index ff35582b85b..6062854e93f 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 14:31+0000\n"
+"PO-Revision-Date: 2010-08-14 08:44+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -44,7 +44,7 @@ msgstr "Үйлчилгээ"
 msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
-msgstr ""
+msgstr "Худалдан авах захиалгын жагсаалтад энэ бараа харагдах эсэхий заана."
 
 #. module: product
 #: help:product.supplierinfo,name:0
@@ -67,6 +67,8 @@ msgid ""
 "The minimal quantity to purchase for this supplier, expressed in the default "
 "unit of measure."
 msgstr ""
+"Энэ нийлүүлэгчээс худалдан авалт хийх хамгийн бага хэмжээ, үндсэн хэмжих "
+"нэгжээр илэрхийлэгдсэн."
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -79,6 +81,8 @@ msgid ""
 "Quantities of products that are planned to arrive in selected locations or "
 "all internal if none have been selected."
 msgstr ""
+"Сонгосон эсвэл бүх дотоод байрлал (сонголт байхгүй бол) дээр ирэхээр "
+"төлөвлөгдсөн барааны тоо ширхэг."
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -87,6 +91,9 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"Сонгосон эсвэл бүх дотоод байрлал (сонголт байхгүй бол) дээрх энэ барааны "
+"ирээдүйн үлдэгдэл. Ирээдүйн үлдэгдэл = Бодид үлдэгдэл  - Гарч байгаа + Ирж "
+"байгаа."
 
 #. module: product
 #: field:product.packaging,width:0
@@ -99,26 +106,28 @@ msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
 msgstr ""
+"Хэрэв энэ дүрэм зөвхөн барааны загварт үйлчлэх бол уг загварыг сонгоно. Бүх "
+"бараанд хамаатай бол хоосон орхино."
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Нийлүүлэх арга"
 
 #. module: product
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: product
 #: model:process.process,name:product.process_process_productprocess0
 msgid "Product Process"
-msgstr ""
+msgstr "Бараа боловсруулах"
 
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr ""
+msgstr "Барааны дэлгэц дээр харгалзах талбар."
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -133,7 +142,7 @@ msgstr "Пакетын өндөр"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr ""
+msgstr "Барааны үнийн жагсаалт"
 
 #. module: product
 #: model:product.category,name:product.cat1
@@ -143,12 +152,12 @@ msgstr "Зарж болох"
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr ""
+msgstr "Kit гар + Хулгана"
 
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr ""
+msgstr "Үнийн нэр"
 
 #. module: product
 #: field:product.product,price:0
@@ -168,7 +177,7 @@ msgstr "Түрээслэж болох"
 #. module: product
 #: field:product.product,lst_price:0
 msgid "List Price"
-msgstr ""
+msgstr "Нэрлэсэн үнэ"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
@@ -192,6 +201,7 @@ msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
 msgstr ""
+"Хэрэглэгчийн үнийг гаргах суурь үнэ. Заримдаа каталоги үнэ гэж нэрлэгддэг."
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
@@ -201,27 +211,27 @@ msgstr "Тоо ширхэг"
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
-msgstr ""
+msgstr "Processor AMD Athlon XP 2200+"
 
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr ""
+msgstr "Энэ төрлийн үнийн нэр"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Үнийн хувилбар хэрэгжиж эхлэх огноо."
 
 #. module: product
 #: field:product.product,incoming_qty:0
 msgid "Incoming"
-msgstr ""
+msgstr "Ирж байгаа"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Агуулахад хийх"
 
 #. module: product
 #: view:product.product:0
@@ -232,7 +242,7 @@ msgstr "Жин"
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr ""
+msgstr "Чимээгүй сэнс"
 
 #. module: product
 #: help:product.template,supply_method:0
@@ -240,27 +250,29 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Purchase will trigger purchase orders when requested."
 msgstr ""
+"Барааны төрөлд зааснаар Үйлдвэрлэх гэдэг нь үйлдвэрлэх захиалга үүсгэнэ. "
+"Худалдан авах гэдэг нь шаардлагатай үед худалдан авах захиалга үүсгэнэ."
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
 msgid "You can see the list of suppliers for that product."
-msgstr ""
+msgstr "Тухайн барааны нийлүүлэгчдийн жагсаалтыг харж болно."
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layer on a palet or box"
-msgstr ""
+msgstr "Палет эсвэл хайраг дэх давхаргын тоо"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "Борлуулах үнэ"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "Хэрэв өөр үнийн жагсаалт бол"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -278,6 +290,9 @@ msgid ""
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
 msgstr ""
+"Энэ утгаар үржүүлж үнийг тогтооно.\n"
+"Үнийн хөнгөлөлт болон нэмэлтийн дараа тоймлолт хийгдэнэ.\n"
+"9.99 үнийг гаргаж авахын тулд тоймлолт нь 10, нэмэлт нь -0.01 байна."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -292,13 +307,13 @@ msgstr "Ирээдүйн үлдэгдэл"
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Тогтсон"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Хэмжих нэгжийн ангилал"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -306,24 +321,26 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
+"Энэ дүрэм зөвхөн нэг бараанд үйлчлэх бол уг барааг сонгоно. Хэрэв бүх "
+"бараанд хамаатай бол хоосон орхино."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
 #: field:product.pricelist,type:0
 #: view:product.pricelist.type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "Үнийн жагсаалтын төрөл"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Base Prices"
-msgstr ""
+msgstr "Суурь үнэ"
 
 #. module: product
 #: model:ir.ui.menu,name:product.menu_price
 msgid "Prices Computations"
-msgstr ""
+msgstr "Үнийн тооцоолол"
 
 #. module: product
 #: field:product.pricelist.item,name:0
@@ -348,12 +365,12 @@ msgstr "Алдаа! Рекурсив ангилал үүсгэж болохгү
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default UoM"
-msgstr ""
+msgstr "Үндсэн хэмжих нэгж"
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Үйлдвэрлэлийн хүлээлт"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
@@ -364,17 +381,17 @@ msgstr "Нийлүүлэгчийн үнийн жагсаалт"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr ""
+msgstr "Палетын хэмжээ"
 
 #. module: product
 #: field:product.pricelist.item,base:0
 msgid "Based on"
-msgstr ""
+msgstr "Суурь"
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Keyboard"
-msgstr ""
+msgstr "Гар"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -384,7 +401,7 @@ msgstr "Харилцагч"
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Хэрэглэгчийн хүлээлт"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -398,11 +415,14 @@ msgid ""
 "at the end of the year), Average Price: the cost price is recomputed at each "
 "reception of products."
 msgstr ""
+"Стандарт үнэ: өртөг тогтмол байх бөгөөд тодорхой хугацааны эцэст (ихэвчлэн "
+"жилийн эцэст) өөрчлөнө, Дундаж үнэ: бараа хүлээн авах бүрт өртөгийг "
+"тооцоолно."
 
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "Үнийн жагсаалтын нэр"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -422,7 +442,7 @@ msgstr "Шинэ бараа үүсгэх"
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "Энэ мөрөнд таарах тодорхой нэр."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -442,12 +462,12 @@ msgstr "Процессор AMD Athlon XP 1800+"
 #. module: product
 #: selection:product.template,state:0
 msgid "In Production"
-msgstr ""
+msgstr "Үйлдвэрлэх шатанд"
 
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Дэд ангиллууд"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -462,13 +482,13 @@ msgstr "Урьтамж"
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr ""
+msgstr "HDD on demand"
 
 #. module: product
 #: field:product.uom,factor_inv:0
 #: field:product.uom,factor_inv_data:0
 msgid "Factor"
-msgstr ""
+msgstr "Фактор"
 
 #. module: product
 #: wizard_button:product.price_list,init,price:0
@@ -494,7 +514,7 @@ msgstr "ҮнийнЖагсаалт"
 #: view:product.product:0
 #: view:product.template:0
 msgid "UOM"
-msgstr ""
+msgstr "Хэмжих нэгж"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
@@ -506,7 +526,7 @@ msgstr "Ш"
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_main
 msgid "Pricelists"
-msgstr ""
+msgstr "Үнийн жагсаалт"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
@@ -517,12 +537,12 @@ msgstr "Харилцагчийн барааны нэр"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Бусад"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "Энэ дүрмийн үнэ тооцоолох горим."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -535,7 +555,7 @@ msgstr "Хэмжих нэгж"
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr ""
+msgstr "Үйлчлүүлэгч"
 
 #. module: product
 #: field:product.supplierinfo,qty:0
@@ -545,7 +565,7 @@ msgstr "Хамгийн бага тоо"
 #. module: product
 #: model:product.category,name:product.product_category_pc
 msgid "PC"
-msgstr ""
+msgstr "PC"
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -558,22 +578,22 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "Нийлүүлэгчийн хүлээлт"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "Үндсэн Үнийн хувилбар"
 
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr ""
+msgstr "Түлхүүр"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
-msgstr ""
+msgstr "Үнийн хувилбар"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -585,13 +605,13 @@ msgstr ""
 msgid ""
 "This pricelist will be used, instead of the default one,                     "
 "for sales to the current partner"
-msgstr ""
+msgstr "Харилцагчийн борлуулалтад энэ үнийн жагсаалт ашиглагдана."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist
 #: view:product.supplierinfo:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Үнийн жагсаалт"
 
 #. module: product
 #: selection:product.template,type:0
@@ -601,7 +621,7 @@ msgstr "Зарцуулж болох"
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "Илэрхийлэгдэх валют"
 
 #. module: product
 #: help:product.template,weight:0
@@ -624,21 +644,22 @@ msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Борлуулах захиалгын барааны жагсаалтад энэ бараа харагдах эсэхийг заана."
 
 #. module: product
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Алдаа: Борлуулах нэгжийн ангилал хэмжих нэгжийнхээс өөр байх ёстой"
 
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Эцэг ангилал"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr ""
+msgstr "Хөгжүүлэлтийн шатанд"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -653,6 +674,8 @@ msgid ""
 "Quantities of products that are planned to leave in selected locations or "
 "all internal if none have been selected."
 msgstr ""
+"Сонгосон эсвэл бүх дотоод (сонголт хийгээгүй) байрлалаас гарахаар "
+"төлөвлөгдсөн барааны тоо хэмжээ."
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -666,23 +689,26 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"'Агуулахад хийх': хэрэгтэй үед агуулахаас авдаг эсвэл агуулахад ирэхийг "
+"хүлээдэг. 'Захиалга хийх': хэрэгтэй үед худалдан авах эсвэл үйлдвэрлэх "
+"захиалга өгдөг."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr ""
+msgstr "Татан авалт"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_product_category_action
 msgid "Products by Category"
-msgstr ""
+msgstr "Бараа, ангиллаар"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
 msgid "HDD Seagate 7200.8 80GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 80GB"
 
 #. module: product
 #: help:product.pricelist.version,active:0
@@ -691,11 +717,14 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"Хувилбарууд давхардвал эх хувилбартай огнооны хувьд огтлолцохгүй болгох "
+"үүднээс идэвхигүй төлөвт оруулна. Та үнийн хувилбарын огноог засаж дахин "
+"идэвхжүүлэх ёстой."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
 msgid "HDD Seagate 7200.8 160GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 160GB"
 
 #. module: product
 #: view:product.product:0
@@ -715,12 +744,12 @@ msgstr "Раак"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "Хэмжих нэгжийн ангилал"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr ""
+msgstr "Савлагаа"
 
 #. module: product
 #: field:product.product,ean13:0
@@ -752,7 +781,7 @@ msgstr "Жин"
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr ""
+msgstr "Processor on demand"
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
@@ -760,21 +789,23 @@ msgid ""
 "Name of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
 msgstr ""
+"Үнийн санал асуух үед хэвлэгдэх нийлүүлэгчийн барааны нэр. Хэрэв дотоод нэр "
+"ашиглах бол хоосон орхино."
 
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply method"
-msgstr ""
+msgstr "Түгээх арга"
 
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr ""
+msgstr "IT эд ангиуд"
 
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr ""
+msgstr "Хэмжих нэгжийн ангилал"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -786,7 +817,7 @@ msgstr "Дараалал"
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr ""
+msgstr "Нийлүүлэгчийн мэдээлэл"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -807,18 +838,18 @@ msgstr "Валют"
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "Энгийн процессор"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "Тайлбар"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Suppliers of Product"
-msgstr ""
+msgstr "Барааны нийлүүлэгчид"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -828,19 +859,19 @@ msgstr "Эхлэл огноо"
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Борлуулалтын шинжүүд"
 
 #. module: product
 #: help:product.product,qty_available:0
 msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
-msgstr ""
+msgstr "Сонгосон эсвэл бүх байрлал дээрх барааны тоо хэмжээ."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr ""
+msgstr "Үндсэн PC"
 
 #. module: product
 #: field:product.template,loc_row:0
@@ -856,12 +887,12 @@ msgstr "Ангилал"
 #: help:product.pricelist.item,min_quantity:0
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
-msgstr ""
+msgstr "Харилцагч зөвхөн энэ хэмжээнээс илүүг зарах/авах үед дүрэм үйлчилнэ."
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
 msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "DDR 256MB PC400"
 
 #. module: product
 #: field:product.product,qty_available:0
@@ -879,11 +910,12 @@ msgid ""
 "Unit of Measure of a category can be converted between each others in the "
 "same category."
 msgstr ""
+"Хэмжих нэгж нь тухайн ангилал дотроо өөр нэгж рүү хөрвүүлэгдэж болно."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Барааны хэмжих нэгж"
 
 #. module: product
 #: field:product.template,sale_ok:0
@@ -893,23 +925,24 @@ msgstr "Зарж болох"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr ""
+msgstr "Иж бүрэн PC"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr ""
+msgstr "ASUStek A7V8X-X эх хавтан"
 
 #. module: product
 #: field:product.uom,factor:0
 msgid "Rate"
-msgstr ""
+msgstr "Харьцаа"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -919,17 +952,17 @@ msgstr ""
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr ""
+msgstr "Тоймлох нарийвчлал"
 
 #. module: product
 #: help:product.packaging,width:0
 msgid "The width of the package"
-msgstr ""
+msgstr "Пакетын өргөн"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr ""
+msgstr "Пакетаархи тоо"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -938,46 +971,49 @@ msgid ""
 "management. For example, in food industries, you will manage a stock of ham "
 "but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
+"Хоёр хэмжих нэгж ашигладаг компаниудад хэрэглэгдэнэ. Жишээлбэл, хүнсний "
+"үйлдвэрлэлд, агуулахдаа гулуузаар хэмжих боловч хэрэглэгчээс  Кг-аар "
+"нэхэмжлэнэ. Үндсэн хэмжих нэгжийг ашиглах бол хоосон орхино."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr ""
+msgstr "Татан авалт & Байршил"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "Байдал"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Гарч байгаа"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Buy"
-msgstr ""
+msgstr "Худалдаж авах"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
 #: view:product.pricelist.version:0
 msgid "Pricelist Version"
-msgstr ""
+msgstr "Үнийн хувилбар"
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
 msgid "Price Rounding"
-msgstr ""
+msgstr "Үнэ тоймлолт"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
 msgid "Public Price"
-msgstr ""
+msgstr "Нийтийн үнэ"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -987,12 +1023,12 @@ msgstr ""
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Борлуулалт & Худалдан авалт"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr ""
+msgstr "IT эд ангиуд"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1002,17 +1038,17 @@ msgstr ""
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr ""
+msgstr "Тээвэрлэх нэгжийн код"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase UoM"
-msgstr ""
+msgstr "Худалдан авах нэгж"
 
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr ""
+msgstr "Барааны үнийн төрөл"
 
 #. module: product
 #: field:product.template,product_manager:0
@@ -1027,12 +1063,12 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "80mm ердийн үүрэн сэнс"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "Бараа нийлүүлэгчийн тухай мэдээлэл"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1041,7 +1077,7 @@ msgstr ""
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr ""
+msgstr "Идэвхитэй"
 
 #. module: product
 #: field:product.product,price_margin:0
@@ -1051,12 +1087,12 @@ msgstr ""
 #. module: product
 #: wizard_view:product.price_list,init:0
 msgid "Price list"
-msgstr ""
+msgstr "Үнийн жагсаалт"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr ""
+msgstr "Дундаж PC"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -1074,24 +1110,24 @@ msgstr "Өртөг үнэ"
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Хупалдан авах тайлбар"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr ""
+msgstr "Хоёрдогч нэгж"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr ""
+msgstr "Dello Компьютер"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr ""
+msgstr "Хадгалах байрлал"
 
 #. module: product
 #: help:product.packaging,length:0
@@ -1106,7 +1142,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "Пакетын зураасан код."
 
 #. module: product
 #: field:product.template,weight:0
@@ -1124,33 +1160,33 @@ msgstr ""
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Барааны ангилал"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr ""
+msgstr "Барааны талбар"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_type_action
 msgid "Pricelists Types"
-msgstr ""
+msgstr "Үнийн жагсаалтын төрлүүд"
 
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr ""
+msgstr "Барааг хэрэглэж болох эсэхийг хэрэглэгчид мэдэгдэнэ."
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Partner Product Code"
-msgstr ""
+msgstr "Харилцагчийн барааны код"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr ""
+msgstr "Компьютер хэрэгсэл"
 
 #. module: product
 #: field:product.packaging,code:0
@@ -1165,11 +1201,13 @@ msgid ""
 "The coefficient for the formula:\n"
 "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
 msgstr ""
+"Дараахь томъёоны коэффициент:\n"
+"коэф (суурь нэгж) = 1 (энэ нэгж). Фактор = 1 / Харьцаа."
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr ""
+msgstr "Д/д"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
@@ -1179,12 +1217,12 @@ msgstr "Утсаар туслах"
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Variable"
-msgstr ""
+msgstr "Хувьсах"
 
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Агуулахын бүх үйлдэлд ашиглах үндсэн хэмжих нэгж."
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -1197,7 +1235,7 @@ msgstr "Барааны загвар"
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr ""
+msgstr "Тээвэрлэх нэгж"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -1205,6 +1243,8 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for products "
 "that can not be split."
 msgstr ""
+"Энэ утгаар үржүүлж тоо ширхэгийг тооцоолно. Хуваалт хийхгүй барааны хувьд "
+"1.0 гэж сонгоно."
 
 #. module: product
 #: field:product.packaging,height:0
@@ -1219,12 +1259,12 @@ msgstr ""
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "Энэ үнийн хүчинтэй хугацааны төгсгөл."
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr ""
+msgstr "Харилцагчийн мэдээлэл"
 
 #. module: product
 #: view:product.product:0
@@ -1252,12 +1292,12 @@ msgstr "Болих"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by palet or box."
-msgstr ""
+msgstr "Палет эсвэл хайрцагаар савлаж болох барааны нийт тоо."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr ""
+msgstr "Үнийн дүрэм"
 
 #. module: product
 #: model:ir.actions.wizard,name:product.report_wizard_price
@@ -1268,12 +1308,12 @@ msgstr "Үнийн жагсаалт"
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr ""
+msgstr "Нийтийн үнийн жагсаалт"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr ""
+msgstr "RAM on demand"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1284,7 +1324,7 @@ msgstr "Нэгж"
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
 msgid "HDD Seagate 7200.8 120GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 120GB"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty2:0
@@ -1307,11 +1347,13 @@ msgstr "Код"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty4:0
 msgid "Quantity-4"
-msgstr ""
+msgstr "Тоо-4"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty5:0
@@ -1333,7 +1375,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr ""
+msgstr "Үнийн дүрмүүд"
 
 #. module: product
 #: help:product.supplierinfo,product_code:0
@@ -1350,7 +1392,7 @@ msgstr ""
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr ""
+msgstr "Палет"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
@@ -1378,7 +1420,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Product suppliers, with their product name, price, etc."
-msgstr ""
+msgstr "Барааны нийлүүлэгчид, барааны нэр, үнэ зэрэг."
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -1408,23 +1450,23 @@ msgstr "Эзлэхүүн"
 #: view:product.template:0
 #: field:product.template,description:0
 msgid "Description"
-msgstr ""
+msgstr "Тодорхойлолт"
 
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr ""
+msgstr "Зур.код"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Product Description"
-msgstr ""
+msgstr "Барааны тодорхойлолт"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid " ) + "
-msgstr ""
+msgstr " ) + "
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1433,36 +1475,38 @@ msgid ""
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
 msgstr ""
+"Хэрэглэгчийн захиалга батлагдсанаас хойш эцсийн бүтээгдэхүүнийг хүргэх "
+"хүртэлх дундаж хугацаа. Ө.х хэрэглэгчид амлалт өгөх хугацаа."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr ""
+msgstr "Барааны хэмжих нэгжийн ангилал"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty3:0
 msgid "Quantity-3"
-msgstr ""
+msgstr "Тоо-3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "20x20x40 хайрцаг"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr ""
+msgstr "Үйлдвэрлэх"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Захиалга хийх"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr ""
+msgstr "Үнийн нэмэгдэл"
 
 #. module: product
 #: constraint:product.pricelist.version:0
@@ -1472,12 +1516,12 @@ msgstr "Огтлолцсон 2 үнийн жагсаалт байж болохг
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rounding Method"
-msgstr ""
+msgstr "Тоймлох арга"
 
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "Хувилбарууд"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1487,7 +1531,7 @@ msgstr "Үнийн тооцоолол"
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr ""
+msgstr "ASUStek A7N8X эх хавтан"
 
 #. module: product
 #: field:product.template,loc_case:0
@@ -1497,13 +1541,13 @@ msgstr "Үүр"
 #. module: product
 #: field:product.pricelist.version,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Төгсгөл огноо"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 msgid "Products Categories"
-msgstr ""
+msgstr "Барааны ангилал"
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1528,6 +1572,8 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uom = uos * coeff"
 msgstr ""
+"Хэмжих нэгжийг зарах нэгж рүү хөрвүүлэх коэффициент\n"
+" uom = uos * coeff"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -1537,7 +1583,7 @@ msgstr "Худалдаж авч болох"
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr ""
+msgstr "UOM -> UOS Коэф"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
@@ -1547,7 +1593,7 @@ msgstr "Өндөр хурдны процессор"
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "Үндсэн+ PC (захиалгаар угсарна)"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -1558,7 +1604,7 @@ msgstr "Өртөг тооцох арга"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr ""
+msgstr "Палетжуулах"
 
 #. module: product
 #: view:product.product:0
@@ -1569,7 +1615,7 @@ msgstr "Үнэ & Нийлүүлэгч"
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full of products palet or box."
-msgstr ""
+msgstr "Палет эсвэл хайрцагын бүтэн жин."
 
 #. module: product
 #: selection:product.template,state:0
@@ -1587,6 +1633,8 @@ msgid ""
 "The coefficient for the formula:\n"
 "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
 msgstr ""
+"Дараахь томъёоны коэффициент:\n"
+"1 (суурь нэгж) = коэфф (энэ нэгж). Харьцаа = 1 / Фактор."
 
 #. module: product
 #: help:product.template,weight_net:0
@@ -1596,7 +1644,7 @@ msgstr "Цэвэр жин кг-аар."
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
 msgid "ATX Mid-size Tower"
-msgstr ""
+msgstr "ATX Mid-size Tower"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -1608,12 +1656,12 @@ msgstr "Хүргэлтийн хүлээлт"
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action
 #: field:product.pricelist,version_id:0
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Үнийн хувилбар"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr ""
+msgstr "Хоосон пакетын жин"
 
 #. module: product
 #: field:product.template,list_price:0
@@ -1632,7 +1680,7 @@ msgstr ""
 #. module: product
 #: wizard_field:product.price_list,init,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "Тоо-1"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1642,7 +1690,7 @@ msgstr "Урт"
 #. module: product
 #: model:product.category,name:product.cat2
 msgid "Private"
-msgstr ""
+msgstr "Хувийн"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -1658,6 +1706,8 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must in the same "
 "category than the default unit of measure."
 msgstr ""
+"Худалдан авалтад хэрэглэх үндсэн хэмжих нэгж. Энэ нь үндсэн хэмжих нэгжийн "
+"ангилалтай адил байх ёстой."
 
 #. module: product
 #: constraint:product.product:0
@@ -1667,7 +1717,7 @@ msgstr "Алдаа: Буруу зураасан код"
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr ""
+msgstr "Хамгийн бага тоо"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1675,6 +1725,8 @@ msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his childs. Keep empty for all products"
 msgstr ""
+"Энэ дүрэм үйлчлэх барааны ангиллыг сонгоно. Хэрэв бүх бараанд хамаатай бол "
+"хоосон орхино."
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index b46884b3f64..a4330a52f45 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index b1d0f15cdcc..ce16d1c89b3 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:11+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 1799a8d95f8..c2b389551bd 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:13+0000\n"
+"PO-Revision-Date: 2010-08-14 08:49+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 496f2cf9158..fce117de0ae 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 430fa4b513e..c7b9a645554 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <menuitem groups="base.group_extended,base.group_system" id="menu_product_pricelist_main" name="Pricelists" parent="prod_config_main" sequence="50"/>
+        <menuitem id="base.menu_sale_config_sales" name="Sales"
+            parent="base.menu_base_config" sequence="0" groups="base.group_system,base.group_extended"/>
+        <menuitem groups="base.group_extended,base.group_system" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_sale_config_sales" sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index 72f18412af4..fbfa7dc1610 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -23,7 +23,6 @@ from osv import fields, osv
 import pooler
 
 class stock_production_lot(osv.osv):
-    _name = 'stock.production.lot'
     _inherit = 'stock.production.lot'
 
     def _get_date(dtype):
@@ -51,7 +50,7 @@ class stock_production_lot(osv.osv):
             help='The date the lot starts deteriorating without becoming dangerous.'),
         'removal_date': fields.datetime('Removal Date',
             help='The date the lot should be removed.'),
-        'alert_date': fields.datetime('Alert Date'),
+        'alert_date': fields.datetime('Alert Date', help="The date signifying an alert to notify about the production lot."),
     }
     # Assign dates according to products data
     def create(self, cr, uid, vals, context=None):
@@ -76,15 +75,14 @@ stock_production_lot()
 
 class product_product(osv.osv):
     _inherit = 'product.product'
-    _name = 'product.product'
     _columns = {
-        'life_time': fields.integer('Product lifetime',
+        'life_time': fields.integer('Product Life Time',
             help='The number of days before a production lot may become dangerous and should not be consumed.'),
-        'use_time': fields.integer('Product usetime',
+        'use_time': fields.integer('Product Use Time',
             help='The number of days before a production lot starts deteriorating without becoming dangerous.'),
-        'removal_time': fields.integer('Product removal time',
+        'removal_time': fields.integer('Product Removal Time',
             help='The number of days before a production lot should be removed.'),
-        'alert_time': fields.integer('Product alert time'),
+        'alert_time': fields.integer('Product Alert Time', help="The number of days after which, needs an alert to notify about the production lot."),
     }
 product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index 245a4a2c600..e0a249d09eb 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -13,6 +13,7 @@
                     <field name="use_date" />
                     <field name="removal_date" />
                     <field name="alert_date" />
+                    <separator colspan="4" />
                 </field>
             </field>
         </record>
@@ -25,7 +26,6 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Dates">
-                        <separator string="Dates" colspan="4" />
                         <field name="life_time" />
                         <field name="use_time" />
                         <field name="removal_time" />
diff --git a/addons/product_manufacturer/__init__.py b/addons/product_manufacturer/__init__.py
index 3c3dce04d51..9b2446b4a44 100644
--- a/addons/product_manufacturer/__init__.py
+++ b/addons/product_manufacturer/__init__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,10 +14,11 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import product_manufacturer
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index bccabe95283..1ad5068be0f 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,7 +14,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 {
@@ -22,7 +22,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "category" : "Enterprise Specific Modules/Manufacturer Industries",
-    "depends" : ["base", "account", "product", "stock"],
+    "depends" : ["stock"],
     "init_xml" : [],
     "demo_xml" : [],
     "description": "A module that add manufacturers and attributes on the product form",
@@ -30,5 +30,4 @@
     "active": False,
     "installable": True
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/product_manufacturer/i18n/product_electronic.pot b/addons/product_manufacturer/i18n/en_US.po
similarity index 79%
rename from addons/product_manufacturer/i18n/product_electronic.pot
rename to addons/product_manufacturer/i18n/en_US.po
index 41372e6597f..91281fdacd4 100644
--- a/addons/product_manufacturer/i18n/product_electronic.pot
+++ b/addons/product_manufacturer/i18n/en_US.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 13:27:55+0000\n"
-"PO-Revision-Date: 2009-11-25 13:27:55+0000\n"
+"POT-Creation-Date: 2010-08-12 12:35:32+0000\n"
+"PO-Revision-Date: 2010-08-12 12:35:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
+msgid "Manufacturer Product Code"
 msgstr ""
 
 #. module: product_manufacturer
@@ -41,18 +41,14 @@ msgid "The Object name must start with x_ and not contain any special character
 msgstr ""
 
 #. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
 msgstr ""
 
 #. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
 #: view:product.product:0
-msgid "Manufacturing data"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Product reference"
+msgid "Product Attributes"
 msgstr ""
 
 #. module: product_manufacturer
@@ -61,6 +57,7 @@ msgid "Attribute"
 msgstr ""
 
 #. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
 #: field:product.manufacturer.attribute,product_id:0
 msgid "Product"
 msgstr ""
@@ -70,16 +67,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Product name"
-msgstr ""
-
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
@@ -93,10 +80,11 @@ msgstr ""
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
+msgid "Manufacturer Product Name"
 msgstr ""
 
 #. module: product_manufacturer
+#: view:product.product:0
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr ""
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
deleted file mode 100644
index a50fde79269..00000000000
--- a/addons/product_manufacturer/i18n/es.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-06-27 21:56+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
-msgid "A module that add manufacturers and attributes on the product form"
-msgstr ""
-"Un módulo que añade fabricantes y atributos en el formulario de producto"
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
-msgstr "Código de producto del fabricante"
-
-#. module: product_electronic
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la estructura de la vista!"
-
-#. module: product_electronic
-#: view:product.electronic.attribute:0
-msgid "Product Template Name"
-msgstr "Nombre de plantilla de producto"
-
-#. module: product_electronic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con  x_ y no puede contener ningún "
-"carácter especial!"
-
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
-msgid "Product attributes"
-msgstr "Atributos de producto"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing data"
-msgstr "Datos de fabricación"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product reference"
-msgstr "Referencia del producto"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
-msgid "Attribute"
-msgstr "Atributo"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr "Datos de fabricación"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product name"
-msgstr "Nombre del producto"
-
-#. module: product_electronic
-#: view:product.product:0
-#: field:product.product,attribute_ids:0
-msgid "Attributes"
-msgstr "Atributos"
-
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
-msgid "Products Attributes & Manufacturers"
-msgstr "Fabricantes y atributos de los productos"
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
-msgstr "Nombre del fabricante del producto"
-
-#. module: product_electronic
-#: field:product.product,manufacturer:0
-msgid "Manufacturer"
-msgstr "Fabricante"
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
deleted file mode 100644
index 2d9bd1740b9..00000000000
--- a/addons/product_manufacturer/i18n/et.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Estonian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-06-25 18:10+0000\n"
-"Last-Translator: lyyser <logard.1961@gmail.com>\n"
-"Language-Team: Estonian <et@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
-msgid "A module that add manufacturers and attributes on the product form"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
-msgstr "Tootja tootekood"
-
-#. module: product_electronic
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: product_electronic
-#: view:product.electronic.attribute:0
-msgid "Product Template Name"
-msgstr "Toote Malli nimi"
-
-#. module: product_electronic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
-msgid "Product attributes"
-msgstr "Toote omadused"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing data"
-msgstr "Tootmise andmed"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product reference"
-msgstr "Toote viide"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
-msgid "Attribute"
-msgstr "Atribuut"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
-msgid "Product"
-msgstr "Toode"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
-msgid "Value"
-msgstr "Väärtus"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr "Valmistusandmeid"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product name"
-msgstr "Toote nimi"
-
-#. module: product_electronic
-#: view:product.product:0
-#: field:product.product,attribute_ids:0
-msgid "Attributes"
-msgstr "Omadused"
-
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
-msgid "Products Attributes & Manufacturers"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
-msgstr "Toote nimetus"
-
-#. module: product_electronic
-#: field:product.product,manufacturer:0
-msgid "Manufacturer"
-msgstr "Tootja"
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
deleted file mode 100644
index 0a50e49cd62..00000000000
--- a/addons/product_manufacturer/i18n/fr.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-07-22 09:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
-msgid "A module that add manufacturers and attributes on the product form"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
-msgstr ""
-
-#. module: product_electronic
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.electronic.attribute:0
-msgid "Product Template Name"
-msgstr ""
-
-#. module: product_electronic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
-msgid "Product attributes"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing data"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product reference"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
-msgid "Attribute"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
-msgid "Value"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product name"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-#: field:product.product,attribute_ids:0
-msgid "Attributes"
-msgstr ""
-
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
-msgid "Products Attributes & Manufacturers"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer:0
-msgid "Manufacturer"
-msgstr ""
diff --git a/addons/product_manufacturer/i18n/fr_BE.po b/addons/product_manufacturer/i18n/fr_BE.po
index 41372e6597f..bcf9aabbe06 100644
--- a/addons/product_manufacturer/i18n/fr_BE.po
+++ b/addons/product_manufacturer/i18n/fr_BE.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 13:27:55+0000\n"
-"PO-Revision-Date: 2009-11-25 13:27:55+0000\n"
+"POT-Creation-Date: 2010-08-13 06:18:00+0000\n"
+"PO-Revision-Date: 2010-08-13 06:18:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
+msgid "Manufacturer Product Code"
 msgstr ""
 
 #. module: product_manufacturer
@@ -41,18 +41,14 @@ msgid "The Object name must start with x_ and not contain any special character
 msgstr ""
 
 #. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
 msgstr ""
 
 #. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
 #: view:product.product:0
-msgid "Manufacturing data"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Product reference"
+msgid "Product Attributes"
 msgstr ""
 
 #. module: product_manufacturer
@@ -61,6 +57,7 @@ msgid "Attribute"
 msgstr ""
 
 #. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
 #: field:product.manufacturer.attribute,product_id:0
 msgid "Product"
 msgstr ""
@@ -70,16 +67,6 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Product name"
-msgstr ""
-
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
@@ -93,10 +80,11 @@ msgstr ""
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
+msgid "Manufacturer Product Name"
 msgstr ""
 
 #. module: product_manufacturer
+#: view:product.product:0
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr ""
diff --git a/addons/product_manufacturer/i18n/nl.po b/addons/product_manufacturer/i18n/mn.po
similarity index 61%
rename from addons/product_manufacturer/i18n/nl.po
rename to addons/product_manufacturer/i18n/mn.po
index 69153f9d6cb..04c5d6d22c4 100644
--- a/addons/product_manufacturer/i18n/nl.po
+++ b/addons/product_manufacturer/i18n/mn.po
@@ -1,4 +1,4 @@
-# Dutch translation for openobject-addons
+# Mongolian translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
@@ -7,99 +7,91 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-08-02 11:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"POT-Creation-Date: 2010-08-12 12:35+0000\n"
+"PO-Revision-Date: 2010-08-13 08:22+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
 msgid "A module that add manufacturers and attributes on the product form"
 msgstr ""
+"Бүтээгдэхүүний дэлгэц дээр үйлдвэрлэгчийн мэдээлэл болон бусад атрибутуу "
+"нэмэх модуль"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
+msgid "Manufacturer Product Code"
 msgstr ""
 
 #. module: product_manufacturer
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Дэлгэцийн XML алдаатай!"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
-msgstr ""
+msgstr "Бүтээгдэхүүний загварын нэр"
 
 #. module: product_manufacturer
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
 
 #. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
-msgstr ""
+msgstr "Барааны атрибутууд"
 
 #. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
 #: view:product.product:0
-msgid "Manufacturing data"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Product reference"
+msgid "Product Attributes"
 msgstr ""
 
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,name:0
 msgid "Attribute"
-msgstr ""
+msgstr "Аттрибут"
 
 #. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
 #: field:product.manufacturer.attribute,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Бүтээгдэхүүн"
 
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,value:0
 msgid "Value"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-msgid "Product name"
-msgstr ""
+msgstr "Утга"
 
 #. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
 msgid "Attributes"
-msgstr ""
+msgstr "Аттрибутууд"
 
 #. module: product_manufacturer
 #: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
 msgid "Products Attributes & Manufacturers"
-msgstr ""
+msgstr "Бүтээгдэхүүний Атрибут & Үйлдвэрлэгч"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
+msgid "Manufacturer Product Name"
 msgstr ""
 
 #. module: product_manufacturer
+#: view:product.product:0
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
-msgstr ""
+msgstr "Үйлдвэрлэгч"
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
new file mode 100644
index 00000000000..91281fdacd4
--- /dev/null
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -0,0 +1,91 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_manufacturer
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-08-12 12:35:32+0000\n"
+"PO-Revision-Date: 2010-08-12 12:35:32+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr ""
+
+#. module: product_manufacturer
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr ""
+
+#. module: product_manufacturer
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr ""
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr ""
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr ""
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr ""
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr ""
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr ""
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr ""
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr ""
+
diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po
deleted file mode 100644
index dbbb7e12456..00000000000
--- a/addons/product_manufacturer/i18n/ru.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-07-10 20:09+0000\n"
-"Last-Translator: Pomazan Bogdan <Unknown>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
-msgid "A module that add manufacturers and attributes on the product form"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
-msgstr ""
-
-#. module: product_electronic
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра структуры!"
-
-#. module: product_electronic
-#: view:product.electronic.attribute:0
-msgid "Product Template Name"
-msgstr ""
-
-#. module: product_electronic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
-
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
-msgid "Product attributes"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing data"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product reference"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
-msgid "Attribute"
-msgstr "Атрибут"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
-msgid "Product"
-msgstr "Продукция"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
-msgid "Value"
-msgstr "Значение"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product name"
-msgstr "Название продукта"
-
-#. module: product_electronic
-#: view:product.product:0
-#: field:product.product,attribute_ids:0
-msgid "Attributes"
-msgstr "Атрибуты"
-
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
-msgid "Products Attributes & Manufacturers"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer:0
-msgid "Manufacturer"
-msgstr "Производитель"
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
deleted file mode 100644
index 5476b158c12..00000000000
--- a/addons/product_manufacturer/i18n/sl.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 13:27+0000\n"
-"PO-Revision-Date: 2010-07-28 12:29+0000\n"
-"Last-Translator: Simon Vidmar <Unknown>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
-msgid "A module that add manufacturers and attributes on the product form"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pref:0
-msgid "Manufacturer product code"
-msgstr ""
-
-#. module: product_electronic
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#. module: product_electronic
-#: view:product.electronic.attribute:0
-msgid "Product Template Name"
-msgstr ""
-
-#. module: product_electronic
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
-
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
-msgid "Product attributes"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing data"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product reference"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
-msgid "Attribute"
-msgstr "Lastnost"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
-msgid "Value"
-msgstr "Vrednost"
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Manufacturing Data"
-msgstr ""
-
-#. module: product_electronic
-#: view:product.product:0
-msgid "Product name"
-msgstr "Ime proizvoda"
-
-#. module: product_electronic
-#: view:product.product:0
-#: field:product.product,attribute_ids:0
-msgid "Attributes"
-msgstr "Lastnosti"
-
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
-msgid "Products Attributes & Manufacturers"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer_pname:0
-msgid "Manufacturer product name"
-msgstr ""
-
-#. module: product_electronic
-#: field:product.product,manufacturer:0
-msgid "Manufacturer"
-msgstr "Proizvajalec"
diff --git a/addons/product_manufacturer/product_manufacturer.py b/addons/product_manufacturer/product_manufacturer.py
index 969b4ce69cf..93f4a6f1a8e 100644
--- a/addons/product_manufacturer/product_manufacturer.py
+++ b/addons/product_manufacturer/product_manufacturer.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,15 +14,14 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 
 class product_product(osv.osv):
     _inherit = 'product.product'
-    _name = 'product.product'
     _columns = {
         'manufacturer' : fields.many2one('res.partner', 'Manufacturer'),
         'manufacturer_pname' : fields.char('Manufacturer Product Name', size=64),
@@ -41,6 +40,4 @@ class product_attribute(osv.osv):
     }
 product_attribute()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 1d1f952cd4d..0f901173caa 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -15,7 +15,7 @@
                         <newline/>
                         <field name="manufacturer_pname"/>
                         <field name="manufacturer_pref"/>
-
+                        
                         <separator string="Attributes" colspan="4"/>
                         <field name="attribute_ids" colspan="4" nolabel="1">
                             <tree string="Product Attributes" editable="bottom">
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 495c3a76b53..0f95e8ff7dd 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -30,7 +30,7 @@ and other interesting indicators based on invoices. The wizard to launch
 the report has several options to help you get the data you need.
 """,
     'author': 'OpenERP SA',
-    'depends': ['base', 'product', 'account'],
+    'depends': ['account'],
     'update_xml': [
                    'security/ir.model.access.csv',
                    'wizard/product_margin_view.xml',
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 9bc8077094a..9cdeabd9cb7 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 09108057cc2..287c7333a17 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:12+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index b5421d3798c..ad6ef680a98 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -19,28 +19,30 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import pooler
-from tools import config
 import time
 
+from osv import fields, osv
+
 class product_product(osv.osv):
     _inherit = "product.product"
+
     def _product_margin(self, cr, uid, ids, field_names, arg, context=None):
         res = {}
+        if context is None:
+            context = {}
         for val in self.browse(cr, uid, ids,context=context):
             res[val.id] = {}
-            date_from=context.get('date_from', time.strftime('%Y-01-01'))
-            date_to=context.get('date_to', time.strftime('%Y-12-31'))
-            invoice_state=context.get('invoice_state', 'open_paid')
+            date_from = context.get('date_from', time.strftime('%Y-01-01'))
+            date_to = context.get('date_to', time.strftime('%Y-12-31'))
+            invoice_state = context.get('invoice_state', 'open_paid')
             if 'date_from' in field_names:
             	res[val.id]['date_from']=date_from
             if 'date_to' in field_names:
                 res[val.id]['date_to']=date_to
             if 'invoice_state' in field_names:
             	res[val.id]['invoice_state']=invoice_state
-            invoice_types=()
-            states=()
+            invoice_types = ()
+            states = ()
             if invoice_state=='paid':
                 states=('paid',)
             elif invoice_state=='open_paid':
@@ -109,8 +111,7 @@ class product_product(osv.osv):
         'total_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Total Margin (%)', multi='margin',help="Total margin * 100 / Turnover"),
         'expected_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Expected Margin (%)', multi='margin',help="Expected margin * 100 / Expected Sale"),
     }
+
 product_product()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index a717e54dcdb..811477571d4 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -18,15 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
-from osv import osv
-from osv import fields
 
-import netsvc
 import time
+
+from osv import fields, osv
 from tools.translate import _
-class product_margin(osv.osv_memory):
 
+class product_margin(osv.osv_memory):
     _name = 'product.margin'
     _description = 'Product Margin'
     _columns = {
@@ -39,9 +37,9 @@ class product_margin(osv.osv_memory):
         ],'Invoice State', select=True, required=True),
     }
     _defaults = {
-        'from_date':  lambda *a:time.strftime('%Y-01-01'),
-        'to_date':lambda *a:time.strftime('%Y-12-31'),
-        'invoice_state': lambda *a:"open_paid",
+        'from_date': time.strftime('%Y-01-01'),
+        'to_date': time.strftime('%Y-12-31'),
+        'invoice_state': "open_paid",
     }
     def action_open_window(self, cr, uid, ids, context=None):
         """
@@ -77,3 +75,5 @@ class product_margin(osv.osv_memory):
         }
 
 product_margin()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 404022e21fd..20a38148d3d 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-        <data>
-	     	<record id="product_margin_form_view" model="ir.ui.view">
-	            <field name="name">product.margin.form</field>
-	            <field name="model">product.margin</field>
-	            <field name="type">form</field>
-	            <field name="arch" type="xml">
-	                <form string="Properties categories">
-	                    <separator colspan="4" string="General Information"/>
-						<field name="from_date" />
-						<field name="to_date" />
-						<field name="invoice_state" />
-						<separator colspan="4" string=""/>						
-						<group col="4" colspan="2">
-		                		<button icon='gtk-cancel' special="cancel"
-									string="Cancel" />
-						    	<button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
-						</group>
-	                </form>
-	            </field>
-	        </record>
+    <data>
+     	<record id="product_margin_form_view" model="ir.ui.view">
+            <field name="name">product.margin.form</field>
+            <field name="model">product.margin</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties categories">
+                    <separator colspan="4" string="General Information"/>
+					<field name="from_date" />
+					<field name="to_date" />
+					<field name="invoice_state" />
+					<separator colspan="4" string=""/>						
+					<group col="4" colspan="2">
+                		<button icon='gtk-cancel' special="cancel" string="Cancel" />
+				    	<button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
+					</group>
+                </form>
+            </field>
+        </record>
   		        
 		<act_window name="Product Margins"
-					res_model="product.margin"
-					src_model="product.product"
-					view_mode="form"
-					target="new"
-					key2="client_action_multi"    
-					id="product_margin_act_window"/>	       
-            </data>
+			res_model="product.margin"
+			src_model="product.product"
+			view_mode="form"
+			target="new"
+			key2="client_action_multi"    
+			id="product_margin_act_window"/>	
+			       
+    </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/product_visible_discount/__init__.py b/addons/product_visible_discount/__init__.py
index 425f2bec537..4abaf54aa85 100644
--- a/addons/product_visible_discount/__init__.py
+++ b/addons/product_visible_discount/__init__.py
@@ -17,6 +17,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import product
+
+import product_visible_discount
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index f767ea3526e..16f82646ccf 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -32,7 +32,7 @@
     """,
     "depends": ["sale"],
     "demo_xml": [],
-    "update_xml": ['product_view.xml'],
+    "update_xml": ['product_visible_discount_view.xml'],
     "active": False,
     "installable": True,
 }
diff --git a/addons/product_visible_discount/i18n/mn.po b/addons/product_visible_discount/i18n/mn.po
index 4e18f35ca23..d7271ebe6b4 100644
--- a/addons/product_visible_discount/i18n/mn.po
+++ b/addons/product_visible_discount/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-03-25 12:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:24+0000\n"
+"PO-Revision-Date: 2010-08-12 06:37+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 05:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
diff --git a/addons/product_visible_discount/product.py b/addons/product_visible_discount/product_visible_discount.py
similarity index 97%
rename from addons/product_visible_discount/product.py
rename to addons/product_visible_discount/product_visible_discount.py
index 53c6446c57e..f10b50138fb 100644
--- a/addons/product_visible_discount/product.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -19,27 +19,24 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
-import pooler
-from tools import config
 from osv.osv import except_osv
 from tools.translate import _
 
 class product_pricelist(osv.osv):
-    _name = 'product.pricelist'
     _inherit = 'product.pricelist'
 
     _columns ={
-        'visible_discount':fields.boolean('Visible Discount'),
+        'visible_discount': fields.boolean('Visible Discount'),
     }
     _defaults = {
          'visible_discount': True,
-   }
+    }
 
 product_pricelist()
 
 class sale_order_line(osv.osv):
-    _name = "sale.order.line"
     _inherit = "sale.order.line"
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
@@ -106,7 +103,6 @@ class sale_order_line(osv.osv):
 sale_order_line()
 
 class account_invoice_line(osv.osv):
-    _name = "account.invoice.line"
     _inherit = "account.invoice.line"
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
diff --git a/addons/product_visible_discount/product_view.xml b/addons/product_visible_discount/product_visible_discount_view.xml
similarity index 100%
rename from addons/product_visible_discount/product_view.xml
rename to addons/product_visible_discount/product_visible_discount_view.xml
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
index ecb6a4791a8..d425a07efbc 100644
--- a/addons/profile_accounting/i18n/tr.po
+++ b/addons/profile_accounting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:01+0000\n"
+"PO-Revision-Date: 2010-08-14 08:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 4037b073319..59e0cbab3db 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -26,10 +26,10 @@ class misc_tools_installer(osv.osv_memory):
 
     _columns = {
         # Tools
-        'lunch':fields.boolean('Lunch Orders'),
-        'subscription':fields.boolean('Recurring Documents'),
-        'survey':fields.boolean('Survey'),
-        'audittrail':fields.boolean('Audit Trail'),
+        'lunch':fields.boolean('Lunch Orders',help='Installs tools for lunch module'),
+        'subscription':fields.boolean('Recurring Documents',help='Installs tools for subscription module'),
+        'survey':fields.boolean('Survey',help='Installs tools for survey module'),
+        'audittrail':fields.boolean('Audit Trail',help='Installs tools for audittrail module'),
         }
     _defaults = {
         'lunch': True,
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 69250f0dcf1..64bb428e278 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -19,8 +19,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string"
-                       >Here are a few useful applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
+            <attribute name="string">Here are a few useful applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 69ac74ef225..6e7666ddfe9 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:45+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 6667d241c97..9e9afc7e019 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 0e5af8da6fc..d7783a9f293 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/project.py b/addons/project/project.py
index f97858315b8..a70e72cdfbb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -283,7 +283,7 @@ class project(osv.osv):
             res_id = result[0]
             form_view_id = data_obj._get_id(cr, uid, 'project', 'edit_project')
             form_view = data_obj.read(cr, uid, form_view_id, ['res_id'])
-            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_list')
+            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project')
             tree_view = data_obj.read(cr, uid, tree_view_id, ['res_id'])
             search_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_project_filter')
             search_view = data_obj.read(cr, uid, search_view_id, ['res_id'])
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 82b88716421..8505bc261a9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -62,7 +62,7 @@
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>
@@ -91,24 +91,6 @@
             </field>
         </record>
 
-        <record id="view_project_list" model="ir.ui.view">
-            <field name="name">project.project.list</field>
-            <field name="model">project.project</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="5"/>
-            <field name="arch" type="xml">
-                <tree colors="blue:state in ('pending');black:state in ('open','template','close');gray:state in ('cancelled') " string="Projects">
-                    <field name="complete_name" string="Project Name"/>
-                    <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Partner"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="effective_hours" widget="float_time"/>
-                    <field name="total_hours" widget="float_time"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
        <record id="view_project_project_filter" model="ir.ui.view">
             <field name="name">project.project.select</field>
             <field name="model">project.project</field>
@@ -119,7 +101,7 @@
                        <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-personal-" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
+                       <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1"/>
@@ -127,9 +109,10 @@
                    </group>
                    <newline />
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                    	<filter string="Parent" name="Parent"  icon="terp-personal" domain = "[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Users" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                        <filter string="User" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
+                         <separator orientation="vertical"/>
+                        <filter string="Parent" name="Parent"  icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
                </search>
             </field>
@@ -418,6 +401,7 @@
                         <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+                        <separator orientation="vertical"/>
 						<filter name="edit"  
 	                        string="Edit" context="{'set_editable':True,'seq_visible': True}"
 	                        icon="gtk-execute"
@@ -427,22 +411,24 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
+                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <field name="user_id" select="1">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal" separator="1"/>
                         </field>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
-                        <filter string="End Date" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index 65e61c6e4cd..ea6c02bc2cb 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -21,13 +21,19 @@
 
 from osv import fields, osv
 from caldav import calendar
+from datetime import datetime
+
+from project.project import task as base_project_task
 
 class project_task(osv.osv):
     _name = "project.task"
     _inherit = ["calendar.todo", "project.task"]
     _columns = {
+        # force inherit from project.project_task so that 
+        # calendar.todo.active is masked oute
+        'active': base_project_task._columns['active'],
         'write_date': fields.datetime('Write Date'),
-        'create_date': fields.datetime('Create Date'),
+        'create_date': fields.datetime('Create Date', readonly=True),
         'attendee_ids': fields.many2many('calendar.attendee', \
                                          'task_attendee_rel', 'task_id', 'attendee_id', 'Attendees'),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 0a300a55576..abf15addb55 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 09:00+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index 0f2a4d0b06c..a2d3cf65923 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -21,15 +21,15 @@
 
     <record model="project.gtd.timebox" id="timebox_daily">
         <field name="name">Today</field>
-        <field name="icon">terp-hr</field>
+        <field name="icon">terp-go-today</field>
     </record>
     <record model="project.gtd.timebox" id="timebox_weekly">
         <field name="name">This Week</field>
-        <field name="icon">terp-partner</field>
+        <field name="icon">terp-go-week</field>
     </record>
     <record model="project.gtd.timebox" id="timebox_monthly">
         <field name="name">This Month</field>
-        <field name="icon">terp-product</field>
+        <field name="icon">terp-go-month</field>
     </record>
     <record model="project.gtd.timebox" id="timebox_lt">
         <field name="name">Long Term</field>
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 3490bad082c..2606d52b99e 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:47+0000\n"
+"PO-Revision-Date: 2010-08-14 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index ab66f37e417..1e9d21babfc 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:05+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_planning/i18n/ru.po b/addons/project_planning/i18n/ru.po
index 3784eb56f39..6ae59fe7932 100644
--- a/addons/project_planning/i18n/ru.po
+++ b/addons/project_planning/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2008-11-06 05:12+0000\n"
+"PO-Revision-Date: 2010-08-13 14:23+0000\n"
 "Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
diff --git a/addons/project_planning/i18n/tr.po b/addons/project_planning/i18n/tr.po
index 60eceb55788..3971d698904 100644
--- a/addons/project_planning/i18n/tr.po
+++ b/addons/project_planning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:27+0000\n"
+"PO-Revision-Date: 2010-08-14 08:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index af656553c67..8fa50353ab0 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index de71e788b7b..56665123c17 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 007399c40a8..fe995d30103 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -61,8 +61,8 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
-      					<button name="button_postpone" string="Post Pone" type="object"
-						help="Post Pone backlog" colspan="2"
+      					<button name="button_postpone" string="Postpone" type="object"
+							help="Postpone backlog" colspan="2"
                          icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 077d190e85e..bf11132d121 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index a7421253ddb..7a052bcee3e 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:51+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index ba537f8a136..9eaa48f5811 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:41+0000\n"
+"PO-Revision-Date: 2010-08-14 08:57+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 7a708942d56..9786622258d 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 10:15+0000\n"
+"PO-Revision-Date: 2010-08-14 08:46+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -25,7 +25,7 @@ msgstr "Нэхэмжилсэн & Төлсөн"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr ""
+msgstr "Хүлээн авалт дээр нийлүүлэгчийн нэхэмжлэл үүснэ"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
@@ -384,7 +384,7 @@ msgstr "Захиалга нэгтгэх"
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "Нөөц хүргэх хаяг"
 
 #. module: purchase
 #: field:purchase.order,name:0
@@ -404,7 +404,7 @@ msgstr "Үнийн хүснэгт"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "When controlling invoice from orders"
-msgstr ""
+msgstr "Захиалгаас нэхэмлэл удирдах үед"
 
 #. module: purchase
 #: constraint:ir.ui.view:0
@@ -424,7 +424,7 @@ msgstr "Худалдан авалтаас нэхэмжлэх"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "Packing is created for the products reception control."
-msgstr ""
+msgstr "Бараа хүлээн авалтын хяналт дээр савлагаа баримт үүснэ"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -694,7 +694,7 @@ msgstr "Цуцлах"
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchases Properties"
-msgstr ""
+msgstr "Худалдан авалтын атрибутууд"
 
 #. module: purchase
 #: field:purchase.order.line,order_id:0
@@ -747,7 +747,7 @@ msgstr "Гарах баглаа"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Control invoices on receptions"
-msgstr ""
+msgstr "Ирэх нэхэмжлэлийг удирдах"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -919,7 +919,7 @@ msgstr "Үнийн ишлэл"
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Гарын авлага үргэлжилж байна"
 
 #. module: purchase
 #: selection:report.purchase.order.category,state:0
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 3a08d911b1a..d57a19666df 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-07 03:51+0000\n"
+"PO-Revision-Date: 2010-08-12 06:37+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@gmail.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 05:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 2c60a305846..cd43f0207d0 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index dc10beacd98..369849e1b18 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
               <data>
 	          <form position="attributes">
-	            <attribute name="string">Purchase Modules Installation</attribute>
+	            <attribute name="string"> Purchase Modules Configuration</attribute>
 	          </form>
 			  <xpath expr='//separator[@string="vsep"]' position='attributes'>
 	          	  <attribute name='string'></attribute>
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 45aa5fbb408..22f9174878d 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 5579fd5a8c5..687844e4e7b 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 08df56ccfb9..8cabcd0a0ed 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:13+0000\n"
+"PO-Revision-Date: 2010-08-14 08:49+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@gmail.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index a2d1f8db515..62bb5a9ffd1 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 9270d24712d..74f78cd582c 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:56+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index d835d1db382..571a749edc4 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:47+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 3ab5494e0bd..34f855711a4 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:47+0000\n"
-"Last-Translator: Jay  (OpenERP) <jvo@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-14 08:57+0000\n"
+"Last-Translator: Jay (OpenERP) <jvo@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 65abd5ba8fc..ddd63a476c2 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c1ea2ea6a8e..62b91346706 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -703,6 +703,7 @@ class sale_order(osv.osv):
             for proc_id in proc_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
 
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index c77faf905e6..0806ae941ac 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Sale Management Modules Installation</attribute>
+            <attribute name="string">Sale Management Modules Configuration</attribute>
           </form>
 
           <separator string="title" position="attributes">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index bb32cfc8f83..e7fe2a6fe7d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager"/>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index eb0f1a70cbf..e9bf17dc816 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 05a0a6283ae..f4d1b97b33d 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:43+0000\n"
+"PO-Revision-Date: 2010-08-14 08:53+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index d06b2744476..13a4c5c6a08 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:39+0000\n"
+"PO-Revision-Date: 2010-08-14 08:50+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index a495101ab66..d9f6d9cd475 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:18+0000\n"
+"PO-Revision-Date: 2010-08-14 08:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index d85a94321e4..d8c3487749c 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:55+0000\n"
+"PO-Revision-Date: 2010-08-14 09:07+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index d876a2246db..a153ab7cbd4 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 404e0925d9c..42c7d48fca0 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:42+0000\n"
+"PO-Revision-Date: 2010-08-14 08:52+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 8f61ea18ae1..eef0a7f155a 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:46+0000\n"
+"PO-Revision-Date: 2010-08-14 08:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index ab4b2e16599..7b0f561897f 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -28,4 +28,5 @@ import lot_overview_all
 import report_stock
 import report_stock_picking
 import report_stock_move
+import stock_inventory_move_report
 
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
new file mode 100755
index 00000000000..cd82cc4312a
--- /dev/null
+++ b/addons/stock/report/stock_inventory_move.rml
@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>  
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Untitled1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="14.0" spaceAfter="0.0"/>
+   <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+   	<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+	<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>   	
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
+    <blockTable colWidths="539.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Stock Inventory</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_header_Centre">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="260.0,260.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Inventory</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Date</para>
+        </td>
+        </tr>
+        <tr>
+        <td>
+         <para style="terp_default_Centre_9">[[ o.name ]]</para></td>
+        <td> <para style="terp_default_Centre_9"> [[ formatLang(o.date,date=True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_Bold_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_Bold_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="114.0,93.0,195.0,66.0,71.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Location</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Production Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Product </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">UOM</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_9">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
+      <blockTable colWidths="114.0,93.0,195.0,66.0,71.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ p.location_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ p.prod_lot_id and p.prod_lot_id.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ p.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ p.product_qty ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ p.product_uom.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="402.0,66.0,71.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">[[ format(qty_total(o.inventory_line_id)['quantity']) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">[[ format(qty_total(o.inventory_line_id)['uom']) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
new file mode 100755
index 00000000000..b89b6b9fa9b
--- /dev/null
+++ b/addons/stock/report/stock_inventory_move_report.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 time
+from report import report_sxw
+
+class stock_inventory_move(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(stock_inventory_move, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+             'time': time,
+             'qty_total':self._qty_total
+        })
+        
+    def _qty_total(self,objects):
+        total = 0.0
+        uom = objects[0].product_uom.name
+        for obj in objects:
+            total += obj.product_qty
+        return {'quantity':str(total),'uom':uom}
+
+report_sxw.report_sxw(
+    'report.stock.inventory.move',
+    'stock.inventory',
+    'addons/stock/report/stock_inventory_move.rml',
+    parser=stock_inventory_move
+)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index f1adfc33816..a214dc8045e 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -8,5 +8,6 @@
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/>
+        <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Inventory" rml="stock/report/stock_inventory_move.rml"/>
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 507df8dc683..9665d3967ab 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1636,7 +1636,7 @@
                         <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" />
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/stock_invoice_directly/i18n/it.po b/addons/stock_invoice_directly/i18n/it.po
index c61ef891bf6..6392ae4436b 100644
--- a/addons/stock_invoice_directly/i18n/it.po
+++ b/addons/stock_invoice_directly/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-08-12 05:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 05:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 5eb970a42ba..a172e3fc06c 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:32+0000\n"
+"PO-Revision-Date: 2010-08-14 09:06+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po
index a00fb98d4de..0d7d3e60582 100644
--- a/addons/stock_location/i18n/ca.po
+++ b/addons/stock_location/i18n/ca.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 17:43+0000\n"
+"PO-Revision-Date: 2010-08-12 05:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 05:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po
index 0fb34ab74b7..60098682217 100644
--- a/addons/stock_location/i18n/lt.po
+++ b/addons/stock_location/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:52+0000\n"
+"PO-Revision-Date: 2010-08-13 10:19+0000\n"
 "Last-Translator: Andrius Vilciauskas <a.vilciauskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/mn.po b/addons/stock_location/i18n/mn.po
index 273f91b47a2..d617471b978 100644
--- a/addons/stock_location/i18n/mn.po
+++ b/addons/stock_location/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 10:28+0000\n"
+"PO-Revision-Date: 2010-08-13 09:52+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 9fd5ef0163b..b77bfed3e36 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:37+0000\n"
+"PO-Revision-Date: 2010-08-14 09:01+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index bd5b039356e..44039c4ed34 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 04:50+0000\n"
+"PO-Revision-Date: 2010-08-14 09:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 9b8b6afd506..0a89573e2f7 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -182,7 +182,7 @@
         <!-- Forecast section -->
         
         <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
-                parent="base.menu_base_partner" sequence="6"/>
+                parent="base.menu_base_partner" sequence="6" groups="base.group_extended,base.group_system"/>
 
         <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
             <field name="name">stock.sale.forecast.list.select</field>
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index d8435b08864..33deaeb9f9f 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:47+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 33ab0881c52..e19fdde993b 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -3,8 +3,8 @@ access_subscription_document,subscription.document,model_subscription_document,b
 access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
 access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
 access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_survey_user,1,1,1,1
-access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_survey_manager,1,0,0,0
-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_survey_user,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
+access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,0,0,0
+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
 access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
-access_subscription_document_user,subscription.document user,model_subscription_document,base.group_survey_user,1,1,1,1
+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 86f0e2c6069..0014f38182b 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -2,10 +2,10 @@
 <openerp>
 <data noupdate="0">
 
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 9944a84996d..8d50471fd03 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,30 +1,30 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_manager","survey.type manager","model_survey_type","base.group_survey_manager",1,1,1,1
-"access_survey_type_user","survey.type user","model_survey_type","base.group_survey_user",1,1,1,1
-"access_survey_manager","survey","model_survey","base.group_survey_manager",1,0,0,0
+"access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
+"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
+"access_survey_manager","survey","model_survey","base.group_tool_manager",1,0,0,0
 "access_survey_system","survey","model_survey","base.group_system",1,0,0,0
-"access_survey_user","survey","model_survey","base.group_survey_user",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_survey_manager",1,0,0,0
+"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,0,0,0
 "access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
-"access_survey_page_user","survey.page user","model_survey_page","base.group_survey_user",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_survey_manager",1,1,1,1
-"access_survey_question_user","survey.question user","model_survey_question","base.group_survey_user",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_survey_manager",1,1,1,1
-"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_survey_user",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_survey_manager",1,1,1,1
-"access_survey_response_user","survey.response user","model_survey_response","base.group_survey_user",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_survey_manager",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_survey_user",1,1,1,1
-"access_survey_history_user","survey.history.user","model_survey_history","base.group_survey_user",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_survey_manager",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_survey_manager",1,0,0,0
-"access_survey_request_user","survey.request user","model_survey_request","base.group_survey_user",1,1,1,1
+"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
+"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
+"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
+"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
+"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
+"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
+"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
+"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
+"access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,0,0,0
+"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
 "access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_survey_manager",1,1,1,1
-"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_survey_user",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_user",1,1,1,1
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
@@ -38,7 +38,7 @@
 "access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
 "access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_survey_manager",1,0,0,0
+"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,0,0,0
 "access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
 "access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
 "access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 8c50d72496c..7172fdf615e 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -11,10 +11,10 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index f45eab0bf9d..890d674a408 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -2,15 +2,15 @@
 <openerp>
     <data>
 
-            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28" groups="base.group_system,base.group_survey_manager,base.group_survey_user"/>
+            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28" groups="base.group_system,base.group_tool_manager,base.group_tool_user"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_survey_manager,base.group_survey_user,base.group_system" sequence="2"/>
+                        groups="base.group_tool_manager,base.group_tool_user,base.group_system" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_survey_manager,base.group_survey_user,base.group_system"
+                 groups="base.group_tool_manager,base.group_tool_user,base.group_system"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
             <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" groups="base.group_survey_manager" sequence="6"/>
+                id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
         <!--
             Survey
@@ -291,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <!--
             Survey Pages
@@ -491,7 +491,7 @@
 
         <menuitem name="Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1116,7 +1116,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <!--
             Survey Type
@@ -1191,7 +1191,7 @@
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
             action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system" icon="STOCK_INDEX"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 1a0da339483..7e02e067f2c 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -35,7 +35,7 @@
 
 		<menuitem name="Browse Answers" id="menu_browse_survey_response"
 			action="action_browse_survey_response" parent="menu_reporting"
-			groups="base.group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
+			groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 719eaa309e8..d9f3ae6fe1e 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -37,7 +37,7 @@
 
         <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
-            groups="base.group_survey_manager" icon="STOCK_PRINT"/>
+            groups="base.group_tool_manager" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index e7a05dff6c4..9a0ea6dd83f 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -37,7 +37,7 @@
 		</record>
 
 		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index abb11336b90..9bd729db010 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -31,7 +31,7 @@
 		</record>
 
 		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 1e5a0e01831..b34d97c6b03 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -100,7 +100,7 @@ class survey_send_invitation(osv.osv_memory):
         survey_ref= self.pool.get('survey')
 
         model_data_obj = self.pool.get('ir.model.data')
-        group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user')
+        group_id = model_data_obj._get_id(cr, uid, 'survey', 'base.group_tool_user')
         group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id
 
         act_id = self.pool.get('ir.actions.act_window')
diff --git a/addons/thunderbird/__init__.py b/addons/thunderbird/__init__.py
index 4ab5861f126..68afc0cccf9 100644
--- a/addons/thunderbird/__init__.py
+++ b/addons/thunderbird/__init__.py
@@ -1,50 +1,23 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
-##############################################################################
-#
-# Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
 
 import partner
 import installer
diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 4c2820c78e2..ed16b4909a9 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,11 @@
 {
     "name" : "Thunderbird Interface",
     "version" : "1.0",
-    "author" : "Axelor",
-    "website" : "http://www.axelor.com/",
-    "depends" : ["base"],
+    "author" : "OpenERP SA & Axelor",
+    "website" : "http://www.openerp.com/",
+    "depends" : ["base","mail_gateway"],
     "category" : "Generic Modules/Thunderbird interface",
-    "description": '''
+    "description": """
       This module is required for the thuderbird plug-in to work
       properly.
 
@@ -35,8 +35,7 @@
       a project, an analytical account, or any other object and attach selected
       mail as .eml file in attachment of selected record.
 
-      You can create new case in crm using Create Case button.
-      Select a section for which you want to create case.''',
+      """,
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : ['thunderbird_installer.xml',
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 82ea1c3042f..cbe1db8df2d 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -24,6 +24,7 @@ from osv import osv
 from tools import config
 
 import base64
+import addons
 
 class thunderbird_installer(osv.osv_memory):
     _name = 'thunderbird.installer'
@@ -31,9 +32,9 @@ class thunderbird_installer(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(thunderbird_installer, self).default_get(cr, uid, fields, context)
-        pdf_file = open(config['addons_path'] + "/thunderbird/doc/Installation Guide to OpenERP Thunderbid Plug-in.pdf", 'r')
+        pdf_file = open(addons.get_module_resource('thunderbird','doc', 'Installation Guide to OpenERP Thunderbid Plug-in.pdf'),'rb')
         data['pdf_file'] = base64.encodestring(pdf_file.read())
-        file = open(config['addons_path'] + "/thunderbird/plugin/tiny_plugin-2.0.xpi", 'r')
+        file = open(addons.get_module_resource('thunderbird','plugin', 'openerp_plugin.xpi'),'rb')
         data['plugin_file'] = base64.encodestring(file.read())
         return data
 
@@ -48,9 +49,23 @@ class thunderbird_installer(osv.osv_memory):
 
     _defaults = {
         'thunderbird' : True,
-        'name' : 'OpenERP_plugin-2.0.xpi',
+        'name' : 'openerp_plugin.xpi',
         'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf',
-        'description' : """ * Save the Thunderbird plug­in. \n * Follows the step to install Thunderbird plug­in. \n -> 1.From Menu Bar of Thunderbird, open Tools ­> Add ons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled \n -> 5. Click "Install Now". \n -> 6. Restart Thunderbird. \n Follow the steps to configure OpenERP in Thunderbird. \n -> 1. Go to Tools > OpenERP Synchronization. \n -> 2. Check  data (configured by default) \n -> 3. Click Test  Connection. \n -> 4. A message appears with state of your connection. \n -> 5. If your connection failed, check if your database is open, and check your data. \n -> 6. If you have a good connection, click Ok and start to archive mail in OpenERP. """
-        }
+        'description' : """* Save the Thunderbird plug­in.
+* Follows the following step to install Thunderbird plug­in.
+    1. From Menu Bar of Thunderbird, open Tools ­> Add ons.
+    2. Click on install button and a browser window appears.
+    3. Select the plug-in(.xpi file) and click Ok.
+    4. Software installation window appears and within a short time “Install Now” button will be enabled.
+    5. Click "Install Now".
+    6. Restart Thunderbird.
+* Follow the steps to configure OpenERP in Thunderbird. 
+    1. Go to Tools > OpenERP Synchronization. 
+    2. Check  data (configured by default).
+    3. Click "Connect". 
+    4. A message appears with state of your connection.
+    5. If your connection failed, check if your database is open, and check your data.
+    6. If you have a good connection, you can start to archive mail in OpenERP. """
+    }
 
 thunderbird_installer()
diff --git a/addons/thunderbird/partner/__init__.py b/addons/thunderbird/partner/__init__.py
index 5b7582a98f0..8eee7a82e06 100644
--- a/addons/thunderbird/partner/__init__.py
+++ b/addons/thunderbird/partner/__init__.py
@@ -1,50 +1,23 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ##############################################################################
-##############################################################################
-#
-# Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
 
 import partner
 
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 08ed6dd5262..4e5baf25904 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -1,219 +1,301 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-##############################################################################
-#
-# Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import time
-import ir
-from osv import osv,fields
-import base64
-import netsvc
-from tools.translate import _
-
-class tinythunderbird_partner(osv.osv):
-
-    def _links_get(self, cr, uid, context={}):
-        obj = self.pool.get('res.request.link')
-        ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['object', 'name'], context)
-
-        return [(r['object'], r['name']) for r in res]
-
-    _name = "tinythunderbird.partner"
-    _description="Thunderbid mails"
-    _rec_name="sender"
-    _columns = {
-                'sender':fields.char("Sender",size=128,required=True,select=True),
-                'receiver':fields.text("Receiver"),
-                "copy_to":fields.text("Copy To"),
-                "date":fields.date("Date",select=True),
-                "title":fields.char("Subject",size=128,select=True),
-                "description":fields.text("Description"),
-                "reference":fields.reference("Reference", selection=_links_get, size=128),
-                "res_user_id":fields.many2one("res.users","User"),
-                "attachments":fields.text("Attached Files",readonly=True),
-                }
-    _defaults = {
-                 'res_user_id':lambda obj,cr,uid,context: uid,
-                 'date': lambda *a: time.strftime('%Y-%m-%d')
-                 }
-
-    def thunderbird_mailcreate(self,cr,user,vals):
-        dictcreate = dict(vals)
-        import email
-        header_name = email.Header.decode_header(dictcreate['name'])
-        dictcreate['name'] = header_name and header_name[0] and header_name[0][0] 
-        add_obj=self.pool.get('res.partner.address')
-        case_pool=self.pool.get(dictcreate.get('object','crm.case'))
-        partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
-        partner=add_obj.read(cr,user,partner_ids,['partner_id'])
-        if partner and partner[0] and partner[0]['partner_id']:
-            dictcreate.update({'partner_id':partner[0]['partner_id'][0]})
-        create_id = case_pool.create(cr, user, dictcreate)
-        cases=case_pool.browse(cr,user,[create_id])
-        case_pool._history(cr, user, cases, _('Archive'), history=True, email=False)
-        return create_id
-
-    def thunderbird_createcontact(self,cr,user,vals):
-        dictcreate = dict(vals)
-        create_id = self.pool.get('res.partner.address').create(cr, user, dictcreate)
-        return create_id
-
-    def thunderbird_createpartner(self,cr,user,vals):
-        dictcreate = dict(vals)
-        address_obj = self.pool.get('res.partner')
-        search_id = address_obj.search(cr, user,[('name','=',dictcreate['name'])])
-        if search_id:
-            return 0
-        create_id = address_obj.create(cr, user, dictcreate)
-        return create_id
-
-    def thunderbird_searchobject(self,cr,user,vals):
-        dictcreate = dict(vals)
-        search_id = self.pool.get('ir.model').search(cr, user,[('model','=',dictcreate['model'])])
-        return (search_id and search_id[0]) or 0
-
-    def thunderbird_searchcontact(self,cr,user,vals):
-        address_obj = self.pool.get('res.partner.address')
-        search_id1 = address_obj.search(cr,user,[('name','ilike',vals)])
-        search_id2 = address_obj.search(cr,user,[('email','=',vals)])
-        if search_id1:
-            return address_obj.name_get(cr, user, search_id1)
-        elif search_id2:
-            return address_obj.name_get(cr, user, search_id2)
-        return []
-
-    def thunderbird_tempsearch(self,cr,user,vals):
-        if vals[0]:
-            value = vals[0][0]
-        if vals[1]:
-            obj = vals[1];
-        name_get=[]
-        er_val=[]
-        for object in obj:
-            dyn_object = self.pool.get(object)
-            if object == 'res.partner.address':
-                search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
-                search_id2 = dyn_object.search(cr,user,[('email','=',value)])
-                if search_id1:
-                    name_get.append(object)
-                    name_get.append(dyn_object.name_get(cr, user, search_id1))
-                elif search_id2:
-                    name_get.append(object)
-                    name_get.append(dyn_object.name_get(cr, user, search_id2))
-            else:
-                try:
-                    search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
-                    if search_id1:
-                        name_get.append(object)
-                        name_get.append(dyn_object.name_get(cr, user, search_id1))
-                except:
-                    er_val.append(object)
-                    continue
-        if len(er_val) > 0:
-            name_get.append('error')
-            name_get.append(er_val)
-        return name_get
-
-    def thunderbird_attachment(self,cr,user,vals):
-        dictcreate = dict(vals)
-        datas = [dictcreate['datas']]
-        name = [dictcreate['name']]
-        f_name = [dictcreate['datas_fname']]
-        if(dictcreate['datas'].__contains__(',')):
-            name = dictcreate['name'].split(',')
-            datas = dictcreate['datas'].split(',')
-            f_name = dictcreate['datas_fname'].split(',')
-        for i in range(0,datas.__len__()):
-            dictcreate['name'] = name[i]
-            dictcreate['datas'] = datas[i]
-            dictcreate['datas_fname'] = f_name[i]
-            create_id = self.pool.get('ir.attachment').create(cr,user,dictcreate)
-        return 0
-
-    def thunderbird_login(self,cr,user,vals):
-        dictcreate = dict(vals)
-        service = netsvc.LocalService('common')
-        res = service.login(dictcreate['db'],dictcreate['login'],dictcreate['passwd'])
-        return res or 0
-
-    def read(self, cr, user, ids, fields=None, context={}, load='_classic_read'):
-         ret_read = super(tinythunderbird_partner, self).read(cr, user, ids,fields,context,load)
-         attach_obj = self.pool.get('ir.attachment')
-         for read_data in ret_read:
-             attachments = attach_obj.search(cr,user,[('res_model','=',self._name),('res_id','=',read_data['id'])])
-             attechments_data = sattach_obj.read(cr,user,attachments,['name'])
-             file_names = [a['name'] for a in attechments_data]
-             text_atteched = '\n'.join(file_names)
-             read_data['attachments'] = text_atteched
-         return ret_read
-
-    def unlink(self, cr, uid, ids, context={}):
-        attach_obj = self.pool.get('ir.attachment')
-        attachments = attach_obj.search(cr,uid,[('res_model','=',self._name),('res_id','in',ids)])
-        attach_obj.unlink(cr,uid,attachments)
-        return super(tinythunderbird_partner, self).unlink(cr, uid, ids,context)
-
-    def thunderbird_objectsearch(self,cr,user,vals):
-        obj_list= [('crm.claim', 'Claim'), ('crm.lead','Lead'), ('crm.meeting','Metting'), ('crm.opportunity','Opportunity'), ('crm.phonecall','Phonecall'), ('crm.fundraising','Fund raising'), ('crm.helpdesk','Helpdesk')]
-        object=[]
-        model_obj = self.pool.get('ir.model')
-        for obj in obj_list:
-            if model_obj.search(cr, user, [('model', '=', obj[0])]):
-                object.append(obj)
-        return object
-
-    def thunderbird_list_search_object(self,cr,user,vals):
-        model_obj = self.pool.get('ir.model')
-        object=''
-        for obj in vals[0][1].split(','):
-            if model_obj.search(cr, user, [('model', '=', obj)]):
-                object += obj + ","
-            else:
-                object += "null,"
-        return object
-
-tinythunderbird_partner()
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 time
+import ir
+from osv import osv,fields
+import base64
+import netsvc
+from tools.translate import _
+import email
+import tools
+import binascii
+class email_server_tools(osv.osv_memory):
+    _inherit = "email.server.tools"
+    def history_message(self, cr, uid, model, res_id, message):
+        #@param message: string of mail which is read from EML File
+        attachment_pool = self.pool.get('ir.attachment')
+        msg = self.parse_message(message)
+        attachments = msg.get('attachments', [])
+        att_ids = []
+        for attachment in attachments:
+            data_attach = {
+                'name': attachment,
+                'datas': binascii.b2a_base64(str(attachments.get(attachment))),
+                'datas_fname': attachment,
+                'description': 'Mail attachment From Thunderbird msg_id: %s' %(msg.get('message_id', '')),
+                'res_model': model,
+                'res_id': res_id,
+            }
+            att_ids.append(attachment_pool.create(cr, uid, data_attach))
+        return self.history(cr, uid, model, res_id, msg, att_ids)
+
+    def parse_message(self, message):
+        #TOCHECK: put this function in mailgateway
+        msg_txt = email.message_from_string(message)
+        message_id = msg_txt.get('message-id', False)
+        msg = {}
+        msg_txt = email.message_from_string(message)
+        fields = msg_txt.keys()
+        msg['id'] = message_id
+        msg['message-id'] = message_id
+
+        if 'Subject' in fields:
+            msg['subject'] = self._decode_header(msg_txt.get('Subject'))
+
+        if 'Content-Type' in fields:
+            msg['content-type'] = msg_txt.get('Content-Type')
+
+        if 'From' in fields:
+            msg['from'] = self._decode_header(msg_txt.get('From'))
+
+        if 'Delivered-To' in fields:
+            msg['to'] = self._decode_header(msg_txt.get('Delivered-To'))
+
+        if 'CC' in fields:
+            msg['cc'] = self._decode_header(msg_txt.get('CC'))
+
+        if 'Reply-to' in fields:
+            msg['reply'] = self._decode_header(msg_txt.get('Reply-To'))
+
+        if 'Date' in fields:
+            msg['date'] = self._decode_header(msg_txt.get('Date'))
+
+        if 'Content-Transfer-Encoding' in fields:
+            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
+
+        if 'References' in fields:
+            msg['references'] = msg_txt.get('References')
+
+        if 'In-Reply-To' in fields:
+            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
+
+        if 'X-Priority' in fields:
+            msg['priority'] = msg_txt.get('X-Priority', '3 (Normal)').split(' ')[0]
+
+        if not msg_txt.is_multipart() or 'text/plain' in msg.get('Content-Type', ''):
+            encoding = msg_txt.get_content_charset()
+            body = msg_txt.get_payload(decode=True)
+            msg['body'] = tools.ustr(body, encoding)
+
+        attachments = {}
+        has_plain_text = False
+        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
+            body = ""
+            for part in msg_txt.walk():
+                if part.get_content_maintype() == 'multipart':
+                    continue
+
+                encoding = part.get_content_charset()
+                filename = part.get_filename()
+                if part.get_content_maintype()=='text':
+                    content = part.get_payload(decode=True)
+                    if filename:
+                        attachments[filename] = content
+                    elif not has_plain_text:
+                        # main content parts should have 'text' maintype
+                        # and no filename. we ignore the html part if
+                        # there is already a plaintext part without filename,
+                        # because presumably these are alternatives.
+                        content = tools.ustr(content, encoding)
+                        if part.get_content_subtype() == 'html':
+                            body = tools.ustr(tools.html2plaintext(content))
+                        elif part.get_content_subtype() == 'plain':
+                            body = content
+                            has_plain_text = True
+                elif part.get_content_maintype() in ('application', 'image'):
+                    if filename :
+                        attachments[filename] = part.get_payload(decode=True)
+                    else:
+                        res = part.get_payload(decode=True)
+                        body += tools.ustr(res, encoding)
+
+            msg['body'] = body
+            msg['attachments'] = attachments
+        return msg
+email_server_tools()
+
+class thunderbird_partner(osv.osv_memory):
+    _name = "thunderbird.partner"
+    _description="Thunderbid mails"
+
+    def create_contact(self,cr,user,vals):
+        dictcreate = dict(vals)
+        if not eval(dictcreate.get('partner_id')):
+            dictcreate.update({'partner_id': False})
+        create_id = self.pool.get('res.partner.address').create(cr, user, dictcreate)
+        return create_id
+
+    def history_message(self,cr,uid,vals):
+        dictcreate = dict(vals)
+        server_tools_pool = self.pool.get('email.server.tools')
+        res_id = int(dictcreate.get('res_id'))
+        model = str(dictcreate.get('model'))
+        message = str(dictcreate.get('message'))
+        server_tools_pool.history_message(cr,uid,model,res_id,message)
+        return True
+
+    def process_email(self,cr,uid,vals):
+        dictcreate = dict(vals)
+        model = str(dictcreate.get('model'))
+        message = str(dictcreate.get('message'))
+        return self.pool.get('email.server.tools').process_email(cr, uid, model, message, attach=True, context=None)
+
+    def search_contact(self, cr, user, vals):
+        address_obj = self.pool.get('res.partner.address')
+        partner = address_obj.search(cr, user,[('email','=',vals)])
+        res = {}
+        res1 = {}
+
+        if not partner:
+            res1 = {
+                'email': '',
+                    }
+            return res1.items()
+
+        if partner:
+            partner=partner[0]
+            data = address_obj.read(cr,user, partner)
+            res = {
+                'partner_name': data['partner_id'] and data['partner_id'][1] or '',
+                'contactname': data['name'] or '',
+                'street': data['street'] or '',
+                'street2': data['street2'] or '',
+                'zip': data['zip'] or '',
+                'city': data['city'] or '',
+                'country': data['country_id'] and data['country_id'][1] or '',
+                'state': data['state_id'] and data['state_id'][1] or '',
+                'email': data['email'] or '',
+                'phone': data['phone'] or '',
+                'mobile': data['mobile'] or '',
+                'fax': data['fax'] or '',
+                'res_id': str(partner),
+            }
+        return res.items()
+
+    def update_contact(self,cr,user,vals):
+        dictcreate = dict(vals)
+        res_id = dictcreate.get('res_id',False)
+        result={}
+
+        if not (dictcreate.get('partner_id')):
+            dictcreate.update({'partner_id': False})
+            create_id = self.pool.get('res.partner.address').create(cr, user, dictcreate)
+            return create_id
+
+        if res_id:
+            address_obj = self.pool.get('res.partner.address')
+            address_data = address_obj.read(cr, user, int(res_id), [])
+            result={           'partner_id': address_data['partner_id'] and address_data['partner_id'][0] or False,
+                               'country_id': dictcreate['country_id'] and int(dictcreate['country_id'][0]) or False,
+                               'state_id': dictcreate['state_id'] and int(dictcreate['state_id'][0]) or False,
+                               'name': dictcreate['name'],
+                               'street': dictcreate['street'],
+                               'street2': dictcreate['street2'],
+                               'zip': dictcreate['zip'],
+                               'city': dictcreate['city'],
+                               'phone': dictcreate['phone'],
+                               'fax': dictcreate['fax'],
+                               'mobile': dictcreate['mobile'],
+                               'email': dictcreate['email'],
+                               }
+        address_obj.write(cr, user,int(res_id),result )
+        return True
+
+    def create_partner(self,cr,user,vals):
+        dictcreate = dict(vals)
+        partner_obj = self.pool.get('res.partner')
+        search_id =  partner_obj.search(cr, user,[('name','=',dictcreate['name'])])
+        if search_id:
+            return 0
+        create_id =  partner_obj.create(cr, user, dictcreate)
+        return create_id
+
+    def search_document(self,cr,user,vals):
+        dictcreate = dict(vals)
+        search_id = self.pool.get('ir.model').search(cr, user,[('model','=',dictcreate['model'])])
+        return (search_id and search_id[0]) or 0
+
+    def search_checkbox(self,cr,user,vals):
+        if vals[0]:
+            value = vals[0][0]
+        if vals[1]:
+            obj = vals[1];
+        name_get=[]
+        er_val=[]
+        for object in obj:
+            dyn_object = self.pool.get(object)
+            if object == 'res.partner.address':
+                search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
+                search_id2 = dyn_object.search(cr,user,[('email','=',value)])
+                if search_id1:
+                    name_get.append(object)
+                    name_get.append(dyn_object.name_get(cr, user, search_id1))
+                elif search_id2:
+                    name_get.append(object)
+                    name_get.append(dyn_object.name_get(cr, user, search_id2))
+            else:
+                try:
+                    search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
+                    if search_id1:
+                        name_get.append(object)
+                        name_get.append(dyn_object.name_get(cr, user, search_id1))
+                except:
+                    er_val.append(object)
+                    continue
+        if len(er_val) > 0:
+            name_get.append('error')
+            name_get.append(er_val)
+        return name_get
+
+
+
+    def list_alldocument(self,cr,user,vals):
+        obj_list= [('crm.lead','Lead'),('project.issue','Project Issue'), ('hr.applicant','HR Recruitment')]
+        object=[]
+        model_obj = self.pool.get('ir.model')
+        for obj in obj_list:
+            if model_obj.search(cr, user, [('model', '=', obj[0])]):
+                object.append(obj)
+        return object
+
+    def list_allcountry(self,cr,user,vals):
+        country_list = []
+        cr.execute("SELECT id, name from res_country")
+        country_list = cr.fetchall()
+        return country_list
+
+    def list_allstate(self,cr,user,vals):
+        cr.execute("SELECT id, name from res_country_state")
+        state_country_list = cr.fetchall()
+        return state_country_list
+
+    def search_document_attachment(self,cr,user,vals):
+        model_obj = self.pool.get('ir.model')
+        object=''
+        for obj in vals[0][1].split(','):
+            if model_obj.search(cr, user, [('model', '=', obj)]):
+                object += obj + ","
+            else:
+                object += "null,"
+        return object
+
+thunderbird_partner()
diff --git a/addons/thunderbird/plugin/chrome.manifest b/addons/thunderbird/plugin/chrome.manifest
new file mode 100755
index 00000000000..5fa9c2f5754
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome.manifest
@@ -0,0 +1,5 @@
+content	openerp_plugin	jar:chrome/openerp_plugin.jar!/content/
+overlay	chrome://messenger/content/messenger.xul	chrome://openerp_plugin/content/overlay.xul
+locale	openerp_plugin	en-US	jar:chrome/openerp_plugin.jar!/locale/en-US/
+skin	openerp_plugin	classic/1.0 jar:chrome/openerp_plugin.jar!/skin/
+#style	chrome://global/content/customizeToolbar.xul	chrome://openerp_plugin/skin/overlay.css
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/chrome/openerp_plugin.jar
new file mode 100644
index 00000000000..986c9fa7551
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul
new file mode 100644
index 00000000000..2d6f0e2dec1
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/address.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.createContactAddress()" height="380" width="800">
+
+<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">
+     <hbox>
+        <label  align="right" id="emailid"  value="&emailid.value;" width="94" />
+		 <textbox id="txtemail" width="268" align="right"/>
+         <spacer width="5"/>
+          <button label="&create.label;" accesskey="r" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+         <button label="&bsearch.label;" oncommand="searchContactdetail();" image="&imagesearch.value;"/>
+	</hbox>
+	<hbox>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
+		<textbox id="txtname" align="right" width="270" readonly="true"/>
+        <spacer width="5"/>
+         <button label="New Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);" width="133"/>
+	</hbox>
+   </groupbox>
+</tabpanel>
+
+<tabpanel id="address">
+  <groupbox id="address">
+    <hbox>
+        <caption label="&postaladdress.value;" />
+        <spacer width="300"/>
+     <vbox>
+        <caption label="&communication.value;" />
+     </vbox>
+    </hbox>
+
+     <hbox>
+        <label  align="right" id="contactname"  value="&contactname.value;" width="80" />
+		<textbox id="txtcontactname" align="right" width="270" />
+        <spacer width="33"/>
+        <vbox>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtoffice" />
+        </vbox>
+	</hbox>
+    
+    <hbox>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
+		<textbox id="txtstreet" width="270"/>
+        <spacer width="33"/>
+        <vbox>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtmobile"/>
+        </vbox>
+	</hbox>
+    <hbox>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
+		<textbox id="txtstreet2" width="270"/>
+        <spacer width="35"/>
+        <vbox>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtfax" />
+        </vbox>
+	</hbox>
+
+     <hbox>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
+		<textbox id="txtzip" />
+        <spacer width="115"/>
+	</hbox>
+ 
+    <hbox>
+        <label  align="right" id="city"  value="&city.value;" width="97" />
+		<textbox id="txtcity" />
+    </hbox>
+
+    <hbox>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
+         <menulist id="country" width="190">
+           <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>
+</groupbox>
+</tabpanel>
+
+<description></description>
+
+<hbox>
+  <spacer width="600"/>
+    <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+    <button label="&ok.label;" image="&imageok.value;" oncommand="UpdateContact();"/>
+ 
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.js
new file mode 100755
index 00000000000..5757897de96
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.js
@@ -0,0 +1,163 @@
+
+function config_close()
+{
+	//window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    //ksa
+   window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+	window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
+}
+
+//set the value of the configuration fields
+function config_change_load()
+{
+	var s = getServer();
+	var a =s.split(':');
+	if (String(a)=="" || String(a)=="undefined"){
+		document.getElementById('txtcurl').value = "localhost"
+		document.getElementById('txtcport').value = "8069"
+	}
+	else
+	{
+		len = a[1];
+		var url = "";
+		for (i=0;i<len.length;i++)
+		{	if (len[i] == "/")
+			{
+				continue
+			}
+			url += len[i]
+		}
+		if (String(url) == "" || String(url) == "undefined"){
+			document.getElementById('txtcurl').value = "localhost"
+		}
+		else
+		{
+			document.getElementById('txtcurl').value = url
+		}
+
+		if (String(a[2]) == "" || String(a[2]) == "undefined"){
+			document.getElementById('txtcport').value = "8069"
+			setPort("8069");
+		}
+		else
+		{
+			document.getElementById('txtcport').value = a[2]
+			setPort(a[2]);
+		}
+
+	}
+}
+function config_ok()
+{
+	if (document.getElementById('txtcurl').value == '')
+	{
+        alert("You Must Enter Server Name!")
+		return false;
+      
+	}
+	if (document.getElementById('txtcport').value == '')
+	{
+		alert("You Must Enter Port!")
+		return false;
+	}
+	setServer("http://"+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
+	window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    //ksa
+    window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
+}
+function openConfigChange()
+{
+	//window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    //ksa
+    window.close("chrome://openerp_plugin/content/config.xul", "", "chrome");
+    window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+}
+
+function appendDbList()
+{
+	setServerService('xmlrpc/db');
+	getDbList('DBlist');
+}
+
+//set the database list in the listbox in configuration window
+function setDb()
+{
+	var cmbDbList = document.getElementById('listDBListBox');
+	document.getElementById('DBlist').value = cmbDbList.getItemAtIndex(cmbDbList.selectedIndex).value;
+}
+
+//stores the value of configuration fields in preferences
+function okClick()
+{
+	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') != null)
+	{
+		setDbName(document.getElementById('DBlist').value);
+	}
+	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);
+	window.close();
+}
+
+//deletes the value of the selected value in the listbox in configuraton menu
+function deleteDocument(){
+	if(document.getElementById("listObjectListBox").selectedItem){
+		var objectlist = getPref().getCharPref("object").split(',');
+		var imagelist = getPref().getCharPref("imagename").split(',');
+		var objlist = getPref().getCharPref("listobject").split(',');
+		if(objectlist.length>0){
+			var objectcharpref = '';
+			var imagecharpref = '';
+			var objcharpref = '';
+			var nodelist = document.getElementById("listObjectListBox").selectedItem.childNodes
+			var childnode = document.getElementById("listObjectListBox").childNodes
+			for(i=2;i<childnode.length;i++){
+				if(childnode[i].hasChildNodes){
+					var secondchild = childnode[i].childNodes;
+					if (secondchild[1].getAttribute("label") != nodelist[1].getAttribute("label")){
+						objcharpref += secondchild[0].getAttribute("label")+',';
+						objectcharpref += secondchild[1].getAttribute("label")+',';
+						imagecharpref += secondchild[2].getAttribute("image")+',';
+					}
+				}
+			}
+			var demo3 = objectcharpref.substring(0,objectcharpref.length-1);
+			var demo4 = imagecharpref.substring(0,imagecharpref.length-1);
+			var demo5 = objcharpref.substring(0,objcharpref.length-1);
+
+			getPref().setCharPref("listobject",demo5);
+			getPref().setCharPref("object",demo3);
+			getPref().setCharPref("imagename",demo4);
+		}
+		document.getElementById("listObjectListBox").removeItemAt(document.getElementById("listObjectListBox").selectedIndex)
+	}
+	else{
+		alert("No Document Selected");
+	}
+}
+
+//function to add the image file for the checkbox
+function addFile(){
+	var nsIFilePicker = Components.interfaces.nsIFilePicker;
+	var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+	fp.init(this, "Select a File", nsIFilePicker.modeOpen);
+	fp.appendFilters(nsIFilePicker.filterImages);
+	var res = fp.show();
+	if (res == nsIFilePicker.returnOK){
+	  var thefile = fp.file;
+	  document.getElementById("txtimagename").value = thefile.path
+	}
+}
+
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.xul
new file mode 100755
index 00000000000..348ef92309a
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.xul
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/config.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.register();"  unload="myPrefObserver.unregister()" height="410" width="900">
+<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/overlay.js"></script>
+<tabbox>
+  <tabs>
+    <tab label="Configuration Settings"/>
+    <tab label="Document Settings"/>
+    <tab label="About"/>
+  </tabs>
+  <tabpanels>
+    <tabpanel id="configtab">
+    	<vbox >
+	      	<groupbox id="gpConnection" width="770" height="300" align ="center" >
+			  <caption label="&gpConnection.label;"/>
+				<hbox>
+					<label  align="right" id="url"  value="&txturl.label;" width="80" />
+					<textbox id="txturl" width="200" readonly="true" />
+					<button label="&getdblist.label;" oncommand="openConfigChange();" image="&imagesearch.value;" width="90"/>
+				</hbox>
+				<hbox align="center" id="database_option">
+				</hbox>
+				<hbox id="first">
+					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/> 
+					<textbox id="DBlist_text" width="300"/>
+				</hbox>
+
+				<hbox >
+					<label align="right"  control="txtusername" value="&username.label;" width="80"/>
+					<textbox id="txtusername" width="300"/>
+				</hbox>
+				<hbox>
+					<label align="right" control="txtpassword" value="&password.label;" width="80"/>
+					<textbox id="txtpassword" type="password" width="300"/>
+				</hbox>
+				<hbox >
+					<spacer width="290"/>
+					<button align="center" id="btconnection" label="&connection.label;" oncommand="testConnection();" image="&imageok.value;" width="100"/>
+				</hbox>
+			</groupbox>
+		</vbox>
+    </tabpanel>
+    <tabpanel id="objecttab">
+		<groupbox id="gpObject" width="700" >
+		<caption label="&listDocument.header;"/>
+			<hbox>
+				<vbox>
+					<hbox>
+						<label control="txtobject" value="Title : " />
+						<textbox id="txtobj" width="100"/>
+						<label control="txtobject" value="&document.label;"/>
+						<textbox id="txtobject" width="100"/>
+						<label control="txtimagename" value="&image.label;"/>
+						<textbox id="txtimagename" width="100" readonly="true" />
+						<button id="btaddfile" label="&addfile.label;" oncommand="addFile();" image="&imagemoveleft.value;"/>
+				
+						<button id="btobjectcreate" label="&documentcreate.label;" oncommand="searchDocument();" image="&imagemovedown.value;"/>
+                        <button id="btobjectdelete" label="&documentdelete.label;" oncommand="deleteDocument();" image="&imagecancel.value;"/>
+					</hbox>
+					
+					<listbox id="listObjectListBox" flex="1" rows="10">
+				        <listhead>
+						<listheader label="Title"/>
+				        	<listheader label="&listDocumentListBox.header;"/>
+				        	<listheader label="Image"/>
+				        </listhead>
+				        <listcols>
+				        	<listcol flex="1"/>
+				        	<listcol flex="2"/>
+				        	<listcol flex="3"/>
+				        </listcols>
+				    </listbox>
+				</vbox>
+				<vbox>
+					<description>       </description>
+				</vbox>
+			</hbox>
+		</groupbox>
+    </tabpanel>
+    <tabpanel id="abouttab">
+		<groupbox id="gpAbout" width="770" align="center">
+			<caption label="&gpAbout.label;"/>
+			<image src="chrome://openerp_plugin/skin/developped_by.png" sizemode="stretch" align="center"/>
+			<description> </description>
+			<description> </description>
+			<description>&develop.value;</description>
+			<description> </description>
+			<description> </description>
+			<description>&information.value;</description>
+			<description><html:a href="&openerp.value;">&openerp.value;</html:a></description>
+			<description><html:a href="&axelor.value;">&axelor.value;</html:a></description>
+			<description><html:a href="&tinyerp.value;">&tinyerp.value;</html:a></description>
+			<description> </description>
+			<description> </description>
+			<description>Copyright © 2006-TODAY OpenERP SA All Rights Reserved.</description>
+			<description>OpenERP is a trademark of the OpenERP SA Company. OpenERP Web is jointly developed by OpenERP SA and Axelor.</description>
+			<description>Licenced under the terms of <html:a href="https://tiny.odoo.com/LICENSE.txt"> OpenERP Public License (OEPL) v1.1 (https://tiny.odoo.com/LICENSE.txt)</html:a> </description>
+		</groupbox>
+    </tabpanel>
+  </tabpanels>
+</tabbox>
+<hbox align="center">
+	<spacer width="800"/>
+	<button label="&close.label;" oncommand="close();" image="&imagecancel.value;"/>
+</hbox>
+</window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config_change.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config_change.xul
new file mode 100644
index 00000000000..1e23652d98b
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config_change.xul
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/config_change.dtd">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml"  onload="config_change_load()"
+	title="Openerp Connection" height="140" width="280">
+<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>
+	<hbox>
+    <spacer width="70"/>
+	<description>Openerp Connection</description>
+    </hbox>
+<groupbox id="gpData" width="200">
+	<hbox >
+		<label id="lblurl" control="txtcurl" value="&lblurl.label;" width="80"/>
+		<textbox id="txtcurl" width="100" />
+	</hbox>
+	<hbox>	
+		<label id="lblport" control="txtcport" value="&lblport.label;" width="80"/>
+		<textbox id="txtcport" width="100" />
+	</hbox>
+    
+</groupbox>
+<hbox align="right">
+	<spacer width="50"/>
+  <button label="Cancel" image="&imagecancel.value;" oncommand="config_close();" />
+  <button label="OK" image="&imageok.value;" oncommand="config_ok()"/>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul
new file mode 100644
index 00000000000..d3d551d63e8
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!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="350" width="780">
+<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">
+    <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;"/>
+	</hbox>
+	<hbox>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
+		<textbox id="txtname" align="right" width="270"/>
+	</hbox>
+    </groupbox>
+    </tabpanel>    
+
+ <tabpanel id="address">
+  <groupbox id="address">
+    <hbox>
+        <caption label="&postaladdress.value;" />
+        <spacer width="300"/>
+     <vbox>
+        <caption label="&communication.value;" />
+     </vbox>
+    </hbox>
+
+     <hbox>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
+		<textbox id="txtstreet" width="270"/>
+        <spacer width="33"/>
+         <vbox>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtoffice" />
+        </vbox>
+	</hbox>
+
+     <hbox>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
+		<textbox id="txtstreet2" width="270"/>
+        <spacer width="35"/>
+        <vbox>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtfax" />
+        </vbox>
+	</hbox>
+   <hbox>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
+		<textbox id="txtzip" />
+        <spacer width="114"/>
+        <vbox>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="48" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtmobile"/>
+        </vbox>
+	</hbox>
+
+     <hbox>
+        <label  align="right" id="city"  value="&city.value;" width="97"/>
+		<textbox id="txtcity" />
+        <spacer width="112"/>
+        <vbox>
+          <label  align="right" id="emailid"  value="&email.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtemail" width="260" />
+        </vbox>
+	</hbox>
+ 
+    <hbox>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
+         <menulist id="country" width="190">
+           <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>
+</groupbox>
+</tabpanel>
+<description></description>
+<hbox>
+  <spacer width="580"/>
+  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+  <button label="&ok.label;" image="&imageok.value;" oncommand="createContact();"/>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/createpartner.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/createpartner.xul
new file mode 100644
index 00000000000..abc23a5b430
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/createpartner.xul
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/createpartner.dtd">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	title="&title.label;" height="100" width="325">
+<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>
+<groupbox id="gpData">
+	<hbox>
+		<description>&name.value;</description>
+		<spacer width="50"/>
+		<textbox id="txtname" align="right" />
+	</hbox>
+</groupbox>
+<description></description>
+<hbox>
+  <spacer width="140"/>
+  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+  <button label="&ok.label;" image="&imageok.value;" oncommand="createPartner();"/>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/exportTools.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/exportTools.js
new file mode 100644
index 00000000000..7da3701b1f3
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/exportTools.js
@@ -0,0 +1,248 @@
+
+var MBstrBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].
+			getService(Components.interfaces.nsIStringBundleService);
+var mboximportbundle = MBstrBundleService.createBundle("chrome://openerp_plugin/locale/mboximport.properties"); 
+
+
+function saveMsgAsEML(msguri,file,append,uriArray,hdrArray,fileArray) {
+	
+    var myEMLlistner = {
+	   
+		scriptStream : null,
+		emailtext : "",
+
+        QueryInterface : function(iid)  {
+                if (iid.equals(Components.interfaces.nsIStreamListener) ||   
+                    iid.equals(Components.interfaces.nsIMsgHeaderSink) ||
+                    iid.equals(Components.interfaces.nsISupports))
+                 return this;
+        
+                throw Components.results.NS_NOINTERFACE;
+                return 0;
+        },
+        
+        onStartRequest : function (aRequest, aContext) { 
+			this.scriptStream = Components.classes['@mozilla.org/binaryinputstream;1'].createInstance(Components.interfaces.nsIBinaryInputStream);
+        },
+            
+        onStopRequest : function (aRequest, aContext, aStatusCode) {
+			this.scriptStream = null;
+						
+			if (append) {
+				if (this.emailtext != "") {
+					var data = this.emailtext + "\n";
+					// Some Imap servers don't add to the message the "From" prologue
+					if (data && ! data.match(/^From/)) {
+						var now = new Date;
+						var prologue = "From - " + now.toString() + "\n";
+						data = prologue+data;
+					}
+					data = IETescapeBeginningFrom(data);
+				}
+				var fileClone = file.clone();
+				IETwriteDataOnDisk(fileClone,data,true,this.sub,null);
+			}
+			else {
+				if (! hdrArray)
+					var sub = getSubjectForHdr(hdr);
+				else {
+					var parts = hdrArray[IETexported].split("§][§^^§");
+					var sub = parts[4];
+				}
+			
+				var data = this.emailtext.replace(/^From.+\r?\n]/, "");
+				data = IETescapeBeginningFrom(data);
+				var clone = file.clone();
+				// The name is taken from the subject "corrected"
+				clone.append(sub+".eml");
+				clone.createUnique(0,0644);
+				var time = (hdr.dateInSeconds)*1000;
+				IETwriteDataOnDisk(clone,data,false,null,time);
+			}
+			IETexported = IETexported + 1;
+			IETwritestatus(mboximportbundle.GetStringFromName("exported")+" "+IETexported+" "+mboximportbundle.GetStringFromName("msgs")+" "+IETtotal);
+			
+			if (IETexported < IETtotal) {
+				if (fileArray) {
+					var nextUri = uriArray[IETexported];
+					var nextFile = fileArray[IETexported];
+				}
+				else if (! hdrArray) {
+					var nextUri = uriArray[IETexported];
+					var nextFile = file;
+				}
+				else {
+					parts = hdrArray[IETexported].split("§][§^^§");
+					var nextUri = parts[5];
+					var nextFile = file;
+				}
+				saveMsgAsEML(nextUri,nextFile,append,uriArray,hdrArray,fileArray);
+			}
+			else {
+				IETexported = 0;
+				IETtotal = 0;
+			}
+		},
+            
+        onDataAvailable : function (aRequest, aContext, aInputStream, aOffset, aCount) {
+			this.scriptStream.setInputStream(aInputStream);
+			var chunk = this.scriptStream.readBytes(aCount);
+           	this.emailtext += chunk;
+	     }        
+        };
+	var mms = messenger.messageServiceFromURI(msguri).QueryInterface(Components.interfaces.nsIMsgMessageService);
+	var hdr = mms.messageURIToMsgHdr(msguri);
+	mms.streamMessage(msguri, myEMLlistner, msgWindow, null, false, null);
+}
+
+
+function nametoascii(str) {
+	if (! gPrefBranch.getBoolPref("mboximport.export.filenames_toascii")) {
+		str = str.replace(/[\x00-\x19]/g,"_");
+		return str.replace(/[\/\\:,<>*\?\"\|]/g,"_");
+	}
+	if (str)
+		str = str.replace(/[^a-zA-Z0-9]/g,"_");
+	else
+		str = "Undefinied_or_empty";
+	return str;
+}
+
+
+function  IETwriteDataOnDisk(file,data,append,name,time) {
+	var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
+		.createInstance(Components.interfaces.nsIFileOutputStream);
+	if (append) {
+		file.append(name);
+		foStream.init(file, 0x02 | 0x08 | 0x10, 0664, 0); // write,  create, append
+	}
+	else 
+		foStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
+	if (data)
+		foStream.write(data,data.length);
+	foStream.close();
+	var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+		.getService(Components.interfaces.nsIPrefBranch);
+	if (time && prefs.getBoolPref("mboximport.export.set_filetime"))
+		file.lastModifiedTime = time;
+}
+
+
+
+function IETescapeBeginningFrom(data) {
+	// Workaround to fix the "From " in beginning line problem in body messages
+	// See https://bugzilla.mozilla.org/show_bug.cgi?id=119441 and
+	// https://bugzilla.mozilla.org/show_bug.cgi?id=194382
+	// TB2 has uncorrect beahviour with html messages
+	// This is not very fine, but I didnt' find anything better...
+	var datacorrected = data.replace(/\nFrom /g, "\n From ");
+	return datacorrected;
+}
+
+
+function getPredefinedFolder(type) {
+	var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+		.getService(Components.interfaces.nsIPrefBranch);
+	// type 0 = folder
+	// type 1 = all messages
+	// type 2 = selected messages
+
+	var use_dir = "mboximport.exportMSG.use_dir";
+
+	var dir_path="";
+	if(navigator.userAgent.indexOf('Linux')!= -1){
+		dir_path ="/tmp"
+	}
+	else if(navigator.userAgent.indexOf('Win')!= -1){
+		dir_path ="C:\\"
+	}
+	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+		dir_path ="/tmp"
+	} 
+	try {
+		var localFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+		localFile.initWithPath(dir_path);
+		return localFile;
+
+	}
+	catch(e) {
+		return null;
+	}
+}
+
+function getSubjectForHdr(hdr) {
+	var emlNameType = gPrefBranch.getIntPref("mboximport.exportEML.filename_format");	
+	var mustcorrectname = gPrefBranch.getBoolPref("mboximport.export.filenames_toascii");
+	var subMaxLen = gPrefBranch.getIntPref("mboximport.subject.max_length")-1;
+	if (hdr.mime2DecodedSubject)
+
+		var subj = hdr.mime2DecodedSubject.substring(0, subMaxLen);
+	else
+		var subj =IETnosub;
+	subj = nametoascii(subj);
+	var dateInSec = hdr.dateInSeconds;
+	var msgDate8601string = dateInSecondsTo8601(dateInSec);
+	var key = hdr.messageKey;
+	if (emlNameType == 2) {
+		var pattern = gPrefBranch.getCharPref("mboximport.export.filename_pattern");
+		pattern = pattern.replace("%s",subj);
+    	pattern = pattern.replace("%k",key);
+		pattern = pattern.replace("%d", msgDate8601string);
+		pattern = pattern.replace(/-%e/g, "");
+		pattern = pattern.replace(/[\x00-\x19]/g,"_");
+		var fname = pattern;
+	}
+	else {
+
+		var fname = msgDate8601string+"-"+subj+"-"+hdr.messageKey;
+	}
+	setFileName(fname)
+	fname = fname.replace(/[\x00-\x19]/g,"_");
+	if (mustcorrectname)
+		fname = nametoascii(fname);
+	else
+		fname = fname.replace(/[\/\\:,<>*\?\"\|]/g,"_");
+	return fname;
+}
+
+function dateInSecondsTo8601(secs) {
+	var addTime = gPrefBranch.getBoolPref("mboximport.export.filenames_addtime");
+	var msgDate = new Date(secs*1000);
+	var msgDate8601 = msgDate.getFullYear();
+	if (msgDate.getMonth() < 9)
+		var month = "0"+(msgDate.getMonth()+1);
+	else
+		var month = msgDate.getMonth()+1;
+	if (msgDate.getDate() < 10)
+		var day = "0"+ msgDate.getDate();
+	else
+		var day = msgDate.getDate();
+	var msgDate8601string = msgDate8601.toString()+month.toString()+day.toString();
+	if (addTime &&  gPrefBranch.getIntPref("mboximport.exportEML.filename_format") == 2) {
+		if (msgDate.getHours() < 10)
+			var hours = "0"+msgDate.getHours();
+		else
+			var hours = msgDate.getHours();
+		if (msgDate.getMinutes() < 10)
+			var min = "0"+msgDate.getMinutes();
+		else
+			var min = msgDate.getMinutes();
+		msgDate8601string += "-"+ hours.toString() + min.toString();
+	}
+	return msgDate8601string;
+}
+
+function IETwritestatus(text) {
+	document.getElementById("statusText").setAttribute("label", text);
+	var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+	var delay = prefs.getIntPref("mboximport.delay.clean_statusbar");
+	if (delay > 0)
+		window.setTimeout(function(){IETdeletestatus(text);}, delay);
+}
+
+function IETdeletestatus(text) {
+	if (document.getElementById("statusText").getAttribute("label") == text)
+		document.getElementById("statusText").setAttribute("label", "");
+}
+
+
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js
new file mode 100755
index 00000000000..93d21f56f5c
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js
@@ -0,0 +1,134 @@
+//gives the preference branch instance
+var preferenceBranch = getPref();
+
+//returns the selected checkbox for searching
+function getnamesearch()
+{
+	var checkboxlist = [];
+	var j=0;
+	var objectlist = preferenceBranch.getCharPref("object").split(',');
+	if (objectlist[0]!=''){
+		for (var i=1;i<=objectlist.length;i++)
+		{
+			if(document.getElementById('cbx'+i) && document.getElementById('cbx'+i).checked == true)
+			{
+				checkboxlist[j] = objectlist[i-1] //document.getElementById('cbx'+i).label;
+				j++;
+			}
+		}
+	}
+	return checkboxlist;
+}
+//function to set the text value for the selected partner for contact creation
+function selectPartner(){
+	if(document.getElementById('listPartnerBox').selectedItem){
+		var listselectedItem = document.getElementById('listPartnerBox').selectedItem;
+		var value = listselectedItem.firstChild.getAttribute('label');
+		setPartnerId(listselectedItem.value);
+		document.getElementById('txtselectpartner').setAttribute('value',value);
+		window.opener.document.getElementById('txtselectpartner').setAttribute('value',value);
+		}
+	else{
+		window.opener.document.getElementById('txtselectpartner').setAttribute('value','');
+	}
+}
+
+//function for the intialization procedure //used while loading and unloading of the window
+var myPrefObserver =
+{
+	//set the intial value of the email for the text field in plugin window and also loads the listbox of objects with image
+	loaddata: function()
+	{	
+		setTimeout("listSearchDocumentAttachment()", 0)
+	},
+
+	//set the initial value of name and email field of create contact window
+	createContact: function()
+	{
+        document.getElementById("txtname").value = getSenderName();
+        document.getElementById("txtemail").value = getSenderEmail();
+        document.getElementById("country").value = getAllCountry();
+        document.getElementById("state").value = getAllState();
+        setPartnerId(0);
+	},
+
+	//sets the value of email information in preferences and adds observer for the window
+	register: function()
+  	{
+	    appendDbList()
+    	preferenceBranch.addObserver("", myPrefObserver, false);
+	    document.getElementById("txturl").value = getServer();
+    	    var s = document.getElementById('txturl').value;
+	    var a =s.split(':');
+	    setPort(a[a.length-1]);
+	    document.getElementById("txtusername").value = getUsername();
+	    document.getElementById("txtpassword").value = getPassword();
+	    document.getElementById("DBlist_text").value = getDbName();
+		if(getPref().getCharPref("object") != ''){
+	    	var objectlist = getPref().getCharPref("object").split(',');
+	    	var imagelist = getPref().getCharPref("imagename").split(',');
+	    	var obj = getPref().getCharPref("listobject").split(',');
+			if(objectlist.length>0){
+				for(i=0;i<objectlist.length;i++){
+					var	listItem = document.createElement("listitem");
+					var listcell1 = document.createElement("listcell");
+					var listcell2 = document.createElement("listcell");
+					var listcell3 = document.createElement("listcell");
+					listcell1.setAttribute("label",obj[i]);
+					listcell2.setAttribute("label",objectlist[i]);
+					listcell3.setAttribute("image",imagelist[i]);
+					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);
+                   
+				}
+			}
+		}
+    },
+
+    createContactAddress: function()
+	{
+	  	document.getElementById("txtname").value = getPartnerName();
+        document.getElementById("txtcontactname").value = getSenderName();
+        document.getElementById("txtstreet").value = getStreet();
+        document.getElementById("txtstreet2").value = getStreet2();
+        document.getElementById("txtzip").value = getZipCode();
+        document.getElementById("txtcity").value = getCity();
+        document.getElementById("txtoffice").value = getOfficenumber();
+        document.getElementById("txtfax").value = getFax();
+        document.getElementById("txtmobile").value = getMobilenumber();
+	    document.getElementById("txtemail").value = getSenderEmail();
+        document.getElementById("country").value =getAllCountry();
+        document.getElementById("state").value = getAllState();
+	},
+
+	//unregistering the window observer
+	unregister: function()
+	{
+		if(!preferenceBranch) return;
+	    preferenceBranch.removeObserver("", myPrefObserver);
+	},
+
+  	observe: function(aSubject, aTopic, aData)
+  	{
+    	if(aTopic != "nsPref:changed") return;
+    	// aSubject is the nsIPrefBranch we're observing (after appropriate QI)
+    	// aData is the name of the pref that's been changed (relative to aSubject)
+    	switch (aData) {
+      		case "serverport":
+        	break;
+      	case "serverurl":
+        	break;
+      	case "serverdbname":
+        	break;
+    	}
+  	},
+}
+
+function runMoreCode() 
+{
+} 
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.js
new file mode 100755
index 00000000000..7d7c9098bce
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.js
@@ -0,0 +1,315 @@
+//global array creation and declaration
+var contentType = new Array();
+var uri = new Array();
+var url = new Array();
+var name = new Array();
+var test = new Array();
+
+var MBstrBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].
+			getService(Components.interfaces.nsIStringBundleService);
+var mboximportbundle = MBstrBundleService.createBundle("chrome://mboximport/locale/mboximport.properties"); 
+//function to get the required details of the selected email
+
+function searchmail()
+{	
+	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
+	}
+	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];
+
+	if(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
+		alert("You must select only one mail to archive");
+		return false
+	}
+
+	//gives the selected email uri
+	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);
+
+	//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;
+
+	//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 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;
+
+	//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()
+		if (getmodule_install() == "no")
+		{
+			alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
+			return false
+		}
+		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+		createInstance(name,test)
+
+	}
+	else
+	{
+			if (getmodule_install() == "no")
+			{
+				alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
+				return false
+			}
+		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+	}
+}
+
+function open_contact()
+{	
+	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(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
+		alert("You must select only one mail For Open Contact Detail");
+		return false
+	}
+
+	//gives the selected email uri
+	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);
+
+	//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
+	setSenderEmail(senderemail);
+	setSenderName(sendername);
+    setPartnerName("");
+    setStreet("");
+    setStreet2("");
+    setZipCode("");
+    setCity("");
+    setOfficenumber("");
+    setFax("");
+    setMobilenumber("");
+
+    if (getmodule_install() == "no")
+	{
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
+		return false
+	}
+	window.open("chrome://openerp_plugin/content/address.xul", "", "chrome, resizable=yes");
+
+}
+
+//function to open the configuration window
+var Config = {
+  onLoad: function() {
+    // initialization code
+    this.initialized = true;
+  },
+
+  onMenuItemCommand: function() {
+    window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
+  }
+};
+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;
+	},
+
+	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;
+	},
+
+	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;
+	},
+
+	onMenuItemCommand: function(){
+       open_contact();
+        searchContact();
+	}
+};
+
+
+//function to open the window for selecting the partner for a new contact creation
+var Select = {
+	onLoad: function(){
+	this.initialized=true;
+	},
+
+	onMenuItemCommand: function(){
+		window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
+	}
+};
+
+var CreatePartner = {
+	onLoad: function(){
+	this.initialized=true;
+	},
+
+	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/chrome/openerp_plugin/content/overlay.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul
new file mode 100755
index 00000000000..c48dc0d70b9
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://openerp_plugin/skin/overlay.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "chrome://openerp_plugin/locale/overlay.dtd">
+<overlay id="tiny-overlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+         xmlns:html="http://www.w3.org/1999/xhtml">
+<script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
+<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>
+
+<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();"/>
+</popup>
+
+<toolbarpalette id="MailToolbarPalette">
+	<toolbarbutton id="GA-button"
+		class="toolbarbutton-1"
+		image="&menuicon.value;"
+		label= "Archive To OpenERP"
+		oncommand="searchmail();" />
+</toolbarpalette> 
+
+<toolbarpalette id="MailToolbarPalette">
+	<toolbarbutton id="GA-button1"
+		class="toolbarbutton-1"
+		image="&partnericon.value;"
+		label= "Open Contact"
+		oncommand="Address.onMenuItemCommand(event);" />
+</toolbarpalette> 
+
+<toolbarpalette id="MailToolbarPalette">
+	<toolbarbutton id="GA-button2"
+		class="toolbarbutton-1"
+		image="&imagearchive.value;"
+		label= "Open Document"
+		oncommand="archivemail();"  />
+</toolbarpalette> 
+
+
+</overlay>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
new file mode 100644
index 00000000000..45c552452bb
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://openerp_plugin/skin/line.css" type="text/css"?>
+<!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="480" width="1000">
+
+<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>
+<script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
+<description></description>
+<hbox id="root">
+   <vbox width="400">
+      <groupbox height="30" id="existsobjectgroup" width="400">
+         <caption label="&gptinyobj.label;" />
+	   <hbox>
+	   <label id="lblsearch" control="txtvalueobj" value="&search.label;"/>
+	   <textbox id="txtvalueobj" size="30"/>
+	   <button label="&bsearch.label;" oncommand="searchCheckbox()" image="&imagesearch.value;" accesskey="s"/> 
+	   </hbox>
+	   <vbox align="left" id="checkbox-dynamic"> 
+	  </vbox> 
+	  <hbox align="center">
+	   <image src='chrome://tiny_plugin/skin/perform.gif'/>
+	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" checked="false"/>
+        <caption label="&cbxselectall.label;" />
+	    <spacer width="10"/>
+      
+	  </hbox>
+    <label id="lblex" value=" "/>
+    <hbox>
+    <description>Documents</description>
+    </hbox>
+	<listbox height="250" id="listSearchBox" seltype="multiple">
+	    <listhead >
+	    	<listheader label="&listSearchBox.header;"/>
+	    </listhead>
+	    <listcols>
+	    	<listcol  flex="1"/>
+	    </listcols>
+	</listbox>
+	<hbox>
+	<spacer width="360"/>
+	<button label="&attach.label;" accesskey="u" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('upload');"/>
+	</hbox>
+      </groupbox>
+
+   </vbox>
+   <vbox>
+      <groupbox id="newobjectgroup" align="center" width="170" height="375">
+	<caption label="&newobject.label;" />
+	<hbox>
+	<label id="lblex" value=" "/>
+         <label id="lblex3" control="section" value="&object.label;"/>
+         <menulist id="section" width="150">
+           <menupopup>
+	     <menuitem label="" value=""/>
+   	    </menupopup>
+      	  </menulist>
+        <vbox>
+      	  <button width="50" label="&archive.label;" accesskey="c" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('create');"/>
+        </vbox>
+	</hbox>
+
+	<label id="lblsection" value=" "/>	
+	<separator class="groove-thin" orient="horizontal" width="180"/>
+
+    
+    <hbox>
+	<label id="lblsection" control="section" value="&partner.label;"/>
+        <vbox>
+	    <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+        </vbox>
+    </hbox>
+  
+ </groupbox>
+  <label id="lblex" value=" "/>
+  <label id="lblex" value=" "/>
+  <hbox align="right">
+  <spacer width="330"/>
+	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+    </hbox>
+    
+  
+  </vbox>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/selectpartner.xul
new file mode 100644
index 00000000000..f0512339a40
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/selectpartner.xul
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/selectpartner.dtd">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml" onload="getPartnerList()"
+	title="&title.label;" height="500" width="375">
+<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>
+<groupbox id="gpPartner">
+	<hbox>
+		<textbox id="txtselectpartner"/>
+		<spacer width="25"/>
+		<button label="&bsearch.label;" image="&imagesearch.value;" oncommand="getPartnerList();"/>
+	</hbox>
+</groupbox>
+<listbox id="listPartnerBox" flex="1" rows="5">
+    <listhead>
+    	<listheader label="&listPartnerName.header;"/>
+    </listhead>
+    <listcols>
+    	<listcol flex="1"/>
+    </listcols>
+</listbox>
+<description></description>
+<hbox>
+  <button label="Create Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
+  <spacer width="45"/>
+  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+  <button label="&select.label;" image="&imageok.value;" oncommand="selectPartner();close()"/>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/static.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/static.js
new file mode 100644
index 00000000000..c44c5bf7bb4
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/static.js
@@ -0,0 +1,19 @@
+
+//function to check all the checkbox
+function selectAllCheckbox()
+{
+	var objectlist = preferenceBranch.getCharPref("object").split(',');
+	if(objectlist.length == 1 && objectlist[0]==''){
+		return false;
+	}
+	for (var i=1;i<=objectlist.length;i++)
+	{
+	 	var checkboxobj = document.getElementById('cbx'+i);
+		if (!checkboxobj)
+			continue
+		if(document.getElementById('cbxselectall').checked == true)
+			checkboxobj.checked = true;
+		else
+		  	checkboxobj.checked = false;
+	}
+}
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
new file mode 100755
index 00000000000..b5057a8cd09
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -0,0 +1,2046 @@
+/**
+* Global instance stored here
+*/
+
+var xmlRpcClient;
+
+//Service name on server like /common,/db etc...
+var strServerService;
+
+//temporary variables
+var strobject;
+
+//Array
+var arrDbList = new Array();
+var arrPartnerList = new Array();
+var arrFinalList = new Array();
+
+
+var contentType = new Array();
+var uri = new Array();
+var url = new Array();
+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;
+
+			}
+		}
+		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'];
+	}
+}
+function handler_function( 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 branchobj = prefService.getBranch("extensions.tiny.");
+    branchobj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+	return branchobj
+}
+
+function setFileName(fname){
+	getPref().setCharPref('fname',fname);
+}
+
+//set attachment file save or not
+function setAttachment(argAttac){
+	getPref().setCharPref('attachment',argAttac);
+}
+
+//set preference value for server url
+function setServer(argServer){
+	getPref().setCharPref('serverurl',argServer);
+}
+
+//set preference value for server port
+function setPort(argPort){
+	getPref().setCharPref('serverport',argPort)
+}
+
+//set preference value of database name for data searching and selection
+function setDbName(argDbName){
+	getPref().setCharPref('serverdbname',argDbName);
+}
+
+//set preference value of username for login
+function setUsername(argUsername){
+	getPref().setCharPref('username',argUsername);
+}
+
+//set preference value of password for login
+function setPassword(argPassword){
+	getPref().setCharPref('password',argPassword);
+}
+
+//set preference value for storing partner id
+function setPartnerId(argPartnerId){
+	getPref().setCharPref('partnerid',argPartnerId)
+}
+
+//set preference value for Resource Id
+function setResourceId(argResourceId){
+    getPref().setCharPref('res_id',argResourceId)
+}
+//set server service
+function setServerService(argServerService){
+	strServerService = argServerService;
+}
+
+//set preference value for sender email
+function setSenderEmail(argSenderEmail){
+	getPref().setCharPref('senderemail',argSenderEmail)
+}
+
+//set preference value for receiver email
+function setReceiverEmail(argReceiverEmail){
+	getPref().setCharPref('receiveremail',argReceiverEmail)
+}
+
+//set preference value for sender name
+function setSenderName(argSenderName){
+    getPref().setCharPref('sendername',argSenderName)
+}
+
+//set preference value for email subject
+function setSubject(argSubject){
+	getPref().setCharPref('subject',argSubject)
+}
+
+//set preference value for email received date
+function setReceivedDate(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)
+}
+
+//set preference value for storing attachment option in config
+function setAttachValue(argAttachValue){
+	getPref().setCharPref('attachvalue',argAttachValue)
+}
+
+//set preference value for email cclist
+function setCCList(argCCList){
+	getPref().setCharPref('cclist',argCCList)
+}
+
+//set preference value for email message body
+function setMessageBody(argMessageBody){
+	getPref().setCharPref('messagebody',argMessageBody)
+}
+
+//set preference value for Partner Name
+function setPartnerName(argPartnerName){
+	getPref().setCharPref('partnername',argPartnerName)
+}
+
+//set preference value for Contact Name
+function setContactName(argContactName){
+	getPref().setCharPref('contactname',argContactName)
+}
+
+//set preference value for street
+function setStreet(argStreet){
+	getPref().setCharPref('street',argStreet)
+}
+
+//set preference value for street2
+function setStreet2(argStreet2){
+	getPref().setCharPref('street2',argStreet2)
+}
+
+//set preference value for zipcode
+function setZipCode(argZipcode){
+	getPref().setCharPref('zipcode',argZipcode)
+}
+
+//set preference value for Office Number
+function setOfficenumber(argOfficenumber){
+	getPref().setCharPref('officeno',argOfficenumber)
+}
+
+//set preference value for Phone Number
+function setMobilenumber(argMobilenumber){
+	getPref().setCharPref('phoneno',argMobilenumber)
+}
+
+//set preference value for Fax
+function setFax(argFax){
+	getPref().setCharPref('fax',argFax)
+}
+
+//set preference value for city
+function setCity(argCity){
+	getPref().setCharPref('city',argCity)
+}
+
+//set preference value for country
+function setCountry(argCountry){
+	getPref().setCharPref('country',argCountry)
+}
+
+//set preference value for state
+function setState(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]);
+}
+
+//set preference value for storing user id
+function setUserId(argUserId){
+	getPref().setIntPref('userid',argUserId);
+}
+
+//set database list is displaye or not
+function setDBList(argDBList){
+	getPref().setCharPref('db_list',argDBList)
+}
+
+//set server connect or not
+function setconnect_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)
+}
+
+//get module install or not
+function getmodule_install(){
+	return getPref().getCharPref('module_install');
+}
+
+
+//get server connect or not
+function getconnect_server(){
+	return getPref().getCharPref('connect_server');
+}
+
+
+//get partner id
+function getPartnerId(){
+	return getPref().getCharPref('partnerid');
+}
+//get database list is displaye or not
+function getDBList(){
+	return getPref().getCharPref('db_list');
+}
+
+function getFileName(){
+	return getPref().getCharPref('fname');
+}
+
+//get attachment save or not
+function getAttachment(){
+	return getPref().getCharPref('attachment');
+}
+
+//get serverurl
+function getServer(){
+	return getPref().getCharPref('serverurl');
+}
+
+//get server port
+function getPort(){
+	return getPref().getCharPref('serverport');
+}
+
+//get database name
+function getDbName(){
+	return getPref().getCharPref('serverdbname');
+}
+
+//get username from config settings
+function getUsername(){
+	return getPref().getCharPref('username');
+}
+
+//get password from config settings
+function getPassword(){
+	return getPref().getCharPref('password');
+}
+
+//get serverservice
+function getServerService(){
+	return strServerService;
+
+}
+
+//get sender email
+function getSenderEmail(){
+	return getPref().getCharPref('senderemail');
+}
+
+//get receiver email
+function getReceiverEmail(){
+	return getPref().getCharPref('receiveremail');
+}
+
+//get resource id
+function getResourceId(){
+	return getPref().getCharPref('res_id');
+}
+
+
+//get sender name
+function getSenderName(){
+        str = getPref().getCharPref('sendername');
+        if(!str.toString().match(/=?utf-8?q?/))
+        {
+            return str;
+        }
+        else
+        {
+
+            string = str.replace(/[\'Š',\'Ž',\'š',\'ž',\'Ÿ',\'À',\'Á',\'Â',\'Ã',\'Ä',\'Å',\'Ç',\'È',\'É',\'Ê',\'Ë',\'Ì',\'Í',\'Î',\'Ï',\'Ñ',\'Ò',\'Ó',\'Ô',\'Õ',\'Ö',\'Ø',\'Ù',\'Ú',\'Û',\'Ü',\'Ý',\'à',\'á',\'â',\'ã',\'ä',\'å',\'ç',\'è',\'é',\'ê',\'ë',\'ì',\'í',\'î',\'ï',\'ñ',\'ò',\'ó',\'ô',\'õ',\'ö',\'ø',\'ù',\'ú',\'û',\'ü',\'ý',\'ÿ',\'Þ',\'þ',\'Ð',\'ð',\'ß',\'Œ',\'œ',\'Æ',\'æ',\'µ']/g,'"',"'",'“','”',"\n","\r",'_/',"'S','Z','s','z','Y','A','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','O','U','U','U','U','Y','a','a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','o','u','u','u','u','y','y','TH','th','DH','dh','ss','OE','oe','AE','ae','u','','','','','','','-'");
+
+            var utftext = "";
+            var encoded_string = "";
+            var convertedString = "";
+		    for (var n = 0; n < string.length; n++)
+            {
+        		var c = string.charCodeAt(n);
+			    if (c < 128) {
+				    utftext += String.fromCharCode(c);
+			    }
+		    }
+
+            encoded_string = encode64(utftext);
+		   return encoded_string;
+        }
+}
+
+//ger partner name
+function getPartnerName(){
+	return getPref().getCharPref('partnername');
+}
+
+//get contact name
+function getContactName(){
+	return getPref().getCharPref('contactname');
+}
+
+
+//get street name
+function getStreet(){
+	return getPref().getCharPref('street');
+}
+
+//get street2 name
+function getStreet2(){
+	return getPref().getCharPref('street2');
+}
+
+//get zip code
+function getZipCode(){
+	return getPref().getCharPref('zipcode');
+}
+
+//get city name
+function getCity(){
+	return getPref().getCharPref('city');
+}
+
+//get country name
+function getCountry(){
+    return getPref().getCharPref('country');
+}
+
+//get state name
+function getState(){
+	return getPref().getCharPref('state');
+}
+
+//get office no
+function getOfficenumber(){
+	return getPref().getCharPref('officeno');
+}
+
+//get mobile no
+function getMobilenumber(){
+	return getPref().getCharPref('phoneno');
+}
+
+//get fax no
+function getFax(){
+	return getPref().getCharPref('fax');
+}
+
+
+//get email subject
+function getSubject(){
+	return getPref().getCharPref('subject');
+}
+
+//get email received date
+function getReceivedDate(){
+	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');
+}
+
+//get attachment option information from the configuration settings
+function getAttachValue(){
+	return getPref().getCharPref('attachvalue');
+}
+
+//get email cclist information
+function getCCList(){
+	return getPref().getCharPref('cclist');
+}
+
+//get email message body
+function getMessageBody(){
+	return getPref().getCharPref('messagebody');
+}
+
+//get the whole server path
+function getServerUrl(){
+	return getServer()+":"+getPort()+"/"+getServerService();
+}
+
+//get user id for the xmlrpc request
+function getUserId(){
+	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);
+}
+
+//returns the xmlrpc client instance
+function getXmlRpc() {
+	if (!xmlRpcClient) {
+		xmlRpcClient = getClient();
+	}
+
+	// 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
+}
+
+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;
+}
+
+//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);
+                // 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);
+                        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 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]));
+					}
+				}
+			}
+		}
+	},
+
+
+	onFault: function (client, ctxt, fault) {
+		
+	},
+
+	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);
+
+	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;
+}
+
+//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);
+                // 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.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) {
+
+	}
+}
+
+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);
+          
+			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) {
+		
+	}
+}
+
+var listAllStateHandler = {
+
+	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);
+			arrPartnerList1[i] = arrDataPair;
+		}
+		if (!context)
+		{
+			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+			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]));
+
+			}
+		}
+	
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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);
+}
+
+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);
+}
+
+function getAllState(){
+	var branchobj = getPref();
+	setServerService('xmlrpc/object');
+	var xmlRpcClient = getXmlRpc();
+	arrPartnerList1 = [];
+	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("state").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;
+}
+
+//function to search and fillup section selection box
+function createMenuItem(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[1]);
+  item.setAttribute("value", aLabel[0]);
+  return item;
+}
+
+
+function listinstallmodule( result ) {
+	if ( rpc.onfault( result ) ) 
+	{ 
+		setmodule_install('no')
+	}
+}
+
+function module_install()
+{
+	setmodule_install("yes")
+	var branchobj = getPref();
+	setServerService('xmlrpc/object');
+	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+	var xmlRpcClient = getXmlRpc();
+	strDbName = branchobj.getCharPref("serverdbname");
+	struid = branchobj.getIntPref('userid');
+	strpass = branchobj.getCharPref("password");
+	strmethod = 'search';
+	strobj = 'thunderbird.partner'; // TOFIX: Find module 'thunderbird' into 'module.module' model.
+	var temp = new Array()
+	server=getServer()
+	port=getPort()
+	basicList=getBasicList()
+	rpc.addserver('object',basicList[3] , basicList[4],'/xmlrpc/object');
+	srcids=rpc.ask( 'object', 'execute', [basicList[0],basicList[1],basicList[2],strobj,strmethod,[]],listinstallmodule)
+}
+
+
+var listSearchContactHandler = {
+	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 strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
+            var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            if(strlSearchResult=="partner_name"){
+                 setPartnerName(strlSearchResultValue);
+                 var t = getPartnerName();}
+
+             if(strlSearchResult=="contactname"){
+                 setSenderName(strlSearchResultValue);
+                 var t = getSenderName();}
+            
+            if(strlSearchResult=="street"){
+                 setStreet(strlSearchResultValue);
+                 var t = getStreet();}
+            
+            if(strlSearchResult=="street2"){
+                 setStreet2(strlSearchResultValue);
+                 var t = getStreet2();}
+            
+            if(strlSearchResult=="zip"){
+                 setZipCode(strlSearchResultValue);
+                 var t = getZipCode();}
+
+            if(strlSearchResult=="city"){
+                 setCity(strlSearchResultValue);
+                 var t = getCity();}
+        
+            if(strlSearchResult=="phone"){
+                 setOfficenumber(strlSearchResultValue);
+                 var t = getOfficenumber();}
+        
+            if(strlSearchResult=="fax"){
+                 setFax(strlSearchResultValue);
+                 var t = getFax();}
+            
+            if(strlSearchResult=="mobile"){
+                 setMobilenumber(strlSearchResultValue);
+                 var t = getMobilenumber();}
+
+           if(strlSearchResult=="email" && strlSearchResultValue!=''){
+                 setSenderEmail(strlSearchResultValue);
+                 var t = getSenderEmail();} 
+    
+            if(strlSearchResult=="res_id"){
+                 setResourceId(strlSearchResultValue);
+                 var t = getResourceId();}
+		}
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+
+}
+var listSearchContactdetailHandler = {
+	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 strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
+            var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            if(strlSearchResult=="email" && strlSearchResultValue=='')
+            {
+                alert("Contact is not Available")
+                document.getElementById("txtemail").value = sendername;
+            } 
+            if(strlSearchResult=="partner_name"){
+                 document.getElementById("txtname").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="contactname"){
+                 document.getElementById("txtcontactname").value =strlSearchResultValue;}
+            
+            if(strlSearchResult=="street"){
+                document.getElementById("txtstreet").value =strlSearchResultValue;}
+            
+            if(strlSearchResult=="street2"){
+                 document.getElementById("txtstreet2").value =strlSearchResultValue;}
+            if(strlSearchResult=="zip"){
+                 document.getElementById("txtzip").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="city"){
+                document.getElementById("txtcity").value =strlSearchResultValue;}
+            if(strlSearchResult=="phone"){
+                 document.getElementById("txtoffice").value =strlSearchResultValue;}
+        
+            if(strlSearchResult=="fax"){
+                 document.getElementById("txtfax").value =strlSearchResultValue;}
+            
+            if(strlSearchResult=="mobile"){
+                 document.getElementById("txtmobile").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="email"&& strlSearchResultValue!=''){
+                document.getElementById("txtemail").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="res_id"){
+                 setResourceId(strlSearchResultValue);
+                 var t = getResourceId();}
+
+		}
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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 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);
+}
+
+//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);
+                // 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 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]
+						}
+					}
+
+					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) {
+
+	},
+
+	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("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 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);
+}
+
+//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);
+                // 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) {
+
+	},
+
+	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);
+}
+//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;
+}
+
+//xmlrpc request handler for creating the record of mail
+var listArchiveHandler = {
+	onResult: function(client, context, result) {
+		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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 + 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
+    }
+}
+function upload_archivemail()
+{
+    list_documents = document.getElementById('listSearchBox')
+    var context = []
+    var cnt = list_documents.selectedCount
+	for(i=0;i<cnt;i++)
+	{	
+        var object = list_documents.getSelectedItem(i);
+		var eml_string = parse_eml();
+        var model = object.label;
+        var res_id = object.value;
+		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,{});
+        var a = ['model', 'res_id','message'];
+	    var b = [model, res_id,eml_string];
+        var arrofarr = dictcontact(a,b)
+        xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+        alert("Mail Archive Successfully");
+      }
+		window.close();
+    
+}
+
+function create_archivemail(){
+	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';
+        var eml_string = parse_eml()
+		var a = ['model', 'message'];
+		var b = [object, eml_string];
+		var arrofarr = dictcontact(a,b);
+		xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+        alert("Mail Archive Successfully");
+		}
+    	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) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+}
+
+var listUpdateContactHandler = {
+	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) {
+
+	},
+
+	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(),getSenderName(),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(),getPartnerName(),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);
+
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+}
+
+
+//function to encode the string into base64
+var base64chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split("");
+function base64_encode (s)
+ {
+   // the result/encrypted string, the padding string, and the pad count
+   var r = ""; var p = ""; var c = s.length % 3;
+
+   // add a right zero pad to make this string a multiple of 3 characters
+   if (c > 0) { for (; c < 3; c++) { p += '='; s += "\0"; } }
+
+   // increment over the length of the string, three characters at a time
+   for (c = 0; c < s.length; c += 3) {
+
+     // we add newlines after every 76 output characters, according to the MIME specs
+     if (c > 0 && (c / 3 * 4) % 76 == 0) { r += "\r\n"; }
+
+     // these three 8-bit (ASCII) characters become one 24-bit number
+     var n = (s.charCodeAt(c) << 16) + (s.charCodeAt(c+1) << 8) + s.charCodeAt(c+2);
+
+     // this 24-bit number gets separated into four 6-bit numbers
+     n = [(n >>> 18) & 63, (n >>> 12) & 63, (n >>> 6) & 63, n & 63];
+
+     // those four 6-bit numbers are used as indices into the base64 character list
+     r += base64chars[n[0]] + base64chars[n[1]] + base64chars[n[2]] + base64chars[n[3]];
+
+     // add the actual padding string, after removing the zero pad
+   } return r.substring(0, r.length - p.length) + p;
+ }
+
+//function to encode the string into base64
+var keyStr = "ABCDEFGHIJKLMNOP" +
+                "QRSTUVWXYZabcdef" +
+                "ghijklmnopqrstuv" +
+                "wxyz0123456789+/" +
+                "="+"-_.!~*'()";
+
+function encode64(input) {
+var output = "";
+var chr1, chr2, chr3 = "";
+var enc1, enc2, enc3, enc4 = "";
+var i = 0;
+
+do {
+ chr1 = input.charCodeAt(i++);
+ chr2 = input.charCodeAt(i++);
+ chr3 = input.charCodeAt(i++);
+
+ enc1 = chr1 >> 2;
+ enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+ enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+ enc4 = chr3 & 63;
+
+ if (isNaN(chr2)) {
+    enc3 = enc4 = 64;
+ } else if (isNaN(chr3)) {
+    enc4 = 64;
+ }
+
+ output = output +
+    keyStr.charAt(enc1) +
+    keyStr.charAt(enc2) +
+    keyStr.charAt(enc3) +
+    keyStr.charAt(enc4);
+ chr1 = chr2 = chr3 = "";
+ enc1 = enc2 = enc3 = enc4 = "";
+} while (i < input.length);
+
+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 = ''
+
+	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);
+
+
+}
+
+//xmlrpc request handler for handling the login information
+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);
+			alert('Successful Login To OpenERP');
+            window.close();
+		}
+		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.");
+	}
+}
+
+//function to check the login information
+function testConnection(){
+	if (getconnect_server() == "false")
+	{
+		alert("No Server Running..."+" "+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);
+}
+
+
+//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) {
+		
+	},
+
+	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);
+}
+
+//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);
+		
+		if(typeof(createId.data) == 'number' && createId!=0){
+			window.close();
+		}
+		if(createId == 0){
+			alert("Partner Already Exist");
+		}
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+}
+//function to create the tiny partner object
+function createPartner(){
+	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_partner';
+	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+	strobj.data = 'thunderbird.partner';
+	if(document.getElementById('txtname').value ==''){
+		alert("You Must Enter Partner Name");
+		return false;
+	}
+	var a = ['name'];
+	var b = [document.getElementById('txtname').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");
+
+		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) {
+
+	},
+
+	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);
+}
+
+//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(',');
+
+		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");
+
+				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)
+
+				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)
+
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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);
+}
+
+
+//function to create a new attachment record
+
+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 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");
+			}
+		}
+}
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/address.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/address.dtd
new file mode 100644
index 00000000000..3b5b95e2a32
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/address.dtd
@@ -0,0 +1,26 @@
+<!ENTITY title.label "Open Contact">
+<!ENTITY name.value "Partner Name:">
+<!ENTITY contactname.value "Contact Name:">
+<!ENTITY street.value "Street:">
+<!ENTITY street2.value "Street2:">
+<!ENTITY zip.value "Zip:">
+<!ENTITY city.value "City:">
+<!ENTITY country.value "Country:">
+<!ENTITY state.value "State:">
+<!ENTITY office.value "Office:">
+<!ENTITY fax.value "Fax:">
+<!ENTITY mobile.value "Mobile:">
+<!ENTITY email.value "Email:">
+<!ENTITY emailid.value "Email ID:">
+<!ENTITY communication.value "Communication:">
+<!ENTITY postaladdress.value "Postal Address:">
+<!ENTITY ok.label "Save">
+<!ENTITY partner.label "Create New Contact :">
+<!ENTITY create.label "New Contact">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY newpartner.label "New Partner">
+<!ENTITY bsearch.label "Search Contact">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd
new file mode 100755
index 00000000000..23cd94efa05
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd
@@ -0,0 +1,49 @@
+<!ENTITY title.label "OpenERP Configuration">
+<!ENTITY separate.label "Configuration Login for OpenERP!">
+<!ENTITY close.label "Cancel">
+<!ENTITY database.label "Database:">
+<!ENTITY ok.label "OK">
+<!ENTITY connection.label "Connect">
+<!ENTITY txturl.label "Server: ">
+<!ENTITY image.label "Image : ">
+<!ENTITY obj.label "Document : ">
+<!ENTITY username.label "Username: ">
+<!ENTITY password.label "Password: ">
+<!ENTITY setdb.label "Move &gt;">
+<!ENTITY getdblist.label "Change">
+<!ENTITY gpConnection.label "Connection Parameters">
+<!ENTITY listDBListBox.header "Available DBs">
+<!ENTITY listDocument.header "Document">
+<!ENTITY listDocumentListBox.header "Document Name">
+<!ENTITY document.label "Document Name : ">
+<!ENTITY documentcreate.label "Add">
+<!--<!ENTITY objectdelete.label "Delete Selected Object From The List"> -->
+<!ENTITY documentdelete.label "Delete">
+<!ENTITY gpArchive.label "Archived Email Attachment Options">
+<!ENTITY rdAlwaysAttached.label "Always Send Email Attachments to OpenERP">
+<!ENTITY rdPromptAttached.label "Prompt Before Sending Email Attachments">
+<!ENTITY rdNeverAttached.label "Never Send Email attachments to OpenERP">
+<!ENTITY reserve.value "Copyright © 2006-TODAY OpenERP SA All Rights Reserved.
+OpenERP is a trademark of the OpenERP SA Company. OpenERP Web is jointly developed by OpenERP SA and Axelor.\n
+Licenced under the terms of OpenERP Public License (OEPL) v1.1 ">
+<!ENTITY openerp.value "http://www.openerp.com/">
+<!ENTITY axelor.value "http://www.axelor.com">
+<!ENTITY tinyerp.value "http://tiny.be/">
+
+<!ENTITY openerp_s.value "OpenERP">
+<!ENTITY axelor_s.value "The Axelor Company">
+<!ENTITY tinyerp_s.value "The Tiny Company">
+
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY gpAbout.label "About OpenERP Thunderbird Plugin">
+<!ENTITY develop.value "This Thunderbird Plugin for OpenERP has been developed by OpenERP SA &amp; Axelor">
+<!ENTITY information.value "For more information, please visit our website">
+<!ENTITY contact.label "Contact Us">
+<!ENTITY contact.value "info@axelor.com">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagemove.value "chrome://openerp_plugin/skin/Move.gif">
+<!ENTITY imagemoveleft.value "chrome://openerp_plugin/skin/MoveLeft.png">
+<!ENTITY imagemovedown.value "chrome://openerp_plugin/skin/MoveDown.png">
+<!ENTITY addfile.label "Load Image">
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
new file mode 100644
index 00000000000..a926d3a980d
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
@@ -0,0 +1,5 @@
+<!ENTITY lblurl.label "Server: ">
+<!ENTITY lblport.label "Port: ">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/create.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/create.dtd
new file mode 100644
index 00000000000..181d408a3e9
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/create.dtd
@@ -0,0 +1,37 @@
+<!ENTITY title.label "Create a new Contact">
+<!ENTITY name.value "Contact Name:">
+<!ENTITY street.value "Street:">
+<!ENTITY street2.value "Street2:">
+<!ENTITY zip.value "Zip:">
+<!ENTITY city.value "City:">
+<!ENTITY country.value "Country:">
+<!ENTITY state.value "State:">
+<!ENTITY office.value "Office:">
+<!ENTITY fax.value "Fax:">
+<!ENTITY mobile.value "Mobile:">
+<!ENTITY email.value "Email:">
+<!ENTITY communication.value "Communication:">
+<!ENTITY postaladdress.value "Postal Address:">
+
+
+<!ENTITY selectpartner.value "Partner:">
+<!ENTITY listEmail.header "Email">
+<!ENTITY listName.header "Name">
+<!ENTITY bsearch.label "Search">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY cbxarchive.label "Archive">
+<!ENTITY ok.label "Save">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+
+<!ENTITY title.label "Select Partner">
+<!ENTITY listPartnerName.header "Partner Name">
+<!ENTITY bsearch.label "Search">
+<!ENTITY create.label "Create">
+<!ENTITY select.label "Select">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY reload.label "Reload">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
+<!ENTITY imagereload.value "chrome://openerp_plugin/skin/Archive.png">
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd
new file mode 100644
index 00000000000..67b32b32907
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd
@@ -0,0 +1,7 @@
+<!ENTITY title.label "Create a new Partner">
+<!ENTITY name.value "Name:">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY ok.label "Save">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
new file mode 100644
index 00000000000..33845423f7d
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
@@ -0,0 +1,31 @@
+nomboxfile=není mbox souborem
+folderexists=Není možné importovat: složka se stejným názvem již existuje
+fileexists=Není možné importovat: soubor se stejným názvem již existuje
+nowritable=Není možné importovat: nemáte právo zápisu do složky
+exportOK=Export byl úspěšně dokončen
+isNewsgroup=Tato funkce není dostupná: export složky z IMAP účtů nebo diskuzních \nskupin je možný, pouze pokud je nastavené čtení v režimu Offline
+nofolder=Nebyla vybrána žádná cílová složka
+badfolder=Není možné importovat do této složky (typ IMAP nebo diskuzní skupina)
+exportAccount=Export všech složek
+exportFolder=Export složky
+filePickerImport=Výběr souboru k importu
+filePickerExport=Výběr cílové složky
+extensions.{3ed8cc52-86fc-4613-9026-c1ef969da4c3}.description=Umožňuje import a export souborů ve formátu mbox a eml
+virtualfolder=Toto je virtuální složka. Pro export jejich\nzpráv musíte tyto zprávy nejdříve\nzkopírovat do normální složky.
+searchdir=Vyberte složku, ve které budou vyhledány mbox soubory
+confirmimport=Chcete importovat soubor?
+endscan=Konec prohledávání složek
+internalerror=Není možné provést import, protože nastala neznámá chyba
+exportstart=Probíhá export, čekejte prosím...
+exported=Exportovalo se
+msgs=zpráv z
+nosubjectmsg=bez_predmetu
+messsubdir=zprávy
+badfolder2=Není možné importovat do této složky (IMAP nebo diskuzní skupina nebo virtuální složka)
+temp_error=Není možné importovat: nastala chyba při vytváření dočasného souboru
+importEMLstart=Pobíhá import, čekejte prosím...
+numEML=Naimportovány eml soubory:
+CSVseparator=,
+noEML=No eml file found in this directory
+backupWarning=During this operation, the program could be\nunresponsive for some minutes.\nDo you want to go on?\n  
+noWaring=Don't show again this warning
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
new file mode 100755
index 00000000000..a2345f0aaaf
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -0,0 +1,11 @@
+<!ENTITY tinyplugin "OpenERP Configuration">
+<!ENTITY tinypluginconfig "Archieve To OpenERP">
+<!ENTITY tinyarchive "Archive 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.png">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
+<!ENTITY tooltip.value "Add To Archive">
+<!ENTITY pluginconfig.value "OpenERP Configuration Settings">
+<!ENTITY pluginconfigvalue.value "Archieve To OpenERP Settings">
+
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
new file mode 100644
index 00000000000..ed26728b0d0
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
@@ -0,0 +1,28 @@
+<!ENTITY title.label "Archive To OpenERP">
+<!ENTITY gptinyobj.label "Link to an Existing Document">
+<!ENTITY newobject.label "New Documents">
+<!ENTITY bsearch.label "Search">
+<!ENTITY close.label "Close">
+<!ENTITY attach.label "Archive to OpenERP">
+<!ENTITY create.label "New Contact">
+<!ENTITY archive.label "Create">
+<!ENTITY attach.label "Attach">
+<!ENTITY cbxcontact.label "Contact">
+<!ENTITY cbxinvoice.label "Invoice">
+<!ENTITY cbxproject.label "Project">
+<!ENTITY cbxpartner.label "Partner">
+<!ENTITY cbxproduct.label "Product">
+<!ENTITY cbxaccount.label "Account">
+<!ENTITY cbxsale.label "Sale">
+<!ENTITY cbxcase.label "Case">
+<!ENTITY cbxtask.label "Task">
+<!ENTITY cbxselectall.label "Select All">
+<!ENTITY object.label "Type of Document :">
+<!ENTITY partner.label "Create New Contact :">
+<!ENTITY search.label "Search :">
+<!ENTITY listSearchBox.header "Name">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/Archive.png">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
+<!ENTITY gptinyobjexe.label "Documents">
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
new file mode 100644
index 00000000000..e6a62c16003
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
@@ -0,0 +1,12 @@
+<!ENTITY title.label "Select Partner">
+<!ENTITY selectpartner.value "Partner">
+<!ENTITY listPartnerName.header "Partner Name">
+<!ENTITY bsearch.label "Search">
+<!ENTITY create.label "Create">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY select.label "Select">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Account.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Account.png
new file mode 100644
index 00000000000..b13f2b0f523
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Account.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Archive.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Archive.png
new file mode 100644
index 00000000000..5aa6a958d37
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Archive.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Case.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Case.png
new file mode 100644
index 00000000000..9b950b8ea9d
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Case.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Contact.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Contact.png
new file mode 100644
index 00000000000..9bd6f9f6059
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Contact.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Create.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Create.png
new file mode 100644
index 00000000000..1ab240c32cb
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Create.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Error.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Error.gif
new file mode 100644
index 00000000000..38c3523781b
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Error.gif differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Invoice.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Invoice.png
new file mode 100644
index 00000000000..4551107ec3b
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Invoice.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Move.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Move.gif
new file mode 100644
index 00000000000..401bf861213
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Move.gif differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveDown.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveDown.png
new file mode 100644
index 00000000000..3761ff1e747
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveDown.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveLeft.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveLeft.png
new file mode 100644
index 00000000000..031d7532673
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveLeft.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT.png
new file mode 100644
index 00000000000..373464bd53e
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT1.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT1.png
new file mode 100644
index 00000000000..2daac224a51
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT1.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Partner.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Partner.png
new file mode 100644
index 00000000000..c661339598e
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Partner.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Product.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Product.png
new file mode 100644
index 00000000000..51451e422ae
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Product.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Project.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Project.png
new file mode 100644
index 00000000000..0f8ea2af8f5
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Project.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Sale.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Sale.png
new file mode 100644
index 00000000000..1b0b44f890e
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Sale.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Search.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Search.gif
new file mode 100644
index 00000000000..b29c3cf1054
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Search.gif differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Success.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Success.gif
new file mode 100644
index 00000000000..fb3bff729c5
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Success.gif differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Task.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Task.png
new file mode 100644
index 00000000000..52056b1e713
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Task.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/developped_by.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/developped_by.png
new file mode 100644
index 00000000000..54dc465b421
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/developped_by.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png
new file mode 100755
index 00000000000..bdbe31c4bff
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png
new file mode 100644
index 00000000000..e2b45b52211
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/overlay.css b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/overlay.css
new file mode 100755
index 00000000000..1f71b8fdcbe
--- /dev/null
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/overlay.css
@@ -0,0 +1,3 @@
+menuitem#tiny-plugin {
+  color: red !important;
+}
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png
new file mode 100644
index 00000000000..37b29e13382
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/perform.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/perform.gif
new file mode 100644
index 00000000000..16cc3873858
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/perform.gif differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
new file mode 100644
index 00000000000..b1e78c0047e
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico differ
diff --git a/addons/thunderbird/plugin/components/nsXmlRpcClient.js b/addons/thunderbird/plugin/components/nsXmlRpcClient.js
new file mode 100755
index 00000000000..40347a9993d
--- /dev/null
+++ b/addons/thunderbird/plugin/components/nsXmlRpcClient.js
@@ -0,0 +1,1039 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla XML-RPC Client component.
+ *
+ * The Initial Developer of the Original Code is
+ * Digital Creations 2, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Martijn Pieters <mj@digicool.com> (original author)
+ *   Samuel Sieb <samuel@sieb.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ *  nsXmlRpcClient XPCOM component
+ *  Version: $Revision: 1.39 $
+ *
+ *  $Id: nsXmlRpcClient.js,v 1.39 2006/10/24 16:02:01 silver%warwickcompsoc.co.uk Exp $
+ */
+
+/*
+ * Constants
+ */
+const XMLRPCCLIENT_CONTRACTID = '@mozilla.org/xml-rpc/client;1';
+const XMLRPCCLIENT_CID =
+    Components.ID('{4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}');
+const XMLRPCCLIENT_IID = Components.interfaces.nsIXmlRpcClient;
+
+const XMLRPCFAULT_CONTRACTID = '@mozilla.org/xml-rpc/fault;1';
+const XMLRPCFAULT_CID =
+    Components.ID('{691cb864-0a7e-448c-98ee-4a7f359cf145}');
+const XMLRPCFAULT_IID = Components.interfaces.nsIXmlRpcFault;
+
+const XMLHTTPREQUEST_CONTRACTID = '@mozilla.org/xmlextras/xmlhttprequest;1';
+
+const NSICHANNEL = Components.interfaces.nsIChannel;
+
+const DEBUG = false;
+const DEBUGPARSE = false;
+
+const DOMNode = Components.interfaces.nsIDOMNode;
+/*
+ * Class definitions
+ */
+
+/* The nsXmlRpcFault class constructor. */
+function nsXmlRpcFault() {}
+
+/* the nsXmlRpcFault class def */
+nsXmlRpcFault.prototype = {
+    faultCode: 0,
+    faultString: '',
+
+    init: function(faultCode, faultString) {
+        this.faultCode = faultCode;
+        this.faultString = faultString;
+    },
+
+    toString: function() {
+        return '<XML-RPC Fault: (' + this.faultCode + ') ' +
+            this.faultString + '>';
+    },
+
+    // nsISupports interface
+    QueryInterface: function(iid) {
+        if (!iid.equals(Components.interfaces.nsISupports) &&
+            !iid.equals(XMLRPCFAULT_IID))
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+        return this;
+    }
+};
+
+/* The nsXmlRpcClient class constructor. */
+function nsXmlRpcClient() {}
+
+/* the nsXmlRpcClient class def */
+nsXmlRpcClient.prototype = {
+    _serverUrl: null,
+    _useAuth: false,
+
+    init: function(serverURL) {
+        this._serverUrl = serverURL;
+        this._encoding = "UTF-8";
+    },
+
+    setAuthentication: function(username, password){
+        if ((typeof username == "string") &&
+            (typeof password == "string")){
+          this._useAuth = true;
+          this._username = username;
+          this._password = password;
+        }
+    },
+
+    clearAuthentication: function(){
+        this._useAuth = false;
+    },
+
+    setEncoding: function(encoding){
+        this._encoding = encoding;
+    },
+
+    get serverUrl() { return this._serverUrl; },
+
+    // Internal copy of the status
+    _status: null,
+    _listener: null,
+
+    asyncCall: function(listener, context, methodName, methodArgs, count) {
+        debug('asyncCall');
+        // Check for call in progress.
+        if (this._inProgress)   
+            return;
+            //throw Components.Exception('Call in progress!');
+
+        // Check for the server URL;
+        if (!this._serverUrl)
+            throw Components.Exception('Not initialized');
+
+        this._inProgress = true;
+
+        // Clear state.
+        this._foundFault = false;
+        this._passwordTried = false;
+        this._result = null;
+        this._fault = null;
+        this._status = null;
+        this._responseStatus = null;
+        this._responseString = null;
+        this._listener = listener;
+        this._seenStart = false;
+        this._context = context;
+        
+        debug('Arguments: ' + methodArgs);
+
+        // Generate request body
+        var xmlWriter = new XMLWriter(this._encoding);
+        this._generateRequestBody(xmlWriter, methodName, methodArgs);
+
+        var requestBody = xmlWriter.data;
+
+        debug('Request: ' + requestBody);
+
+        this.xmlhttp = Components.classes[XMLHTTPREQUEST_CONTRACTID]
+            .createInstance(Components.interfaces.nsIXMLHttpRequest);
+        if (this._useAuth) {
+            this.xmlhttp.open('POST', this._serverUrl, true,
+                              this._username, this._password);
+        } else {
+            this.xmlhttp.open('POST', this._serverUrl);
+        }
+        this.xmlhttp.onload = this._onload;
+        this.xmlhttp.onerror = this._onerror;
+        this.xmlhttp.parent = this;
+        this.xmlhttp.setRequestHeader('Content-Type','text/xml');
+        this.xmlhttp.send(requestBody);
+        var chan = this.xmlhttp.channel.QueryInterface(NSICHANNEL);
+        chan.notificationCallbacks = this;
+    },
+
+    _onload: function(e) {
+        var result;
+        var parent = e.target.parent;
+        parent._inProgress = false;
+        parent._responseStatus = e.target.status;
+        parent._responseString = e.target.statusText;
+        if (!e.target.responseXML) {
+            if (e.target.status) {
+                try {
+                    parent._listener.onError(parent, parent._context,
+                        Components.results.NS_ERROR_FAILURE,
+                        'Server returned status ' + e.target.status);
+                } catch (ex) {
+                    debug('Exception in listener.onError: ' + ex);
+                }
+            } else {
+                try {
+                    parent._listener.onError(parent, parent._context,
+                                      Components.results.NS_ERROR_FAILURE,
+                                      'Unknown network error');
+                } catch (ex) {
+                    debug('Exception in listener.onError: ' + ex);
+                }
+            }
+            return;
+        }
+        try {
+            e.target.responseXML.normalize();
+            result = parent.parse(e.target.responseXML);
+        } catch (ex) {
+            try {
+                parent._listener.onError(parent, parent._context,
+                                         ex.result, ex.message);
+            } catch (ex) {
+                debug('Exception in listener.onError: ' + ex);
+            }
+            return;
+        }
+        if (parent._foundFault) {
+            parent._fault = result;
+            try {
+                parent._listener.onFault(parent, parent._context, result);
+            } catch(ex) {
+                debug('Exception in listener.onFault: ' + ex);
+            }
+        } else {
+            parent._result = result.value;
+            try { 
+                parent._listener.onResult(parent, parent._context,
+                                          result.value);
+            } catch (ex) {
+                debug('Exception in listener.onResult: ' + ex);
+            }
+        }
+    },
+
+    _onerror: function(e) {
+        var parent = e.target.parent;
+        parent._inProgress = false;
+        try {
+            parent._listener.onError(parent, parent._context,
+                                Components.results.NS_ERROR_FAILURE,
+                                'Unknown network error');
+        } catch (ex) {
+            debug('Exception in listener.onError: ' + ex);
+        }
+    },
+    
+    _foundFault: false,
+
+    _fault: null,
+    _result: null,
+    _responseStatus: null,
+    _responseString: null,
+
+    get fault() { return this._fault; },
+    get result() { return this._result; },
+    get responseStatus() { return this._responseStatus; },
+    get responseString() { return this._responseString; },
+
+    /* Convenience. Create an appropriate XPCOM object for a given type */
+    INT:      1,
+    BOOLEAN:  2,
+    STRING:   3,
+    DOUBLE:   4,
+    DATETIME: 5,
+    ARRAY:    6,
+    STRUCT:   7,
+    BASE64:   8, // Not part of nsIXmlRpcClient interface, internal use.
+    createType: function(type, uuid) {
+        const SUPPORTSID = '@mozilla.org/supports-';
+        switch(type) {
+            case this.INT:
+                uuid.value = Components.interfaces.nsISupportsPRInt32
+                return createInstance(SUPPORTSID + 'PRInt32;1',
+                    'nsISupportsPRInt32');
+
+            case this.BOOLEAN:
+                uuid.value = Components.interfaces.nsISupportsPRBool
+                return createInstance(SUPPORTSID + 'PRBool;1',
+                    'nsISupportsPRBool');
+
+            case this.STRING:
+                uuid.value = Components.interfaces.nsISupportsCString
+                return createInstance(SUPPORTSID + 'cstring;1',
+                    'nsISupportsCString');
+
+            case this.DOUBLE:
+                uuid.value = Components.interfaces.nsISupportsDouble
+                return createInstance(SUPPORTSID + 'double;1',
+                    'nsISupportsDouble');
+
+            case this.DATETIME:
+                uuid.value = Components.interfaces.nsISupportsPRTime
+                return createInstance(SUPPORTSID + 'PRTime;1',
+                    'nsISupportsPRTime');
+
+            case this.ARRAY:
+                uuid.value = Components.interfaces.nsISupportsArray
+                return createInstance(SUPPORTSID + 'array;1',
+                    'nsISupportsArray');
+
+            case this.STRUCT:
+                uuid.value = Components.interfaces.nsIDictionary
+                return createInstance('@mozilla.org/dictionary;1', 
+                    'nsIDictionary');
+
+            default: throw Components.Exception('Unsupported type');
+        }
+    },
+
+    // nsISupports interface
+    QueryInterface: function(iid) {
+        if (!iid.equals(Components.interfaces.nsISupports) &&
+            !iid.equals(XMLRPCCLIENT_IID) &&
+            !iid.equals(Components.interfaces.nsIInterfaceRequestor))
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+        return this;
+    },
+
+    // nsIInterfaceRequester interface
+    getInterface: function(iid, result){
+        if (iid.equals(Components.interfaces.nsIAuthPrompt)){
+            return this;
+        }
+        Components.returnCode = Components.results.NS_ERROR_NO_INTERFACE;
+        return null;
+    },
+
+    // nsIAuthPrompt interface
+    _passwordTried: false,
+    promptUsernameAndPassword: function(dialogTitle, text, passwordRealm,
+                                        savePassword, user, pwd){
+
+        if (this._useAuth){
+            if (this._passwordTried){
+                return false;
+            }
+            user.value = this._username;
+            pwd.value = this._password;
+            this._passwordTried = true;
+            return true;
+        }
+        return false;
+    },
+
+    /* Generate the XML-RPC request body */
+    _generateRequestBody: function(writer, methodName, methodArgs) {
+        writer.startElement('methodCall');
+
+        writer.startElement('methodName');
+        writer.write(methodName);
+        writer.endElement('methodName');
+
+        writer.startElement('params');
+        for (var i = 0; i < methodArgs.length; i++) {
+            writer.startElement('param');
+            this._generateArgumentBody(writer, methodArgs[i]);
+            writer.endElement('param');
+        }
+        writer.endElement('params');
+
+        writer.endElement('methodCall');
+    },
+
+    /* Write out a XML-RPC parameter value */
+    _generateArgumentBody: function(writer, obj) {
+        writer.startElement('value');
+        var sType = this._typeOf(obj);
+        switch (sType) {
+            case 'PRUint8':
+            case 'PRUint16':
+            case 'PRInt16':
+            case 'PRInt32':
+                obj=obj.QueryInterface(Components.interfaces['nsISupports' +
+                    sType]);
+                writer.startElement('i4');
+                writer.write(obj.toString());
+                writer.endElement('i4');
+                break;
+
+            case 'PRBool':
+                obj=obj.QueryInterface(Components.interfaces.nsISupportsPRBool);
+                writer.startElement('boolean');
+                writer.write(obj.data ? '1' : '0');
+                writer.endElement('boolean');
+                break;
+
+            case 'Char':
+            case 'CString':
+                obj=obj.QueryInterface(Components.interfaces['nsISupports' +
+                    sType]);
+                writer.startElement('string');
+                writer.write(obj.toString());
+                writer.endElement('string');
+                break;
+
+            case 'Float':
+            case 'Double':
+                obj=obj.QueryInterface(Components.interfaces['nsISupports' +
+                    sType]);
+                writer.startElement('double');
+                writer.write(obj.toString());
+                writer.endElement('double');
+                break;
+
+            case 'PRTime':
+                obj = obj.QueryInterface(
+                    Components.interfaces.nsISupportsPRTime);
+                var date = new Date(obj.data)
+                writer.startElement('dateTime.iso8601');
+                writer.write(iso8601Format(date));
+                writer.endElement('dateTime.iso8601');
+                break;
+                
+            case 'InputStream':
+                obj = obj.QueryInterface(Components.interfaces.nsIInputStream);
+                obj = toScriptableStream(obj);
+                writer.startElement('base64');
+                streamToBase64(obj, writer);
+                writer.endElement('base64');
+                break;
+            
+            case 'Array':
+                obj = obj.QueryInterface(
+                    Components.interfaces.nsISupportsArray);
+                writer.startElement('array');
+                writer.startElement('data');
+                for (var i = 0; i < obj.Count(); i++)
+                    this._generateArgumentBody(writer, obj.GetElementAt(i));
+                writer.endElement('data');
+                writer.endElement('array');
+                break;
+
+            case 'Dictionary':
+                obj = obj.QueryInterface(Components.interfaces.nsIDictionary);
+                writer.startElement('struct');
+                var keys = obj.getKeys({});
+                for (var k = 0; k < keys.length; k++) {
+                    writer.startElement('member');
+                    writer.startElement('name');
+                    writer.write(keys[k]);
+                    writer.endElement('name');
+                    this._generateArgumentBody(writer, obj.getValue(keys[k]));
+                    writer.endElement('member');
+                }
+                writer.endElement('struct');
+                break;
+
+            default:
+                throw Components.Exception('Unsupported argument', null, null,
+                    obj);
+        }
+
+        writer.endElement('value');
+    },
+
+    /* Determine type of a nsISupports primitive, array or dictionary. */
+    _typeOf: function(obj) {
+        // XPConnect alows JS to pass in anything, because we are a regular
+        // JS object to it. So we have to test rigorously.
+        if (typeof obj != 'object') return 'Unknown';
+
+        // Anything else not nsISupports is not allowed.
+        if (typeof obj.QueryInterface != 'function') return 'Unknown';
+
+        // Now we will have to eliminate by trying all possebilities.
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRUint8);
+            return 'PRUint8';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRUint16);
+            return 'PRUint16';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRInt16);
+            return 'PRInt16';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+            return 'PRInt32';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRBool);
+            return 'PRBool';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsChar);
+            return 'Char';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsCString);
+            return 'CString';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsFloat);
+            return 'Float';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsDouble);
+            return 'Double';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRTime);
+            return 'PRTime';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsIInputStream);
+            return 'InputStream';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsArray);
+            return 'Array';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsIDictionary);
+            return 'Dictionary';
+        } catch(e) {}
+        
+        // Not a supported type
+        return 'Unknown';
+    },
+
+    // Response parsing state
+    _valueStack: [],
+    _currValue: null,
+    _cdata: null,
+
+    parse: function(doc) {
+        var node = doc.firstChild;
+        var result;
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'methodResponse')) {
+            throw Components.Exception('Expecting a methodResponse', null, null,
+                                       doc);
+        }
+        node = node.firstChild;
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if (node.nodeType != DOMNode.ELEMENT_NODE)
+            throw Components.Exception('Expecting a params or fault', null,
+                                       null, doc);
+        if (node.nodeName == 'params') {
+            node = node.firstChild;
+            if (node.nodeType == DOMNode.TEXT_NODE)
+                node = node.nextSibling;
+            if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
+                (node.nodeName != 'param')) {
+                throw Components.Exception('Expecting a param', null, null,
+                                           doc);
+            }
+            result = this.parseValue(node.firstChild);
+        } else if (node.nodeName == 'fault') {
+            this._foundFault = true;
+            result = this.parseFault(node.firstChild);
+        } else {
+            throw Components.Exception('Expecting a params or fault', null,
+                                       null, doc);
+        }
+        debug('Parse finished');
+        return result;
+    },
+
+    parseValue: function(node) {
+        var cValue = new Value();
+        if (node && (node.nodeType == DOMNode.TEXT_NODE))
+            node = node.nextSibling;
+        if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'value')) {
+            throw Components.Exception('Expecting a value', null, null, node);
+        }
+        node = node.firstChild;
+        if (!node)
+            return cValue;
+        if (node.nodeType == DOMNode.TEXT_NODE){
+            if (!node.nextSibling) {
+                cValue.value = node.nodeValue;
+                return cValue;
+            } else {
+                node = node.nextSibling;
+            }
+        }
+        if (node.nodeType != DOMNode.ELEMENT_NODE)
+            throw Components.Exception('Expecting a value type', null, null,
+                                       node);
+        switch (node.nodeName) {
+            case 'string':
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'i4':
+            case 'int':
+                cValue.type = this.INT;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'boolean':
+                cValue.type = this.BOOLEAN;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'double':
+                cValue.type = this.DOUBLE;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'dateTime.iso8601':
+                cValue.type = this.DATETIME;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'base64':
+                cValue.type = this.BASE64;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'struct':
+                cValue.type = this.STRUCT;
+                this.parseStruct(cValue, node.firstChild);
+                break;
+            case 'array':
+                cValue.type = this.ARRAY;
+                this.parseArray(cValue, node.firstChild);
+                break;
+            default:
+                throw Components.Exception('Expecting a value type', null, null,
+                                           node);
+        }
+        return cValue;
+    },
+
+    parseString: function(node) {
+        value = '';
+        while (node) {
+            if (node.nodeType != DOMNode.TEXT_NODE)
+                throw Components.Exception('Expecting a text node', null, null,
+                                           node);
+            value += node.nodeValue; 
+            node = node.nextSibling;
+        }
+        return value;
+    },
+
+    parseStruct: function(struct, node) {
+        while (node) {
+            if (node.nodeType == DOMNode.TEXT_NODE)
+                node = node.nextSibling;
+            if (!node)
+                return;
+            if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
+                (node.nodeName != 'member')) {
+                throw Components.Exception('Expecting a member', null, null,
+                                           node);
+            }
+            this.parseMember(struct, node.firstChild);
+            node = node.nextSibling;
+        }
+    },
+
+    parseMember: function(struct, node) {
+        var cValue;
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'name')) {
+            throw Components.Exception('Expecting a name', null, null, node);
+        }
+        struct.name = this.parseString(node.firstChild);
+        cValue = this.parseValue(node.nextSibling);
+        struct.appendValue(cValue.value);
+    },
+
+    parseArray: function(array, node) {
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'data')) {
+            throw Components.Exception('Expecting array data', null, null, node);
+        }
+        for (node = node.firstChild; node; node = node.nextSibling) {
+            if (node.nodeType == DOMNode.TEXT_NODE)
+                continue;
+            array.appendValue(this.parseValue(node).value);
+        }
+    },
+
+    parseFault: function(node) {
+        var fault = createInstance(XMLRPCFAULT_CONTRACTID, 'nsIXmlRpcFault');
+        var cValue = this.parseValue(node);
+        if ((cValue.type != this.STRUCT) ||
+            (!cValue.value.hasKey('faultCode')) ||
+            (!cValue.value.hasKey('faultString'))) {
+            throw Components.Exception('Invalid fault', null, null, node);
+        }
+        fault.init(cValue.value.getValue('faultCode').data,
+                   cValue.value.getValue('faultString').data);
+        return fault;
+    }
+};
+
+/* The XMLWriter class constructor */
+function XMLWriter(encoding) {
+    if (!encoding)
+        encoding = "UTF-8";
+    this.data = '<?xml version="1.0" encoding="' + encoding + '"?>';
+}
+
+/* The XMLWriter class def */
+XMLWriter.prototype = {
+    data: '',
+    
+    startElement: function(element) {
+        this.data += '<' + element + '>';
+    },
+
+    endElement: function(element) {
+        this.data += '</' + element + '>';
+    },
+    
+    write: function(text) {
+        for (var i = 0; i < text.length; i++) {
+            var c = text[i];
+            switch (c) {
+                case '<':
+                    this.data += '&lt;';
+                    break;
+                case '&':
+                    this.data += '&amp;';
+                    break;
+                default:
+                    this.data += c;
+            }
+        }
+    },
+
+    markup: function(text) { this.data += text }
+};
+
+/* The Value class contructor */
+function Value() { this.type = this.STRING; };
+
+/* The Value class def */
+Value.prototype = {
+    INT:      nsXmlRpcClient.prototype.INT,
+    BOOLEAN:  nsXmlRpcClient.prototype.BOOLEAN,
+    STRING:   nsXmlRpcClient.prototype.STRING,
+    DOUBLE:   nsXmlRpcClient.prototype.DOUBLE,
+    DATETIME: nsXmlRpcClient.prototype.DATETIME,
+    ARRAY:    nsXmlRpcClient.prototype.ARRAY,
+    STRUCT:   nsXmlRpcClient.prototype.STRUCT,
+    BASE64:   nsXmlRpcClient.prototype.BASE64,
+    
+    _createType: nsXmlRpcClient.prototype.createType,
+
+    name: null,
+    
+    _value: null,
+    get value() { return this._value; },
+    set value(val) {
+        // accepts [0-9]+ or x[0-9a-fA-F]+ and returns the character.
+        function entityTrans(substr, code) {
+            return String.fromCharCode("0" + code);
+        }
+        
+        switch (this.type) {
+            case this.STRING:
+                val = val.replace(/&#([0-9]+);/g, entityTrans);
+                val = val.replace(/&#(x[0-9a-fA-F]+);/g, entityTrans);
+                val = val.replace(/&lt;/g, '<');
+                val = val.replace(/&gt;/g, '>');
+                val = val.replace(/&amp;/g, '&');
+                this._value.data = val;
+                break;
+        
+            case this.BOOLEAN:
+                this._value.data = (val == 1);
+                break;
+
+            case this.DATETIME:
+                this._value.data = Date.UTC(val.slice(0, 4), 
+                    val.slice(4, 6) - 1, val.slice(6, 8), val.slice(9, 11),
+                    val.slice(12, 14), val.slice(15));
+                break;
+
+            case this.BASE64:
+                this._value.data = base64ToString(val);
+                break;
+
+            default:
+                this._value.data = val;
+        }
+    },
+
+    _type: null,
+    get type() { return this._type; },
+    set type(type) { 
+        this._type = type;
+        if (type == this.BASE64) 
+            this._value = this._createType(this.STRING, {});
+        else this._value = this._createType(type, {});
+    },
+
+    appendValue: function(val) {
+        switch (this.type) {
+            case this.ARRAY:
+                this.value.AppendElement(val);
+                break;
+
+            case this.STRUCT:
+                this.value.setValue(this.name, val);
+                break;
+        }
+    }
+};
+
+/*
+ * Objects
+ */
+
+/* nsXmlRpcClient Module (for XPCOM registration) */
+var nsXmlRpcClientModule = {
+    registerSelf: function(compMgr, fileSpec, location, type) {
+        compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+
+        compMgr.registerFactoryLocation(XMLRPCCLIENT_CID, 
+                                        'XML-RPC Client JS component', 
+                                        XMLRPCCLIENT_CONTRACTID, 
+                                        fileSpec,
+                                        location, 
+                                        type);
+        compMgr.registerFactoryLocation(XMLRPCFAULT_CID, 
+                                        'XML-RPC Fault JS component', 
+                                        XMLRPCFAULT_CONTRACTID, 
+                                        fileSpec,
+                                        location, 
+                                        type);
+    },
+
+    getClassObject: function(compMgr, cid, iid) {
+        if (!cid.equals(XMLRPCCLIENT_CID) && !cid.equals(XMLRPCFAULT_CID))
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+
+        if (!iid.equals(Components.interfaces.nsIFactory))
+            throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+
+        if (cid.equals(XMLRPCCLIENT_CID))
+            return nsXmlRpcClientFactory
+        else return nsXmlRpcFaultFactory;
+    },
+
+    canUnload: function(compMgr) { return true; }
+};
+
+/* nsXmlRpcClient Class Factory */
+var nsXmlRpcClientFactory = {
+    createInstance: function(outer, iid) {
+        if (outer != null)
+            throw Components.results.NS_ERROR_NO_AGGREGATION;
+    
+        if (!iid.equals(XMLRPCCLIENT_IID) &&
+            !iid.equals(Components.interfaces.nsISupports))
+            throw Components.results.NS_ERROR_INVALID_ARG;
+
+        return new nsXmlRpcClient();
+    }
+}
+
+/* nsXmlRpcFault Class Factory */
+var nsXmlRpcFaultFactory = {
+    createInstance: function(outer, iid) {
+        if (outer != null)
+            throw Components.results.NS_ERROR_NO_AGGREGATION;
+
+        if (!iid.equals(XMLRPCFAULT_IID) &&
+            !iid.equals(Components.interfaces.nsISupports))
+            throw Components.results.NS_ERROR_INVALID_ARG;
+
+        return new nsXmlRpcFault();
+    }
+}
+
+/*
+ * Functions
+ */
+
+/* module initialisation */
+function NSGetModule(comMgr, fileSpec) { return nsXmlRpcClientModule; }
+
+/* Create an instance of the given ContractID, with given interface */
+function createInstance(contractId, intf) {
+    return Components.classes[contractId]
+        .createInstance(Components.interfaces[intf]);
+}
+
+/* Get a pointer to a service indicated by the ContractID, with given interface */
+function getService(contractId, intf) {
+    return Components.classes[contractId]
+        .getService(Components.interfaces[intf]);
+}
+
+/* Convert an inputstream to a scriptable inputstream */
+function toScriptableStream(input) {
+    var SIStream = Components.Constructor(
+        '@mozilla.org/scriptableinputstream;1',
+        'nsIScriptableInputStream', 'init');
+    return new SIStream(input);
+}
+
+/* format a Date object into a iso8601 datetime string, UTC time */
+function iso8601Format(date) {
+    var datetime = date.getUTCFullYear();
+    var month = String(date.getUTCMonth() + 1);
+    datetime += (month.length == 1 ?  '0' + month : month);
+    var day = date.getUTCDate();
+    datetime += (day < 10 ? '0' + day : day);
+
+    datetime += 'T';
+
+    var hour = date.getUTCHours();
+    datetime += (hour < 10 ? '0' + hour : hour) + ':';
+    var minutes = date.getUTCMinutes();
+    datetime += (minutes < 10 ? '0' + minutes : minutes) + ':';
+    var seconds = date.getUTCSeconds();
+    datetime += (seconds < 10 ? '0' + seconds : seconds);
+
+    return datetime;
+}
+
+/* Convert a stream to Base64, writing it away to a string writer */
+const BASE64CHUNK = 255; // Has to be dividable by 3!!
+function streamToBase64(stream, writer) {
+    while (stream.available()) {
+        var data = [];
+        while (data.length < BASE64CHUNK && stream.available()) {
+            var d = stream.read(1).charCodeAt(0);
+            // reading a 0 results in NaN, compensate.
+            data = data.concat(isNaN(d) ? 0 : d);
+        }
+        writer.write(toBase64(data));
+    }
+}
+
+/* Convert data (an array of integers) to a Base64 string. */
+const toBase64Table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' +
+    '0123456789+/';
+const base64Pad = '=';
+function toBase64(data) {
+    var result = '';
+    var length = data.length;
+    var i;
+    // Convert every three bytes to 4 ascii characters.
+    for (i = 0; i < (length - 2); i += 3) {
+        result += toBase64Table[data[i] >> 2];
+        result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
+        result += toBase64Table[((data[i+1] & 0x0f) << 2) + (data[i+2] >> 6)];
+        result += toBase64Table[data[i+2] & 0x3f];
+    }
+
+    // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
+    if (length%3) {
+        i = length - (length%3);
+        result += toBase64Table[data[i] >> 2];
+        if ((length%3) == 2) {
+            result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
+            result += toBase64Table[(data[i+1] & 0x0f) << 2];
+            result += base64Pad;
+        } else {
+            result += toBase64Table[(data[i] & 0x03) << 4];
+            result += base64Pad + base64Pad;
+        }
+    }
+
+    return result;
+}
+
+/* Convert Base64 data to a string */
+const toBinaryTable = [
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
+    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1,
+    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
+    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
+    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
+    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
+];
+function base64ToString(data) {
+    var result = '';
+    var leftbits = 0; // number of bits decoded, but yet to be appended
+    var leftdata = 0; // bits decoded, but yet to be appended
+
+    // Convert one by one.
+    for (var i = 0; i < data.length; i++) {
+        var c = toBinaryTable[data.charCodeAt(i) & 0x7f];
+        var padding = (data[i] == base64Pad);
+        // Skip illegal characters and whitespace
+        if (c == -1) continue;
+        
+        // Collect data into leftdata, update bitcount
+        leftdata = (leftdata << 6) | c;
+        leftbits += 6;
+
+        // If we have 8 or more bits, append 8 bits to the result
+        if (leftbits >= 8) {
+            leftbits -= 8;
+            // Append if not padding.
+            if (!padding)
+                result += String.fromCharCode((leftdata >> leftbits) & 0xff);
+            leftdata &= (1 << leftbits) - 1;
+        }
+    }
+
+    // If there are any bits left, the base64 string was corrupted
+    if (leftbits)
+        throw Components.Exception('Corrupted base64 string');
+
+    return result;
+}
+
+if (DEBUG) debug = function(msg) { 
+    dump(' -- XML-RPC client -- : ' + msg + '\n'); 
+};
+else debug = function() {}
+
+// vim:sw=4:sr:sta:et:sts:
diff --git a/addons/thunderbird/plugin/components/xml-rpc.xpt b/addons/thunderbird/plugin/components/xml-rpc.xpt
new file mode 100755
index 00000000000..8e59aa20c85
Binary files /dev/null and b/addons/thunderbird/plugin/components/xml-rpc.xpt differ
diff --git a/addons/thunderbird/plugin/defaults/preferences/tiny.js b/addons/thunderbird/plugin/defaults/preferences/tiny.js
new file mode 100755
index 00000000000..ca8332c868e
--- /dev/null
+++ b/addons/thunderbird/plugin/defaults/preferences/tiny.js
@@ -0,0 +1,56 @@
+
+pref("extensions.tiny.serverurl", "http://localhost");
+pref("extensions.tiny.serverport", "8069");
+pref("extensions.tiny.serverdbname", "terp");
+pref("extensions.tiny.username","admin");
+pref("extensions.tiny.password","admin");
+pref("extensions.tiny.senderemail","");
+pref("extensions.tiny.sendername","");
+pref("extensions.tiny.receiveremail","");
+pref("extensions.tiny.subject","");
+pref("extensions.tiny.receiveddate","");
+pref("extensions.tiny.partnerid","");
+pref("extensions.tiny.contactid","");
+pref("extensions.tiny.attachvalue","");
+pref("extensions.tiny.cclist","");
+pref("extensions.tiny.messagebody","");
+pref("extensions.tiny.displayName","");
+pref("extensions.tiny.attachmentdata","");
+pref("extensions.tiny.userid",3);
+pref("extensions.tiny.partnername","");
+pref("extensions.tiny.officeno","");
+pref("extensions.tiny.phoneno","");
+pref("extensions.tiny.address","");
+pref("extensions.tiny.listobject","Partner,Partner Address,Accout Invoice,Project,Product,Account,Sale Order,Project Task");
+pref("extensions.tiny.object","res.partner,res.partner.address,account.invoice,project.project,product.product,account.account,sale.order,project.task");
+pref("extensions.tiny.imagename","chrome://openerp_plugin/skin/Partner.png,chrome://openerp_plugin/skin/Contact.png,chrome://openerp_plugin/skin/Invoice.png,chrome://openerp_plugin/skin/Project.png,chrome://openerp_plugin/skin/Product.png,chrome://openerp_plugin/skin/Account.png,chrome://openerp_plugin/skin/Sale.png,chrome://openerp_plugin/skin/Case.png,chrome://openerp_plugin/skin/Task.png");
+pref("extensions.tiny.attachmentlength","");
+pref("extensions.tiny.attachment","");
+pref("extensions.tiny.db_list","false");
+pref("extensions.tiny.connect_server","false");
+pref("extensions.tiny.module_install","yes");
+pref("extensions.tiny.serverprotocol", "false");
+
+
+
+pref("mboximport.export.filenames_toascii", false);
+pref("mboximport.export.overwrite", false);
+pref("mboximport.confirm.before_mbox_import", true);
+pref("mboximport.clipboard.always_just_text", false);
+pref("mboximport.export.HTML_as_displayed", false);
+pref("mboximport.exportEML.filename_format", 0);
+pref("mboximport.delay.clean_statusbar", 5000);
+pref("mboximport.subject.max_length", 50);
+pref("mboximport.author.max_length", 50);
+pref("mboximport.recipients.max_length", 50);
+pref("extensions.{3ed8cc52-86fc-4613-9026-c1ef969da4c3}.description", "chrome://mboximport/locale/mboximport.properties");
+pref("mboximport.export.set_filetime", false);
+pref("mboximport.exportEML.use_dir", false);
+pref("mboximport.exportMBOX.use_dir", false);
+pref("mboximport.exportMSG.use_dir", false);
+pref("mboximport.export.filenames_addtime", false);
+pref("mboximport.export_all.warning1", true);
+pref("mboximport.export_all.warning2", true);
+
+pref("mboximport.exportMSG.dir", "/tmp");
+
diff --git a/addons/thunderbird/plugin/install.js b/addons/thunderbird/plugin/install.js
new file mode 100755
index 00000000000..50e4b301e32
--- /dev/null
+++ b/addons/thunderbird/plugin/install.js
@@ -0,0 +1,105 @@
+// constants
+const APP_DISPLAY_NAME = "OpenERP Thunderbird Plugins";
+const APP_NAME = "OpenERP";
+const APP_VERSION = "1.0";
+const WARNING = "WARNING: You need administrator privileges to install OpenERP Thunderbird Plugin. It will be installed in the application directory for all users.";
+const VERSION_ERROR = "This extension can only be installed in a version higher than 2.0";
+const NOT_WRITABLE_ERROR = "This extension requires write access to the application directory to install properly."
+const locales = [
+	"en-US",
+	null
+];
+
+// Gecko 1.7 doesn't support custom button labels
+var incompatible = (typeof Install.BUTTON_POS_0 == "undefined");
+if (incompatible)
+	alert(VERSION_ERROR);
+
+if (!incompatible) {
+	// Check whether all directories can be accessed
+	var dirList = [
+		getFolder("Components"),
+		getFolder(getFolder("Program", "defaults"), "pref")
+	];
+	for (var i = 0; i < dirList.length; i++)
+		if (!File.isWritable(dirList[i]))
+			incompatible = true;
+
+	if (incompatible)
+		alert(NOT_WRITABLE_ERROR);
+}
+
+if (!incompatible && confirm(WARNING, APP_DISPLAY_NAME)) {
+	/* Pre-Install Cleanup (for prior versions) */
+
+	// List of files to be checked
+	var checkFiles = [
+		[getFolder("Components"), "nsXmlRpcClient.js"],            // Root component
+		[getFolder("Components"), "xml-rpc.xpt"],           // Component interface
+			];
+
+	// Remove any existing files
+	initInstall("pre-install", "/rename", "0.0");  // open dummy-install
+	for (var i = 0 ; i < checkFiles.length ; i++) {
+		var currentDir = checkFiles[i][0];
+		var name = checkFiles[i][1];
+		var oldFile = getFolder(currentDir, name);
+
+		// Find a name to rename the file into
+		var newName = name + "-uninstalled";
+		for (var n = 1; File.exists(oldFile) && File.exists(getFolder(currentDir, newName)); n++)
+			newName = name + n + "-uninstalled";
+
+		if (File.exists(oldFile))
+			File.rename(oldFile, newName);
+	}
+	performInstall(); // commit renamed files
+
+	/* Main part of the installation */
+
+	var chromeType = DELAYED_CHROME;
+
+	var files = [
+		["components/nsXmlRpcClient.js", getFolder("Components")],
+		["components/xml-rpc.xpt", getFolder("Components")],
+		["defaults/preferences/tiny.js", getFolder(getFolder("Program", "defaults"), "pref")],
+	];
+
+	// initialize our install
+	initInstall(APP_NAME, APP_PACKAGE, APP_VERSION);
+
+	// Add files
+	for (var i = 0; i < files.length; i++)
+		addFile(APP_NAME, APP_VERSION, files[i][0], files[i][1], null);
+
+	try {
+		var err = registerChrome(CONTENT | chromeType, jar, "content/");
+		if (err != SUCCESS)
+			throw "Chrome registration for content failed (error code " + err + ").";
+
+		err = registerChrome(SKIN | chromeType, jar, "skin/classic/");
+		if (err != SUCCESS)
+			throw "Chrome registration for skin failed (error code " + err + ").";
+
+		for (i = 0; i < locales.length; i++) {
+			if (!locales[i])
+				continue;
+
+			err = registerChrome(LOCALE | chromeType, jar, "locale/" + locales[i] + "/");
+			if (err != SUCCESS)
+				throw "Chrome registration for " + locales[i] + " locale failed (error code " + err + ").";
+		}
+
+		var err = performInstall();
+		if (err != SUCCESS && err != 999)
+			throw "Committing installation failed (error code " + err + ").";
+
+		alert("OpenERP Thunderbird Plugin " + APP_VERSION + " is now installed.\n" +
+					"It will become active after you restart your browser.");
+	}
+	catch (ex) {
+		alert("Installation failed: " + ex + "\n" +
+					"You probably don't have the necessary permissions (log in as system administrator).");
+		cancelInstall(err);
+	}
+}
diff --git a/addons/thunderbird/plugin/install.rdf b/addons/thunderbird/plugin/install.rdf
new file mode 100755
index 00000000000..07fdd116744
--- /dev/null
+++ b/addons/thunderbird/plugin/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>{d57f315a-9f5d-4366-a530-a769a4a8c949}</em:id>
+    <em:iconURL>chrome://openerp_plugin/skin/tinyerp-icon.ico</em:iconURL>
+    <em:name>OpenERP Plugin for Thunderbird 2.0</em:name>
+    <em:version>1.0</em:version>
+    <em:description>OpenERP Thunderbird Integration</em:description>
+    <em:creator>OpenERP SA</em:creator>
+    <!-- optional items -->
+    <em:homepageURL>http://openerp.com</em:homepageURL>
+    <!-- Thunderbird -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+        <em:minVersion>2.0</em:minVersion>
+        <em:maxVersion>3.0.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+  </Description>
+</RDF>
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
new file mode 100644
index 00000000000..0f9243510d2
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome.manifest b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
new file mode 100755
index 00000000000..5fa9c2f5754
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
@@ -0,0 +1,5 @@
+content	openerp_plugin	jar:chrome/openerp_plugin.jar!/content/
+overlay	chrome://messenger/content/messenger.xul	chrome://openerp_plugin/content/overlay.xul
+locale	openerp_plugin	en-US	jar:chrome/openerp_plugin.jar!/locale/en-US/
+skin	openerp_plugin	classic/1.0 jar:chrome/openerp_plugin.jar!/skin/
+#style	chrome://global/content/customizeToolbar.xul	chrome://openerp_plugin/skin/overlay.css
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
new file mode 100644
index 00000000000..3c322b423f5
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
new file mode 100644
index 00000000000..2d6f0e2dec1
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/address.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.createContactAddress()" height="380" width="800">
+
+<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">
+     <hbox>
+        <label  align="right" id="emailid"  value="&emailid.value;" width="94" />
+		 <textbox id="txtemail" width="268" align="right"/>
+         <spacer width="5"/>
+          <button label="&create.label;" accesskey="r" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+         <button label="&bsearch.label;" oncommand="searchContactdetail();" image="&imagesearch.value;"/>
+	</hbox>
+	<hbox>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
+		<textbox id="txtname" align="right" width="270" readonly="true"/>
+        <spacer width="5"/>
+         <button label="New Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);" width="133"/>
+	</hbox>
+   </groupbox>
+</tabpanel>
+
+<tabpanel id="address">
+  <groupbox id="address">
+    <hbox>
+        <caption label="&postaladdress.value;" />
+        <spacer width="300"/>
+     <vbox>
+        <caption label="&communication.value;" />
+     </vbox>
+    </hbox>
+
+     <hbox>
+        <label  align="right" id="contactname"  value="&contactname.value;" width="80" />
+		<textbox id="txtcontactname" align="right" width="270" />
+        <spacer width="33"/>
+        <vbox>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtoffice" />
+        </vbox>
+	</hbox>
+    
+    <hbox>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
+		<textbox id="txtstreet" width="270"/>
+        <spacer width="33"/>
+        <vbox>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtmobile"/>
+        </vbox>
+	</hbox>
+    <hbox>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
+		<textbox id="txtstreet2" width="270"/>
+        <spacer width="35"/>
+        <vbox>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtfax" />
+        </vbox>
+	</hbox>
+
+     <hbox>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
+		<textbox id="txtzip" />
+        <spacer width="115"/>
+	</hbox>
+ 
+    <hbox>
+        <label  align="right" id="city"  value="&city.value;" width="97" />
+		<textbox id="txtcity" />
+    </hbox>
+
+    <hbox>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
+         <menulist id="country" width="190">
+           <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>
+</groupbox>
+</tabpanel>
+
+<description></description>
+
+<hbox>
+  <spacer width="600"/>
+    <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+    <button label="&ok.label;" image="&imageok.value;" oncommand="UpdateContact();"/>
+ 
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
new file mode 100755
index 00000000000..5757897de96
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
@@ -0,0 +1,163 @@
+
+function config_close()
+{
+	//window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    //ksa
+   window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+	window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
+}
+
+//set the value of the configuration fields
+function config_change_load()
+{
+	var s = getServer();
+	var a =s.split(':');
+	if (String(a)=="" || String(a)=="undefined"){
+		document.getElementById('txtcurl').value = "localhost"
+		document.getElementById('txtcport').value = "8069"
+	}
+	else
+	{
+		len = a[1];
+		var url = "";
+		for (i=0;i<len.length;i++)
+		{	if (len[i] == "/")
+			{
+				continue
+			}
+			url += len[i]
+		}
+		if (String(url) == "" || String(url) == "undefined"){
+			document.getElementById('txtcurl').value = "localhost"
+		}
+		else
+		{
+			document.getElementById('txtcurl').value = url
+		}
+
+		if (String(a[2]) == "" || String(a[2]) == "undefined"){
+			document.getElementById('txtcport').value = "8069"
+			setPort("8069");
+		}
+		else
+		{
+			document.getElementById('txtcport').value = a[2]
+			setPort(a[2]);
+		}
+
+	}
+}
+function config_ok()
+{
+	if (document.getElementById('txtcurl').value == '')
+	{
+        alert("You Must Enter Server Name!")
+		return false;
+      
+	}
+	if (document.getElementById('txtcport').value == '')
+	{
+		alert("You Must Enter Port!")
+		return false;
+	}
+	setServer("http://"+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
+	window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    //ksa
+    window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
+}
+function openConfigChange()
+{
+	//window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    //ksa
+    window.close("chrome://openerp_plugin/content/config.xul", "", "chrome");
+    window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+}
+
+function appendDbList()
+{
+	setServerService('xmlrpc/db');
+	getDbList('DBlist');
+}
+
+//set the database list in the listbox in configuration window
+function setDb()
+{
+	var cmbDbList = document.getElementById('listDBListBox');
+	document.getElementById('DBlist').value = cmbDbList.getItemAtIndex(cmbDbList.selectedIndex).value;
+}
+
+//stores the value of configuration fields in preferences
+function okClick()
+{
+	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') != null)
+	{
+		setDbName(document.getElementById('DBlist').value);
+	}
+	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);
+	window.close();
+}
+
+//deletes the value of the selected value in the listbox in configuraton menu
+function deleteDocument(){
+	if(document.getElementById("listObjectListBox").selectedItem){
+		var objectlist = getPref().getCharPref("object").split(',');
+		var imagelist = getPref().getCharPref("imagename").split(',');
+		var objlist = getPref().getCharPref("listobject").split(',');
+		if(objectlist.length>0){
+			var objectcharpref = '';
+			var imagecharpref = '';
+			var objcharpref = '';
+			var nodelist = document.getElementById("listObjectListBox").selectedItem.childNodes
+			var childnode = document.getElementById("listObjectListBox").childNodes
+			for(i=2;i<childnode.length;i++){
+				if(childnode[i].hasChildNodes){
+					var secondchild = childnode[i].childNodes;
+					if (secondchild[1].getAttribute("label") != nodelist[1].getAttribute("label")){
+						objcharpref += secondchild[0].getAttribute("label")+',';
+						objectcharpref += secondchild[1].getAttribute("label")+',';
+						imagecharpref += secondchild[2].getAttribute("image")+',';
+					}
+				}
+			}
+			var demo3 = objectcharpref.substring(0,objectcharpref.length-1);
+			var demo4 = imagecharpref.substring(0,imagecharpref.length-1);
+			var demo5 = objcharpref.substring(0,objcharpref.length-1);
+
+			getPref().setCharPref("listobject",demo5);
+			getPref().setCharPref("object",demo3);
+			getPref().setCharPref("imagename",demo4);
+		}
+		document.getElementById("listObjectListBox").removeItemAt(document.getElementById("listObjectListBox").selectedIndex)
+	}
+	else{
+		alert("No Document Selected");
+	}
+}
+
+//function to add the image file for the checkbox
+function addFile(){
+	var nsIFilePicker = Components.interfaces.nsIFilePicker;
+	var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+	fp.init(this, "Select a File", nsIFilePicker.modeOpen);
+	fp.appendFilters(nsIFilePicker.filterImages);
+	var res = fp.show();
+	if (res == nsIFilePicker.returnOK){
+	  var thefile = fp.file;
+	  document.getElementById("txtimagename").value = thefile.path
+	}
+}
+
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul
new file mode 100755
index 00000000000..348ef92309a
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/config.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.register();"  unload="myPrefObserver.unregister()" height="410" width="900">
+<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/overlay.js"></script>
+<tabbox>
+  <tabs>
+    <tab label="Configuration Settings"/>
+    <tab label="Document Settings"/>
+    <tab label="About"/>
+  </tabs>
+  <tabpanels>
+    <tabpanel id="configtab">
+    	<vbox >
+	      	<groupbox id="gpConnection" width="770" height="300" align ="center" >
+			  <caption label="&gpConnection.label;"/>
+				<hbox>
+					<label  align="right" id="url"  value="&txturl.label;" width="80" />
+					<textbox id="txturl" width="200" readonly="true" />
+					<button label="&getdblist.label;" oncommand="openConfigChange();" image="&imagesearch.value;" width="90"/>
+				</hbox>
+				<hbox align="center" id="database_option">
+				</hbox>
+				<hbox id="first">
+					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/> 
+					<textbox id="DBlist_text" width="300"/>
+				</hbox>
+
+				<hbox >
+					<label align="right"  control="txtusername" value="&username.label;" width="80"/>
+					<textbox id="txtusername" width="300"/>
+				</hbox>
+				<hbox>
+					<label align="right" control="txtpassword" value="&password.label;" width="80"/>
+					<textbox id="txtpassword" type="password" width="300"/>
+				</hbox>
+				<hbox >
+					<spacer width="290"/>
+					<button align="center" id="btconnection" label="&connection.label;" oncommand="testConnection();" image="&imageok.value;" width="100"/>
+				</hbox>
+			</groupbox>
+		</vbox>
+    </tabpanel>
+    <tabpanel id="objecttab">
+		<groupbox id="gpObject" width="700" >
+		<caption label="&listDocument.header;"/>
+			<hbox>
+				<vbox>
+					<hbox>
+						<label control="txtobject" value="Title : " />
+						<textbox id="txtobj" width="100"/>
+						<label control="txtobject" value="&document.label;"/>
+						<textbox id="txtobject" width="100"/>
+						<label control="txtimagename" value="&image.label;"/>
+						<textbox id="txtimagename" width="100" readonly="true" />
+						<button id="btaddfile" label="&addfile.label;" oncommand="addFile();" image="&imagemoveleft.value;"/>
+				
+						<button id="btobjectcreate" label="&documentcreate.label;" oncommand="searchDocument();" image="&imagemovedown.value;"/>
+                        <button id="btobjectdelete" label="&documentdelete.label;" oncommand="deleteDocument();" image="&imagecancel.value;"/>
+					</hbox>
+					
+					<listbox id="listObjectListBox" flex="1" rows="10">
+				        <listhead>
+						<listheader label="Title"/>
+				        	<listheader label="&listDocumentListBox.header;"/>
+				        	<listheader label="Image"/>
+				        </listhead>
+				        <listcols>
+				        	<listcol flex="1"/>
+				        	<listcol flex="2"/>
+				        	<listcol flex="3"/>
+				        </listcols>
+				    </listbox>
+				</vbox>
+				<vbox>
+					<description>       </description>
+				</vbox>
+			</hbox>
+		</groupbox>
+    </tabpanel>
+    <tabpanel id="abouttab">
+		<groupbox id="gpAbout" width="770" align="center">
+			<caption label="&gpAbout.label;"/>
+			<image src="chrome://openerp_plugin/skin/developped_by.png" sizemode="stretch" align="center"/>
+			<description> </description>
+			<description> </description>
+			<description>&develop.value;</description>
+			<description> </description>
+			<description> </description>
+			<description>&information.value;</description>
+			<description><html:a href="&openerp.value;">&openerp.value;</html:a></description>
+			<description><html:a href="&axelor.value;">&axelor.value;</html:a></description>
+			<description><html:a href="&tinyerp.value;">&tinyerp.value;</html:a></description>
+			<description> </description>
+			<description> </description>
+			<description>Copyright © 2006-TODAY OpenERP SA All Rights Reserved.</description>
+			<description>OpenERP is a trademark of the OpenERP SA Company. OpenERP Web is jointly developed by OpenERP SA and Axelor.</description>
+			<description>Licenced under the terms of <html:a href="https://tiny.odoo.com/LICENSE.txt"> OpenERP Public License (OEPL) v1.1 (https://tiny.odoo.com/LICENSE.txt)</html:a> </description>
+		</groupbox>
+    </tabpanel>
+  </tabpanels>
+</tabbox>
+<hbox align="center">
+	<spacer width="800"/>
+	<button label="&close.label;" oncommand="close();" image="&imagecancel.value;"/>
+</hbox>
+</window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
new file mode 100644
index 00000000000..1e23652d98b
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/config_change.dtd">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml"  onload="config_change_load()"
+	title="Openerp Connection" height="140" width="280">
+<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>
+	<hbox>
+    <spacer width="70"/>
+	<description>Openerp Connection</description>
+    </hbox>
+<groupbox id="gpData" width="200">
+	<hbox >
+		<label id="lblurl" control="txtcurl" value="&lblurl.label;" width="80"/>
+		<textbox id="txtcurl" width="100" />
+	</hbox>
+	<hbox>	
+		<label id="lblport" control="txtcport" value="&lblport.label;" width="80"/>
+		<textbox id="txtcport" width="100" />
+	</hbox>
+    
+</groupbox>
+<hbox align="right">
+	<spacer width="50"/>
+  <button label="Cancel" image="&imagecancel.value;" oncommand="config_close();" />
+  <button label="OK" image="&imageok.value;" oncommand="config_ok()"/>
+</hbox>
+
+</window>
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
new file mode 100644
index 00000000000..d3d551d63e8
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!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="350" width="780">
+<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">
+    <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;"/>
+	</hbox>
+	<hbox>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
+		<textbox id="txtname" align="right" width="270"/>
+	</hbox>
+    </groupbox>
+    </tabpanel>    
+
+ <tabpanel id="address">
+  <groupbox id="address">
+    <hbox>
+        <caption label="&postaladdress.value;" />
+        <spacer width="300"/>
+     <vbox>
+        <caption label="&communication.value;" />
+     </vbox>
+    </hbox>
+
+     <hbox>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
+		<textbox id="txtstreet" width="270"/>
+        <spacer width="33"/>
+         <vbox>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtoffice" />
+        </vbox>
+	</hbox>
+
+     <hbox>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
+		<textbox id="txtstreet2" width="270"/>
+        <spacer width="35"/>
+        <vbox>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtfax" />
+        </vbox>
+	</hbox>
+   <hbox>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
+		<textbox id="txtzip" />
+        <spacer width="114"/>
+        <vbox>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="48" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtmobile"/>
+        </vbox>
+	</hbox>
+
+     <hbox>
+        <label  align="right" id="city"  value="&city.value;" width="97"/>
+		<textbox id="txtcity" />
+        <spacer width="112"/>
+        <vbox>
+          <label  align="right" id="emailid"  value="&email.value;" width="50" />
+        </vbox>
+        <vbox>
+	        <textbox id="txtemail" width="260" />
+        </vbox>
+	</hbox>
+ 
+    <hbox>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
+         <menulist id="country" width="190">
+           <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>
+</groupbox>
+</tabpanel>
+<description></description>
+<hbox>
+  <spacer width="580"/>
+  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+  <button label="&ok.label;" image="&imageok.value;" oncommand="createContact();"/>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/createpartner.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/createpartner.xul
new file mode 100644
index 00000000000..abc23a5b430
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/createpartner.xul
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/createpartner.dtd">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	title="&title.label;" height="100" width="325">
+<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>
+<groupbox id="gpData">
+	<hbox>
+		<description>&name.value;</description>
+		<spacer width="50"/>
+		<textbox id="txtname" align="right" />
+	</hbox>
+</groupbox>
+<description></description>
+<hbox>
+  <spacer width="140"/>
+  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+  <button label="&ok.label;" image="&imageok.value;" oncommand="createPartner();"/>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
new file mode 100644
index 00000000000..7da3701b1f3
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
@@ -0,0 +1,248 @@
+
+var MBstrBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].
+			getService(Components.interfaces.nsIStringBundleService);
+var mboximportbundle = MBstrBundleService.createBundle("chrome://openerp_plugin/locale/mboximport.properties"); 
+
+
+function saveMsgAsEML(msguri,file,append,uriArray,hdrArray,fileArray) {
+	
+    var myEMLlistner = {
+	   
+		scriptStream : null,
+		emailtext : "",
+
+        QueryInterface : function(iid)  {
+                if (iid.equals(Components.interfaces.nsIStreamListener) ||   
+                    iid.equals(Components.interfaces.nsIMsgHeaderSink) ||
+                    iid.equals(Components.interfaces.nsISupports))
+                 return this;
+        
+                throw Components.results.NS_NOINTERFACE;
+                return 0;
+        },
+        
+        onStartRequest : function (aRequest, aContext) { 
+			this.scriptStream = Components.classes['@mozilla.org/binaryinputstream;1'].createInstance(Components.interfaces.nsIBinaryInputStream);
+        },
+            
+        onStopRequest : function (aRequest, aContext, aStatusCode) {
+			this.scriptStream = null;
+						
+			if (append) {
+				if (this.emailtext != "") {
+					var data = this.emailtext + "\n";
+					// Some Imap servers don't add to the message the "From" prologue
+					if (data && ! data.match(/^From/)) {
+						var now = new Date;
+						var prologue = "From - " + now.toString() + "\n";
+						data = prologue+data;
+					}
+					data = IETescapeBeginningFrom(data);
+				}
+				var fileClone = file.clone();
+				IETwriteDataOnDisk(fileClone,data,true,this.sub,null);
+			}
+			else {
+				if (! hdrArray)
+					var sub = getSubjectForHdr(hdr);
+				else {
+					var parts = hdrArray[IETexported].split("§][§^^§");
+					var sub = parts[4];
+				}
+			
+				var data = this.emailtext.replace(/^From.+\r?\n]/, "");
+				data = IETescapeBeginningFrom(data);
+				var clone = file.clone();
+				// The name is taken from the subject "corrected"
+				clone.append(sub+".eml");
+				clone.createUnique(0,0644);
+				var time = (hdr.dateInSeconds)*1000;
+				IETwriteDataOnDisk(clone,data,false,null,time);
+			}
+			IETexported = IETexported + 1;
+			IETwritestatus(mboximportbundle.GetStringFromName("exported")+" "+IETexported+" "+mboximportbundle.GetStringFromName("msgs")+" "+IETtotal);
+			
+			if (IETexported < IETtotal) {
+				if (fileArray) {
+					var nextUri = uriArray[IETexported];
+					var nextFile = fileArray[IETexported];
+				}
+				else if (! hdrArray) {
+					var nextUri = uriArray[IETexported];
+					var nextFile = file;
+				}
+				else {
+					parts = hdrArray[IETexported].split("§][§^^§");
+					var nextUri = parts[5];
+					var nextFile = file;
+				}
+				saveMsgAsEML(nextUri,nextFile,append,uriArray,hdrArray,fileArray);
+			}
+			else {
+				IETexported = 0;
+				IETtotal = 0;
+			}
+		},
+            
+        onDataAvailable : function (aRequest, aContext, aInputStream, aOffset, aCount) {
+			this.scriptStream.setInputStream(aInputStream);
+			var chunk = this.scriptStream.readBytes(aCount);
+           	this.emailtext += chunk;
+	     }        
+        };
+	var mms = messenger.messageServiceFromURI(msguri).QueryInterface(Components.interfaces.nsIMsgMessageService);
+	var hdr = mms.messageURIToMsgHdr(msguri);
+	mms.streamMessage(msguri, myEMLlistner, msgWindow, null, false, null);
+}
+
+
+function nametoascii(str) {
+	if (! gPrefBranch.getBoolPref("mboximport.export.filenames_toascii")) {
+		str = str.replace(/[\x00-\x19]/g,"_");
+		return str.replace(/[\/\\:,<>*\?\"\|]/g,"_");
+	}
+	if (str)
+		str = str.replace(/[^a-zA-Z0-9]/g,"_");
+	else
+		str = "Undefinied_or_empty";
+	return str;
+}
+
+
+function  IETwriteDataOnDisk(file,data,append,name,time) {
+	var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
+		.createInstance(Components.interfaces.nsIFileOutputStream);
+	if (append) {
+		file.append(name);
+		foStream.init(file, 0x02 | 0x08 | 0x10, 0664, 0); // write,  create, append
+	}
+	else 
+		foStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
+	if (data)
+		foStream.write(data,data.length);
+	foStream.close();
+	var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+		.getService(Components.interfaces.nsIPrefBranch);
+	if (time && prefs.getBoolPref("mboximport.export.set_filetime"))
+		file.lastModifiedTime = time;
+}
+
+
+
+function IETescapeBeginningFrom(data) {
+	// Workaround to fix the "From " in beginning line problem in body messages
+	// See https://bugzilla.mozilla.org/show_bug.cgi?id=119441 and
+	// https://bugzilla.mozilla.org/show_bug.cgi?id=194382
+	// TB2 has uncorrect beahviour with html messages
+	// This is not very fine, but I didnt' find anything better...
+	var datacorrected = data.replace(/\nFrom /g, "\n From ");
+	return datacorrected;
+}
+
+
+function getPredefinedFolder(type) {
+	var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+		.getService(Components.interfaces.nsIPrefBranch);
+	// type 0 = folder
+	// type 1 = all messages
+	// type 2 = selected messages
+
+	var use_dir = "mboximport.exportMSG.use_dir";
+
+	var dir_path="";
+	if(navigator.userAgent.indexOf('Linux')!= -1){
+		dir_path ="/tmp"
+	}
+	else if(navigator.userAgent.indexOf('Win')!= -1){
+		dir_path ="C:\\"
+	}
+	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+		dir_path ="/tmp"
+	} 
+	try {
+		var localFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+		localFile.initWithPath(dir_path);
+		return localFile;
+
+	}
+	catch(e) {
+		return null;
+	}
+}
+
+function getSubjectForHdr(hdr) {
+	var emlNameType = gPrefBranch.getIntPref("mboximport.exportEML.filename_format");	
+	var mustcorrectname = gPrefBranch.getBoolPref("mboximport.export.filenames_toascii");
+	var subMaxLen = gPrefBranch.getIntPref("mboximport.subject.max_length")-1;
+	if (hdr.mime2DecodedSubject)
+
+		var subj = hdr.mime2DecodedSubject.substring(0, subMaxLen);
+	else
+		var subj =IETnosub;
+	subj = nametoascii(subj);
+	var dateInSec = hdr.dateInSeconds;
+	var msgDate8601string = dateInSecondsTo8601(dateInSec);
+	var key = hdr.messageKey;
+	if (emlNameType == 2) {
+		var pattern = gPrefBranch.getCharPref("mboximport.export.filename_pattern");
+		pattern = pattern.replace("%s",subj);
+    	pattern = pattern.replace("%k",key);
+		pattern = pattern.replace("%d", msgDate8601string);
+		pattern = pattern.replace(/-%e/g, "");
+		pattern = pattern.replace(/[\x00-\x19]/g,"_");
+		var fname = pattern;
+	}
+	else {
+
+		var fname = msgDate8601string+"-"+subj+"-"+hdr.messageKey;
+	}
+	setFileName(fname)
+	fname = fname.replace(/[\x00-\x19]/g,"_");
+	if (mustcorrectname)
+		fname = nametoascii(fname);
+	else
+		fname = fname.replace(/[\/\\:,<>*\?\"\|]/g,"_");
+	return fname;
+}
+
+function dateInSecondsTo8601(secs) {
+	var addTime = gPrefBranch.getBoolPref("mboximport.export.filenames_addtime");
+	var msgDate = new Date(secs*1000);
+	var msgDate8601 = msgDate.getFullYear();
+	if (msgDate.getMonth() < 9)
+		var month = "0"+(msgDate.getMonth()+1);
+	else
+		var month = msgDate.getMonth()+1;
+	if (msgDate.getDate() < 10)
+		var day = "0"+ msgDate.getDate();
+	else
+		var day = msgDate.getDate();
+	var msgDate8601string = msgDate8601.toString()+month.toString()+day.toString();
+	if (addTime &&  gPrefBranch.getIntPref("mboximport.exportEML.filename_format") == 2) {
+		if (msgDate.getHours() < 10)
+			var hours = "0"+msgDate.getHours();
+		else
+			var hours = msgDate.getHours();
+		if (msgDate.getMinutes() < 10)
+			var min = "0"+msgDate.getMinutes();
+		else
+			var min = msgDate.getMinutes();
+		msgDate8601string += "-"+ hours.toString() + min.toString();
+	}
+	return msgDate8601string;
+}
+
+function IETwritestatus(text) {
+	document.getElementById("statusText").setAttribute("label", text);
+	var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+	var delay = prefs.getIntPref("mboximport.delay.clean_statusbar");
+	if (delay > 0)
+		window.setTimeout(function(){IETdeletestatus(text);}, delay);
+}
+
+function IETdeletestatus(text) {
+	if (document.getElementById("statusText").getAttribute("label") == text)
+		document.getElementById("statusText").setAttribute("label", "");
+}
+
+
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js
new file mode 100755
index 00000000000..93d21f56f5c
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js
@@ -0,0 +1,134 @@
+//gives the preference branch instance
+var preferenceBranch = getPref();
+
+//returns the selected checkbox for searching
+function getnamesearch()
+{
+	var checkboxlist = [];
+	var j=0;
+	var objectlist = preferenceBranch.getCharPref("object").split(',');
+	if (objectlist[0]!=''){
+		for (var i=1;i<=objectlist.length;i++)
+		{
+			if(document.getElementById('cbx'+i) && document.getElementById('cbx'+i).checked == true)
+			{
+				checkboxlist[j] = objectlist[i-1] //document.getElementById('cbx'+i).label;
+				j++;
+			}
+		}
+	}
+	return checkboxlist;
+}
+//function to set the text value for the selected partner for contact creation
+function selectPartner(){
+	if(document.getElementById('listPartnerBox').selectedItem){
+		var listselectedItem = document.getElementById('listPartnerBox').selectedItem;
+		var value = listselectedItem.firstChild.getAttribute('label');
+		setPartnerId(listselectedItem.value);
+		document.getElementById('txtselectpartner').setAttribute('value',value);
+		window.opener.document.getElementById('txtselectpartner').setAttribute('value',value);
+		}
+	else{
+		window.opener.document.getElementById('txtselectpartner').setAttribute('value','');
+	}
+}
+
+//function for the intialization procedure //used while loading and unloading of the window
+var myPrefObserver =
+{
+	//set the intial value of the email for the text field in plugin window and also loads the listbox of objects with image
+	loaddata: function()
+	{	
+		setTimeout("listSearchDocumentAttachment()", 0)
+	},
+
+	//set the initial value of name and email field of create contact window
+	createContact: function()
+	{
+        document.getElementById("txtname").value = getSenderName();
+        document.getElementById("txtemail").value = getSenderEmail();
+        document.getElementById("country").value = getAllCountry();
+        document.getElementById("state").value = getAllState();
+        setPartnerId(0);
+	},
+
+	//sets the value of email information in preferences and adds observer for the window
+	register: function()
+  	{
+	    appendDbList()
+    	preferenceBranch.addObserver("", myPrefObserver, false);
+	    document.getElementById("txturl").value = getServer();
+    	    var s = document.getElementById('txturl').value;
+	    var a =s.split(':');
+	    setPort(a[a.length-1]);
+	    document.getElementById("txtusername").value = getUsername();
+	    document.getElementById("txtpassword").value = getPassword();
+	    document.getElementById("DBlist_text").value = getDbName();
+		if(getPref().getCharPref("object") != ''){
+	    	var objectlist = getPref().getCharPref("object").split(',');
+	    	var imagelist = getPref().getCharPref("imagename").split(',');
+	    	var obj = getPref().getCharPref("listobject").split(',');
+			if(objectlist.length>0){
+				for(i=0;i<objectlist.length;i++){
+					var	listItem = document.createElement("listitem");
+					var listcell1 = document.createElement("listcell");
+					var listcell2 = document.createElement("listcell");
+					var listcell3 = document.createElement("listcell");
+					listcell1.setAttribute("label",obj[i]);
+					listcell2.setAttribute("label",objectlist[i]);
+					listcell3.setAttribute("image",imagelist[i]);
+					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);
+                   
+				}
+			}
+		}
+    },
+
+    createContactAddress: function()
+	{
+	  	document.getElementById("txtname").value = getPartnerName();
+        document.getElementById("txtcontactname").value = getSenderName();
+        document.getElementById("txtstreet").value = getStreet();
+        document.getElementById("txtstreet2").value = getStreet2();
+        document.getElementById("txtzip").value = getZipCode();
+        document.getElementById("txtcity").value = getCity();
+        document.getElementById("txtoffice").value = getOfficenumber();
+        document.getElementById("txtfax").value = getFax();
+        document.getElementById("txtmobile").value = getMobilenumber();
+	    document.getElementById("txtemail").value = getSenderEmail();
+        document.getElementById("country").value =getAllCountry();
+        document.getElementById("state").value = getAllState();
+	},
+
+	//unregistering the window observer
+	unregister: function()
+	{
+		if(!preferenceBranch) return;
+	    preferenceBranch.removeObserver("", myPrefObserver);
+	},
+
+  	observe: function(aSubject, aTopic, aData)
+  	{
+    	if(aTopic != "nsPref:changed") return;
+    	// aSubject is the nsIPrefBranch we're observing (after appropriate QI)
+    	// aData is the name of the pref that's been changed (relative to aSubject)
+    	switch (aData) {
+      		case "serverport":
+        	break;
+      	case "serverurl":
+        	break;
+      	case "serverdbname":
+        	break;
+    	}
+  	},
+}
+
+function runMoreCode() 
+{
+} 
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
new file mode 100755
index 00000000000..7d7c9098bce
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
@@ -0,0 +1,315 @@
+//global array creation and declaration
+var contentType = new Array();
+var uri = new Array();
+var url = new Array();
+var name = new Array();
+var test = new Array();
+
+var MBstrBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].
+			getService(Components.interfaces.nsIStringBundleService);
+var mboximportbundle = MBstrBundleService.createBundle("chrome://mboximport/locale/mboximport.properties"); 
+//function to get the required details of the selected email
+
+function searchmail()
+{	
+	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
+	}
+	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];
+
+	if(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
+		alert("You must select only one mail to archive");
+		return false
+	}
+
+	//gives the selected email uri
+	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);
+
+	//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;
+
+	//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 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;
+
+	//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()
+		if (getmodule_install() == "no")
+		{
+			alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
+			return false
+		}
+		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+		createInstance(name,test)
+
+	}
+	else
+	{
+			if (getmodule_install() == "no")
+			{
+				alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
+				return false
+			}
+		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+	}
+}
+
+function open_contact()
+{	
+	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(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
+		alert("You must select only one mail For Open Contact Detail");
+		return false
+	}
+
+	//gives the selected email uri
+	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);
+
+	//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
+	setSenderEmail(senderemail);
+	setSenderName(sendername);
+    setPartnerName("");
+    setStreet("");
+    setStreet2("");
+    setZipCode("");
+    setCity("");
+    setOfficenumber("");
+    setFax("");
+    setMobilenumber("");
+
+    if (getmodule_install() == "no")
+	{
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
+		return false
+	}
+	window.open("chrome://openerp_plugin/content/address.xul", "", "chrome, resizable=yes");
+
+}
+
+//function to open the configuration window
+var Config = {
+  onLoad: function() {
+    // initialization code
+    this.initialized = true;
+  },
+
+  onMenuItemCommand: function() {
+    window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
+  }
+};
+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;
+	},
+
+	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;
+	},
+
+	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;
+	},
+
+	onMenuItemCommand: function(){
+       open_contact();
+        searchContact();
+	}
+};
+
+
+//function to open the window for selecting the partner for a new contact creation
+var Select = {
+	onLoad: function(){
+	this.initialized=true;
+	},
+
+	onMenuItemCommand: function(){
+		window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
+	}
+};
+
+var CreatePartner = {
+	onLoad: function(){
+	this.initialized=true;
+	},
+
+	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
new file mode 100755
index 00000000000..c48dc0d70b9
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://openerp_plugin/skin/overlay.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "chrome://openerp_plugin/locale/overlay.dtd">
+<overlay id="tiny-overlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+         xmlns:html="http://www.w3.org/1999/xhtml">
+<script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
+<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>
+
+<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();"/>
+</popup>
+
+<toolbarpalette id="MailToolbarPalette">
+	<toolbarbutton id="GA-button"
+		class="toolbarbutton-1"
+		image="&menuicon.value;"
+		label= "Archive To OpenERP"
+		oncommand="searchmail();" />
+</toolbarpalette> 
+
+<toolbarpalette id="MailToolbarPalette">
+	<toolbarbutton id="GA-button1"
+		class="toolbarbutton-1"
+		image="&partnericon.value;"
+		label= "Open Contact"
+		oncommand="Address.onMenuItemCommand(event);" />
+</toolbarpalette> 
+
+<toolbarpalette id="MailToolbarPalette">
+	<toolbarbutton id="GA-button2"
+		class="toolbarbutton-1"
+		image="&imagearchive.value;"
+		label= "Open Document"
+		oncommand="archivemail();"  />
+</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
new file mode 100644
index 00000000000..45c552452bb
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://openerp_plugin/skin/line.css" type="text/css"?>
+<!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="480" width="1000">
+
+<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>
+<script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
+<description></description>
+<hbox id="root">
+   <vbox width="400">
+      <groupbox height="30" id="existsobjectgroup" width="400">
+         <caption label="&gptinyobj.label;" />
+	   <hbox>
+	   <label id="lblsearch" control="txtvalueobj" value="&search.label;"/>
+	   <textbox id="txtvalueobj" size="30"/>
+	   <button label="&bsearch.label;" oncommand="searchCheckbox()" image="&imagesearch.value;" accesskey="s"/> 
+	   </hbox>
+	   <vbox align="left" id="checkbox-dynamic"> 
+	  </vbox> 
+	  <hbox align="center">
+	   <image src='chrome://tiny_plugin/skin/perform.gif'/>
+	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" checked="false"/>
+        <caption label="&cbxselectall.label;" />
+	    <spacer width="10"/>
+      
+	  </hbox>
+    <label id="lblex" value=" "/>
+    <hbox>
+    <description>Documents</description>
+    </hbox>
+	<listbox height="250" id="listSearchBox" seltype="multiple">
+	    <listhead >
+	    	<listheader label="&listSearchBox.header;"/>
+	    </listhead>
+	    <listcols>
+	    	<listcol  flex="1"/>
+	    </listcols>
+	</listbox>
+	<hbox>
+	<spacer width="360"/>
+	<button label="&attach.label;" accesskey="u" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('upload');"/>
+	</hbox>
+      </groupbox>
+
+   </vbox>
+   <vbox>
+      <groupbox id="newobjectgroup" align="center" width="170" height="375">
+	<caption label="&newobject.label;" />
+	<hbox>
+	<label id="lblex" value=" "/>
+         <label id="lblex3" control="section" value="&object.label;"/>
+         <menulist id="section" width="150">
+           <menupopup>
+	     <menuitem label="" value=""/>
+   	    </menupopup>
+      	  </menulist>
+        <vbox>
+      	  <button width="50" label="&archive.label;" accesskey="c" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('create');"/>
+        </vbox>
+	</hbox>
+
+	<label id="lblsection" value=" "/>	
+	<separator class="groove-thin" orient="horizontal" width="180"/>
+
+    
+    <hbox>
+	<label id="lblsection" control="section" value="&partner.label;"/>
+        <vbox>
+	    <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+        </vbox>
+    </hbox>
+  
+ </groupbox>
+  <label id="lblex" value=" "/>
+  <label id="lblex" value=" "/>
+  <hbox align="right">
+  <spacer width="330"/>
+	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+    </hbox>
+    
+  
+  </vbox>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
new file mode 100644
index 00000000000..f0512339a40
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/selectpartner.dtd">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml" onload="getPartnerList()"
+	title="&title.label;" height="500" width="375">
+<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>
+<groupbox id="gpPartner">
+	<hbox>
+		<textbox id="txtselectpartner"/>
+		<spacer width="25"/>
+		<button label="&bsearch.label;" image="&imagesearch.value;" oncommand="getPartnerList();"/>
+	</hbox>
+</groupbox>
+<listbox id="listPartnerBox" flex="1" rows="5">
+    <listhead>
+    	<listheader label="&listPartnerName.header;"/>
+    </listhead>
+    <listcols>
+    	<listcol flex="1"/>
+    </listcols>
+</listbox>
+<description></description>
+<hbox>
+  <button label="Create Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
+  <spacer width="45"/>
+  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+  <button label="&select.label;" image="&imageok.value;" oncommand="selectPartner();close()"/>
+</hbox>
+
+</window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/static.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/static.js
new file mode 100644
index 00000000000..c44c5bf7bb4
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/static.js
@@ -0,0 +1,19 @@
+
+//function to check all the checkbox
+function selectAllCheckbox()
+{
+	var objectlist = preferenceBranch.getCharPref("object").split(',');
+	if(objectlist.length == 1 && objectlist[0]==''){
+		return false;
+	}
+	for (var i=1;i<=objectlist.length;i++)
+	{
+	 	var checkboxobj = document.getElementById('cbx'+i);
+		if (!checkboxobj)
+			continue
+		if(document.getElementById('cbxselectall').checked == true)
+			checkboxobj.checked = true;
+		else
+		  	checkboxobj.checked = false;
+	}
+}
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
new file mode 100755
index 00000000000..b5057a8cd09
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -0,0 +1,2046 @@
+/**
+* Global instance stored here
+*/
+
+var xmlRpcClient;
+
+//Service name on server like /common,/db etc...
+var strServerService;
+
+//temporary variables
+var strobject;
+
+//Array
+var arrDbList = new Array();
+var arrPartnerList = new Array();
+var arrFinalList = new Array();
+
+
+var contentType = new Array();
+var uri = new Array();
+var url = new Array();
+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;
+
+			}
+		}
+		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'];
+	}
+}
+function handler_function( 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 branchobj = prefService.getBranch("extensions.tiny.");
+    branchobj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+	return branchobj
+}
+
+function setFileName(fname){
+	getPref().setCharPref('fname',fname);
+}
+
+//set attachment file save or not
+function setAttachment(argAttac){
+	getPref().setCharPref('attachment',argAttac);
+}
+
+//set preference value for server url
+function setServer(argServer){
+	getPref().setCharPref('serverurl',argServer);
+}
+
+//set preference value for server port
+function setPort(argPort){
+	getPref().setCharPref('serverport',argPort)
+}
+
+//set preference value of database name for data searching and selection
+function setDbName(argDbName){
+	getPref().setCharPref('serverdbname',argDbName);
+}
+
+//set preference value of username for login
+function setUsername(argUsername){
+	getPref().setCharPref('username',argUsername);
+}
+
+//set preference value of password for login
+function setPassword(argPassword){
+	getPref().setCharPref('password',argPassword);
+}
+
+//set preference value for storing partner id
+function setPartnerId(argPartnerId){
+	getPref().setCharPref('partnerid',argPartnerId)
+}
+
+//set preference value for Resource Id
+function setResourceId(argResourceId){
+    getPref().setCharPref('res_id',argResourceId)
+}
+//set server service
+function setServerService(argServerService){
+	strServerService = argServerService;
+}
+
+//set preference value for sender email
+function setSenderEmail(argSenderEmail){
+	getPref().setCharPref('senderemail',argSenderEmail)
+}
+
+//set preference value for receiver email
+function setReceiverEmail(argReceiverEmail){
+	getPref().setCharPref('receiveremail',argReceiverEmail)
+}
+
+//set preference value for sender name
+function setSenderName(argSenderName){
+    getPref().setCharPref('sendername',argSenderName)
+}
+
+//set preference value for email subject
+function setSubject(argSubject){
+	getPref().setCharPref('subject',argSubject)
+}
+
+//set preference value for email received date
+function setReceivedDate(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)
+}
+
+//set preference value for storing attachment option in config
+function setAttachValue(argAttachValue){
+	getPref().setCharPref('attachvalue',argAttachValue)
+}
+
+//set preference value for email cclist
+function setCCList(argCCList){
+	getPref().setCharPref('cclist',argCCList)
+}
+
+//set preference value for email message body
+function setMessageBody(argMessageBody){
+	getPref().setCharPref('messagebody',argMessageBody)
+}
+
+//set preference value for Partner Name
+function setPartnerName(argPartnerName){
+	getPref().setCharPref('partnername',argPartnerName)
+}
+
+//set preference value for Contact Name
+function setContactName(argContactName){
+	getPref().setCharPref('contactname',argContactName)
+}
+
+//set preference value for street
+function setStreet(argStreet){
+	getPref().setCharPref('street',argStreet)
+}
+
+//set preference value for street2
+function setStreet2(argStreet2){
+	getPref().setCharPref('street2',argStreet2)
+}
+
+//set preference value for zipcode
+function setZipCode(argZipcode){
+	getPref().setCharPref('zipcode',argZipcode)
+}
+
+//set preference value for Office Number
+function setOfficenumber(argOfficenumber){
+	getPref().setCharPref('officeno',argOfficenumber)
+}
+
+//set preference value for Phone Number
+function setMobilenumber(argMobilenumber){
+	getPref().setCharPref('phoneno',argMobilenumber)
+}
+
+//set preference value for Fax
+function setFax(argFax){
+	getPref().setCharPref('fax',argFax)
+}
+
+//set preference value for city
+function setCity(argCity){
+	getPref().setCharPref('city',argCity)
+}
+
+//set preference value for country
+function setCountry(argCountry){
+	getPref().setCharPref('country',argCountry)
+}
+
+//set preference value for state
+function setState(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]);
+}
+
+//set preference value for storing user id
+function setUserId(argUserId){
+	getPref().setIntPref('userid',argUserId);
+}
+
+//set database list is displaye or not
+function setDBList(argDBList){
+	getPref().setCharPref('db_list',argDBList)
+}
+
+//set server connect or not
+function setconnect_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)
+}
+
+//get module install or not
+function getmodule_install(){
+	return getPref().getCharPref('module_install');
+}
+
+
+//get server connect or not
+function getconnect_server(){
+	return getPref().getCharPref('connect_server');
+}
+
+
+//get partner id
+function getPartnerId(){
+	return getPref().getCharPref('partnerid');
+}
+//get database list is displaye or not
+function getDBList(){
+	return getPref().getCharPref('db_list');
+}
+
+function getFileName(){
+	return getPref().getCharPref('fname');
+}
+
+//get attachment save or not
+function getAttachment(){
+	return getPref().getCharPref('attachment');
+}
+
+//get serverurl
+function getServer(){
+	return getPref().getCharPref('serverurl');
+}
+
+//get server port
+function getPort(){
+	return getPref().getCharPref('serverport');
+}
+
+//get database name
+function getDbName(){
+	return getPref().getCharPref('serverdbname');
+}
+
+//get username from config settings
+function getUsername(){
+	return getPref().getCharPref('username');
+}
+
+//get password from config settings
+function getPassword(){
+	return getPref().getCharPref('password');
+}
+
+//get serverservice
+function getServerService(){
+	return strServerService;
+
+}
+
+//get sender email
+function getSenderEmail(){
+	return getPref().getCharPref('senderemail');
+}
+
+//get receiver email
+function getReceiverEmail(){
+	return getPref().getCharPref('receiveremail');
+}
+
+//get resource id
+function getResourceId(){
+	return getPref().getCharPref('res_id');
+}
+
+
+//get sender name
+function getSenderName(){
+        str = getPref().getCharPref('sendername');
+        if(!str.toString().match(/=?utf-8?q?/))
+        {
+            return str;
+        }
+        else
+        {
+
+            string = str.replace(/[\'Š',\'Ž',\'š',\'ž',\'Ÿ',\'À',\'Á',\'Â',\'Ã',\'Ä',\'Å',\'Ç',\'È',\'É',\'Ê',\'Ë',\'Ì',\'Í',\'Î',\'Ï',\'Ñ',\'Ò',\'Ó',\'Ô',\'Õ',\'Ö',\'Ø',\'Ù',\'Ú',\'Û',\'Ü',\'Ý',\'à',\'á',\'â',\'ã',\'ä',\'å',\'ç',\'è',\'é',\'ê',\'ë',\'ì',\'í',\'î',\'ï',\'ñ',\'ò',\'ó',\'ô',\'õ',\'ö',\'ø',\'ù',\'ú',\'û',\'ü',\'ý',\'ÿ',\'Þ',\'þ',\'Ð',\'ð',\'ß',\'Œ',\'œ',\'Æ',\'æ',\'µ']/g,'"',"'",'“','”',"\n","\r",'_/',"'S','Z','s','z','Y','A','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','O','U','U','U','U','Y','a','a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','o','u','u','u','u','y','y','TH','th','DH','dh','ss','OE','oe','AE','ae','u','','','','','','','-'");
+
+            var utftext = "";
+            var encoded_string = "";
+            var convertedString = "";
+		    for (var n = 0; n < string.length; n++)
+            {
+        		var c = string.charCodeAt(n);
+			    if (c < 128) {
+				    utftext += String.fromCharCode(c);
+			    }
+		    }
+
+            encoded_string = encode64(utftext);
+		   return encoded_string;
+        }
+}
+
+//ger partner name
+function getPartnerName(){
+	return getPref().getCharPref('partnername');
+}
+
+//get contact name
+function getContactName(){
+	return getPref().getCharPref('contactname');
+}
+
+
+//get street name
+function getStreet(){
+	return getPref().getCharPref('street');
+}
+
+//get street2 name
+function getStreet2(){
+	return getPref().getCharPref('street2');
+}
+
+//get zip code
+function getZipCode(){
+	return getPref().getCharPref('zipcode');
+}
+
+//get city name
+function getCity(){
+	return getPref().getCharPref('city');
+}
+
+//get country name
+function getCountry(){
+    return getPref().getCharPref('country');
+}
+
+//get state name
+function getState(){
+	return getPref().getCharPref('state');
+}
+
+//get office no
+function getOfficenumber(){
+	return getPref().getCharPref('officeno');
+}
+
+//get mobile no
+function getMobilenumber(){
+	return getPref().getCharPref('phoneno');
+}
+
+//get fax no
+function getFax(){
+	return getPref().getCharPref('fax');
+}
+
+
+//get email subject
+function getSubject(){
+	return getPref().getCharPref('subject');
+}
+
+//get email received date
+function getReceivedDate(){
+	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');
+}
+
+//get attachment option information from the configuration settings
+function getAttachValue(){
+	return getPref().getCharPref('attachvalue');
+}
+
+//get email cclist information
+function getCCList(){
+	return getPref().getCharPref('cclist');
+}
+
+//get email message body
+function getMessageBody(){
+	return getPref().getCharPref('messagebody');
+}
+
+//get the whole server path
+function getServerUrl(){
+	return getServer()+":"+getPort()+"/"+getServerService();
+}
+
+//get user id for the xmlrpc request
+function getUserId(){
+	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);
+}
+
+//returns the xmlrpc client instance
+function getXmlRpc() {
+	if (!xmlRpcClient) {
+		xmlRpcClient = getClient();
+	}
+
+	// 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
+}
+
+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;
+}
+
+//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);
+                // 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);
+                        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 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]));
+					}
+				}
+			}
+		}
+	},
+
+
+	onFault: function (client, ctxt, fault) {
+		
+	},
+
+	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);
+
+	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;
+}
+
+//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);
+                // 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.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) {
+
+	}
+}
+
+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);
+          
+			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) {
+		
+	}
+}
+
+var listAllStateHandler = {
+
+	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);
+			arrPartnerList1[i] = arrDataPair;
+		}
+		if (!context)
+		{
+			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+			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]));
+
+			}
+		}
+	
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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);
+}
+
+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);
+}
+
+function getAllState(){
+	var branchobj = getPref();
+	setServerService('xmlrpc/object');
+	var xmlRpcClient = getXmlRpc();
+	arrPartnerList1 = [];
+	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("state").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;
+}
+
+//function to search and fillup section selection box
+function createMenuItem(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[1]);
+  item.setAttribute("value", aLabel[0]);
+  return item;
+}
+
+
+function listinstallmodule( result ) {
+	if ( rpc.onfault( result ) ) 
+	{ 
+		setmodule_install('no')
+	}
+}
+
+function module_install()
+{
+	setmodule_install("yes")
+	var branchobj = getPref();
+	setServerService('xmlrpc/object');
+	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+	var xmlRpcClient = getXmlRpc();
+	strDbName = branchobj.getCharPref("serverdbname");
+	struid = branchobj.getIntPref('userid');
+	strpass = branchobj.getCharPref("password");
+	strmethod = 'search';
+	strobj = 'thunderbird.partner'; // TOFIX: Find module 'thunderbird' into 'module.module' model.
+	var temp = new Array()
+	server=getServer()
+	port=getPort()
+	basicList=getBasicList()
+	rpc.addserver('object',basicList[3] , basicList[4],'/xmlrpc/object');
+	srcids=rpc.ask( 'object', 'execute', [basicList[0],basicList[1],basicList[2],strobj,strmethod,[]],listinstallmodule)
+}
+
+
+var listSearchContactHandler = {
+	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 strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
+            var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            if(strlSearchResult=="partner_name"){
+                 setPartnerName(strlSearchResultValue);
+                 var t = getPartnerName();}
+
+             if(strlSearchResult=="contactname"){
+                 setSenderName(strlSearchResultValue);
+                 var t = getSenderName();}
+            
+            if(strlSearchResult=="street"){
+                 setStreet(strlSearchResultValue);
+                 var t = getStreet();}
+            
+            if(strlSearchResult=="street2"){
+                 setStreet2(strlSearchResultValue);
+                 var t = getStreet2();}
+            
+            if(strlSearchResult=="zip"){
+                 setZipCode(strlSearchResultValue);
+                 var t = getZipCode();}
+
+            if(strlSearchResult=="city"){
+                 setCity(strlSearchResultValue);
+                 var t = getCity();}
+        
+            if(strlSearchResult=="phone"){
+                 setOfficenumber(strlSearchResultValue);
+                 var t = getOfficenumber();}
+        
+            if(strlSearchResult=="fax"){
+                 setFax(strlSearchResultValue);
+                 var t = getFax();}
+            
+            if(strlSearchResult=="mobile"){
+                 setMobilenumber(strlSearchResultValue);
+                 var t = getMobilenumber();}
+
+           if(strlSearchResult=="email" && strlSearchResultValue!=''){
+                 setSenderEmail(strlSearchResultValue);
+                 var t = getSenderEmail();} 
+    
+            if(strlSearchResult=="res_id"){
+                 setResourceId(strlSearchResultValue);
+                 var t = getResourceId();}
+		}
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+
+}
+var listSearchContactdetailHandler = {
+	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 strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
+            var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            if(strlSearchResult=="email" && strlSearchResultValue=='')
+            {
+                alert("Contact is not Available")
+                document.getElementById("txtemail").value = sendername;
+            } 
+            if(strlSearchResult=="partner_name"){
+                 document.getElementById("txtname").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="contactname"){
+                 document.getElementById("txtcontactname").value =strlSearchResultValue;}
+            
+            if(strlSearchResult=="street"){
+                document.getElementById("txtstreet").value =strlSearchResultValue;}
+            
+            if(strlSearchResult=="street2"){
+                 document.getElementById("txtstreet2").value =strlSearchResultValue;}
+            if(strlSearchResult=="zip"){
+                 document.getElementById("txtzip").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="city"){
+                document.getElementById("txtcity").value =strlSearchResultValue;}
+            if(strlSearchResult=="phone"){
+                 document.getElementById("txtoffice").value =strlSearchResultValue;}
+        
+            if(strlSearchResult=="fax"){
+                 document.getElementById("txtfax").value =strlSearchResultValue;}
+            
+            if(strlSearchResult=="mobile"){
+                 document.getElementById("txtmobile").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="email"&& strlSearchResultValue!=''){
+                document.getElementById("txtemail").value =strlSearchResultValue;}
+
+            if(strlSearchResult=="res_id"){
+                 setResourceId(strlSearchResultValue);
+                 var t = getResourceId();}
+
+		}
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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 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);
+}
+
+//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);
+                // 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 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]
+						}
+					}
+
+					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) {
+
+	},
+
+	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("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 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);
+}
+
+//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);
+                // 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) {
+
+	},
+
+	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);
+}
+//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;
+}
+
+//xmlrpc request handler for creating the record of mail
+var listArchiveHandler = {
+	onResult: function(client, context, result) {
+		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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 + 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
+    }
+}
+function upload_archivemail()
+{
+    list_documents = document.getElementById('listSearchBox')
+    var context = []
+    var cnt = list_documents.selectedCount
+	for(i=0;i<cnt;i++)
+	{	
+        var object = list_documents.getSelectedItem(i);
+		var eml_string = parse_eml();
+        var model = object.label;
+        var res_id = object.value;
+		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,{});
+        var a = ['model', 'res_id','message'];
+	    var b = [model, res_id,eml_string];
+        var arrofarr = dictcontact(a,b)
+        xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+        alert("Mail Archive Successfully");
+      }
+		window.close();
+    
+}
+
+function create_archivemail(){
+	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';
+        var eml_string = parse_eml()
+		var a = ['model', 'message'];
+		var b = [object, eml_string];
+		var arrofarr = dictcontact(a,b);
+		xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+        alert("Mail Archive Successfully");
+		}
+    	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) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+}
+
+var listUpdateContactHandler = {
+	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) {
+
+	},
+
+	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(),getSenderName(),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(),getPartnerName(),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);
+
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+}
+
+
+//function to encode the string into base64
+var base64chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split("");
+function base64_encode (s)
+ {
+   // the result/encrypted string, the padding string, and the pad count
+   var r = ""; var p = ""; var c = s.length % 3;
+
+   // add a right zero pad to make this string a multiple of 3 characters
+   if (c > 0) { for (; c < 3; c++) { p += '='; s += "\0"; } }
+
+   // increment over the length of the string, three characters at a time
+   for (c = 0; c < s.length; c += 3) {
+
+     // we add newlines after every 76 output characters, according to the MIME specs
+     if (c > 0 && (c / 3 * 4) % 76 == 0) { r += "\r\n"; }
+
+     // these three 8-bit (ASCII) characters become one 24-bit number
+     var n = (s.charCodeAt(c) << 16) + (s.charCodeAt(c+1) << 8) + s.charCodeAt(c+2);
+
+     // this 24-bit number gets separated into four 6-bit numbers
+     n = [(n >>> 18) & 63, (n >>> 12) & 63, (n >>> 6) & 63, n & 63];
+
+     // those four 6-bit numbers are used as indices into the base64 character list
+     r += base64chars[n[0]] + base64chars[n[1]] + base64chars[n[2]] + base64chars[n[3]];
+
+     // add the actual padding string, after removing the zero pad
+   } return r.substring(0, r.length - p.length) + p;
+ }
+
+//function to encode the string into base64
+var keyStr = "ABCDEFGHIJKLMNOP" +
+                "QRSTUVWXYZabcdef" +
+                "ghijklmnopqrstuv" +
+                "wxyz0123456789+/" +
+                "="+"-_.!~*'()";
+
+function encode64(input) {
+var output = "";
+var chr1, chr2, chr3 = "";
+var enc1, enc2, enc3, enc4 = "";
+var i = 0;
+
+do {
+ chr1 = input.charCodeAt(i++);
+ chr2 = input.charCodeAt(i++);
+ chr3 = input.charCodeAt(i++);
+
+ enc1 = chr1 >> 2;
+ enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+ enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+ enc4 = chr3 & 63;
+
+ if (isNaN(chr2)) {
+    enc3 = enc4 = 64;
+ } else if (isNaN(chr3)) {
+    enc4 = 64;
+ }
+
+ output = output +
+    keyStr.charAt(enc1) +
+    keyStr.charAt(enc2) +
+    keyStr.charAt(enc3) +
+    keyStr.charAt(enc4);
+ chr1 = chr2 = chr3 = "";
+ enc1 = enc2 = enc3 = enc4 = "";
+} while (i < input.length);
+
+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 = ''
+
+	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);
+
+
+}
+
+//xmlrpc request handler for handling the login information
+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);
+			alert('Successful Login To OpenERP');
+            window.close();
+		}
+		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.");
+	}
+}
+
+//function to check the login information
+function testConnection(){
+	if (getconnect_server() == "false")
+	{
+		alert("No Server Running..."+" "+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);
+}
+
+
+//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) {
+		
+	},
+
+	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);
+}
+
+//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);
+		
+		if(typeof(createId.data) == 'number' && createId!=0){
+			window.close();
+		}
+		if(createId == 0){
+			alert("Partner Already Exist");
+		}
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	onError: function (client, ctxt, status, errorMsg) {
+
+	}
+}
+//function to create the tiny partner object
+function createPartner(){
+	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_partner';
+	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+	strobj.data = 'thunderbird.partner';
+	if(document.getElementById('txtname').value ==''){
+		alert("You Must Enter Partner Name");
+		return false;
+	}
+	var a = ['name'];
+	var b = [document.getElementById('txtname').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");
+
+		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) {
+
+	},
+
+	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);
+}
+
+//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(',');
+
+		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");
+
+				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)
+
+				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)
+
+	},
+	onFault: function (client, ctxt, fault) {
+
+	},
+
+	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);
+}
+
+
+//function to create a new attachment record
+
+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 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");
+			}
+		}
+}
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/address.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
new file mode 100644
index 00000000000..3b5b95e2a32
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
@@ -0,0 +1,26 @@
+<!ENTITY title.label "Open Contact">
+<!ENTITY name.value "Partner Name:">
+<!ENTITY contactname.value "Contact Name:">
+<!ENTITY street.value "Street:">
+<!ENTITY street2.value "Street2:">
+<!ENTITY zip.value "Zip:">
+<!ENTITY city.value "City:">
+<!ENTITY country.value "Country:">
+<!ENTITY state.value "State:">
+<!ENTITY office.value "Office:">
+<!ENTITY fax.value "Fax:">
+<!ENTITY mobile.value "Mobile:">
+<!ENTITY email.value "Email:">
+<!ENTITY emailid.value "Email ID:">
+<!ENTITY communication.value "Communication:">
+<!ENTITY postaladdress.value "Postal Address:">
+<!ENTITY ok.label "Save">
+<!ENTITY partner.label "Create New Contact :">
+<!ENTITY create.label "New Contact">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY newpartner.label "New Partner">
+<!ENTITY bsearch.label "Search Contact">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
new file mode 100755
index 00000000000..23cd94efa05
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
@@ -0,0 +1,49 @@
+<!ENTITY title.label "OpenERP Configuration">
+<!ENTITY separate.label "Configuration Login for OpenERP!">
+<!ENTITY close.label "Cancel">
+<!ENTITY database.label "Database:">
+<!ENTITY ok.label "OK">
+<!ENTITY connection.label "Connect">
+<!ENTITY txturl.label "Server: ">
+<!ENTITY image.label "Image : ">
+<!ENTITY obj.label "Document : ">
+<!ENTITY username.label "Username: ">
+<!ENTITY password.label "Password: ">
+<!ENTITY setdb.label "Move &gt;">
+<!ENTITY getdblist.label "Change">
+<!ENTITY gpConnection.label "Connection Parameters">
+<!ENTITY listDBListBox.header "Available DBs">
+<!ENTITY listDocument.header "Document">
+<!ENTITY listDocumentListBox.header "Document Name">
+<!ENTITY document.label "Document Name : ">
+<!ENTITY documentcreate.label "Add">
+<!--<!ENTITY objectdelete.label "Delete Selected Object From The List"> -->
+<!ENTITY documentdelete.label "Delete">
+<!ENTITY gpArchive.label "Archived Email Attachment Options">
+<!ENTITY rdAlwaysAttached.label "Always Send Email Attachments to OpenERP">
+<!ENTITY rdPromptAttached.label "Prompt Before Sending Email Attachments">
+<!ENTITY rdNeverAttached.label "Never Send Email attachments to OpenERP">
+<!ENTITY reserve.value "Copyright © 2006-TODAY OpenERP SA All Rights Reserved.
+OpenERP is a trademark of the OpenERP SA Company. OpenERP Web is jointly developed by OpenERP SA and Axelor.\n
+Licenced under the terms of OpenERP Public License (OEPL) v1.1 ">
+<!ENTITY openerp.value "http://www.openerp.com/">
+<!ENTITY axelor.value "http://www.axelor.com">
+<!ENTITY tinyerp.value "http://tiny.be/">
+
+<!ENTITY openerp_s.value "OpenERP">
+<!ENTITY axelor_s.value "The Axelor Company">
+<!ENTITY tinyerp_s.value "The Tiny Company">
+
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY gpAbout.label "About OpenERP Thunderbird Plugin">
+<!ENTITY develop.value "This Thunderbird Plugin for OpenERP has been developed by OpenERP SA &amp; Axelor">
+<!ENTITY information.value "For more information, please visit our website">
+<!ENTITY contact.label "Contact Us">
+<!ENTITY contact.value "info@axelor.com">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagemove.value "chrome://openerp_plugin/skin/Move.gif">
+<!ENTITY imagemoveleft.value "chrome://openerp_plugin/skin/MoveLeft.png">
+<!ENTITY imagemovedown.value "chrome://openerp_plugin/skin/MoveDown.png">
+<!ENTITY addfile.label "Load Image">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
new file mode 100644
index 00000000000..a926d3a980d
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
@@ -0,0 +1,5 @@
+<!ENTITY lblurl.label "Server: ">
+<!ENTITY lblport.label "Port: ">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/create.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
new file mode 100644
index 00000000000..181d408a3e9
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
@@ -0,0 +1,37 @@
+<!ENTITY title.label "Create a new Contact">
+<!ENTITY name.value "Contact Name:">
+<!ENTITY street.value "Street:">
+<!ENTITY street2.value "Street2:">
+<!ENTITY zip.value "Zip:">
+<!ENTITY city.value "City:">
+<!ENTITY country.value "Country:">
+<!ENTITY state.value "State:">
+<!ENTITY office.value "Office:">
+<!ENTITY fax.value "Fax:">
+<!ENTITY mobile.value "Mobile:">
+<!ENTITY email.value "Email:">
+<!ENTITY communication.value "Communication:">
+<!ENTITY postaladdress.value "Postal Address:">
+
+
+<!ENTITY selectpartner.value "Partner:">
+<!ENTITY listEmail.header "Email">
+<!ENTITY listName.header "Name">
+<!ENTITY bsearch.label "Search">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY cbxarchive.label "Archive">
+<!ENTITY ok.label "Save">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+
+<!ENTITY title.label "Select Partner">
+<!ENTITY listPartnerName.header "Partner Name">
+<!ENTITY bsearch.label "Search">
+<!ENTITY create.label "Create">
+<!ENTITY select.label "Select">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY reload.label "Reload">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
+<!ENTITY imagereload.value "chrome://openerp_plugin/skin/Archive.png">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd
new file mode 100644
index 00000000000..67b32b32907
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd
@@ -0,0 +1,7 @@
+<!ENTITY title.label "Create a new Partner">
+<!ENTITY name.value "Name:">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY ok.label "Save">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
new file mode 100644
index 00000000000..33845423f7d
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
@@ -0,0 +1,31 @@
+nomboxfile=není mbox souborem
+folderexists=Není možné importovat: složka se stejným názvem již existuje
+fileexists=Není možné importovat: soubor se stejným názvem již existuje
+nowritable=Není možné importovat: nemáte právo zápisu do složky
+exportOK=Export byl úspěšně dokončen
+isNewsgroup=Tato funkce není dostupná: export složky z IMAP účtů nebo diskuzních \nskupin je možný, pouze pokud je nastavené čtení v režimu Offline
+nofolder=Nebyla vybrána žádná cílová složka
+badfolder=Není možné importovat do této složky (typ IMAP nebo diskuzní skupina)
+exportAccount=Export všech složek
+exportFolder=Export složky
+filePickerImport=Výběr souboru k importu
+filePickerExport=Výběr cílové složky
+extensions.{3ed8cc52-86fc-4613-9026-c1ef969da4c3}.description=Umožňuje import a export souborů ve formátu mbox a eml
+virtualfolder=Toto je virtuální složka. Pro export jejich\nzpráv musíte tyto zprávy nejdříve\nzkopírovat do normální složky.
+searchdir=Vyberte složku, ve které budou vyhledány mbox soubory
+confirmimport=Chcete importovat soubor?
+endscan=Konec prohledávání složek
+internalerror=Není možné provést import, protože nastala neznámá chyba
+exportstart=Probíhá export, čekejte prosím...
+exported=Exportovalo se
+msgs=zpráv z
+nosubjectmsg=bez_predmetu
+messsubdir=zprávy
+badfolder2=Není možné importovat do této složky (IMAP nebo diskuzní skupina nebo virtuální složka)
+temp_error=Není možné importovat: nastala chyba při vytváření dočasného souboru
+importEMLstart=Pobíhá import, čekejte prosím...
+numEML=Naimportovány eml soubory:
+CSVseparator=,
+noEML=No eml file found in this directory
+backupWarning=During this operation, the program could be\nunresponsive for some minutes.\nDo you want to go on?\n  
+noWaring=Don't show again this warning
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
new file mode 100755
index 00000000000..a2345f0aaaf
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -0,0 +1,11 @@
+<!ENTITY tinyplugin "OpenERP Configuration">
+<!ENTITY tinypluginconfig "Archieve To OpenERP">
+<!ENTITY tinyarchive "Archive 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.png">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
+<!ENTITY tooltip.value "Add To Archive">
+<!ENTITY pluginconfig.value "OpenERP Configuration Settings">
+<!ENTITY pluginconfigvalue.value "Archieve To OpenERP Settings">
+
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
new file mode 100644
index 00000000000..ed26728b0d0
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
@@ -0,0 +1,28 @@
+<!ENTITY title.label "Archive To OpenERP">
+<!ENTITY gptinyobj.label "Link to an Existing Document">
+<!ENTITY newobject.label "New Documents">
+<!ENTITY bsearch.label "Search">
+<!ENTITY close.label "Close">
+<!ENTITY attach.label "Archive to OpenERP">
+<!ENTITY create.label "New Contact">
+<!ENTITY archive.label "Create">
+<!ENTITY attach.label "Attach">
+<!ENTITY cbxcontact.label "Contact">
+<!ENTITY cbxinvoice.label "Invoice">
+<!ENTITY cbxproject.label "Project">
+<!ENTITY cbxpartner.label "Partner">
+<!ENTITY cbxproduct.label "Product">
+<!ENTITY cbxaccount.label "Account">
+<!ENTITY cbxsale.label "Sale">
+<!ENTITY cbxcase.label "Case">
+<!ENTITY cbxtask.label "Task">
+<!ENTITY cbxselectall.label "Select All">
+<!ENTITY object.label "Type of Document :">
+<!ENTITY partner.label "Create New Contact :">
+<!ENTITY search.label "Search :">
+<!ENTITY listSearchBox.header "Name">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/Archive.png">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
+<!ENTITY gptinyobjexe.label "Documents">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
new file mode 100644
index 00000000000..e6a62c16003
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
@@ -0,0 +1,12 @@
+<!ENTITY title.label "Select Partner">
+<!ENTITY selectpartner.value "Partner">
+<!ENTITY listPartnerName.header "Partner Name">
+<!ENTITY bsearch.label "Search">
+<!ENTITY create.label "Create">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
+<!ENTITY select.label "Select">
+<!ENTITY cancel.label "Cancel">
+<!ENTITY imagesearch.value "chrome://openerp_plugin/skin/Search.gif">
+<!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
+<!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
+<!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
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
new file mode 100644
index 00000000000..b13f2b0f523
Binary files /dev/null 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
new file mode 100644
index 00000000000..5aa6a958d37
Binary files /dev/null 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
new file mode 100644
index 00000000000..9b950b8ea9d
Binary files /dev/null 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
new file mode 100644
index 00000000000..9bd6f9f6059
Binary files /dev/null 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
new file mode 100644
index 00000000000..1ab240c32cb
Binary files /dev/null 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/Error.gif b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Error.gif
new file mode 100644
index 00000000000..38c3523781b
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Error.gif 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
new file mode 100644
index 00000000000..4551107ec3b
Binary files /dev/null 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/Move.gif b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Move.gif
new file mode 100644
index 00000000000..401bf861213
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Move.gif 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
new file mode 100644
index 00000000000..3761ff1e747
Binary files /dev/null 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
new file mode 100644
index 00000000000..031d7532673
Binary files /dev/null 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
new file mode 100644
index 00000000000..373464bd53e
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png 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
new file mode 100644
index 00000000000..2daac224a51
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png 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
new file mode 100644
index 00000000000..c661339598e
Binary files /dev/null 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
new file mode 100644
index 00000000000..51451e422ae
Binary files /dev/null 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
new file mode 100644
index 00000000000..0f8ea2af8f5
Binary files /dev/null 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
new file mode 100644
index 00000000000..1b0b44f890e
Binary files /dev/null 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/Search.gif b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Search.gif
new file mode 100644
index 00000000000..b29c3cf1054
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Search.gif differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Success.gif b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Success.gif
new file mode 100644
index 00000000000..fb3bff729c5
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Success.gif 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
new file mode 100644
index 00000000000..52056b1e713
Binary files /dev/null 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
new file mode 100644
index 00000000000..54dc465b421
Binary files /dev/null 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
new file mode 100755
index 00000000000..bdbe31c4bff
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png 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
new file mode 100644
index 00000000000..e2b45b52211
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css
new file mode 100755
index 00000000000..1f71b8fdcbe
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css
@@ -0,0 +1,3 @@
+menuitem#tiny-plugin {
+  color: red !important;
+}
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
new file mode 100644
index 00000000000..37b29e13382
Binary files /dev/null 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/perform.gif b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/perform.gif
new file mode 100644
index 00000000000..16cc3873858
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/perform.gif 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
new file mode 100644
index 00000000000..b1e78c0047e
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
new file mode 100755
index 00000000000..40347a9993d
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
@@ -0,0 +1,1039 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla XML-RPC Client component.
+ *
+ * The Initial Developer of the Original Code is
+ * Digital Creations 2, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Martijn Pieters <mj@digicool.com> (original author)
+ *   Samuel Sieb <samuel@sieb.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ *  nsXmlRpcClient XPCOM component
+ *  Version: $Revision: 1.39 $
+ *
+ *  $Id: nsXmlRpcClient.js,v 1.39 2006/10/24 16:02:01 silver%warwickcompsoc.co.uk Exp $
+ */
+
+/*
+ * Constants
+ */
+const XMLRPCCLIENT_CONTRACTID = '@mozilla.org/xml-rpc/client;1';
+const XMLRPCCLIENT_CID =
+    Components.ID('{4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}');
+const XMLRPCCLIENT_IID = Components.interfaces.nsIXmlRpcClient;
+
+const XMLRPCFAULT_CONTRACTID = '@mozilla.org/xml-rpc/fault;1';
+const XMLRPCFAULT_CID =
+    Components.ID('{691cb864-0a7e-448c-98ee-4a7f359cf145}');
+const XMLRPCFAULT_IID = Components.interfaces.nsIXmlRpcFault;
+
+const XMLHTTPREQUEST_CONTRACTID = '@mozilla.org/xmlextras/xmlhttprequest;1';
+
+const NSICHANNEL = Components.interfaces.nsIChannel;
+
+const DEBUG = false;
+const DEBUGPARSE = false;
+
+const DOMNode = Components.interfaces.nsIDOMNode;
+/*
+ * Class definitions
+ */
+
+/* The nsXmlRpcFault class constructor. */
+function nsXmlRpcFault() {}
+
+/* the nsXmlRpcFault class def */
+nsXmlRpcFault.prototype = {
+    faultCode: 0,
+    faultString: '',
+
+    init: function(faultCode, faultString) {
+        this.faultCode = faultCode;
+        this.faultString = faultString;
+    },
+
+    toString: function() {
+        return '<XML-RPC Fault: (' + this.faultCode + ') ' +
+            this.faultString + '>';
+    },
+
+    // nsISupports interface
+    QueryInterface: function(iid) {
+        if (!iid.equals(Components.interfaces.nsISupports) &&
+            !iid.equals(XMLRPCFAULT_IID))
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+        return this;
+    }
+};
+
+/* The nsXmlRpcClient class constructor. */
+function nsXmlRpcClient() {}
+
+/* the nsXmlRpcClient class def */
+nsXmlRpcClient.prototype = {
+    _serverUrl: null,
+    _useAuth: false,
+
+    init: function(serverURL) {
+        this._serverUrl = serverURL;
+        this._encoding = "UTF-8";
+    },
+
+    setAuthentication: function(username, password){
+        if ((typeof username == "string") &&
+            (typeof password == "string")){
+          this._useAuth = true;
+          this._username = username;
+          this._password = password;
+        }
+    },
+
+    clearAuthentication: function(){
+        this._useAuth = false;
+    },
+
+    setEncoding: function(encoding){
+        this._encoding = encoding;
+    },
+
+    get serverUrl() { return this._serverUrl; },
+
+    // Internal copy of the status
+    _status: null,
+    _listener: null,
+
+    asyncCall: function(listener, context, methodName, methodArgs, count) {
+        debug('asyncCall');
+        // Check for call in progress.
+        if (this._inProgress)   
+            return;
+            //throw Components.Exception('Call in progress!');
+
+        // Check for the server URL;
+        if (!this._serverUrl)
+            throw Components.Exception('Not initialized');
+
+        this._inProgress = true;
+
+        // Clear state.
+        this._foundFault = false;
+        this._passwordTried = false;
+        this._result = null;
+        this._fault = null;
+        this._status = null;
+        this._responseStatus = null;
+        this._responseString = null;
+        this._listener = listener;
+        this._seenStart = false;
+        this._context = context;
+        
+        debug('Arguments: ' + methodArgs);
+
+        // Generate request body
+        var xmlWriter = new XMLWriter(this._encoding);
+        this._generateRequestBody(xmlWriter, methodName, methodArgs);
+
+        var requestBody = xmlWriter.data;
+
+        debug('Request: ' + requestBody);
+
+        this.xmlhttp = Components.classes[XMLHTTPREQUEST_CONTRACTID]
+            .createInstance(Components.interfaces.nsIXMLHttpRequest);
+        if (this._useAuth) {
+            this.xmlhttp.open('POST', this._serverUrl, true,
+                              this._username, this._password);
+        } else {
+            this.xmlhttp.open('POST', this._serverUrl);
+        }
+        this.xmlhttp.onload = this._onload;
+        this.xmlhttp.onerror = this._onerror;
+        this.xmlhttp.parent = this;
+        this.xmlhttp.setRequestHeader('Content-Type','text/xml');
+        this.xmlhttp.send(requestBody);
+        var chan = this.xmlhttp.channel.QueryInterface(NSICHANNEL);
+        chan.notificationCallbacks = this;
+    },
+
+    _onload: function(e) {
+        var result;
+        var parent = e.target.parent;
+        parent._inProgress = false;
+        parent._responseStatus = e.target.status;
+        parent._responseString = e.target.statusText;
+        if (!e.target.responseXML) {
+            if (e.target.status) {
+                try {
+                    parent._listener.onError(parent, parent._context,
+                        Components.results.NS_ERROR_FAILURE,
+                        'Server returned status ' + e.target.status);
+                } catch (ex) {
+                    debug('Exception in listener.onError: ' + ex);
+                }
+            } else {
+                try {
+                    parent._listener.onError(parent, parent._context,
+                                      Components.results.NS_ERROR_FAILURE,
+                                      'Unknown network error');
+                } catch (ex) {
+                    debug('Exception in listener.onError: ' + ex);
+                }
+            }
+            return;
+        }
+        try {
+            e.target.responseXML.normalize();
+            result = parent.parse(e.target.responseXML);
+        } catch (ex) {
+            try {
+                parent._listener.onError(parent, parent._context,
+                                         ex.result, ex.message);
+            } catch (ex) {
+                debug('Exception in listener.onError: ' + ex);
+            }
+            return;
+        }
+        if (parent._foundFault) {
+            parent._fault = result;
+            try {
+                parent._listener.onFault(parent, parent._context, result);
+            } catch(ex) {
+                debug('Exception in listener.onFault: ' + ex);
+            }
+        } else {
+            parent._result = result.value;
+            try { 
+                parent._listener.onResult(parent, parent._context,
+                                          result.value);
+            } catch (ex) {
+                debug('Exception in listener.onResult: ' + ex);
+            }
+        }
+    },
+
+    _onerror: function(e) {
+        var parent = e.target.parent;
+        parent._inProgress = false;
+        try {
+            parent._listener.onError(parent, parent._context,
+                                Components.results.NS_ERROR_FAILURE,
+                                'Unknown network error');
+        } catch (ex) {
+            debug('Exception in listener.onError: ' + ex);
+        }
+    },
+    
+    _foundFault: false,
+
+    _fault: null,
+    _result: null,
+    _responseStatus: null,
+    _responseString: null,
+
+    get fault() { return this._fault; },
+    get result() { return this._result; },
+    get responseStatus() { return this._responseStatus; },
+    get responseString() { return this._responseString; },
+
+    /* Convenience. Create an appropriate XPCOM object for a given type */
+    INT:      1,
+    BOOLEAN:  2,
+    STRING:   3,
+    DOUBLE:   4,
+    DATETIME: 5,
+    ARRAY:    6,
+    STRUCT:   7,
+    BASE64:   8, // Not part of nsIXmlRpcClient interface, internal use.
+    createType: function(type, uuid) {
+        const SUPPORTSID = '@mozilla.org/supports-';
+        switch(type) {
+            case this.INT:
+                uuid.value = Components.interfaces.nsISupportsPRInt32
+                return createInstance(SUPPORTSID + 'PRInt32;1',
+                    'nsISupportsPRInt32');
+
+            case this.BOOLEAN:
+                uuid.value = Components.interfaces.nsISupportsPRBool
+                return createInstance(SUPPORTSID + 'PRBool;1',
+                    'nsISupportsPRBool');
+
+            case this.STRING:
+                uuid.value = Components.interfaces.nsISupportsCString
+                return createInstance(SUPPORTSID + 'cstring;1',
+                    'nsISupportsCString');
+
+            case this.DOUBLE:
+                uuid.value = Components.interfaces.nsISupportsDouble
+                return createInstance(SUPPORTSID + 'double;1',
+                    'nsISupportsDouble');
+
+            case this.DATETIME:
+                uuid.value = Components.interfaces.nsISupportsPRTime
+                return createInstance(SUPPORTSID + 'PRTime;1',
+                    'nsISupportsPRTime');
+
+            case this.ARRAY:
+                uuid.value = Components.interfaces.nsISupportsArray
+                return createInstance(SUPPORTSID + 'array;1',
+                    'nsISupportsArray');
+
+            case this.STRUCT:
+                uuid.value = Components.interfaces.nsIDictionary
+                return createInstance('@mozilla.org/dictionary;1', 
+                    'nsIDictionary');
+
+            default: throw Components.Exception('Unsupported type');
+        }
+    },
+
+    // nsISupports interface
+    QueryInterface: function(iid) {
+        if (!iid.equals(Components.interfaces.nsISupports) &&
+            !iid.equals(XMLRPCCLIENT_IID) &&
+            !iid.equals(Components.interfaces.nsIInterfaceRequestor))
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+        return this;
+    },
+
+    // nsIInterfaceRequester interface
+    getInterface: function(iid, result){
+        if (iid.equals(Components.interfaces.nsIAuthPrompt)){
+            return this;
+        }
+        Components.returnCode = Components.results.NS_ERROR_NO_INTERFACE;
+        return null;
+    },
+
+    // nsIAuthPrompt interface
+    _passwordTried: false,
+    promptUsernameAndPassword: function(dialogTitle, text, passwordRealm,
+                                        savePassword, user, pwd){
+
+        if (this._useAuth){
+            if (this._passwordTried){
+                return false;
+            }
+            user.value = this._username;
+            pwd.value = this._password;
+            this._passwordTried = true;
+            return true;
+        }
+        return false;
+    },
+
+    /* Generate the XML-RPC request body */
+    _generateRequestBody: function(writer, methodName, methodArgs) {
+        writer.startElement('methodCall');
+
+        writer.startElement('methodName');
+        writer.write(methodName);
+        writer.endElement('methodName');
+
+        writer.startElement('params');
+        for (var i = 0; i < methodArgs.length; i++) {
+            writer.startElement('param');
+            this._generateArgumentBody(writer, methodArgs[i]);
+            writer.endElement('param');
+        }
+        writer.endElement('params');
+
+        writer.endElement('methodCall');
+    },
+
+    /* Write out a XML-RPC parameter value */
+    _generateArgumentBody: function(writer, obj) {
+        writer.startElement('value');
+        var sType = this._typeOf(obj);
+        switch (sType) {
+            case 'PRUint8':
+            case 'PRUint16':
+            case 'PRInt16':
+            case 'PRInt32':
+                obj=obj.QueryInterface(Components.interfaces['nsISupports' +
+                    sType]);
+                writer.startElement('i4');
+                writer.write(obj.toString());
+                writer.endElement('i4');
+                break;
+
+            case 'PRBool':
+                obj=obj.QueryInterface(Components.interfaces.nsISupportsPRBool);
+                writer.startElement('boolean');
+                writer.write(obj.data ? '1' : '0');
+                writer.endElement('boolean');
+                break;
+
+            case 'Char':
+            case 'CString':
+                obj=obj.QueryInterface(Components.interfaces['nsISupports' +
+                    sType]);
+                writer.startElement('string');
+                writer.write(obj.toString());
+                writer.endElement('string');
+                break;
+
+            case 'Float':
+            case 'Double':
+                obj=obj.QueryInterface(Components.interfaces['nsISupports' +
+                    sType]);
+                writer.startElement('double');
+                writer.write(obj.toString());
+                writer.endElement('double');
+                break;
+
+            case 'PRTime':
+                obj = obj.QueryInterface(
+                    Components.interfaces.nsISupportsPRTime);
+                var date = new Date(obj.data)
+                writer.startElement('dateTime.iso8601');
+                writer.write(iso8601Format(date));
+                writer.endElement('dateTime.iso8601');
+                break;
+                
+            case 'InputStream':
+                obj = obj.QueryInterface(Components.interfaces.nsIInputStream);
+                obj = toScriptableStream(obj);
+                writer.startElement('base64');
+                streamToBase64(obj, writer);
+                writer.endElement('base64');
+                break;
+            
+            case 'Array':
+                obj = obj.QueryInterface(
+                    Components.interfaces.nsISupportsArray);
+                writer.startElement('array');
+                writer.startElement('data');
+                for (var i = 0; i < obj.Count(); i++)
+                    this._generateArgumentBody(writer, obj.GetElementAt(i));
+                writer.endElement('data');
+                writer.endElement('array');
+                break;
+
+            case 'Dictionary':
+                obj = obj.QueryInterface(Components.interfaces.nsIDictionary);
+                writer.startElement('struct');
+                var keys = obj.getKeys({});
+                for (var k = 0; k < keys.length; k++) {
+                    writer.startElement('member');
+                    writer.startElement('name');
+                    writer.write(keys[k]);
+                    writer.endElement('name');
+                    this._generateArgumentBody(writer, obj.getValue(keys[k]));
+                    writer.endElement('member');
+                }
+                writer.endElement('struct');
+                break;
+
+            default:
+                throw Components.Exception('Unsupported argument', null, null,
+                    obj);
+        }
+
+        writer.endElement('value');
+    },
+
+    /* Determine type of a nsISupports primitive, array or dictionary. */
+    _typeOf: function(obj) {
+        // XPConnect alows JS to pass in anything, because we are a regular
+        // JS object to it. So we have to test rigorously.
+        if (typeof obj != 'object') return 'Unknown';
+
+        // Anything else not nsISupports is not allowed.
+        if (typeof obj.QueryInterface != 'function') return 'Unknown';
+
+        // Now we will have to eliminate by trying all possebilities.
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRUint8);
+            return 'PRUint8';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRUint16);
+            return 'PRUint16';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRInt16);
+            return 'PRInt16';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+            return 'PRInt32';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRBool);
+            return 'PRBool';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsChar);
+            return 'Char';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsCString);
+            return 'CString';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsFloat);
+            return 'Float';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsDouble);
+            return 'Double';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsPRTime);
+            return 'PRTime';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsIInputStream);
+            return 'InputStream';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsISupportsArray);
+            return 'Array';
+        } catch(e) {}
+        
+        try {
+            obj.QueryInterface(Components.interfaces.nsIDictionary);
+            return 'Dictionary';
+        } catch(e) {}
+        
+        // Not a supported type
+        return 'Unknown';
+    },
+
+    // Response parsing state
+    _valueStack: [],
+    _currValue: null,
+    _cdata: null,
+
+    parse: function(doc) {
+        var node = doc.firstChild;
+        var result;
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'methodResponse')) {
+            throw Components.Exception('Expecting a methodResponse', null, null,
+                                       doc);
+        }
+        node = node.firstChild;
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if (node.nodeType != DOMNode.ELEMENT_NODE)
+            throw Components.Exception('Expecting a params or fault', null,
+                                       null, doc);
+        if (node.nodeName == 'params') {
+            node = node.firstChild;
+            if (node.nodeType == DOMNode.TEXT_NODE)
+                node = node.nextSibling;
+            if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
+                (node.nodeName != 'param')) {
+                throw Components.Exception('Expecting a param', null, null,
+                                           doc);
+            }
+            result = this.parseValue(node.firstChild);
+        } else if (node.nodeName == 'fault') {
+            this._foundFault = true;
+            result = this.parseFault(node.firstChild);
+        } else {
+            throw Components.Exception('Expecting a params or fault', null,
+                                       null, doc);
+        }
+        debug('Parse finished');
+        return result;
+    },
+
+    parseValue: function(node) {
+        var cValue = new Value();
+        if (node && (node.nodeType == DOMNode.TEXT_NODE))
+            node = node.nextSibling;
+        if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'value')) {
+            throw Components.Exception('Expecting a value', null, null, node);
+        }
+        node = node.firstChild;
+        if (!node)
+            return cValue;
+        if (node.nodeType == DOMNode.TEXT_NODE){
+            if (!node.nextSibling) {
+                cValue.value = node.nodeValue;
+                return cValue;
+            } else {
+                node = node.nextSibling;
+            }
+        }
+        if (node.nodeType != DOMNode.ELEMENT_NODE)
+            throw Components.Exception('Expecting a value type', null, null,
+                                       node);
+        switch (node.nodeName) {
+            case 'string':
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'i4':
+            case 'int':
+                cValue.type = this.INT;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'boolean':
+                cValue.type = this.BOOLEAN;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'double':
+                cValue.type = this.DOUBLE;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'dateTime.iso8601':
+                cValue.type = this.DATETIME;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'base64':
+                cValue.type = this.BASE64;
+                cValue.value = this.parseString(node.firstChild);
+                break;
+            case 'struct':
+                cValue.type = this.STRUCT;
+                this.parseStruct(cValue, node.firstChild);
+                break;
+            case 'array':
+                cValue.type = this.ARRAY;
+                this.parseArray(cValue, node.firstChild);
+                break;
+            default:
+                throw Components.Exception('Expecting a value type', null, null,
+                                           node);
+        }
+        return cValue;
+    },
+
+    parseString: function(node) {
+        value = '';
+        while (node) {
+            if (node.nodeType != DOMNode.TEXT_NODE)
+                throw Components.Exception('Expecting a text node', null, null,
+                                           node);
+            value += node.nodeValue; 
+            node = node.nextSibling;
+        }
+        return value;
+    },
+
+    parseStruct: function(struct, node) {
+        while (node) {
+            if (node.nodeType == DOMNode.TEXT_NODE)
+                node = node.nextSibling;
+            if (!node)
+                return;
+            if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
+                (node.nodeName != 'member')) {
+                throw Components.Exception('Expecting a member', null, null,
+                                           node);
+            }
+            this.parseMember(struct, node.firstChild);
+            node = node.nextSibling;
+        }
+    },
+
+    parseMember: function(struct, node) {
+        var cValue;
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'name')) {
+            throw Components.Exception('Expecting a name', null, null, node);
+        }
+        struct.name = this.parseString(node.firstChild);
+        cValue = this.parseValue(node.nextSibling);
+        struct.appendValue(cValue.value);
+    },
+
+    parseArray: function(array, node) {
+        if (node.nodeType == DOMNode.TEXT_NODE)
+            node = node.nextSibling;
+        if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
+            (node.nodeName != 'data')) {
+            throw Components.Exception('Expecting array data', null, null, node);
+        }
+        for (node = node.firstChild; node; node = node.nextSibling) {
+            if (node.nodeType == DOMNode.TEXT_NODE)
+                continue;
+            array.appendValue(this.parseValue(node).value);
+        }
+    },
+
+    parseFault: function(node) {
+        var fault = createInstance(XMLRPCFAULT_CONTRACTID, 'nsIXmlRpcFault');
+        var cValue = this.parseValue(node);
+        if ((cValue.type != this.STRUCT) ||
+            (!cValue.value.hasKey('faultCode')) ||
+            (!cValue.value.hasKey('faultString'))) {
+            throw Components.Exception('Invalid fault', null, null, node);
+        }
+        fault.init(cValue.value.getValue('faultCode').data,
+                   cValue.value.getValue('faultString').data);
+        return fault;
+    }
+};
+
+/* The XMLWriter class constructor */
+function XMLWriter(encoding) {
+    if (!encoding)
+        encoding = "UTF-8";
+    this.data = '<?xml version="1.0" encoding="' + encoding + '"?>';
+}
+
+/* The XMLWriter class def */
+XMLWriter.prototype = {
+    data: '',
+    
+    startElement: function(element) {
+        this.data += '<' + element + '>';
+    },
+
+    endElement: function(element) {
+        this.data += '</' + element + '>';
+    },
+    
+    write: function(text) {
+        for (var i = 0; i < text.length; i++) {
+            var c = text[i];
+            switch (c) {
+                case '<':
+                    this.data += '&lt;';
+                    break;
+                case '&':
+                    this.data += '&amp;';
+                    break;
+                default:
+                    this.data += c;
+            }
+        }
+    },
+
+    markup: function(text) { this.data += text }
+};
+
+/* The Value class contructor */
+function Value() { this.type = this.STRING; };
+
+/* The Value class def */
+Value.prototype = {
+    INT:      nsXmlRpcClient.prototype.INT,
+    BOOLEAN:  nsXmlRpcClient.prototype.BOOLEAN,
+    STRING:   nsXmlRpcClient.prototype.STRING,
+    DOUBLE:   nsXmlRpcClient.prototype.DOUBLE,
+    DATETIME: nsXmlRpcClient.prototype.DATETIME,
+    ARRAY:    nsXmlRpcClient.prototype.ARRAY,
+    STRUCT:   nsXmlRpcClient.prototype.STRUCT,
+    BASE64:   nsXmlRpcClient.prototype.BASE64,
+    
+    _createType: nsXmlRpcClient.prototype.createType,
+
+    name: null,
+    
+    _value: null,
+    get value() { return this._value; },
+    set value(val) {
+        // accepts [0-9]+ or x[0-9a-fA-F]+ and returns the character.
+        function entityTrans(substr, code) {
+            return String.fromCharCode("0" + code);
+        }
+        
+        switch (this.type) {
+            case this.STRING:
+                val = val.replace(/&#([0-9]+);/g, entityTrans);
+                val = val.replace(/&#(x[0-9a-fA-F]+);/g, entityTrans);
+                val = val.replace(/&lt;/g, '<');
+                val = val.replace(/&gt;/g, '>');
+                val = val.replace(/&amp;/g, '&');
+                this._value.data = val;
+                break;
+        
+            case this.BOOLEAN:
+                this._value.data = (val == 1);
+                break;
+
+            case this.DATETIME:
+                this._value.data = Date.UTC(val.slice(0, 4), 
+                    val.slice(4, 6) - 1, val.slice(6, 8), val.slice(9, 11),
+                    val.slice(12, 14), val.slice(15));
+                break;
+
+            case this.BASE64:
+                this._value.data = base64ToString(val);
+                break;
+
+            default:
+                this._value.data = val;
+        }
+    },
+
+    _type: null,
+    get type() { return this._type; },
+    set type(type) { 
+        this._type = type;
+        if (type == this.BASE64) 
+            this._value = this._createType(this.STRING, {});
+        else this._value = this._createType(type, {});
+    },
+
+    appendValue: function(val) {
+        switch (this.type) {
+            case this.ARRAY:
+                this.value.AppendElement(val);
+                break;
+
+            case this.STRUCT:
+                this.value.setValue(this.name, val);
+                break;
+        }
+    }
+};
+
+/*
+ * Objects
+ */
+
+/* nsXmlRpcClient Module (for XPCOM registration) */
+var nsXmlRpcClientModule = {
+    registerSelf: function(compMgr, fileSpec, location, type) {
+        compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+
+        compMgr.registerFactoryLocation(XMLRPCCLIENT_CID, 
+                                        'XML-RPC Client JS component', 
+                                        XMLRPCCLIENT_CONTRACTID, 
+                                        fileSpec,
+                                        location, 
+                                        type);
+        compMgr.registerFactoryLocation(XMLRPCFAULT_CID, 
+                                        'XML-RPC Fault JS component', 
+                                        XMLRPCFAULT_CONTRACTID, 
+                                        fileSpec,
+                                        location, 
+                                        type);
+    },
+
+    getClassObject: function(compMgr, cid, iid) {
+        if (!cid.equals(XMLRPCCLIENT_CID) && !cid.equals(XMLRPCFAULT_CID))
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+
+        if (!iid.equals(Components.interfaces.nsIFactory))
+            throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+
+        if (cid.equals(XMLRPCCLIENT_CID))
+            return nsXmlRpcClientFactory
+        else return nsXmlRpcFaultFactory;
+    },
+
+    canUnload: function(compMgr) { return true; }
+};
+
+/* nsXmlRpcClient Class Factory */
+var nsXmlRpcClientFactory = {
+    createInstance: function(outer, iid) {
+        if (outer != null)
+            throw Components.results.NS_ERROR_NO_AGGREGATION;
+    
+        if (!iid.equals(XMLRPCCLIENT_IID) &&
+            !iid.equals(Components.interfaces.nsISupports))
+            throw Components.results.NS_ERROR_INVALID_ARG;
+
+        return new nsXmlRpcClient();
+    }
+}
+
+/* nsXmlRpcFault Class Factory */
+var nsXmlRpcFaultFactory = {
+    createInstance: function(outer, iid) {
+        if (outer != null)
+            throw Components.results.NS_ERROR_NO_AGGREGATION;
+
+        if (!iid.equals(XMLRPCFAULT_IID) &&
+            !iid.equals(Components.interfaces.nsISupports))
+            throw Components.results.NS_ERROR_INVALID_ARG;
+
+        return new nsXmlRpcFault();
+    }
+}
+
+/*
+ * Functions
+ */
+
+/* module initialisation */
+function NSGetModule(comMgr, fileSpec) { return nsXmlRpcClientModule; }
+
+/* Create an instance of the given ContractID, with given interface */
+function createInstance(contractId, intf) {
+    return Components.classes[contractId]
+        .createInstance(Components.interfaces[intf]);
+}
+
+/* Get a pointer to a service indicated by the ContractID, with given interface */
+function getService(contractId, intf) {
+    return Components.classes[contractId]
+        .getService(Components.interfaces[intf]);
+}
+
+/* Convert an inputstream to a scriptable inputstream */
+function toScriptableStream(input) {
+    var SIStream = Components.Constructor(
+        '@mozilla.org/scriptableinputstream;1',
+        'nsIScriptableInputStream', 'init');
+    return new SIStream(input);
+}
+
+/* format a Date object into a iso8601 datetime string, UTC time */
+function iso8601Format(date) {
+    var datetime = date.getUTCFullYear();
+    var month = String(date.getUTCMonth() + 1);
+    datetime += (month.length == 1 ?  '0' + month : month);
+    var day = date.getUTCDate();
+    datetime += (day < 10 ? '0' + day : day);
+
+    datetime += 'T';
+
+    var hour = date.getUTCHours();
+    datetime += (hour < 10 ? '0' + hour : hour) + ':';
+    var minutes = date.getUTCMinutes();
+    datetime += (minutes < 10 ? '0' + minutes : minutes) + ':';
+    var seconds = date.getUTCSeconds();
+    datetime += (seconds < 10 ? '0' + seconds : seconds);
+
+    return datetime;
+}
+
+/* Convert a stream to Base64, writing it away to a string writer */
+const BASE64CHUNK = 255; // Has to be dividable by 3!!
+function streamToBase64(stream, writer) {
+    while (stream.available()) {
+        var data = [];
+        while (data.length < BASE64CHUNK && stream.available()) {
+            var d = stream.read(1).charCodeAt(0);
+            // reading a 0 results in NaN, compensate.
+            data = data.concat(isNaN(d) ? 0 : d);
+        }
+        writer.write(toBase64(data));
+    }
+}
+
+/* Convert data (an array of integers) to a Base64 string. */
+const toBase64Table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' +
+    '0123456789+/';
+const base64Pad = '=';
+function toBase64(data) {
+    var result = '';
+    var length = data.length;
+    var i;
+    // Convert every three bytes to 4 ascii characters.
+    for (i = 0; i < (length - 2); i += 3) {
+        result += toBase64Table[data[i] >> 2];
+        result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
+        result += toBase64Table[((data[i+1] & 0x0f) << 2) + (data[i+2] >> 6)];
+        result += toBase64Table[data[i+2] & 0x3f];
+    }
+
+    // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
+    if (length%3) {
+        i = length - (length%3);
+        result += toBase64Table[data[i] >> 2];
+        if ((length%3) == 2) {
+            result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
+            result += toBase64Table[(data[i+1] & 0x0f) << 2];
+            result += base64Pad;
+        } else {
+            result += toBase64Table[(data[i] & 0x03) << 4];
+            result += base64Pad + base64Pad;
+        }
+    }
+
+    return result;
+}
+
+/* Convert Base64 data to a string */
+const toBinaryTable = [
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
+    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1,
+    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
+    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
+    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
+    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
+];
+function base64ToString(data) {
+    var result = '';
+    var leftbits = 0; // number of bits decoded, but yet to be appended
+    var leftdata = 0; // bits decoded, but yet to be appended
+
+    // Convert one by one.
+    for (var i = 0; i < data.length; i++) {
+        var c = toBinaryTable[data.charCodeAt(i) & 0x7f];
+        var padding = (data[i] == base64Pad);
+        // Skip illegal characters and whitespace
+        if (c == -1) continue;
+        
+        // Collect data into leftdata, update bitcount
+        leftdata = (leftdata << 6) | c;
+        leftbits += 6;
+
+        // If we have 8 or more bits, append 8 bits to the result
+        if (leftbits >= 8) {
+            leftbits -= 8;
+            // Append if not padding.
+            if (!padding)
+                result += String.fromCharCode((leftdata >> leftbits) & 0xff);
+            leftdata &= (1 << leftbits) - 1;
+        }
+    }
+
+    // If there are any bits left, the base64 string was corrupted
+    if (leftbits)
+        throw Components.Exception('Corrupted base64 string');
+
+    return result;
+}
+
+if (DEBUG) debug = function(msg) { 
+    dump(' -- XML-RPC client -- : ' + msg + '\n'); 
+};
+else debug = function() {}
+
+// vim:sw=4:sr:sta:et:sts:
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
new file mode 100755
index 00000000000..8e59aa20c85
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
new file mode 100755
index 00000000000..ca8332c868e
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
@@ -0,0 +1,56 @@
+
+pref("extensions.tiny.serverurl", "http://localhost");
+pref("extensions.tiny.serverport", "8069");
+pref("extensions.tiny.serverdbname", "terp");
+pref("extensions.tiny.username","admin");
+pref("extensions.tiny.password","admin");
+pref("extensions.tiny.senderemail","");
+pref("extensions.tiny.sendername","");
+pref("extensions.tiny.receiveremail","");
+pref("extensions.tiny.subject","");
+pref("extensions.tiny.receiveddate","");
+pref("extensions.tiny.partnerid","");
+pref("extensions.tiny.contactid","");
+pref("extensions.tiny.attachvalue","");
+pref("extensions.tiny.cclist","");
+pref("extensions.tiny.messagebody","");
+pref("extensions.tiny.displayName","");
+pref("extensions.tiny.attachmentdata","");
+pref("extensions.tiny.userid",3);
+pref("extensions.tiny.partnername","");
+pref("extensions.tiny.officeno","");
+pref("extensions.tiny.phoneno","");
+pref("extensions.tiny.address","");
+pref("extensions.tiny.listobject","Partner,Partner Address,Accout Invoice,Project,Product,Account,Sale Order,Project Task");
+pref("extensions.tiny.object","res.partner,res.partner.address,account.invoice,project.project,product.product,account.account,sale.order,project.task");
+pref("extensions.tiny.imagename","chrome://openerp_plugin/skin/Partner.png,chrome://openerp_plugin/skin/Contact.png,chrome://openerp_plugin/skin/Invoice.png,chrome://openerp_plugin/skin/Project.png,chrome://openerp_plugin/skin/Product.png,chrome://openerp_plugin/skin/Account.png,chrome://openerp_plugin/skin/Sale.png,chrome://openerp_plugin/skin/Case.png,chrome://openerp_plugin/skin/Task.png");
+pref("extensions.tiny.attachmentlength","");
+pref("extensions.tiny.attachment","");
+pref("extensions.tiny.db_list","false");
+pref("extensions.tiny.connect_server","false");
+pref("extensions.tiny.module_install","yes");
+pref("extensions.tiny.serverprotocol", "false");
+
+
+
+pref("mboximport.export.filenames_toascii", false);
+pref("mboximport.export.overwrite", false);
+pref("mboximport.confirm.before_mbox_import", true);
+pref("mboximport.clipboard.always_just_text", false);
+pref("mboximport.export.HTML_as_displayed", false);
+pref("mboximport.exportEML.filename_format", 0);
+pref("mboximport.delay.clean_statusbar", 5000);
+pref("mboximport.subject.max_length", 50);
+pref("mboximport.author.max_length", 50);
+pref("mboximport.recipients.max_length", 50);
+pref("extensions.{3ed8cc52-86fc-4613-9026-c1ef969da4c3}.description", "chrome://mboximport/locale/mboximport.properties");
+pref("mboximport.export.set_filetime", false);
+pref("mboximport.exportEML.use_dir", false);
+pref("mboximport.exportMBOX.use_dir", false);
+pref("mboximport.exportMSG.use_dir", false);
+pref("mboximport.export.filenames_addtime", false);
+pref("mboximport.export_all.warning1", true);
+pref("mboximport.export_all.warning2", true);
+
+pref("mboximport.exportMSG.dir", "/tmp");
+
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.js b/addons/thunderbird/plugin/openerp_plugin/install.js
new file mode 100755
index 00000000000..50e4b301e32
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/install.js
@@ -0,0 +1,105 @@
+// constants
+const APP_DISPLAY_NAME = "OpenERP Thunderbird Plugins";
+const APP_NAME = "OpenERP";
+const APP_VERSION = "1.0";
+const WARNING = "WARNING: You need administrator privileges to install OpenERP Thunderbird Plugin. It will be installed in the application directory for all users.";
+const VERSION_ERROR = "This extension can only be installed in a version higher than 2.0";
+const NOT_WRITABLE_ERROR = "This extension requires write access to the application directory to install properly."
+const locales = [
+	"en-US",
+	null
+];
+
+// Gecko 1.7 doesn't support custom button labels
+var incompatible = (typeof Install.BUTTON_POS_0 == "undefined");
+if (incompatible)
+	alert(VERSION_ERROR);
+
+if (!incompatible) {
+	// Check whether all directories can be accessed
+	var dirList = [
+		getFolder("Components"),
+		getFolder(getFolder("Program", "defaults"), "pref")
+	];
+	for (var i = 0; i < dirList.length; i++)
+		if (!File.isWritable(dirList[i]))
+			incompatible = true;
+
+	if (incompatible)
+		alert(NOT_WRITABLE_ERROR);
+}
+
+if (!incompatible && confirm(WARNING, APP_DISPLAY_NAME)) {
+	/* Pre-Install Cleanup (for prior versions) */
+
+	// List of files to be checked
+	var checkFiles = [
+		[getFolder("Components"), "nsXmlRpcClient.js"],            // Root component
+		[getFolder("Components"), "xml-rpc.xpt"],           // Component interface
+			];
+
+	// Remove any existing files
+	initInstall("pre-install", "/rename", "0.0");  // open dummy-install
+	for (var i = 0 ; i < checkFiles.length ; i++) {
+		var currentDir = checkFiles[i][0];
+		var name = checkFiles[i][1];
+		var oldFile = getFolder(currentDir, name);
+
+		// Find a name to rename the file into
+		var newName = name + "-uninstalled";
+		for (var n = 1; File.exists(oldFile) && File.exists(getFolder(currentDir, newName)); n++)
+			newName = name + n + "-uninstalled";
+
+		if (File.exists(oldFile))
+			File.rename(oldFile, newName);
+	}
+	performInstall(); // commit renamed files
+
+	/* Main part of the installation */
+
+	var chromeType = DELAYED_CHROME;
+
+	var files = [
+		["components/nsXmlRpcClient.js", getFolder("Components")],
+		["components/xml-rpc.xpt", getFolder("Components")],
+		["defaults/preferences/tiny.js", getFolder(getFolder("Program", "defaults"), "pref")],
+	];
+
+	// initialize our install
+	initInstall(APP_NAME, APP_PACKAGE, APP_VERSION);
+
+	// Add files
+	for (var i = 0; i < files.length; i++)
+		addFile(APP_NAME, APP_VERSION, files[i][0], files[i][1], null);
+
+	try {
+		var err = registerChrome(CONTENT | chromeType, jar, "content/");
+		if (err != SUCCESS)
+			throw "Chrome registration for content failed (error code " + err + ").";
+
+		err = registerChrome(SKIN | chromeType, jar, "skin/classic/");
+		if (err != SUCCESS)
+			throw "Chrome registration for skin failed (error code " + err + ").";
+
+		for (i = 0; i < locales.length; i++) {
+			if (!locales[i])
+				continue;
+
+			err = registerChrome(LOCALE | chromeType, jar, "locale/" + locales[i] + "/");
+			if (err != SUCCESS)
+				throw "Chrome registration for " + locales[i] + " locale failed (error code " + err + ").";
+		}
+
+		var err = performInstall();
+		if (err != SUCCESS && err != 999)
+			throw "Committing installation failed (error code " + err + ").";
+
+		alert("OpenERP Thunderbird Plugin " + APP_VERSION + " is now installed.\n" +
+					"It will become active after you restart your browser.");
+	}
+	catch (ex) {
+		alert("Installation failed: " + ex + "\n" +
+					"You probably don't have the necessary permissions (log in as system administrator).");
+		cancelInstall(err);
+	}
+}
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.rdf b/addons/thunderbird/plugin/openerp_plugin/install.rdf
new file mode 100755
index 00000000000..07fdd116744
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>{d57f315a-9f5d-4366-a530-a769a4a8c949}</em:id>
+    <em:iconURL>chrome://openerp_plugin/skin/tinyerp-icon.ico</em:iconURL>
+    <em:name>OpenERP Plugin for Thunderbird 2.0</em:name>
+    <em:version>1.0</em:version>
+    <em:description>OpenERP Thunderbird Integration</em:description>
+    <em:creator>OpenERP SA</em:creator>
+    <!-- optional items -->
+    <em:homepageURL>http://openerp.com</em:homepageURL>
+    <!-- Thunderbird -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+        <em:minVersion>2.0</em:minVersion>
+        <em:maxVersion>3.0.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+  </Description>
+</RDF>
diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
deleted file mode 100644
index e39b655a0fb..00000000000
Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and /dev/null differ
diff --git a/addons/thunderbird/security/ir.model.access.csv b/addons/thunderbird/security/ir.model.access.csv
index f5b3247103c..0a6c192eb56 100644
--- a/addons/thunderbird/security/ir.model.access.csv
+++ b/addons/thunderbird/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_tinythunderbird_partner","tinythunderbird.partner","model_tinythunderbird_partner",,1,1,1,1
+
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 8b9f8fabf6a..834ac7c6a38 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -9,13 +9,13 @@
       <field name="arch" type="xml">
           <data>
               <form position="attributes">
-                  <attribute name="string">Thunderbird Plug-In Installation</attribute>
+                  <attribute name="string">Thunderbird Module Installation</attribute>
               </form>
               <separator string="title" position="attributes">
                    <attribute name="string">Thunderbird</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
-                  <attribute name="string">This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new document like a lead, a phone call, claim and many more.</attribute>
+                  <attribute name="string">This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new object like a lead, a phone call, claim and many more.</attribute>
               </xpath>
 	      <xpath expr="//button[@string='Install Modules']" position="attributes">
 	        <attribute name="string">Configure</attribute>
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index ba3cfcf5340..cf88232b020 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:54+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-13 14:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index da307354d5d..376214fc47f 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:31+0000\n"
+"PO-Revision-Date: 2010-08-14 09:03+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/zh_TW.po b/addons/warning/i18n/zh_TW.po
index 4e9db6ad3c9..afa93addf0f 100644
--- a/addons/warning/i18n/zh_TW.po
+++ b/addons/warning/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 17:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-08-13 11:33+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index 76678427663..bf960f651fa 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:26+0000\n"
+"PO-Revision-Date: 2010-08-14 08:39+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki