diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index d4731fa0215..cea696f590f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -107,8 +107,11 @@ module named account_voucherss
         'company_view.xml',
         'account_installer.xml',
         'report/account_invoice_report_view.xml',
+        'report/account_entries_report_view.xml',
         'report/account_report_view.xml',
         'report/account_analytic_report_view.xml',
+        'report/account_account_report_view.xml',
+        'report/account_analytic_entries_report_view.xml'
     ],
     'demo_xml': [
         #'demo/price_accuracy00.yml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 6095c2aa113..5181028c17b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -231,9 +231,9 @@ class account_account(osv.osv):
             aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
             wheres = [""]
-            if query:
+            if query.strip():
                 wheres.append(query.strip())
-            if aml_query:
+            if aml_query.strip():
                 wheres.append(aml_query.strip())
             query = " AND ".join(wheres)
 
@@ -251,6 +251,7 @@ class account_account(osv.osv):
 
 
         # consolidate accounts with direct children
+        ids2.reverse()
         brs = list(self.browse(cr, uid, ids2, context=context))
         sums = {}
         while brs:
@@ -270,8 +271,9 @@ class account_account(osv.osv):
                     if current.child_id:
                         sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
         res = {}
+        null_result = dict((fn, 0.0) for fn in field_names)
         for id in ids:
-            res[id] = sums[id]
+            res[id] = sums.get(id, null_result)
         return res
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}):
@@ -313,7 +315,7 @@ class account_account(osv.osv):
         'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
             help="These types are defined according to your country. The type contains more information "\
             "about the account and its specificities."),
-        'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade'),
+        'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, method=True, type='many2many', relation="account.account", string="Child Accounts"),
@@ -450,18 +452,42 @@ class account_account(osv.osv):
     def _check_moves(self, cr, uid, ids, method, context):
         line_obj = self.pool.get('account.move.line')
         account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
+        
         if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
             if method == 'write':
                 raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
             elif method == 'unlink':
                 raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
+        #Checking whether the account is set as a property to any Partner or not
+        value = 'account.account,' + str(ids[0])
+        partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
+        if partner_prop_acc:
+            raise osv.except_osv(_('Warning !'), _('You cannot remove/deactivate an account which is set as a property to any Partner.'))
+        return True
+
+    def _check_allow_type_change(self, cr, uid, ids, new_type, context):
+        group1 = ['payable', 'receivable', 'other']
+        group2 = ['consolidation','view']
+        line_obj = self.pool.get('account.move.line')
+        for account in self.browse(cr, uid, ids, context=context):
+            old_type = account.type
+            account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])])
+            if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
+                #Check for 'Closed' type
+                if old_type == 'closed' and new_type !='closed':
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains account entries!"))
+                #Check for change From group1 to group2 and vice versa
+                if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains account entries!") % (old_type,new_type,))
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
-        if not context:
+        if context is None:
             context = {}
         if 'active' in vals and not vals['active']:
             self._check_moves(cr, uid, ids, "write", context)
+        if 'type' in vals.keys(): 
+            self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, context={}):
@@ -557,15 +583,16 @@ class account_journal(osv.osv):
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
-            args=[]
-        if not context:
-            context={}
+            args = []
+        if context is None:
+            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, context=context)
         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, context=context)
         return self.name_get(cr, user, ids, context=context)
+
 account_journal()
 
 class account_fiscalyear(osv.osv):
@@ -631,6 +658,19 @@ class account_fiscalyear(osv.osv):
             else:
                 return False
         return ids[0]
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            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)
+        return self.name_get(cr, user, ids, context=context)
+    
 account_fiscalyear()
 
 class account_period(osv.osv):
@@ -706,12 +746,24 @@ class account_period(osv.osv):
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
         return True
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            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)
+        return self.name_get(cr, user, ids, context=context)
 
 account_period()
 
 class account_journal_period(osv.osv):
     _name = "account.journal.period"
-    _description = "Journal - Period"
+    _description = "Journal Period"
 
     def _icon_get(self, cr, uid, ids, field_name, arg=None, context={}):
         result = {}.fromkeys(ids, 'STOCK_NEW')
@@ -950,7 +1002,6 @@ class account_move(osv.osv):
                         l[2]['period_id'] = default_period
                 context['period_id'] = default_period
 
-        accnt_journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'])
         if 'line_id' in vals:
             c = context.copy()
             c['novalidate'] = True
@@ -1248,7 +1299,7 @@ class account_tax_code(osv.osv):
     _description = 'Tax Code'
     _rec_name = 'code'
     _columns = {
-        'name': fields.char('Tax Case Name', size=64, required=True),
+        'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
         'code': fields.char('Case Code', size=64),
         'info': fields.text('Description'),
         'sum': fields.function(_sum_year, method=True, string="Year Sum"),
@@ -1262,6 +1313,15 @@ class account_tax_code(osv.osv):
     }
 
 
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context)
+
+
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
@@ -1290,7 +1350,15 @@ class account_tax_code(osv.osv):
                 return False
             level -= 1
         return True
+    
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'line_ids': []})
+        return super(account_tax_code, self).copy(cr, uid, id, default, context)
+    
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
     ]
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index ce6341cc9b2..1fa0a5c6cfa 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -30,7 +30,7 @@ from tools import config
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
-    _description = 'Analytic lines'
+    _description = 'Analytic Line'
     _columns = {
         'product_uom_id' : fields.many2one('product.uom', 'UoM'),
         'product_id' : fields.many2one('product.product', 'Product'),
@@ -42,7 +42,7 @@ class account_analytic_line(osv.osv):
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', c),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
     }
     _order = 'date'
     
@@ -118,7 +118,7 @@ account_analytic_line()
 
 class timesheet_invoice(osv.osv):
     _name = "report.hr.timesheet.invoice.journal"
-    _description = "Analytic account costs and revenues"
+    _description = "Analytic Account Costs and Revenues"
     _auto = False
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index deb010c7cd0..81b6e3157a1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -387,7 +387,7 @@ account_bank_statement()
 
 class account_bank_statement_reconcile(osv.osv):
     _name = "account.bank.statement.reconcile"
-    _description = "Statement reconcile"
+    _description = "Statement Reconcile"
 
     def _total_entry(self, cursor, user, ids, name, attr, context=None):
         result = {}
@@ -558,35 +558,40 @@ class account_bank_statement_line(osv.osv):
 
     def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id,
             context={}):
+        res = {'value': {}}
         if not partner_id:
-            return {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        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
-
-        part = self.pool.get('res.partner').browse(cursor, user, 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)
-        if type == 'supplier':
-            account_id = part.property_account_payable.id
-        else:
-            account_id =  part.property_account_receivable.id
+            if type == 'supplier':
+                account_id = part.property_account_payable.id
+            else:
+                account_id = part.property_account_receivable.id
+            res['value']['account_id'] = account_id
 
-        cursor.execute('SELECT sum(debit-credit) \
+        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))
-        res = cursor.fetchone()
-        balance = res and res[0] or 0.0
+            pgres = cursor.fetchone()
+            balance = pgres and pgres[0] or 0.0
 
-        balance = res_currency_obj.compute(cursor, user, company_currency_id,
+            balance = res_currency_obj.compute(cursor, user, company_currency_id,
                 currency_id, balance, context=context)
-        return {'value': {'amount': balance, 'account_id': account_id}}
+            res['value']['amount'] = balance
+        return res
 
     def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
         if not ids:
@@ -625,7 +630,7 @@ class account_bank_statement_line(osv.osv):
         'statement_id': fields.many2one('account.bank.statement', 'Statement',
             select=True, required=True, ondelete='cascade'),
         'reconcile_id': fields.many2one('account.bank.statement.reconcile',
-            'Reconcile', states={'confirm':[('readonly',True)]}),
+            'Reconcile'),
         'move_ids': fields.many2many('account.move',
             'account_bank_statement_line_move_rel', 'move_id','statement_id',
             'Moves'),
@@ -633,7 +638,7 @@ class account_bank_statement_line(osv.osv):
         'note': fields.text('Notes'),
         'reconcile_amount': fields.function(_reconcile_amount,
             string='Amount reconciled', method=True, type='float'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement line."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
     }
     _defaults = {
         'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2ce4324f7c6..2da7c71021c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -478,9 +478,11 @@
         <act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
 
         <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"/>
-        
-        <!--  Partners inherited form -->
+		
+		<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 Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
+		<!--  Partners inherited form -->
+        
         <record id="view_invoice_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.invoice.info.inherit</field>
             <field name="model">res.partner</field>
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 374a436e9ac..4c919765596 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -50,7 +50,7 @@ write({'state':'open'})</field>
             <field name="wkf_id" ref="wkf"/>
             <field name="name">paid</field>
             <!--<field name="flow_stop">True</field>-->
-            <field name="action">write({'state':'paid'})</field>
+            <field name="action">confirm_paid()</field>
             <field name="kind">function</field>
             <field name="signal_send">subflow.paid</field>
         </record>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 37d539a4b25..a2d18095618 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -22,6 +22,7 @@
             groups="group_account_user"/>
         <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
 
+       <menuitem id="menu_finance_statastic_report_statement" name="Satistic Reports" parent="account.menu_finance_reporting" sequence="3"/>
     </data>
 </openerp>
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index a86fce20772..36b65d20dca 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -30,7 +30,7 @@ import tools
 
 class account_move_line(osv.osv):
     _name = "account.move.line"
-    _description = "Entry lines"
+    _description = "Entry Lines"
 
     def _query_get(self, cr, uid, obj='l', context={}):
         fiscalyear_obj = self.pool.get('account.fiscalyear')
@@ -577,11 +577,12 @@ class account_move_line(osv.osv):
         merges_rec = []
         for line in self.browse(cr, uid, ids, context):
             if line.reconcile_id:
-                raise osv.except_osv(_('Already Reconciled'), _('Already Reconciled'))
+                raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id:
-                        merges.append(line2.id)
+                        if line2.id not in merges:
+                            merges.append(line2.id)
                         total += (line2.debit or 0.0) - (line2.credit or 0.0)
                 merges_rec.append(line.reconcile_partial_id.id)
             else:
@@ -774,6 +775,17 @@ class account_move_line(osv.osv):
             result['fields'] = self.fields_get(cr, uid, fields, context)
         return result
 
+    def _check_moves(self, cr, uid, context):
+        # use the first move ever created for this journal and period
+        cr.execute('select id, state, name from account_move where journal_id=%s and period_id=%s order by id limit 1', (context['journal_id'],context['period_id']))
+        res = cr.fetchone()
+        if res:
+            if res[1] != 'draft':
+                raise osv.except_osv(_('UserError'),
+                       _('The account move (%s) for centralisation ' \
+                                'has been confirmed!') % res[2])
+        return res
+
     def unlink(self, cr, uid, ids, context={}, check=True):
         self._update_check(cr, uid, ids, context)
         result = False
@@ -809,7 +821,7 @@ class account_move_line(osv.osv):
             return True
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        if not context:
+        if context is None:
             context={}
         if vals.get('account_tax_id', False):
             raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
@@ -825,6 +837,24 @@ class account_move_line(osv.osv):
         if vals.get('date', False):
             todo_date = vals['date']
             del vals['date']
+            
+        for line in self.browse(cr, uid, ids,context=context):
+            ctx = context.copy()
+            if ('journal_id' not in ctx):
+                if line.move_id:
+                   ctx['journal_id'] = line.move_id.journal_id.id
+                else:
+                    ctx['journal_id'] = line.journal_id.id
+            if ('period_id' not in ctx):
+                if line.move_id:
+                    ctx['period_id'] = line.move_id.period_id.id
+                else:
+                    ctx['period_id'] = line.period_id.id  
+            #Check for centralisation  
+            journal = self.pool.get('account.journal').browse(cr, uid, ctx['journal_id'], context=ctx)
+            if journal.centralisation:
+                self._check_moves(cr, uid, context=ctx)
+
         result = super(account_move_line, self).write(cr, uid, ids, vals, context)
 
         if check:
@@ -891,14 +921,9 @@ class account_move_line(osv.osv):
         is_new_move = False
         if not move_id:
             if journal.centralisation:
-                # use the first move ever created for this journal and period
-                cr.execute('select id, state, name from account_move where journal_id=%s and period_id=%s order by id limit 1', (context['journal_id'],context['period_id']))
-                res = cr.fetchone()
+                #Check for centralisation
+                res = self._check_moves(cr, uid, context)
                 if res:
-                    if res[1] != 'draft':
-                        raise osv.except_osv(_('UserError'),
-                                _('The Ledger Posting (%s) for centralisation ' \
-                                        'has been confirmed!') % res[2])
                     vals['move_id'] = res[0]
 
             if not vals.get('move_id', False):
@@ -926,7 +951,7 @@ class account_move_line(osv.osv):
                         break
             if journal.account_control_ids and not ok:
                 for a in journal.account_control_ids:
-                    if a.id==vals['account_id']:
+                    if a.id == vals['account_id']:
                         ok = True
                         break
             if (account.currency_id) and 'amount_currency' not in vals and account.currency_id.id <> company_currency:
@@ -941,7 +966,7 @@ class account_move_line(osv.osv):
         if not ok:
             raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
 
-        if 'analytic_account_id' in vals and vals['analytic_account_id']:
+        if vals.get('analytic_account_id',False):
             if journal.analytic_journal_id:
                 vals['analytic_lines'] = [(0,0, {
                         'name': vals['name'],
@@ -961,8 +986,8 @@ class account_move_line(osv.osv):
 
         result = super(osv.osv, self).create(cr, uid, vals, context)
         # CREATE Taxes
-        if 'account_tax_id' in vals and vals['account_tax_id']:
-            tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
+        if vals.get('account_tax_id',False):
+            tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
             total = vals['debit'] - vals['credit']
             if journal.refund_journal:
                 base_code = 'ref_base_code_id'
@@ -978,7 +1003,7 @@ class account_move_line(osv.osv):
                 tax_sign = 'tax_sign'
 
             tmp_cnt = 0
-            for tax in tax_obj.compute(cr,uid,[tax_id],total,1.00):
+            for tax in tax_obj.compute(cr, uid, [tax_id], total, 1.00):
                 #create the base movement
                 if tmp_cnt == 0:
                     if tax[base_code]:
@@ -1031,7 +1056,7 @@ class account_move_line(osv.osv):
         #    if context and ('__last_update' in context):
         #        del context['__last_update']
         #    self.pool.get('account.move').write(cr, uid, [move_id], {'date':vals['date']}, context=context)
-        if check and not context.get('no_store_function'):
+        if check and ((not context.get('no_store_function')) or journal.entry_posted):
             tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
             if journal.entry_posted and tmp:
                 self.pool.get('account.move').button_validate(cr,uid, [vals['move_id']],context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5e514041d1d..1edb56d6044 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -351,7 +351,7 @@
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
-                                    <field name="sequence"/>
+                                    <field name="sequence" invisible="1"/>
                                     <field name="date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
@@ -531,7 +531,10 @@
                         <field name="create_date" select="1"/>
                         <field name="type" select="1"/>
                     </group>
+                    <separator colspan="4" string="Reconcile Entries"/>
                     <field colspan="4" name="line_id" nolabel="1"/>
+                    <separator colspan="4" string="Partial Reconcile Entries"/>
+                    <field colspan="4" name="line_partial_ids" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -551,6 +554,7 @@
                     <field name="code"/>
                     <field name="sum"/>
                     <field name="sum_period"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -562,7 +566,7 @@
                 <form string="Account Tax Code">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
-                    <field name="company_id" widget="selection"  groups="base.group_multi_company"/>
+                    <field name="company_id" select="1"/>
                     <field name="notprintable"/>
                     <field name="parent_id" select="1"/>
                     <field name="sign"/>
@@ -648,9 +652,9 @@
                         </page>
                         <page groups="base.group_extended" string="Special Computation">
                             <separator colspan="4" string="Compute Code (if type=code)"/>
-                            <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/>
+                            <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
                             <separator colspan="4" string="Applicable Code (if type=code)"/>
-                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/>
+                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
                         </page>
                     </notebook>
                 </form>
@@ -1453,9 +1457,11 @@
 
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
 
-        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
-        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All account entries" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+		
+		<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 68a84f413de..84652c621ae 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.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-05-17 13:10+0000\n"
-"Last-Translator: Jon A. Ortuondo (Euskotec) <Unknown>\n"
+"PO-Revision-Date: 2010-05-23 09:59+0000\n"
+"Last-Translator: ninaiz <inigo.rekalde@gmail.com>\n"
 "Language-Team: Basque <eu@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-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-24 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -236,7 +236,7 @@ msgstr ""
 #: field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
-msgstr ""
+msgstr "Kopurua"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
@@ -338,7 +338,7 @@ msgstr ""
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Zerga"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -465,7 +465,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desk. (%)"
 
 #. module: account
 #: rml:account.general.ledger:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 1785d79bf38..e6bddde1647 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-18 09:24+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-05-21 17:48+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2495,7 +2495,8 @@ msgid "Analytic Entry"
 msgstr "Ecriture analytique"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Message pour les paiements en retard"
 
@@ -2784,7 +2785,7 @@ msgstr "Ouvrir journal"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -3034,7 +3035,7 @@ msgstr "-"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -6082,3 +6083,6 @@ msgid ""
 msgstr ""
 "Cochez cette case si l'utilisateur peut réconcilier les entrées dans ce "
 "compte."
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 53532fba0ac..180ce8da31a 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.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-03-13 10:33+0000\n"
-"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"PO-Revision-Date: 2010-05-18 08:45+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -175,7 +175,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Total crrdit"
+msgstr "Credit Total"
 
 #. module: account
 #: field:account.config.wizard,charts:0
@@ -255,7 +255,7 @@ msgstr "Taxas provesidors"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Total debit"
+msgstr "Debit Total"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -808,7 +808,6 @@ msgstr ""
 msgid "Move Lines"
 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
@@ -2136,7 +2135,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 320fdc82290..7389cdda788 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.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-03-15 03:12+0000\n"
+"PO-Revision-Date: 2010-05-20 07:09+0000\n"
 "Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
 "Language-Team: Thai <th@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-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -51,7 +51,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "สินทรัพย์"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -106,7 +106,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "พิมพ์รายงานภาษี"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 34c7aa3e6ba..dbaa321f329 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -23,8 +23,8 @@ import time
 import decimal_precision as dp
 
 import netsvc
+
 from osv import fields, osv, orm
-import ir
 import pooler
 from tools import config
 from tools.translate import _
@@ -217,6 +217,7 @@ class account_invoice(osv.osv):
     _name = "account.invoice"
     _description = 'Invoice'
     _order = "number"
+    _log_create = True
     _columns = {
         'name': fields.char('Description', size=64, select=True,readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice."),
@@ -333,7 +334,14 @@ class account_invoice(osv.osv):
                 raise orm.except_orm(_('Configuration Error!'),
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
-                raise
+                raise orm.except_orm(_('UnknownError'), str(e))
+
+    def confirm_paid(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'paid'}, context=context)
+        for (id,name) in self.name_get(cr, uid, ids):
+            message = _('Document ') + " '" + name + "' "+ _("has been paid.")
+            self.log(cr, uid, id, message)
+        return True
 
     def unlink(self, cr, uid, ids, context=None):
         invoices = self.read(cr, uid, ids, ['state'])
@@ -350,7 +358,7 @@ class account_invoice(osv.osv):
 #       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
 #       return [{}]
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
         invoice_addr_id = False
         contact_addr_id = False
         partner_payment_term = False
@@ -415,7 +423,7 @@ class account_invoice(osv.osv):
             else:
                 result['value']['date_due'] = False
 
-        if partner_bank_id != bank_id:
+        if partner_bank != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             result['value'].update(to_update['value'])
         return result
@@ -450,7 +458,7 @@ class account_invoice(osv.osv):
     def onchange_invoice_line(self, cr, uid, ids, lines):
         return {}
 
-    def onchange_partner_bank(self, cursor, user, ids, partner_bank_id):
+    def onchange_partner_bank(self, cursor, user, ids, partner_bank):
         return {'value': {}}
 
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
@@ -650,6 +658,16 @@ class account_invoice(osv.osv):
                 self.write(cr, uid, [inv.id], res['value'])
         return True
 
+    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
+        """finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
+        Hook method to be overridden in additional modules to verify and possibly alter the
+        move lines to be created by an invoice, for special cases.
+        :param invoice_browse: browsable record of the invoice that is generating the move lines
+        :param move_lines: list of dictionaries with the account.move.lines (as for create())
+        :return: the (possibly updated) final move_lines to create for this invoice
+        """
+        return move_lines
+
     def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
         if not inv.tax_line:
             for tax in compute_taxes.values():
@@ -912,7 +930,12 @@ class account_invoice(osv.osv):
                 # will be automatically deleted too
                 account_move_obj.unlink(cr, uid, [i['move_id'][0]])
             if i['payment_ids']:
-                self.pool.get('account.move.line').write(cr, uid, i['payment_ids'], {'reconcile_partial_id': False})
+                account_move_line_obj = self.pool.get('account.move.line')
+                pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
+                for move_line in pay_ids:
+                    if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
+                        raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
+
         self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
         self._log_event(cr, uid, ids,-1.0, 'Cancel Invoice')
         return True
@@ -1147,14 +1170,14 @@ class account_invoice_line(osv.osv):
                     t = t - (p * l[2].get('quantity'))
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
-                        taxes=tax_obj.browse(cr, uid, taxes[0][2])
+                        taxes = tax_obj.browse(cr, uid, taxes[0][2])
                         for tax in tax_obj.compute(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False)):
                             t = t - tax['amount']
             return t
         return 0
 
     _name = "account.invoice.line"
-    _description = "Invoice line"
+    _description = "Invoice Line"
     _columns = {
         'name': fields.char('Description', size=256, required=True),
         'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."),
@@ -1200,8 +1223,8 @@ class account_invoice_line(osv.osv):
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
         fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
 
-        lang=part.lang
-        context.update({'lang': lang})
+        if part.lang:
+            context.update({'lang': part.lang})
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
 
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 494c0f71a48..edbe704d4db 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -113,6 +113,7 @@
                         </form>
                         <tree string="Bank Details">
                             <field name="state"/>
+                            <field name="bank"/>
                             <field name="owner_name"/>
                             <field name="acc_number"/>
                         </tree>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 71e57cb82e2..e57629d2618 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -25,13 +25,13 @@
             <field name="arch" type="xml">
             	<search string="Analytic Account">
             		<group col="8" colspan="4">
-	            		<filter icon="gtk-execute" string="My Accounts" domain="[('user_id','=',uid)]" help="My Analytic Accounts"/>
 	            		<filter icon="gtk-execute" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
 	            		<filter icon="gtk-execute" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="code" select="1"/>
 						<field name="partner_id" select="1"/>
+						<field name="user_id" widget="selection"/>
             		</group>
             	</search>
             </field>
@@ -97,6 +97,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
+			<field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
@@ -188,11 +189,11 @@
             <field name="arch" type="xml">
             	<search string="Search Analytic Lines">
             		<group col='6' colspan='4'>
-            		    <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Analytic Entries"/>
                         <field name="name" select="1"/>
                         <field name="journal_id" select="1"/>
                         <field name="account_id" select="1"/>
                         <field name="date" select="1"/>
+                        <field name="user_id" widget="selection"/>
             		</group>
             	</search>
             </field>
@@ -202,6 +203,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
        <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>
diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py
index 54fbaddc4d9..458827d8bf3 100644
--- a/addons/account/project/report/analytic_check.py
+++ b/addons/account/project/report/analytic_check.py
@@ -54,12 +54,12 @@ class account_analytic_analytic_check(report_sxw.rml_parse):
 
             self.cr.execute("SELECT abs(sum(amount)) AS balance \
                     FROM account_analytic_line \
-                    WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %s", (date1, date2, a['id']))
+                    WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %s", (date1, date2, a['id']))
             (ad,) = self.cr.fetchone()
             ad = ad or 0.0
             self.cr.execute("SELECT abs(sum(amount)) AS balance \
                     FROM account_analytic_line \
-                    WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %s", (date1, date2, a['id']))
+                    WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %s", (date1, date2, a['id']))
             (ac,) = self.cr.fetchone()
             ac = ac or 0.0
 
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 09ff866d1a8..b411e404cac 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -37,6 +37,8 @@ import compare_account_balance
 import account_invoice_report
 import account_report
 import account_analytic_report
-
+import account_account_report
+import account_entries_report
+import account_analytic_entries_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/account_account_report.py b/addons/account/report/account_account_report.py
new file mode 100644
index 00000000000..55e5d7030c7
--- /dev/null
+++ b/addons/account/report/account_account_report.py
@@ -0,0 +1,86 @@
+# -*- 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 tools
+from osv import fields,osv
+
+class account_account_report(osv.osv):
+    _name = "account.account.report"
+    _description = "Account Report"
+    _auto = False
+    _columns = {
+        'name': fields.char('Name', size=128, readonly=True),
+        'code': fields.char('Code', size=64, readonly=True),
+        'type': fields.selection([
+            ('receivable', 'Receivable'),
+            ('payable', 'Payable'),
+            ('view', 'View'),
+            ('consolidation', 'Consolidation'),
+            ('other', 'Others'),
+            ('closed', 'Closed'),
+        ], 'Internal Type', readonly=True),
+      'company_id': fields.many2one('res.company', 'Company', required=True),
+      'currency_mode': fields.selection([('current', 'At Date'), ('average', 'Average Rate')], 'Outgoing Currencies Rate',readonly=True),
+      'user_type': fields.many2one('account.account.type', 'Account Type',readonly=True),
+      'quantity': fields.float('Quantity', readonly=True),
+      'amount_total': fields.float('Total Amount', readonly=True),
+      'credit': fields.float('Credit', readonly=True),
+      'debit': fields.float('Debit', readonly=True),
+      'balance': fields.float('Balance', readonly=True),
+      'nbr': fields.integer('#Accounts', readonly=True),
+      'parent_account_id': fields.many2one('account.account', 'Parent Account', required=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'account_account_report')
+        cr.execute("""
+            create or replace view account_account_report as (
+                select
+                    min(a.id) as id,
+                    count(distinct a.id) as nbr,
+                    a.name,
+                    a.code,
+                    a.type as type,
+                    a.company_id as company_id,
+                    a.currency_mode as currency_mode,
+                    a.user_type as user_type,
+                    a.parent_id as parent_account_id,
+                    sum(ail.quantity) as quantity,
+                    sum(ail.price_subtotal) as amount_total,
+                    sum(m.credit) as credit,
+                    sum(m.debit) as debit,
+                    (sum(m.credit)-sum(m.debit)) as balance
+                from
+                        account_account as a
+                        left join account_move_line as m on m.account_id=a.id
+                        left join account_invoice_line  as ail on ail.account_id=a.id
+                        left join account_invoice as ai on ai.account_id=a.id
+                group by
+                    a.name,
+                    a.code,
+                    a.type,
+                    a.company_id,
+                    a.currency_mode,
+                    a.user_type,
+                    m.account_id,
+                    a.parent_id
+            )
+        """)
+account_account_report()
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
new file mode 100644
index 00000000000..32e77be341f
--- /dev/null
+++ b/addons/account/report/account_account_report_view.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_account_account_report_tree" model="ir.ui.view">
+        <field name="name">account.account.report.tree</field>
+        <field name="model">account.account.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Account Report">
+                <field name="name" invisible="1" string="Account"/>
+                <field name="code" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <field name="company_id" invisible="1" group="base.multi_company"/>
+                <field name="currency_mode" invisible="1"/>
+                <field name="nbr" sum="#Accounts"/>
+                <field name="user_type" invisible="1"/>
+                <field name="parent_account_id" invisible="1"/>
+                <field name="quantity" sum="Quantity"/>
+                <field name="amount_total" sum="Total Amount"/>
+                <field name="credit" sum="Credit"/>
+                <field name="debit" sum="Debit"/>
+                <field name="balance" sum="Balance"/>
+            </tree>
+        </field>
+    </record>
+
+      <record id="view_account_account_report_graph" model="ir.ui.view">
+         <field name="name">account.account.report.graph</field>
+         <field name="model">account.account.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Accounts" type="bar">
+             	<field name="name"/>
+                <field name="credit" operator="+"/>
+                <field name="debit" operator="+"/>
+                <field name="balance" operator="+"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_account_account_report_search" model="ir.ui.view">
+        <field name="name">account.account.report.search</field>
+        <field name="model">account.account.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Accounts">
+               <group>
+               <filter icon="terp-account"
+	                    	string="At Date"
+	                    	domain="[('currency_mode','=', 'current')]"/>
+	                <filter icon="terp-account"
+	                    	string="Average Rate"
+	                    	domain="[('currency_mode','=','average')]"/>
+	            <separator orientation="vertical"/>
+            	<field name="name" string="Account"/>
+            	<field name="code"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <field name="type" />
+                    <field name="user_type" widget="selection"/>
+                    <field name="parent_account_id" />
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                	<filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
+                	<filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
+                	<filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                	<separator orientation="vertical"/>
+                	<filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
+                    <filter string="Internal Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="Account Type" icon="terp-account" context="{'group_by':'user_type'}"/>
+                    <filter string="Parent Account" icon="terp-account" context="{'group_by':'parent_account_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_account_account_report" model="ir.actions.act_window">
+        <field name="name">Accounts</field>
+        <field name="res_model">account.account.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{"search_default_Account":1,"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <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_statastic_report_statement" sequence="6"/>
+
+</data>
+</openerp>
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
new file mode 100644
index 00000000000..2a1b4ad993b
--- /dev/null
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -0,0 +1,83 @@
+# -*- 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 tools
+from osv import fields,osv
+
+class analytic_entries_report(osv.osv):
+    _name = "analytic.entries.report"
+    _description = "Analytic Entries Statistics"
+    _auto = False
+    _columns = {
+        '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'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'user_id' : fields.many2one('res.users', 'User',readonly=True),
+        'name': fields.char('Description', size=64, readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
+        'general_account_id': fields.many2one('account.account', 'General Account', required=True),
+        'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True),
+        'move_id': fields.many2one('account.move.line', 'Move', required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'product_uom_id': fields.many2one('product.uom', 'Product UOM', required=True),
+        'amount': fields.float('Amount', readonly=True),
+        'unit_amount': fields.float('Unit Amount', readonly=True),
+        'amount_currency': fields.float('Amount Currency', readonly=True),
+        'nbr': fields.integer('#Entries', readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'analytic_entries_report')
+        cr.execute("""
+            create or replace view analytic_entries_report as (
+                 select
+                     min(a.id) as id,
+                     count(distinct a.id) as nbr,
+                     a.create_date as date,
+                     to_char(a.create_date, 'YYYY') as year,
+                     to_char(a.create_date, 'MM') as month,
+                     to_char(a.create_date, 'YYYY-MM-DD') as day,
+                     a.user_id as user_id,
+                     a.name as name,
+                     a.company_id as company_id,
+                     a.currency_id as currency_id,
+                     a.account_id as account_id,
+                     a.general_account_id as general_account_id,
+                     a.journal_id as journal_id,
+                     a.move_id as move_id,
+                     a.product_id as product_id,
+                     a.product_uom_id as product_uom_id,
+                     sum(a.amount) as amount,
+                     sum(a.unit_amount) as unit_amount,
+                     sum(a.amount_currency) as amount_currency
+                 from
+                     account_analytic_line a
+                 group by
+                     a.create_date, a.user_id,a.name,company_id,a.currency_id,
+                     a.account_id,a.general_account_id,a.journal_id,
+                     a.move_id,a.product_id,a.product_uom_id
+            )
+        """)
+analytic_entries_report()
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
new file mode 100644
index 00000000000..41d9c0976f2
--- /dev/null
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_analytic_entries_report_tree" model="ir.ui.view">
+        <field name="name">analytic.entries.report.tree</field>
+        <field name="model">analytic.entries.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Analytic Entries Statistics">
+                <field name="date" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="user_id" invisible="1"/>
+                <field name="name" invisible="1"/>
+                <field name="company_id" invisible="1" groups="base.multi_company"/>
+                <field name="currency_id" invisible="1"/>
+                <field name="account_id" invisible="1"/>
+                <field name="general_account_id" invisible="1"/>
+                <field name="journal_id" invisible="1"/>
+                <field name="product_id" invisible="1"/>
+                <field name="product_uom_id" invisible="1"/>
+                <field name="nbr" sum="Entries"/>
+                <field name="amount" sum="Amount"/>
+                <field name="unit_amount" sum="Unit Amount"/>
+                <field name="amount_currency" sum="Amount Currency"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_analytic_entries_report_search" model="ir.ui.view">
+        <field name="name">analytic.entries.report.search</field>
+        <field name="model">analytic.entries.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Analytic Entries">
+              <group col="10" colspan="12">
+	            	<filter icon="terp-account" string="Last 365 DAys"
+		                    domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+		                    help="Analytic Entries of the year"/>
+	                <filter icon="terp-account" string="Last 30 Days"
+	                		name="month"
+	                		domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                		help="Analytic Entries of this month"/>
+	                <filter icon="gtk-media-rewind"
+	                        string="    7 Days    "
+	                        separator="1"
+	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                        help="Analytic Entries during last 7 days"/>
+	                <separator orientation="vertical"/>
+	                <field name="name"/>
+	                <field name="user_id" widget="selection">
+	                <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Case"/>
+	                </field>
+	                <field name="currency_id"/>
+	            </group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+					<field name="account_id" />
+					<field name="general_account_id" widget="selection"/>
+					<field name="journal_id" widget="selection"/>
+					<separator orientation="vertical"/>
+					<field name="product_id" />
+					<field name="product_uom_id" widget="selection"/>
+            <field name="company_id" widget="selection" groups="base.multi_company"/>
+        		</group>
+        		<newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
+                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
+                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Account"  icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <filter string="General Account" icon="terp-account" context="{'group_by':'general_account_id'}"/>
+                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <filter string="Product UOM" icon="terp-account" context="{'group_by':'product_uom_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+    <record id="view_account_analytic_entries_search" model="ir.ui.view">
+         <field name="name">account.analytic.entries.graph</field>
+         <field name="model">analytic.entries.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Analytic Entries" type="bar">
+             	<field name="user_id"/>
+                <field name="amount" operator="+"/>
+                <field name="unit_amount" operator="+"/>
+                <field name="amount_currency" operator="+"/>
+             </graph>
+         </field>
+    </record>
+    <record id="action_analytic_entries_report" model="ir.actions.act_window">
+        <field name="name">Analytic Entries</field>
+        <field name="res_model">analytic.entries.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="search_view_id" ref="view_analytic_entries_report_search"/>
+    </record>
+
+    <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statastic_report_statement"  sequence="4"/>
+
+</data>
+</openerp>
diff --git a/addons/account/report/account_analytic_report.py b/addons/account/report/account_analytic_report.py
index 45057d950bd..87912b4a3ef 100644
--- a/addons/account/report/account_analytic_report.py
+++ b/addons/account/report/account_analytic_report.py
@@ -35,7 +35,7 @@ class analytic_report(osv.osv):
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', readonly=True),
         'user_id' : fields.many2one('res.users', 'Account Manager',readonly=True),
         'product_id' : fields.many2one('product.product', 'Product',readonly=True),
-        'quantity': fields.float('Quantity',readonly=True),
+        'total_quantity': fields.float('# Total Quantity',readonly=True),
         'debit' : fields.float('Debit',readonly=True),
         'credit' : fields.float('Credit',readonly=True),
         'balance' : fields.float('Balance',readonly=True),
@@ -43,6 +43,11 @@ class analytic_report(osv.osv):
         '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),
+        'day': fields.char('Day', size=128, readonly=True),
+        'nbr':fields.integer('# of Lines', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type'),
+
         'state': fields.selection([('draft','Draft'),
                                    ('open','Open'),
                                    ('pending','Pending'),
@@ -50,6 +55,7 @@ class analytic_report(osv.osv):
                                    ('close','Close'),
                                    ('template', 'Template')],
                 'State', readonly=True),
+
     }
     _order = 'date_start desc'
     def init(self, cr):
@@ -60,15 +66,18 @@ class analytic_report(osv.osv):
                       min(s.id) as id,
                       to_char(s.create_date, 'YYYY') as year,
                       to_char(s.create_date, 'MM') as month,
+                      to_char(s.create_date, 'YYYY-MM-DD') as day,
                       l.journal_id,
                       l.product_id,
                       s.parent_id,
                       s.date_start,
                       s.date as date_end,
                       s.user_id,
+                      s.company_id,
+                      s.type,
                       s.name,
                       s.partner_id,
-                      s.quantity,
+                      sum(s.quantity) as total_quantity,
                       s.debit,
                       s.credit,
                       s.balance,
@@ -77,7 +86,8 @@ class analytic_report(osv.osv):
                 from account_analytic_account s
                 left join account_analytic_line l on (s.id=l.account_id)
                 GROUP BY s.create_date,s.state,l.journal_id,s.name,
-                      s.partner_id,s.date_start,s.date,s.user_id,s.quantity,
+                      s.partner_id,s.date_start,s.date,s.user_id,
+                      s.company_id,s.type,
                       s.debit,s.credit,s.balance,s.parent_id,l.product_id
             )
         """)
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index de97bfcb798..838cefe5898 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -9,23 +9,26 @@
             <tree string="Analytic Accounts Statistics">
             	<field name="parent_id" invisible="1" string="Analytic Account"/>
             	<field name="product_id" invisible="1"/>
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="journal_id" string="Analytic Journal"/>
-                <field name="user_id"/>
-                <field name="date_start"/>
-                <field name="date_end"/>
-                <field name="quantity"/>
+                <field name="name" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="journal_id" string="Analytic Journal" invisible="1"/>
+                <field name="user_id" invisible="1"/>
+                <field name="date_start" invisible="1"/>
+                <field name="date_end" invisible="1"/>
+                <field name="total_quantity" sum=" # Total Quantity"/>
+                <field name="nbr" sum ="# of Lines"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
+                <field name="type" invisible="1"/>
                 <field name="debit"/>
                 <field name="credit"/>
                 <field name="balance"/>
-                <field name="state"/>
+                <field name="state" invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="year" invisible="1"/>
             </tree>
         </field>
     </record>
-
     <record id="view_analytic_report_search" model="ir.ui.view">
         <field name="name">analytic.report.search</field>
         <field name="model">analytic.report</field>
@@ -38,23 +41,15 @@
 	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
 	                <filter icon="terp-account"
 	                    	string="This Month"
+	                    	name="This Month"
 	                    	domain="[('month','=',time.strftime('%%m'))]"/>
+	                <filter icon="gtk-media-rewind"
+	                        string="    7 Days    "
+	                        separator="1"
+	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                        help="Entries during last 7 days"/>
 	                <separator orientation="vertical"/>
-		            <filter string="Start" icon="terp-account" domain="[('date_start','=',time.strftime('%%Y/%%m/%%d'))]"/>
-	         		<filter string="End" icon="terp-account" domain="[('date_end','=',time.strftime('%%Y/%%m/%%d'))]"/>
-	                <separator orientation="vertical"/>
-	                <field name="name"/>
-	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-account"
-	                        	string="My Accounts"
-	                        	name="User"
-	                        	domain="[('user_id','=',uid)]"/>
-	                </field>
-	                <field name="partner_id"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-account"
+	                <filter icon="terp-account"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
                     <filter icon="terp-account"
@@ -63,6 +58,18 @@
                     <filter icon="terp-account"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
+                     <separator orientation="vertical"/>
+	                <field name="name"/>
+	                <field name="user_id" widget="selection">
+	                    <filter icon="terp-account"
+	                        	string="My Accounts"
+	                        	help="My Account"
+	                        	domain="[('user_id','=',uid)]"/>
+	                </field>
+	                <field name="partner_id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-account"
                     		string="Close"
                     		domain="[('state','=','close')]"/>
@@ -70,40 +77,59 @@
                     		string="Template"
                     		domain="[('state','=','template')]"/>
                     <separator orientation="vertical"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="parent_id"/>
-                    <field name="journal_id"/>
-                    <field name="product_id"/>
+                    <field name="journal_id" widget="selection"/>
+                    <newline/>
+                    <field name="product_id" />
+                    <field name="type"/>
                     <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="User" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
+                	<filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
+                    <filter string="Associated Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+					<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
+                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
+                    <filter string="Account Type" icon="terp-account" context="{'group_by':'type'}"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
             </search>
         </field>
     </record>
-
+    <record id="view_account_analytic_report_search" model="ir.ui.view">
+         <field name="name">account.analytic.report.graph</field>
+         <field name="model">analytic.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Analytic Accounts" type="bar">
+             	<field name="user_id"/>
+                <field name="credit" operator="+"/>
+                <field name="debit" operator="+"/>
+                <field name="balance" operator="+"/>
+                <field name="nbr" operator="+"/>
+             </graph>
+         </field>
+    </record>
     <record id="action_analytic_report_all" model="ir.actions.act_window">
         <field name="name">Analytic Accounts</field>
         <field name="res_model">analytic.report</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="context">{'search_default_User':1,'search_default_user_id':uid}</field>
+        <field name="view_mode">tree,graph</field>
+        <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_reporting" sequence="0"/>
+    <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statastic_report_statement" sequence="8"/>
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
new file mode 100644
index 00000000000..85ba8a058f7
--- /dev/null
+++ b/addons/account/report/account_entries_report.py
@@ -0,0 +1,123 @@
+# -*- 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 tools
+from osv import fields,osv
+
+class account_entries_report(osv.osv):
+    _name = "account.entries.report"
+    _description = "Entries"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Effective Date', readonly=True),
+        'date_created': fields.date('Date Created', readonly=True),
+        'date_maturity': fields.date('Date Maturity', readonly=True),
+        'nbr':fields.integer('# of Entries', readonly=True),
+        'nbl':fields.integer('# of Lines', readonly=True),
+        'amount': fields.float('Amount',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'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'ref': fields.char('Reference', size=64,readonly=True),
+        'period_id': fields.many2one('account.period', 'Period', readonly=True),
+        'account_id': fields.many2one('account.account', 'Account', readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', readonly=True),
+        'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State',readonly=True,
+                                  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.'),
+        'partner_id': fields.many2one('res.partner','Partner', readonly=True),
+        'period_id2': fields.many2one('account.period', 'Move Line Period', readonly=True),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'journal_id2': fields.many2one('account.journal', 'Move Line Journal', readonly=True),
+        'type': fields.selection([
+            ('pay_voucher','Cash Payment'),
+            ('bank_pay_voucher','Bank Payment'),
+            ('rec_voucher','Cash Receipt'),
+            ('bank_rec_voucher','Bank Receipt'),
+            ('cont_voucher','Contra'),
+            ('journal_sale_vou','Journal Sale'),
+            ('journal_pur_voucher','Journal Purchase'),
+            ('journal_voucher','Journal Voucher'),
+        ],'Type',readonly=True),
+        'quantity': fields.float('Products Quantity', digits=(16,2), readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+    }
+    _order = 'date desc'
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'account_entries_report')
+        cr.execute("""
+            create or replace view account_entries_report as (
+              select
+                   min(l.id) as id,
+                   am.ref as ref,
+                   sum(l.quantity) as quantity,
+                   am.state as state,
+                   l.state as state_2,
+                   am.date as date,
+                   count(l.id) as nbr,
+                   count(distinct am.id) as nbl,
+                   l.debit as amount,
+                   to_char(am.date, 'YYYY') as year,
+                   to_char(am.date, 'MM') as month,
+                   to_char(am.date, 'YYYY-MM-DD') as day,
+                   am.company_id as company_id,
+                   l.account_id as account_id,
+                   l.analytic_account_id as analytic_account_id,
+                   l.date_created as date_created,
+                   l.date_maturity as date_maturity,
+                   am.journal_id as journal_id,
+                   l.journal_id as journal_id2,
+                   l.period_id as period_id2,
+                   am.period_id as period_id,
+                   l.partner_id as partner_id,
+                   l.product_id as product_id,
+                   am.type as type
+             from
+             account_move_line l
+                 left join
+             account_move am on (am.id=l.move_id)
+                group by am.ref,
+                am.state,
+                am.date,
+                am.company_id,
+                am.journal_id,
+                l.journal_id,
+                am.period_id,
+                l.period_id,
+                am.type,
+                l.partner_id,
+                l.analytic_account_id,
+                l.product_id,
+                l.date_created,
+                l.date_maturity,
+                l.account_id,
+                l.state,
+                l.debit
+            )
+        """)
+
+account_entries_report()
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
new file mode 100644
index 00000000000..c6308ec9928
--- /dev/null
+++ b/addons/account/report/account_entries_report_view.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_account_entries_report_tree" model="ir.ui.view">
+        <field name="name">account.entries.report.tree</field>
+        <field name="model">account.entries.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Invoices Statistics">
+                <field name="date" invisible="1"/>
+                <field name="date_created" invisible="1"/>
+                <field name="date_maturity" invisible="1"/>
+                <field name="ref" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="state_2" invisible="1"/>
+                <field name="year"  invisible="1"/>
+                <field name="day"  invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="product_id" invisible="1"/>
+                <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="period_id" invisible="1"/>
+                <field name="period_id2" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <field name="nbr" sum="# of Entries "/>
+                <field name="nbl" sum="# of Lines "/>
+                <field name="amount" sum="# of Amount "/>
+                <field name="quantity" sum="# of Products Qty "/>
+           </tree>
+        </field>
+    </record>
+    <record id="view_account_entries_report_graph" model="ir.ui.view">
+         <field name="name">account.entries.report.graph</field>
+         <field name="model">account.entries.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Entries" type="bar">
+                 <field name="partner_id"/>
+                 <field name="amount"/>
+             </graph>
+         </field>
+    </record>
+    <record id="view_account_entries_report_search" model="ir.ui.view">
+        <field name="name">account.entries.report.search</field>
+        <field name="model">account.entries.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Entries">
+            	<group colspan="10" col="12">
+	            	<filter icon="terp-account" 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="Entries of the year"/>
+	                <filter icon="terp-account" string="This Month"
+	                		name="This Month"
+	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                		help="Entries of this month"/>
+	                <filter icon="gtk-media-rewind"
+	                        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="Entries during last 7 days"/>
+	                <separator orientation="vertical"/>
+                    <filter string="Draft"
+                    		icon="terp-account"
+                    		domain="[('state','=','draft')]"
+                    		help = "Draft tasks"/>
+                    <separator orientation="vertical"/>
+                    		<field name="journal_id" widget="selection"/>
+                    		<field name="account_id"/>
+                    		<field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="partner_id" />
+					</group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                	<filter string="Posted"
+                   			icon="terp-account"
+                   			domain="[('state','=','posted')]"
+                   			help = "Posted tasks"/>
+                		<field name="state_2"/>
+                	<separator orientation="vertical"/>
+                		<field name="period_id" widget="selection"/>
+                		<field name="period_id2" widget="selection"/>
+                		<field name="type"/>
+                    <field name="product_id" />
+                    <field name="analytic_account_id"/>
+                    <newline/>
+                	<separator orientation="vertical"/>
+                    <field name="date_created"/>
+                		<field name="date"/>
+                    <field name="date_maturity"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
+                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <filter string="State of Move Line" icon="terp-account" context="{'group_by':'state_2'}"/>
+                    <filter string="Period" icon="terp-account" context="{'group_by':'period_id'}"/>
+                    <filter string="Period of Move Line" icon="terp-account" context="{'group_by':'period_id2'}"/>
+                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                 </group>
+            </search>
+        </field>
+    </record>
+    <record id="action_account_entries_report_all" model="ir.actions.act_window">
+        <field name="name">Entries</field>
+        <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_This Month':1,'search_default_Journal':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="search_view_id" ref="view_account_entries_report_search"/>
+    </record>
+    <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statastic_report_statement" sequence="2"/>
+</data>
+</openerp>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 36fa5a0d132..cd1477e79cf 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -61,6 +61,13 @@ class account_invoice_report(osv.osv):
             ('paid','Done'),
             ('cancel','Cancelled')
             ], 'Order State', readonly=True),
+        'date_due': fields.date('Due Date', readonly=True),
+        'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
+        'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
+        'account_id': fields.many2one('account.account', 'Account',readonly=True),
+        'partner_bank': 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"),
     }
     _order = 'date desc'
     def init(self, cr):
@@ -87,12 +94,24 @@ class account_invoice_report(osv.osv):
                      (sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average,
                      count(*) as nbr,
                      s.type as type,
-                     s.state
-                     from
+                     s.state,
+                     s.date_due as date_due,
+                     s.address_contact_id as address_contact_id,
+                     s.address_invoice_id as address_invoice_id,
+                     s.account_id as account_id,
+                     s.partner_bank as partner_bank,
+                     s.residual as residual,
+                     case when s.state != 'paid' then null else
+                            extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
+                     end as delay_to_pay
+                 from
                  account_invoice_line l
                  left join
                      account_invoice s on (s.id=l.invoice_id)
-                     left join product_uom u on (u.id=l.uos_id)
+                     left join product_uom u on (u.id=l.uos_id),
+                 account_move_line am left join account_invoice i on (i.move_id=am.move_id)
+                 where
+                        am.account_id=i.account_id
                  group by
                      s.type,
                      s.date_invoice,
@@ -101,12 +120,18 @@ class account_invoice_report(osv.osv):
                      l.uos_id,
                      s.user_id,
                      s.state,
+                     s.residual,
                      s.company_id,
                      s.payment_term,
                      s.period_id,
                      s.fiscal_position,
                      s.currency_id,
-                     s.journal_id
+                     s.journal_id,
+                     s.date_due,
+                     s.address_contact_id,
+                     s.address_invoice_id,
+                     s.account_id,
+                     s.partner_bank
             )
         """)
 account_invoice_report()
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 5a833e454fb..b974afdb8a3 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -17,7 +17,6 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
-                <!--field name="delay" avg="Days to Close"/-->
                 <field name="nbr" sum="# of Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
@@ -27,6 +26,13 @@
                 <field name="fiscal_position" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
+                <field name="date_due" invisible="1"/>
+                <field name="address_contact_id" invisible="1"/>
+                <field name="address_invoice_id" invisible="1"/>
+                <field name="account_id" invisible="1"/>
+                <field name="partner_bank" invisible="1"/>
+                <field name="residual"  sum="Total Residual"/>
+                <field name="delay_to_pay"  avg="Avg. Delay To Pay"/>
             </tree>
         </field>
     </record>
@@ -49,14 +55,14 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices">
-            	<group>
-	            	<filter icon="terp-account" string="This Year"
+              <group col="10" colspan="12">
+	            	<filter icon="terp-account" string="Last 365 Days"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Invoices of the year"/>
-	                <filter icon="terp-account" string="This Month"
+		                    help="Invoices of last 365 days"/>
+	                <filter icon="terp-account" string="Last 30 Days"
 	                		name="month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                		help="Invoices of this month"/>
+	                		help="Invoices of last 30 days"/>
 	                <filter icon="gtk-media-rewind"
 	                        string="    7 Days    "
 	                        separator="1"
@@ -75,61 +81,61 @@
 	                		icon="terp-account"
 	                		domain="[('state', '=' ,'open')]"
 	                		help = "In progress tasks"/>
+	                <filter string="Done"
+                            icon="terp-account"
+                            domain="[('state','=','paid')]"
+                            help = "Done tasks"/>
   					<separator orientation="vertical"/>
-                <field name="product_id"/>
-                <field name="user_id" widget="selection">
-
-                    <filter icon="terp-account"
-                    		string="My Invoices"
-                    		help = "My Invoices"
-                    		domain="[('user_id','=',uid)]" />
+  					<field name="partner_id"/>
+                    <field name="user_id" widget="selection">
                     <filter icon="terp-account"
                     		string="Invoices Non Users"
                     		help="Invoices Non Users"
                     		domain="[('user_id','=',False)]"/>
-                </field>
-                <field name="partner_id"/>
-				<field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </field>
 				</group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter string="Done"
-                   			icon="terp-account"
-                   			domain="[('state','=','paid')]"
-                   			help = "Done tasks"/>
-                   	<filter string="Cancelled"
-                		icon="terp-account"
-                		domain="[('state', '=' ,'cancel')]"
-                		help = "Cancelled tasks"/>
-                	<separator orientation="vertical"/>
-                	<field name="payment_term" widget="selection"/>
-                	<field name="currency_id" widget="selection"/>
-                	<field name="journal_id" widget="selection"/>
+                    <field name="type"/>
+                    <field name="currency_id" widget="selection"/>
+                    <field name="partner_bank" widget="selection"/>
+                    <field name="fiscal_position" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="address_contact_id"/>
+                    <field name="account_id"/>
+                    <newline/>
+                    <field name="payment_term" widget="selection"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <separator orientation="vertical"/>
+                	<field name="address_invoice_id"/>
+                	<field name="product_id"/>
                 	<newline/>
-            		<field name="type"/>
-                	<field name="period_id" widget="selection"/>
-                	<field name="fiscal_position" widget="selection"/>
-					<field name="date"/>
+					<field name="date" string="Date Invoiced"/>
+					<field name="date_due"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Payment Term" icon="terp-account" context="{'group_by':'payment_term'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
+                    <filter string="Payment Term" icon="terp-account" context="{'group_by':'payment_term'}"/>
                     <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Position" icon="terp-account" context="{'group_by':'fiscal_position'}"/>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
             </search>
@@ -141,11 +147,11 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':uid}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
     </record>
 
-    <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_reporting" sequence="0"/>
+    <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statastic_report_statement" sequence="0"/>
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index f0f67b477e3..9b1688730aa 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -47,7 +47,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
         </record>
-        <menuitem action="action_account_receivable_graph" id="menu_account_receivable_graph" parent="account.menu_finance_reporting"/>
+       <!--  <menuitem action="action_account_receivable_graph" id="menu_account_receivable_graph" parent="account.menu_finance_reporting"/> -->
 
         <!-- Report for Aged Receivable -->
 
@@ -116,7 +116,7 @@
 	    </record>
 
 <!--	    <menuitem id="menu_report_this_month" name="This Month" parent="account.menu_finance_reporting"/>-->
-	    <menuitem id="menu_report_all_months" name="Sales by Account" parent="account.menu_finance_reporting"/>
+	    <!-- <menuitem id="menu_report_all_months" name="Sales by Account" parent="account.menu_finance_reporting"/> -->
 	    <!-- Report of the sales by product and account -->
 	    <record id="view_report_account_sales_tree" model="ir.ui.view">
             <field name="name">report.account.sales.tree</field>
@@ -169,7 +169,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_report_account_sales_search"/>
         </record>
-        <menuitem action="action_report_account_sales_tree_all" id="menu_report_account_sales_all" parent="menu_report_all_months"/>
+        <!-- <menuitem action="action_report_account_sales_tree_all" id="menu_report_account_sales_all" parent="menu_report_all_months"/> -->
 
         <!-- Report of the sales by product and account type -->
 	    <record id="view_report_account_type_sales_tree" model="ir.ui.view">
@@ -237,7 +237,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_report_account_type_sales_search"/>
         </record>
-        <menuitem action="action_report_account_type_sales_tree_all" id="menu_report_account_type_sales_all" parent="menu_report_all_months"/>
+        <!-- <menuitem action="action_report_account_type_sales_tree_all" id="menu_report_account_type_sales_all" parent="menu_report_all_months"/> -->
 
     </data>
 </openerp>
diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index 2713b665d06..e8e1a7dc84c 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -84,8 +84,8 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.lang) ]]</para>
@@ -177,16 +177,16 @@
             <para style="terp_default_Centre_9">[[ line['ref'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ line['date_maturity'] ]]</para>
+            <para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'],date=True) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['debit']) and formatLang(line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) ]]</para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit']) and formatLang(line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) ]]</para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d')) and ((line['debit'] - line['credit']) * (line['account_id']['type'] == 'payable' and -1 or 1))) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
@@ -205,13 +205,13 @@
           <para style="terp_default_Bold_9">Sub-Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x ,y: x + (y['credit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]] </para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]]</para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -229,7 +229,7 @@
           <para style="terp_default_Bold_9">Balance : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]]</para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -248,9 +248,9 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]] [[ company.currency_id.name ]].</para>
+    <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.name ]].</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index e1aa3b6510a..7458594d240 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -15,8 +15,8 @@
 "access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
 "access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
 "access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
-"access_account_tax_code","account.tax.code","model_account_tax_code",,1,0,0,0
-"access_account_tax","account.tax","model_account_tax",,1,0,0,0
+"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_account_invoice",1,0,0,0
+"access_account_tax","account.tax","model_account_tax","account.group_account_invoice",1,0,0,0
 "access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
 "access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
 "access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
@@ -93,3 +93,13 @@
 "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0
+"access_project_account_analytic_line","project.account.analytic.line","model_project_account_analytic_line","account.group_account_manager",1,1,1,1
+"access_account_move_line_reconcile_select","account.move.line.reconcile.select","model_account_move_line_reconcile_select","account.group_account_manager",1,1,1,1
+"access_account_move_line_unreconcile_select","account.move.line.unreconcile.select","model_account_move_line_unreconcile_select","account.group_account_manager",1,1,1,1
+"access_account_invoice_refund","account.invoice.refund","model_account_invoice_refund","account.group_account_manager",1,1,1,1
+"access_account_move_journal","account.move.journal","model_account_move_journal","account.group_account_manager",1,1,1,1
+"access_account_move_bank_reconcile","account.move.bank.reconcile","model_account_move_bank_reconcile","account.group_account_manager",1,1,1,1
+"access_account_subscription_generate","account.subscription.generate","model_account_subscription_generate","account.group_account_manager",1,1,1,1
+"access_account_period_close","account.period.close","model_account_period_close","account.group_account_manager",1,1,1,1
+"access_account_fiscalyear_close_state","account.fiscalyear.close.state","model_account_fiscalyear_close_state","account.group_account_manager",1,1,1,1
+"access_account_chart","account.chart","model_account_chart","account.group_account_manager",1,1,1,1
diff --git a/addons/account/sequence.py b/addons/account/sequence.py
index d48f23eb1cf..e23ec1e3def 100644
--- a/addons/account/sequence.py
+++ b/addons/account/sequence.py
@@ -42,7 +42,7 @@ class ir_sequence(osv.osv):
     _columns = {
         'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences')
     }
-    def get_id(self, cr, uid, sequence_id, test='id', context={}):        
+    def get_id(self, cr, uid, sequence_id, test='id', context={}):
         cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index f7e9d79b27a..506155e1ff1 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -21,6 +21,7 @@
 from osv import fields, osv
 from tools.translate import _
 import netsvc
+import time
 
 class account_invoice_refund(osv.osv_memory):
 
@@ -29,10 +30,14 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation date', required=False),
+       'date': fields.date('Operation date', required=False, 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', required=False),
        'description': fields.char('Description', size=150, required=True),
-                }
+    }
+    
+    _defaults = {
+        'date': time.strftime('%Y-%m-%d'),
+    }
 
     def compute_refund(self, cr, uid, ids, mode, context=None):
         """
@@ -167,7 +172,7 @@ class account_invoice_refund(osv.osv_memory):
                 xml_id = 'action_invoice_tree1'
             elif inv.type == 'in_invoice':
                 xml_id = 'action_invoice_tree2'
-            elif type == 'out_refund':
+            elif inv.type == 'out_refund':
                 xml_id = 'action_invoice_tree3'
             else:
                 xml_id = 'action_invoice_tree4'
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 1f745419c5a..be0ebc40677 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 import time
-import datetime
 
 from osv import fields, osv
 from tools.translate import _
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index d50994a6f28..c1de3294c79 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -29,11 +29,17 @@ class account_unreconcile(osv.osv_memory):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
         if context is None:
             context = {}
-        recs = obj_move_line.read(cr, uid, context['active_ids'], ['reconcile_id',])
-        recs = filter(lambda x: x['reconcile_id'], recs)
-        rec_ids = [rec['reconcile_id'][0] for rec in recs]
-        if len(rec_ids):
-            obj_move_reconcile.unlink(cr, uid, rec_ids)
+        recs = pool.get('account.move.line').read(cr, uid, data['ids'], ['reconcile_id','reconcile_partial_id'])
+        unlink_ids = []
+        full_recs = filter(lambda x: x['reconcile_id'], recs)
+        rec_ids = [rec['reconcile_id'][0] for rec in full_recs]
+        part_recs = filter(lambda x: x['reconcile_partial_id'], recs)
+        part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
+        unlink_ids += rec_ids
+        unlink_ids += part_rec_ids
+    
+        if len(unlink_ids):
+            pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, unlink_ids)
         return {}
 
 account_unreconcile()
@@ -44,10 +50,11 @@ class account_unreconcile_reconcile(osv.osv_memory):
 
     def trans_unrec_reconcile(self, cr, uid, ids, context=None):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
+        rec_ids = context['active_ids']
         if context is None:
             context = {}
         if len(rec_ids):
-            obj_move_reconcile.unlink(cr, uid, context['active_ids'])
+            obj_move_reconcile.unlink(cr, uid, rec_ids)
         return {}
 
 account_unreconcile_reconcile()
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 7e4807a3f81..742ef74cc84 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -393,7 +393,7 @@ account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
-    _description = "Hours summary by user"
+    _description = "Hours Summary by User"
     _order='user'
     _auto = False
     _rec_name = 'user'
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index ab81e7d88fc..84fd933d9a9 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -25,7 +25,7 @@ import time
 
 class account_analytic_default(osv.osv):
     _name = 'account.analytic.default'
-    _description = 'Analytic Distributions'
+    _description = 'Analytic Distribution'
     _rec_name = 'analytic_id'
     _order = 'sequence'
     _columns = {
@@ -69,7 +69,7 @@ account_analytic_default()
 
 class account_invoice_line(osv.osv):
     _inherit = 'account.invoice.line'
-    _description = 'account invoice line'
+    _description = 'Invoice Line'
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
         res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, currency_id=currency_id, context=context)
@@ -103,6 +103,8 @@ class sale_order_line(osv.osv):
     # Method overridden to set the analytic account by default on criterion match
     def invoice_line_create(self, cr, uid, ids, context={}):
         create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        if not ids:
+            return create_ids
         sale_line_obj = self.browse(cr, uid, ids[0], context)
         pool_inv_line = self.pool.get('account.invoice.line')
 
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 57acdb6dee5..db441d0931f 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -54,7 +54,7 @@ class one2many_mod2(fields.one2many):
 
 class account_analytic_plan(osv.osv):
     _name = "account.analytic.plan"
-    _description = "Analytic Plans"
+    _description = "Analytic Plan"
     _columns = {
         'name': fields.char('Analytic Plan', size=64, required=True, select=True,),
         'plan_ids': fields.one2many('account.analytic.plan.line','plan_id','Analytic Plans'),
@@ -63,7 +63,7 @@ account_analytic_plan()
 
 class account_analytic_plan_line(osv.osv):
     _name = "account.analytic.plan.line"
-    _description = "Analytic Plan Lines"
+    _description = "Analytic Plan Line"
     _columns = {
         'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
@@ -297,14 +297,15 @@ class account_move_line(osv.osv):
 
     def create_analytic_lines(self, cr, uid, ids, context={}):
         super(account_move_line, self).create_analytic_lines(cr, uid, ids, context)
+        analytic_line_obj = self.pool.get('account.analytic.line')
         for line in self.browse(cr, uid, ids, context):
            if line.analytics_id:
                if not line.journal_id.analytic_journal_id:
                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
 
-               toremove = self.pool.get('account.analytic.line').search(cr, uid, [('move_id','=',line.id)], context=context)
+               toremove = analytic_line_obj.search(cr, uid, [('move_id','=',line.id)], context=context)
                if toremove:
-                    line.unlink(cr, uid, toremove, context=context)
+                    analytic_line_obj.unlink(cr, uid, toremove, context=context)
                for line2 in line.analytics_id.account_ids:
                    val = (line.credit or  0.0) - (line.debit or 0.0)
                    amt=val * (line2.rate/100)
@@ -321,7 +322,7 @@ class account_move_line(osv.osv):
                        'journal_id': line.journal_id.analytic_journal_id.id,
                        'ref': line.ref,
                    }
-                   ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)
+                   ali_id=analytic_line_obj.create(cr, uid, al_vals, context=context)
         return True
 
 account_move_line()
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
index 98694a3d5dd..ac2dffbfd22 100644
--- a/addons/account_anglo_saxon/purchase.py
+++ b/addons/account_anglo_saxon/purchase.py
@@ -24,7 +24,7 @@ from osv import fields, osv
 class purchase_order(osv.osv):
     _name = "purchase.order"
     _inherit = "purchase.order"
-    _description = "Purchase order"
+    _description = "Purchase Order"
 
     def inv_line_create(self, cr, uid, a, ol):
         line = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
@@ -37,5 +37,4 @@ class purchase_order(osv.osv):
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
                 line[2].update({'account_id': a})
         return line
-purchase_order()        
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:        
\ No newline at end of file
+purchase_order()
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 0fdb10c89a6..0e2ef2a363d 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -239,7 +239,7 @@ class crossovered_budget_lines(osv.osv):
                 res[line.id]=0.00
         return res
     _name="crossovered.budget.lines"
-    _description = "Budget Lines"
+    _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
new file mode 100644
index 00000000000..07ca10ef7d0
--- /dev/null
+++ b/addons/account_budget/i18n/oc.po
@@ -0,0 +1,486 @@
+# Occitan (post 1500) 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-05-18 08:42+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "% performance"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
+#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
+msgid "Budgetary Positions"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Printed at:"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post.dotation,period_id:0
+msgid "Period"
+msgstr "Periòde"
+
+#. module: account_budget
+#: wizard_field:account.budget.report,init,date2:0
+#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
+#: wizard_field:wizard.crossovered.budget,init,date_to:0
+#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
+msgid "End of period"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Printing date:"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Borrolhon"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "at"
+msgstr "a"
+
+#. module: account_budget
+#: view:account.budget.post:0
+msgid "Dotations"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Performance"
+msgstr "Performància"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Devisa :"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "From"
+msgstr "De"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Percentatge"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Results"
+msgstr "Resultats"
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Estat"
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets defined (in Financial\n"
+"Management/Budgets/), the Project Managers can set the planned amount on "
+"each\n"
+"Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Description"
+msgstr "Descripcion"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+msgid "Analytic Account :"
+msgstr "Compte Analitic :"
+
+#. module: account_budget
+#: wizard_button:account.budget.report,init,report:0
+#: wizard_button:wizard.analytic.account.budget.report,init,report:0
+#: wizard_button:wizard.crossovered.budget,init,report:0
+#: wizard_button:wizard.crossovered.budget.summary,init,report:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "A/c No."
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "to"
+msgstr "a"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+#: rml:crossovered.budget.report:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Period Budget"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Budget Analysis"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Acabat"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: account_budget
+#: wizard_view:wizard.crossovered.budget,init:0
+#: wizard_view:wizard.crossovered.budget.summary,init:0
+msgid "Select Options"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+#: rml:crossovered.budget.report:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Data de fin"
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:account.budget.post.dotation,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_budget
+#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
+msgid "Print Summary of Budgets"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
+msgid "Spread amount"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Linhas"
+
+#. module: account_budget
+#: rml:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
+#: model:ir.model,name:account_budget.model_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+msgid "Budget"
+msgstr "Budgèt"
+
+#. module: account_budget
+#: field:account.budget.post.dotation,post_id:0
+msgid "Item"
+msgstr "Element"
+
+#. module: account_budget
+#: field:account.budget.post.dotation,amount:0
+#: wizard_field:account.budget.spread,init,amount:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+msgid "Budgets"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Anullat"
+
+#. module: account_budget
+#: view:account.budget.post.dotation:0
+#: model:ir.model,name:account_budget.model_account_budget_post_dotation
+msgid "Budget Dotation"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post.dotation:0
+msgid "Budget Dotations"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Budget Item Detail"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: wizard_field:account.budget.report,init,date1:0
+#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
+#: wizard_field:wizard.crossovered.budget,init,date_from:0
+#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
+#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_budget
+#: field:account.budget.post.dotation,tot_planned:0
+msgid "Total Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: wizard_view:wizard.analytic.account.budget.report,init:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,dotation_ids:0
+msgid "Spreading"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Theoretical Amount"
+msgstr ""
+
+#. module: account_budget
+#: wizard_field:account.budget.spread,init,fiscalyear:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_budget
+#: rml:crossovered.budget.report:0
+msgid "Budget :"
+msgstr "Budgèt :"
+
+#. module: account_budget
+#: rml:account.budget:0
+#: view:account.budget.post:0
+#: wizard_view:account.budget.spread,init:0
+#: wizard_button:account.budget.spread,init,spread:0
+msgid "Spread"
+msgstr "Difusir"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr "Comptes"
+
+#. module: account_budget
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+msgid "Print Budget"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr ""
+
+#. module: account_budget
+#: wizard_button:account.budget.report,init,end:0
+#: wizard_button:account.budget.spread,init,end:0
+#: view:crossovered.budget:0
+#: wizard_button:wizard.analytic.account.budget.report,init,end:0
+#: wizard_button:wizard.crossovered.budget,init,end:0
+#: wizard_button:wizard.crossovered.budget.summary,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Data de començament"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: account_budget
+#: wizard_view:account.budget.report,init:0
+msgid "Select period"
+msgstr "Seleccionatz un periòde"
diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po
new file mode 100644
index 00000000000..e53bfc9b6c2
--- /dev/null
+++ b/addons/account_chart/i18n/th.po
@@ -0,0 +1,23 @@
+# Thai 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-05-20 04:33+0000\n"
+"Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
+"Language-Team: Thai <th@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-05-21 03:38+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "ทำการลบตัวอย่างผังบัญชีแบบง่าย"
diff --git a/addons/account_coda/__init__.py b/addons/account_coda/__init__.py
new file mode 100644
index 00000000000..af866f5dc70
--- /dev/null
+++ b/addons/account_coda/__init__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 coda
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
new file mode 100644
index 00000000000..306098d137b
--- /dev/null
+++ b/addons/account_coda/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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":"Account CODA - import bank statements from coda file",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Account CODA",
+    "description":"""Module provides functionality to import
+    bank statements from coda files.
+    """,
+    "depends":["base", "account"],
+    "demo_xml":["coda_demo.xml"],
+    "init_xml":[],
+    "update_xml" : ["security/ir.model.access.csv","coda_wizard.xml","coda_view.xml"],
+    "active":False,
+    "installable":True,
+
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_coda/coda.py b/addons/account_coda/coda.py
new file mode 100644
index 00000000000..f37b563c245
--- /dev/null
+++ b/addons/account_coda/coda.py
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 osv import osv,fields
+
+class account_coda(osv.osv):
+    _name = "account.coda"
+    _description = "coda for an Account"
+    _columns = {
+        'name': fields.binary('Coda file', readonly=True),
+        'statement_ids': fields.one2many('account.bank.statement','coda_id','Generated Bank Statement', readonly=True),
+        'note': fields.text('Import log', readonly=True),
+        'journal_id': fields.many2one('account.journal','Bank Journal', readonly=True,select=True),
+        'date': fields.date('Import Date', readonly=True,select=True),
+        'user_id': fields.many2one('res.users','User', readonly=True, select=True),
+    }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'user_id': lambda self,cr,uid,context: uid,
+    }
+account_coda()
+
+class account_bank_statement(osv.osv):
+    _inherit = "account.bank.statement"
+    _columns = {
+        'coda_id':fields.many2one('account.coda','Coda'),
+    }
+account_bank_statement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_coda/coda_demo.xml b/addons/account_coda/coda_demo.xml
new file mode 100644
index 00000000000..f91d34d4cbc
--- /dev/null
+++ b/addons/account_coda/coda_demo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+</data>
+</openerp>
diff --git a/addons/account_coda/coda_view.xml b/addons/account_coda/coda_view.xml
new file mode 100644
index 00000000000..3813fe40bf0
--- /dev/null
+++ b/addons/account_coda/coda_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+
+	<record model="ir.ui.view" id="view_account_coda_form">
+		<field name="name">account.coda.form</field>
+		<field name="model">account.coda</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Coda import">
+				<field name="name" />
+				<field name="journal_id" />
+				<field name="date" />
+				<field name="user_id" />
+                                <notebook colspan="4">
+                                    <page string="Log">
+                                       <field name="note" colspan="4"/>
+                                    </page>    
+                                    <page string="Statements">
+                                       <field name="statement_ids" colspan="4"/>
+                                    </page>
+                                </notebook>
+			</form>
+		</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="view_account_coda_tree">
+		<field name="name">account.coda.tree</field>
+		<field name="model">account.coda</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Coda import">
+				<field name="journal_id" />
+				<field name="date" />
+				<field name="user_id" />
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_account_coda">
+		<field name="name">Coda import</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">account.coda</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+
+	<menuitem name="Coda Statements" parent="account.menu_finance_reporting" id="menu_account_coda" action="action_account_coda" sequence="12"/>
+
+	<menuitem name="Import Coda Statements" action="wizard_account_coda_import" parent="account.menu_finance_periodical_processing"
+	type="wizard"  id="menu_account_coda_wizard" sequence="15"/>
+
+	<act_window name="Coda File"
+		domain="[('statement_ids', 'in', [active_id])]"
+		res_model="account.coda"
+		src_model="account.bank.statement"
+		view_type="form"
+		view_mode="tree,form"
+ 		id="act_account_payment_account_bank_statement"/>
+
+	</data>
+</openerp>
diff --git a/addons/account_coda/coda_wizard.xml b/addons/account_coda/coda_wizard.xml
new file mode 100644
index 00000000000..ecd8eb65913
--- /dev/null
+++ b/addons/account_coda/coda_wizard.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<wizard
+		string="Import Coda File"
+		model="account.bank.statement"
+		name="account.coda_import"
+		id="wizard_account_coda_import"
+		menu="False"
+		/>
+	</data>
+</openerp>
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot
new file mode 100644
index 00000000000..348fb035c0d
--- /dev/null
+++ b/addons/account_coda/i18n/account_coda.pot
@@ -0,0 +1,163 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_coda
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-24 13:11:29+0000\n"
+"PO-Revision-Date: 2009-11-24 13:11:29+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: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid "Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
+
diff --git a/addons/account_coda/i18n/fr_BE.po b/addons/account_coda/i18n/fr_BE.po
new file mode 100644
index 00000000000..348fb035c0d
--- /dev/null
+++ b/addons/account_coda/i18n/fr_BE.po
@@ -0,0 +1,163 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_coda
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-24 13:11:29+0000\n"
+"PO-Revision-Date: 2009-11-24 13:11:29+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: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid "Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
+
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
new file mode 100644
index 00000000000..9c1e0a486dc
--- /dev/null
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0
+"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
\ No newline at end of file
diff --git a/addons/account_coda/statement_coda.txt b/addons/account_coda/statement_coda.txt
new file mode 100644
index 00000000000..44fe70220ca
--- /dev/null
+++ b/addons/account_coda/statement_coda.txt
@@ -0,0 +1,10 @@
+0000006060712505   00000CPH CODA  TINY                      0047747270100477472701 00000                                       1
+1 049126201326907 EUR0BE                  0000000015632900050607TINY                      COMPTE COURANT ORDINAIRE           049
+2100010000                     0000000001150000060607001500000INVOICE OF 2006-12-19                                0606070020100
+2200010000                                                                               EUR000000001150000                  100
+2300010000301915554082                         PROLIBRE SARL             CAROUGE GE                                          000
+2100020000                     0000000000500000060607001500000CONTRACT PARTNER ERREUR ECART      YEA               0606070030100
+2200020000RTY CONTRACT PARTNER                                                           EUR000000000500000                  100
+2300020000050000000017                         SEDNACOM                  43 ALLEE DES FOUGERES     9522 0 HERBLAY            000
+8049126201326907                         0000000017282900060607                                                                 
+9               000008000000000000000000000001650000                                                                           2
diff --git a/addons/account_coda/wizard/__init__.py b/addons/account_coda/wizard/__init__.py
new file mode 100644
index 00000000000..72d3b950cf7
--- /dev/null
+++ b/addons/account_coda/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 coda_import
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
new file mode 100644
index 00000000000..5e1ffa365e8
--- /dev/null
+++ b/addons/account_coda/wizard/coda_import.py
@@ -0,0 +1,339 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 pooler
+import time
+import datetime
+import wizard
+import netsvc
+import base64
+from osv import osv
+from tools.translate import _
+
+codawiz_form = """<?xml version="1.0"?>
+<form string="Import Coda Statement">
+<separator colspan="4" string="Select your bank journal :" />
+    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
+    <newline />
+    <field name="def_payable" />    <field name="def_receivable" />
+    <newline />
+    <field name="awaiting_account" />
+    <separator string="Clic on 'New' to select your file :" colspan="4"/>
+    <field name="coda"/>
+</form>
+"""
+
+codawiz_fields = {
+    'journal_id' : {
+        'string':'Bank Journal',
+        'type':'many2one',
+        'relation':'account.journal',
+        'required':True,
+
+    },
+    'coda' : {
+        'string':'Coda File',
+        'type':'binary',
+        'required':True,
+    },
+    'def_payable' : {
+        'string' : 'Default Payable Account',
+        'type' : 'many2one',
+        'relation': 'account.account',
+        'required':True,
+        'domain':[('type','=','payable')],
+        'help': 'Set here the payable account that will be used, by default, if the partner is not found',
+    },
+    'def_receivable' : {
+        'string' : 'Default receivable Account',
+        'type' : 'many2one',
+        'relation': 'account.account',
+        'required':True,
+        'domain':[('type','=','receivable')],
+        'help': 'Set here the receivable account that will be used, by default, if the partner is not found',
+    },
+    'awaiting_account' : {
+        'string' : 'Default Account for Unrecognized Movement',
+        'type' : 'many2one',
+        'relation': 'account.account',
+        'required':True,
+        'help': 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',
+
+    }
+
+}
+
+result_form = """<?xml version="1.0"?>
+<form string="Import Coda Statement">
+<separator colspan="4" string="Results :" />
+    <field name="note" colspan="4" nolabel="1" width="500"/>
+</form>
+"""
+
+result_fields = {
+
+    'note' : {'string':'Log','type':'text'}
+
+}
+
+
+def _coda_parsing(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    codafile = data['form']['coda']
+    journal_code = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context).code
+    def_pay_acc = data['form']['def_payable']
+    def_rec_acc = data['form']['def_receivable']
+
+    str_log = ""
+    err_log = "Errors:\n------\n"
+    nb_err=0
+    std_log=''
+    str_log1 = "Coda File is Imported  :  "
+    str_not=''
+    str_not1=''
+
+    bank_statements=[]
+    recordlist = base64.decodestring(codafile).split('\n')
+    recordlist.pop()
+    for line in recordlist:
+        if line[0] == '0':
+            # header data
+            bank_statement = {}
+            bank_statement["bank_statement_line"]={}
+            bank_statement_lines = {}
+            bank_statement['date'] = str2date(line[5:11])
+            bank_statement['journal_id']=data['form']['journal_id']
+            period_id = pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))])
+            bank_statement['period_id'] = period_id[0]
+            bank_statement['state']='draft'
+        elif line[0] == '1':
+            # old balance data
+            bal_start = list2float(line[43:58])
+            if line[42] == '1':
+                bal_start = - bal_start
+            bank_statement["balance_start"]= bal_start
+            bank_statement["acc_number"]=line[5:17]
+            bank_statement["acc_holder"]=line[64:90]
+            bank_statement['name'] = journal_code + ' ' + str(line[2:5])
+
+        elif line[0]=='2':
+            # movement data record 2
+            if line[1]=='1':
+                # movement data record 2.1
+                if bank_statement_lines.has_key(line[2:6]):
+                    continue
+                st_line = {}
+                st_line['extra_note'] = ''
+                st_line['statement_id']=0
+                st_line['ref'] = line[2:10]
+                st_line['date'] = time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
+                st_line_amt = list2float(line[32:47])
+
+                if line[61]=='1':
+                    st_line['toreconcile'] = True
+                    st_line['name']=line[65:77]
+                else:
+                    st_line['toreconcile'] = False
+                    st_line['name']=line[62:115]
+
+                st_line['free_comm'] = st_line['name']
+                st_line['val_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[47:53]),"%y/%m/%d")),
+                st_line['entry_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
+                st_line['partner_id']=0
+                if line[31] == '1':
+                    st_line_amt = - st_line_amt
+                    st_line['account_id'] = def_pay_acc
+                else:
+                    st_line['account_id'] = def_rec_acc
+                st_line['amount'] = st_line_amt
+                bank_statement_lines[line[2:6]]=st_line
+                bank_statement["bank_statement_line"]=bank_statement_lines
+            elif line[1] == '2':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
+
+            elif line[1] == '3':
+                # movement data record 3.1
+                st_line_name = line[2:6]
+                st_line_partner_acc = str(line[10:47]).strip()
+                cntry_number=line[10:47].strip()
+                contry_name=line[47:125].strip()
+                bank_ids = pool.get('res.partner.bank').search(cr,uid,[('acc_number','=',st_line_partner_acc)])
+                bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name})
+                if bank_ids:
+                    bank = pool.get('res.partner.bank').browse(cr,uid,bank_ids[0],context)
+                    if line and bank.partner_id:
+                        bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
+                        if bank_statement_lines[st_line_name]['amount'] < 0 :
+                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id})
+                        else :
+                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
+                else:
+                    nb_err += 1
+                    err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number,contry_name)
+                    bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
+
+                bank_statement["bank_statement_line"]=bank_statement_lines
+        elif line[0]=='3':
+            if line[1] == '1':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[40:113]
+            elif line[1] == '2':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:115]
+            elif line[1] == '3':
+                st_line_name = line[2:6]
+                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:100]
+        elif line[0]=='8':
+            # new balance record
+            bal_end = list2float(line[42:57])
+            if line[41] == '1':
+                bal_end = - bal_end
+            bank_statement["balance_end_real"]= bal_end
+
+        elif line[0]=='9':
+            # footer record
+            bank_statements.append(bank_statement)
+    #end for
+    bkst_list=[]
+    for statement in bank_statements:
+        try:
+            bk_st_id = pool.get('account.bank.statement').create(cr,uid,{
+                'journal_id': statement['journal_id'],
+                'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
+                'period_id':statement['period_id'],
+                'balance_start': statement["balance_start"],
+                'balance_end_real': statement["balance_end_real"],
+                'state': 'draft',
+                'name': statement['name'],
+            })
+            lines=statement["bank_statement_line"]
+            for value in lines:
+                line=lines[value]
+                reconcile_id = False
+                if line['toreconcile']:
+                    rec_id = pool.get('account.move.line').search(cr, uid, [('name','=',line['name']),('reconcile_id','=',False),('account_id.reconcile','=',True)])
+                    if rec_id:
+                        reconcile_id = pool.get('account.bank.statement.reconcile').create(cr, uid, {
+                            'line_ids': [(6, 0, rec_id)]
+                            }, context=context)
+                str_not1 = ''
+                if line.has_key('contry_name') and line.has_key('cntry_number'):
+                    str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0])
+                id=pool.get('account.bank.statement.line').create(cr,uid,{
+                           'name':line['name'],
+                           'date': line['date'],
+                           'amount': line['amount'],
+                           'partner_id':line['partner_id'] or 0,
+                           'account_id':line['account_id'],
+                           'statement_id': bk_st_id,
+                           'reconcile_id': reconcile_id,
+                           'note':str_not1,
+                           'ref':line['ref'],
+                           })
+
+            str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"])
+            std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
+                      %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
+            bkst_list.append(bk_st_id)
+        
+        except osv.except_osv, e:
+            cr.rollback()
+            nb_err+=1
+            err_log += '\n Application Error : ' + str(e)
+            raise # REMOVEME
+
+        except Exception, e:
+            cr.rollback()
+            nb_err+=1
+            err_log += '\n System Error : '+str(e)
+            raise # REMOVEME
+        except :
+            cr.rollback()
+            nb_err+=1
+            err_log += '\n Unknown Error'
+            raise
+    err_log += '\n\nNumber of statements : '+ str(len(bkst_list))
+    err_log += '\nNumber of error :'+ str(nb_err) +'\n'
+
+    pool.get('account.coda').create(cr, uid,{
+        'name':codafile,
+        'statement_ids': [(6, 0, bkst_list,)],
+        'note':str_log1+str_not+std_log+err_log,
+        'journal_id':data['form']['journal_id'],
+        'date':time.strftime("%Y-%m-%d"),
+        'user_id':uid,
+        })
+
+    return {'note':str_log1 + std_log + err_log ,'journal_id': data['form']['journal_id'], 'coda': data['form']['coda'],'statment_ids':bkst_list}
+
+
+def str2date(date_str):
+    return time.strftime("%y/%m/%d",time.strptime(date_str,"%d%m%y"))
+
+def str2float(str):
+    try:
+        return float(str)
+    except:
+        return 0.0
+
+def list2float(lst):
+    try:
+        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+    except:
+        return 0.0
+
+class coda_import(wizard.interface):
+    def _action_open_window(self, cr, uid, data, context):
+        form=data['form']
+        return {
+            'domain':"[('id','in',%s)]"%(form['statment_ids']),
+            'name': 'Statement',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.bank.statement',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+        }
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : codawiz_form,
+                    'fields' : codawiz_fields,
+                    'state' : [('end', '_Close'),('extraction', '_Ok') ]}
+        },
+        'extraction' : {
+            'actions' : [_coda_parsing],
+            'result' : {'type' : 'form',
+                    'arch' : result_form,
+                    'fields' : result_fields,
+                    'state' : [('end', '_Close'),('open', '_Open Statement')]}
+        },
+        'open': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _action_open_window, 'state': 'end'}
+
+            },
+
+    }
+coda_import("account.coda_import")
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py
index 5eaa2a4e25a..c8bf9537f13 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/followup.py
@@ -23,7 +23,7 @@ from osv import fields, osv
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
-    _description = 'Follow-Ups'
+    _description = 'Follow-Up'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
@@ -34,7 +34,7 @@ followup()
 
 class followup_line(osv.osv):
     _name = 'account_followup.followup.line'
-    _description = 'Follow-Ups Criteria'
+    _description = 'Follow-Up Criteria'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."),
diff --git a/addons/account_followup/followup_report.py b/addons/account_followup/followup_report.py
index 79cd6006e2b..5ce062ebd0b 100644
--- a/addons/account_followup/followup_report.py
+++ b/addons/account_followup/followup_report.py
@@ -30,7 +30,7 @@ def _code_get(self, cr, uid, context={}):
 
 class account_followup_stat(osv.osv):
     _name = "account_followup.stat"
-    _description = "Followup statistics"
+    _description = "Followup Statistics"
     _auto = False
     _columns = {
         'name': fields.many2one('res.partner', 'Partner', readonly=True),
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 4b5e77beb87..ae31f7253a2 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -124,7 +124,7 @@
             </field>
         </record>
         
-        <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True)]" 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="[('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"/>
         
diff --git a/addons/account_invoice_layout/i18n/id.po b/addons/account_invoice_layout/i18n/id.po
index 9f1682ad273..661f48b2b23 100644
--- a/addons/account_invoice_layout/i18n/id.po
+++ b/addons/account_invoice_layout/i18n/id.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-07 13:19+0000\n"
-"Last-Translator: opix <inur.opix@gmail.com>\n"
+"PO-Revision-Date: 2010-05-18 11:05+0000\n"
+"Last-Translator: Pandu Pradana <p4ndupr4d4n4@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-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -35,7 +35,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Pembatalan Tagihan"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -56,7 +56,7 @@ msgstr "Potongan (%)"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "(Incl. taxes):"
-msgstr ""
+msgstr "(Termasuk pajak):"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -132,7 +132,7 @@ msgstr "Harga"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "/ ("
-msgstr ""
+msgstr "/ ("
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -147,7 +147,7 @@ msgstr "Rekening Asal"
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "Tulis Pesan"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -212,7 +212,7 @@ msgstr "Invoice dengan Layout"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "Penjelasan / Pajak"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -222,7 +222,7 @@ msgstr "Jumlah"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description/Taxes"
-msgstr ""
+msgstr "Penjelasan/Pajak"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -262,7 +262,7 @@ msgstr "Faktur Pembelian"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "Catatan :"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -272,12 +272,12 @@ msgstr "Pajak"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "account_invoice_layout"
-msgstr ""
+msgstr "Tatanan_tagihan_akun"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "Jumlah (Tidak termasuk pajak):"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 8f68bdaf46f..8e300f7072a 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -28,7 +28,7 @@ import pooler
 
 class payment_type(osv.osv):
     _name= 'payment.type'
-    _description= 'Payment type'
+    _description= 'Payment Type'
     _columns= {
         'name': fields.char('Name', size=64, required=True,help='Payment Type'),
         'code': fields.char('Code', size=64, required=True,help='Specifies the Code for Payment Type'),
@@ -43,7 +43,7 @@ payment_type()
 
 class payment_mode(osv.osv):
     _name= 'payment.mode'
-    _description= 'Payment mode'
+    _description= 'Payment Mode'
     _columns= {
         'name': fields.char('Name', size=64, required=True,help='Mode of Payment'),
         'bank_id': fields.many2one('res.partner.bank', "Bank account",
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 63dd950520f..d238fe952fc 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -25,6 +25,8 @@
                     <field name="partner_id"/>
                     <field name="ref"/>
                     <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="account_id"/>
                     <field name="date_maturity"/>
                     <field name="date"/>
                     <field name="debit" sum="Total debit"/>
@@ -279,7 +281,6 @@
                     <field name="currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
-                    <field domain="[('partner_id', '=', partner_id)]" name="bank_id"/>
                     <field name="create_date"/>
                     <field name="name"/>
                 </tree>
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 001804c9e8a..266dcb535d8 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -104,7 +104,7 @@ class payment_order_create(osv.osv_memory):
 
         # Search for move line to pay:
         domain = [('reconcile_id', '=', False),('account_id.type', '=', 'payable'),('amount_to_pay', '>', 0)]
-        domain = domain + ['|',('date_maturity','<',search_due_date),('date_maturity','=',False)]
+        domain = domain + ['|',('date_maturity','<=',search_due_date),('date_maturity','=',False)]
         line_ids = line_obj.search(cr, uid, domain, context=context)
         context.update({'line_ids': line_ids})
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_create_payment_order_lines')], context=context)
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 3f8f9330343..381f0d0f8f7 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -106,5 +106,3 @@ class account_payment_populate_statement(osv.osv_memory):
         return {'type' : 'ir.actions.act_window_close'}
 
 account_payment_populate_statement()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 7a6d65878f0..a3f92676111 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -32,7 +32,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class account_report(osv.osv):
     _name = "account.report.report"
-    _description = "Account reporting"
+    _description = "Account Reporting"
 #    _color = [
 #            ('', ''),
 #            ('green','Green'),
diff --git a/addons/account_report/i18n/oc.po b/addons/account_report/i18n/oc.po
new file mode 100644
index 00000000000..1469c5cb903
--- /dev/null
+++ b/addons/account_report/i18n/oc.po
@@ -0,0 +1,532 @@
+# Occitan (post 1500) 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-05-18 08:43+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_report
+#: field:account.report.history,name:0
+#: selection:account.report.report,type:0
+#: model:ir.model,name:account_report.model_account_report_history
+msgid "Indicator"
+msgstr ""
+
+#. module: account_report
+#: wizard_field:print.indicators.pdf,init,file:0
+msgid "Select a PDF File"
+msgstr ""
+
+#. module: account_report
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Operators:"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,parent_id:0
+msgid "Parent"
+msgstr "Parent"
+
+#. module: account_report
+#: field:account.report.report,disp_graph:0
+msgid "Display As Graph"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Debit:"
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Others"
+msgstr "Autres"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Tabular Summary"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Notes"
+msgstr "Nòtas"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Goodness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Very bad"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.history,val:0
+#: field:account.report.report,amount:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Badness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Bad"
+msgstr ""
+
+#. module: account_report
+#: wizard_view:print.indicators.pdf,init:0
+msgid "Select the PDF file on which Indicators will be printed."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "> Goodness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,badness_limit:0
+msgid "Badness Indicator Limit"
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Very Bad"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
+msgid "Indicator history"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Report Amount:"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.fiscal_statements
+msgid "Fiscal Statements"
+msgstr ""
+
+#. module: account_report
+#: wizard_button:print.indicators,init,next:0
+msgid "Next"
+msgstr "Seguent"
+
+#. module: account_report
+#: model:ir.module.module,shortdesc:account_report.module_meta_information
+msgid "Reporting for accounting"
+msgstr ""
+
+#. module: account_report
+#: wizard_button:print.indicators,next,print:0
+#: wizard_button:print.indicators.pdf,init,print:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_report
+#: field:account.report.report,type:0
+msgid "Type"
+msgstr "Tipe"
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
+msgid "Print Indicators in PDF"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Tax Code:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Good"
+msgstr "Bon"
+
+#. module: account_report
+#: view:account.report.history:0
+msgid "Account Report History"
+msgstr ""
+
+#. module: account_report
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_report
+#: help:account.report.report,badness_limit:0
+msgid "This Value sets the limit of badness."
+msgstr ""
+
+#. module: account_report
+#: wizard_field:print.indicators,init,select_base:0
+msgid "Choose Criteria"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Credit:"
+msgstr ""
+
+#. module: account_report
+#: wizard_view:print.indicators,init:0
+msgid "Select the criteria based on which Indicators will be printed."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "< Badness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Very Good"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,note:0
+msgid "Note"
+msgstr "Nòta"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Currency:"
+msgstr "Devisa :"
+
+#. module: account_report
+#: field:account.report.report,status:0
+msgid "Status"
+msgstr "Estat"
+
+#. module: account_report
+#: help:account.report.report,disp_tree:0
+msgid ""
+"When the indicators are printed, if one indicator is set with this field to "
+"True, then it will display one more graphs with all its children in tree"
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Normal"
+msgstr "Normala"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: account_report
+#: field:account.report.report,disp_tree:0
+msgid "Display Tree"
+msgstr ""
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based On Fiscal Years"
+msgstr ""
+
+#. module: account_report
+#: model:ir.model,name:account_report.model_account_report_report
+msgid "Account reporting"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Balance:"
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Expression :"
+msgstr "Expression :"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "report('REPORT_CODE')"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,expression:0
+msgid "Expression"
+msgstr "Expression"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Accounting reporting"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_form
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
+msgid "New Reporting Item Formula"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,code:0
+#: rml:accounting.report:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_report
+#: field:account.report.history,tmp:0
+msgid "temp"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.history,period_id:0
+msgid "Period"
+msgstr "Periòde"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "General"
+msgstr "General"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Legend of operators"
+msgstr ""
+
+#. module: account_report
+#: wizard_button:print.indicators,init,end:0
+#: wizard_button:print.indicators,next,end:0
+#: wizard_button:print.indicators.pdf,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_report
+#: field:account.report.report,child_ids:0
+msgid "Children"
+msgstr "Enfants"
+
+#. module: account_report
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_report
+#: help:account.report.report,goodness_limit:0
+msgid "This Value sets the limit of goodness."
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
+#: model:ir.ui.menu,name:account_report.menu_wizard_print_indicators
+#: wizard_view:print.indicators,init:0
+#: wizard_view:print.indicators,next:0
+msgid "Print Indicators"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "+ - * / ( )"
+msgstr "+ - * / ( )"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Printing date:"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
+msgid "Indicators in PDF"
+msgstr ""
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "at"
+msgstr "a"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Accounting Report"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,goodness_limit:0
+msgid "Goodness Indicator Limit"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
+msgid "Other reports"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid ""
+"Note: The second arguement 'fiscalyear' and 'period' are optional "
+"arguements.If the value is -1,previous fiscalyear or period is considered."
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid ")"
+msgstr ")"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
+msgid "Fiscal Statements reporting"
+msgstr ""
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based on Fiscal Periods"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.report_print_indicators
+#: rml:print.indicators:0
+msgid "Indicators"
+msgstr "Indicadors"
+
+#. module: account_report
+#: wizard_view:print.indicators.pdf,init:0
+msgid "Print Indicators with PDF"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
+msgid "Indicators reporting"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,name:0
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_report
+#: wizard_field:print.indicators,next,base_selection:0
+msgid "Select Criteria"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.history,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
+msgid "Custom reporting"
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Page"
+msgstr "Pagina"
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "View"
+msgstr "Afichatge"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Indicators -"
+msgstr ""
+
+#. module: account_report
+#: help:account.report.report,disp_graph:0
+msgid ""
+"If the field is set to True, information will be printed as a Graph, "
+"otherwise as an array."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Return value for status"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "1cm 27.7cm 20cm 27.7cm"
+msgstr "1cm 27.7cm 20cm 27.7cm"
+
+#. module: account_report
+#: model:ir.module.module,description:account_report.module_meta_information
+msgid ""
+"Financial and accounting reporting\n"
+"    Fiscal statements\n"
+"    Indicators\n"
+"    "
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Fiscal Statement"
+msgstr ""
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index ad1ce59f769..0b4a16b0dd8 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.py
@@ -30,7 +30,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class color_rml(osv.osv):
     _name = "color.rml"
-    _description = "Rml Colors"
+    _description = "Rml Color"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'code': fields.char('code',size=64,required=True),
diff --git a/addons/account_reporting/i18n/oc.po b/addons/account_reporting/i18n/oc.po
new file mode 100644
index 00000000000..97cba6a7eea
--- /dev/null
+++ b/addons/account_reporting/i18n/oc.po
@@ -0,0 +1,246 @@
+# Occitan (post 1500) 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-05-18 08:40+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_reporting
+#: field:color.rml,code:0
+msgid "code"
+msgstr "còde"
+
+#. module: account_reporting
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica-Bold"
+msgstr "Helvetica-Gras"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica"
+msgstr "Helvetica"
+
+#. module: account_reporting
+#: field:account.report.bs,note:0
+msgid "Note"
+msgstr "Nòta"
+
+#. module: account_reporting
+#: field:account.report.bs,report_type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
+#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
+msgid "Balance Sheet Report"
+msgstr ""
+
+#. module: account_reporting
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-BoldOblique"
+msgstr ""
+
+#. module: account_reporting
+#: wizard_button:account.account.balancesheet.report,init,report:0
+msgid "Print BalanceSheet"
+msgstr ""
+
+#. module: account_reporting
+#: help:account.account.balancesheet.report,init,periods:0
+msgid "All periods if empty"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,color_font:0
+msgid "Font Color"
+msgstr "Color de la poliça"
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects With Accounts and child of Accounts"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.module.module,description:account_reporting.module_meta_information
+msgid ""
+"Financial and accounting reporting\n"
+"    Balance Sheet Report"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects With Accounts"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-Oblique"
+msgstr ""
+
+#. module: account_reporting
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_reporting
+#: field:account.report.bs,name:0
+#: field:color.rml,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "Account reporting"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
+msgid "Balance Sheet Report Form"
+msgstr ""
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "Notes"
+msgstr "Nòtas"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-BoldItalic"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.model,name:account_reporting.model_account_report_bs
+msgid "Account reporting for Balance Sheet"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-Bold"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Italic"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects Only"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.model,name:account_reporting.model_color_rml
+msgid "Rml Colors"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
+msgid "Reporting of Balancesheet for accounting"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,code:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_reporting
+#: field:account.report.bs,parent_id:0
+msgid "Parent"
+msgstr "Parent"
+
+#. module: account_reporting
+#: field:account.report.bs,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Bold"
+msgstr ""
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "General"
+msgstr "General"
+
+#. module: account_reporting
+#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
+msgid "Fiscal year"
+msgstr "Exercici fiscal"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+#: field:account.report.bs,account_id:0
+msgid "Accounts"
+msgstr "Comptes"
+
+#. module: account_reporting
+#: wizard_field:account.account.balancesheet.report,init,periods:0
+msgid "Periods"
+msgstr "Periòdes"
+
+#. module: account_reporting
+#: field:account.report.bs,color_back:0
+msgid "Back Color"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,child_id:0
+msgid "Children"
+msgstr "Enfants"
+
+#. module: account_reporting
+#: wizard_button:account.account.balancesheet.report,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Roman"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica-Oblique"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,font_style:0
+msgid "Font"
+msgstr "Poliça de caractèr"
+
+#. module: account_reporting
+#: wizard_view:account.account.balancesheet.report,init:0
+msgid "Customize Report"
+msgstr ""
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
new file mode 100644
index 00000000000..94ee23ca205
--- /dev/null
+++ b/addons/account_voucher/i18n/oc.po
@@ -0,0 +1,601 @@
+# Occitan (post 1500) 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-05-18 08:57+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
+msgid "Opening Balance Entry"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
+msgid "Bank Receipts"
+msgstr "Recebuts bancaris"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Particulars"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "State :"
+msgstr "Estat :"
+
+#. module: account_voucher
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Ref. :"
+msgstr "Ref. :"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
+msgid "Contra Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,company_id:0
+msgid "Company"
+msgstr "Entrepresa"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
+msgid "Journal Voucher"
+msgstr "Jornal dels chèques"
+
+#. module: account_voucher
+#: rml:voucher.cash_receipt.drcr:0
+msgid ","
+msgstr ","
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Set to Draft"
+msgstr "Metre en Borrolhon"
+
+#. module: account_voucher
+#: wizard_button:account.voucher.open,init,open:0
+msgid "Open Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Line"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Total Credit"
+msgstr "Credit Total"
+
+#. module: account_voucher
+#: field:account.voucher,account_id:0
+#: field:account.voucher.line,account_id:0
+msgid "Account"
+msgstr "Compte"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+msgid "D"
+msgstr "D"
+
+#. module: account_voucher
+#: field:account.account,level:0
+msgid "Level"
+msgstr "Nivèl"
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Account Entry Line"
+msgstr "Linha d'escritura comptabla"
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "Debit Total"
+
+#. module: account_voucher
+#: field:account.voucher,amount:0
+#: field:account.voucher.line,amount:0
+#: rml:voucher.cash_amount:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Receiver's Signature"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "No."
+msgstr "N°"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
+msgid "Journal Sale Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
+msgid "Receipt Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+msgid "Account :"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
+#: model:ir.actions.act_window,name:account_voucher.action_payments_cashpay_voucher_list
+#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
+msgid "Payment Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: account_voucher
+#: selection:account.account,type1:0
+#: selection:account.account.template,type1:0
+msgid "None"
+msgstr "Pas cap"
+
+#. module: account_voucher
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr "Numèro"
+
+#. module: account_voucher
+#: view:account.move:0
+#: field:account.voucher,state:0
+#: wizard_field:account.voucher.open,init,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: account_voucher
+#: selection:account.account,type1:0
+#: selection:account.account.template,type1:0
+#: selection:account.voucher.line,type:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+#: field:account.voucher.line,type:0
+msgid "Type"
+msgstr "Tipe"
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
+msgid "Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Authorised Signatory"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+msgid "Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher.line,voucher_id:0
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: wizard_view:account.voucher.open,init:0
+#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open
+msgid "Open Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Dated :"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
+msgid "Cash Receipts"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
+msgid "New Bank Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,payment_ids:0
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,currency_id:0
+msgid "Currency"
+msgstr "Devisa"
+
+#. module: account_voucher
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.voucher:0
+#: field:account.voucher,narration:0
+msgid "Narration"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Voucher Reference"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
+msgid "New Cash Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
+msgid "Voucher Report"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.account,open_bal:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:account.voucher.open,init,state:0
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Draft"
+msgstr "Borrolhon"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
+msgid "Cash Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
+msgid "New Cash Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Optional Information"
+msgstr "Entresenhas opcionalas"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "General Entries"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid ":"
+msgstr ":"
+
+#. module: account_voucher
+#: field:account.account,type1:0
+#: field:account.account.template,type1:0
+msgid "Dr/Cr"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
+msgid "Voucher Report (Cr/Dr)"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.move,voucher_type:0
+#: wizard_field:account.voucher.open,init,type:0
+msgid "Voucher Type"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.account,type1:0
+#: selection:account.account.template,type1:0
+#: selection:account.voucher.line,type:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Credit"
+msgstr "Credit"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Through :"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Periòde"
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
+msgid "Bank Payments"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "General Information"
+msgstr "Informacions generalas"
+
+#. module: account_voucher
+#: wizard_field:account.voucher.open,init,period_ids:0
+msgid "Periods"
+msgstr "Periòdes"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: wizard_button:account.voucher.open,init,end:0
+#: selection:account.voucher.open,init,state:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: selection:account.voucher.open,init,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: account_voucher
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
+msgid "Accounting Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: field:res.currency,sub_name:0
+msgid "Sub Currency"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
+msgid "Other Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr "Descripcion"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Canceled"
+msgstr "Anullat"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Cash Payment Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
+msgid "Bank Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "-"
+msgstr "-"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
+msgid "Journal Purchase Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.account:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,ref:0
+msgid "Ref."
+msgstr "Ref."
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:account.voucher.open,init,state:0
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_voucher
+#: field:account.voucher,move_ids:0
+msgid "Real Entry"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
+msgid "Open a Voucher Entry"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
+msgid "New Bank Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
+msgid "Cash Payments"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_cash_rec_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Cash Receipt Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Bank Payment Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Bank Receipt Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.account,journal_id:0
+#: field:account.voucher,journal_id:0
+msgid "Journal"
+msgstr "Jornal"
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 66b701fb97a..140442aa02e 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -103,7 +103,7 @@ class account_voucher(osv.osv):
             ],'Type', readonly=True, select=True , size=128),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
         '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)]}),
+        '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=False, states={'proforma':[('readonly',True)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}, required=True),
@@ -167,15 +167,14 @@ class account_voucher(osv.osv):
             return {'value':{'account_id':account_id.id}}
 
     def open_voucher(self, cr, uid, ids, context={}):
-        obj=self.pool.get('account.voucher').browse(cr,uid,ids)
-        total=0
+        obj = self.pool.get('account.voucher').browse(cr,uid,ids)
+        total = 0
         for i in obj[0].payment_ids:
-            total+=i.amount
-        if total!=0:
-            self.write(cr,uid,ids,{'amount':total})
-            self.write(cr, uid, ids, {'state':'proforma'})
+            total += i.amount
+        if total != 0:
+            self.write(cr, uid, ids, {'amount':total, 'state':'proforma'})
         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 action !', 'You cannot post to Pro-Forma a voucher with Total amount = 0 !')
         return True
 
     def proforma_voucher(self, cr, uid, ids, context={}):
@@ -302,9 +301,9 @@ class account_voucher(osv.osv):
                 name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
 
             move = {
-                'name': name,
+                'name' : name,
                 'journal_id': journal_id,
-                'voucher_type':inv.type,
+                'type' : inv.type,
                 'narration' : inv.narration
             }
             if inv.period_id:
@@ -487,7 +486,7 @@ class account_voucher_line(osv.osv):
     _columns = {
         'voucher_id':fields.many2one('account.voucher', 'Voucher'),
         'name':fields.char('Description', size=256, required=True),
-        'account_id':fields.many2one('account.account','Account', required=True),
+        'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True),
         'amount':fields.float('Amount'),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'),
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index c0f01322a6c..a3425c3925b 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -31,7 +31,7 @@ import decimal_precision as dp
 
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
-    _description = 'Analytic Accounts'
+    _description = 'Analytic Account'
 
     def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, acc_set, context={}):
         # Handle multi-currency on each level of analytic account
@@ -285,7 +285,7 @@ account_analytic_account()
 
 class account_analytic_line(osv.osv):
     _name = 'account.analytic.line'
-    _description = 'Analytic lines'
+    _description = 'Analytic Line'
     def _amount_currency(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
         for rec in self.browse(cr, uid, ids, context):
@@ -343,7 +343,7 @@ class account_analytic_line(osv.osv):
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', c),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
     }
     _order = 'date'
 account_analytic_line()
diff --git a/addons/analytic_journal_billing_rate/i18n/oc.po b/addons/analytic_journal_billing_rate/i18n/oc.po
new file mode 100644
index 00000000000..22b337e0889
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/oc.po
@@ -0,0 +1,66 @@
+# Occitan (post 1500) 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-05-18 08:44+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic_journal_billing_rate
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Jornal analitic"
+
+#. module: analytic_journal_billing_rate
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid "Analytic Journal Billing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index c5c2af729a0..fe238d373be 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -100,7 +100,7 @@ class hr_analytic_timesheet(osv.osv):
                                 'for this product: "%s" (id:%d)') % \
                                 (r.product_id.name, r.product_id.id,))
             # Compute based on pricetype
-            amount_unit=self.on_change_unit_amount(cr, uid, ids, 
+            amount_unit = self.on_change_unit_amount(cr, uid, ids, 
                 r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
                 
             amount = unit_amount *  amount_unit
@@ -136,7 +136,7 @@ class hr_analytic_timesheet(osv.osv):
                                     'for this product: "%s" (id:%d)') % \
                                     (r.product_id.name, r.product_id.id,))
                 # Compute based on pricetype
-                amount_unit=self.on_change_unit_amount(cr, uid, ids, 
+                amount_unit = self.on_change_unit_amount(cr, uid, ids, 
                     r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
                         
                 amount = unit_amount * amount_unit
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 1c1df0828ca..cc3a2e304f7 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -32,3 +32,5 @@
 "acess_auction_payer","auction.payer","model_auction_payer","base.group_user",1,0,0,0
 "access_auction_pay_sel","auction.pay.sel","model_auction_payer_sel","base.group_user",1,0,0,0
 "acess_auction_taken","auction.taken","model_auction_taken","base.group_user",1,0,0,0
+"access_auction_catalog_flagey","auction.catalog.flagey","model_auction_catalog_flagey","base.group_user",1,0,0,0
+"access_auction_lots_buyer_map_user","auction_lots_buyer_map_user","model_auction_lots_buyer_map","base.group_user",1,0,0,0
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 12c15bb34f4..fbe01ff7c9b 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 14:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-21 17:51+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Rapport de l' audit"
 
 #. module: audittrail
 #: constraint:ir.model:0
@@ -72,7 +72,7 @@ msgstr "Ancienne valeur"
 #. module: audittrail
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action"
 
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
@@ -143,7 +143,7 @@ msgstr "Règle AuditTrail"
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,to:0
 msgid "Log To"
-msgstr ""
+msgstr "Connecter à"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -158,6 +158,10 @@ msgid ""
 "    Subscribe Rules for read, write, create and delete on objects and check "
 "logs"
 msgstr ""
+"Autorise un administrateur à tracer toutes les manipulations des "
+"utilisateurs sur tous les objets du système.\n"
+"    Règles d'abonnement pour la lecture, l'écriture, la création, la "
+"suppression des objets et la consultation des journaux"
 
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
diff --git a/addons/audittrail/i18n/oc.po b/addons/audittrail/i18n/oc.po
new file mode 100644
index 00000000000..7699077394d
--- /dev/null
+++ b/addons/audittrail/i18n/oc.po
@@ -0,0 +1,311 @@
+# Occitan (post 1500) 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-05-18 08:49+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: audittrail
+#: model:ir.module.module,shortdesc:audittrail.module_meta_information
+msgid "Audit Trail"
+msgstr ""
+
+#. module: audittrail
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: audittrail
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Jornal"
+
+#. module: audittrail
+#: selection:audittrail.rule,state:0
+msgid "Subscribed"
+msgstr "Abonat"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr ""
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: audittrail
+#: wizard_view:audittrail.view.log,init:0
+msgid "Audit Logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: audittrail
+#: selection:audittrail.rule,state:0
+msgid "Draft"
+msgstr "Borrolhon"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value:0
+msgid "Old Value"
+msgstr ""
+
+#. module: audittrail
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: audittrail
+#: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
+msgid "View log"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "audittrail.log.line"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,method:0
+msgid "Method"
+msgstr "Metòde"
+
+#. module: audittrail
+#: wizard_field:audittrail.view.log,init,from:0
+msgid "Log From"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,res_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Write"
+msgstr "Escriure"
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail
+msgid "Audittrails"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Log Lines"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Subscribe"
+msgstr "S'abonar"
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Read"
+msgstr "Legir"
+
+#. module: audittrail
+#: field:audittrail.log,object_id:0
+#: field:audittrail.rule,object_id:0
+msgid "Object"
+msgstr "Objècte"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: wizard_field:audittrail.view.log,init,to:0
+msgid "Log To"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value Text: "
+msgstr ""
+
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid ""
+"Allows the administrator to track every user operations on all objects of "
+"the system.\n"
+"    Subscribe Rules for read, write, create and delete on objects and check "
+"logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,timestamp:0
+msgid "Date"
+msgstr "Data"
+
+#. module: audittrail
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr "Utilizaire"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value Text : "
+msgstr ""
+
+#. module: audittrail
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: audittrail
+#: field:audittrail.log,line_ids:0
+msgid "Log lines"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
+msgid "Subscribed Rules"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,field_id:0
+msgid "Fields"
+msgstr "Camps"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "audittrail.rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "UnSubscribe"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_write:0
+msgid "Log writes"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "audittrail.log"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,field_description:0
+msgid "Field Description"
+msgstr ""
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Delete"
+msgstr "Suprimir"
+
+#. module: audittrail
+#: wizard_button:audittrail.view.log,init,open:0
+msgid "Open Logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value_text:0
+msgid "New value Text"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_read:0
+msgid "Log reads"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
+msgid "Logs"
+msgstr "Jornals"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value:0
+msgid "New Value"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
+msgid "View Logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log creates"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "AuditTrail Logs"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
+msgid "Rules"
+msgstr "Règlas"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value : "
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr "Utilizaires"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value_text:0
+msgid "Old value Text"
+msgstr ""
+
+#. module: audittrail
+#: wizard_button:audittrail.view.log,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: audittrail
+#: field:audittrail.rule,log_unlink:0
+msgid "Log deletes"
+msgstr ""
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 44c36997495..de44f6e0333 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,34 +15,35 @@
 #    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/>.
 #
 ##############################################################################
 
 {
-    "name" : "Basic Calendar Functionality", 
-    "version" : "1.0", 
-    "depends" : ["base"], 
+    "name" : "Basic Calendar Functionality",
+    "version" : "1.0",
+    "depends" : ["base"],
     'description': """Full featured calendar system that support:
     - Alerts (create requests)
     - Recurring events (*)
-    - Invitations to others people""", 
-    "author" : "Tiny", 
-    'category': 'Generic Modules/Others', 
-    'website': 'http://www.openerp.com', 
+    - Invitations to others people""",
+    "author" : "Tiny",
+    'category': 'Generic Modules/Others',
+    'website': 'http://www.openerp.com',
     "init_xml" : [
         'base_calendar_data.xml'
-    ], 
-    "demo_xml" : [], 
+    ],
+    "demo_xml" : [],
     "update_xml" : [
         'security/ir.model.access.csv',
-        'wizard/calendar_event_edit_all_view.xml', 
-        'wizard/base_calendar_invite_attendee_view.xml', 
+        'wizard/calendar_event_edit_all_view.xml',
+        'wizard/base_calendar_invite_attendee_view.xml',
+        'wizard/base_calendar_set_exrule_view.xml',
         'base_calendar_view.xml'
-    ], 
-    "test" : ['test/base_calendar_test.yml'], 
-    "installable" : True, 
-    "active" : False, 
+    ],
+   # "test" : ['test/base_calendar_test.yml'],
+    "installable" : True,
+    "active" : False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5546a0e345e..4c3940301b3 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -44,7 +44,6 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
     @param startdate: Startdate for computing recurrent dates
     @return: List of Recurrent dates
     """
-
     def todate(date):
         val = parser.parse(''.join((re.compile('\d')).findall(date)))
         return val
@@ -97,7 +96,7 @@ def real_id2base_calendar_id(real_id, recurrent_date):
         return '%d-%s' % (real_id, recurrent_date)
     return real_id
 
-def _links_get(self, cr, uid, context={}):
+def _links_get(self, cr, uid, context=None):
     """
     Get request link.
     @param cr: the current row, from the database cursor,
@@ -213,7 +212,9 @@ class calendar_attendee(osv.osv):
 
     def _get_address(self, name=None, email=None):
         """
-        Get Email Address
+        Gives email information in ical CAL-ADDRESS type format
+        @param name: Name for CAL-ADDRESS value
+        @param email: Email address for CAL-ADDRESS value
         """
         if name and email:
             name += ':'
@@ -221,7 +222,7 @@ class calendar_attendee(osv.osv):
 
     def _compute_data(self, cr, uid, ids, name, arg, context):
         """
-        Compute data on field.
+        Compute data on function fields for attendee values .
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
@@ -241,6 +242,7 @@ class calendar_attendee(osv.osv):
                 else:
                     result[id][name] = self._get_address(attdata.sent_by_uid.name, \
                                         attdata.sent_by_uid.address_id.email)
+
             if name == 'cn':
                 if attdata.user_id:
                     result[id][name] = attdata.user_id.name
@@ -248,40 +250,47 @@ class calendar_attendee(osv.osv):
                     result[id][name] = attdata.partner_address_id.name or attdata.partner_id.name
                 else:
                     result[id][name] = attdata.email or ''
+
             if name == 'delegated_to':
                 todata = []
                 for child in attdata.child_ids:
                     if child.email:
                         todata.append('MAILTO:' + child.email)
                 result[id][name] = ', '.join(todata)
+
             if name == 'delegated_from':
                 fromdata = []
                 for parent in attdata.parent_ids:
                     if parent.email:
                         fromdata.append('MAILTO:' + parent.email)
                 result[id][name] = ', '.join(fromdata)
+
             if name == 'event_date':
                 if attdata.ref:
                     result[id][name] = attdata.ref.date
                 else:
                     result[id][name] = False
+
             if name == 'event_end_date':
                 if attdata.ref:
                     result[id][name] = attdata.ref.date_deadline
                 else:
                     result[id][name] = False
+
             if name == 'sent_by_uid':
                 if attdata.ref:
                     result[id][name] = (attdata.ref.user_id.id, attdata.ref.user_id.name)
                 else:
                     result[id][name] = uid
+
             if name == 'language':
                 user_obj = self.pool.get('res.users')
                 lang = user_obj.read(cr, uid, uid, ['context_lang'], context=context)['context_lang']
                 result[id][name] = lang.replace('_', '-')
+
         return result
 
-    def _links_get(self, cr, uid, context={}):
+    def _links_get(self, cr, uid, context=None):
         """
         Get request link for ref field in calendar attendee.
         @param cr: the current row, from the database cursor,
@@ -297,7 +306,7 @@ class calendar_attendee(osv.osv):
 
     def _lang_get(self, cr, uid, context={}):
         """
-        Get language for language function field.
+        Get language for language selection field.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
@@ -313,60 +322,60 @@ class calendar_attendee(osv.osv):
         'cutype': fields.selection([('individual', 'Individual'), \
                     ('group', 'Group'), ('resource', 'Resource'), \
                     ('room', 'Room'), ('unknown', '') ], \
-                    'Invite Type', help="Specify the type of Invitation"), 
-        'member': fields.char('Member', size=124, 
-                    help="Indicate the groups that the attendee belongs to"), 
+                    'Invite Type', help="Specify the type of Invitation"),
+        'member': fields.char('Member', size=124,
+                    help="Indicate the groups that the attendee belongs to"),
         'role': fields.selection([('req-participant', 'Participation required'), \
                     ('chair', 'Chair Person'), \
                     ('opt-participant', 'Optional Participation'), \
                     ('non-participant', 'For information Purpose')], 'Role', \
-                    help='Participation role for the calendar user'), 
-        'state': fields.selection([('tentative', 'Tentative'), 
-                        ('needs-action', 'Needs Action'), 
-                        ('accepted', 'Accepted'), 
-                        ('declined', 'Declined'), 
+                    help='Participation role for the calendar user'),
+        'state': fields.selection([('tentative', 'Tentative'),
+                        ('needs-action', 'Needs Action'),
+                        ('accepted', 'Accepted'),
+                        ('declined', 'Declined'),
                         ('delegated', 'Delegated')], 'State', readonly=True, \
-                        help="Status of the attendee's participation"), 
-        'rsvp':  fields.boolean('Required Reply?', 
-                    help="Indicats whether the favor of a reply is requested"), 
+                        help="Status of the attendee's participation"),
+        'rsvp':  fields.boolean('Required Reply?',
+                    help="Indicats whether the favor of a reply is requested"),
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"), 
+request was delegated to"),
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),
         'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', \
-                                    'attendee_id', 'parent_id', 'Delegrated From'), 
+                                    'attendee_id', 'parent_id', 'Delegrated From'),
         'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', \
-                                      'attendee_id', 'child_id', 'Delegrated To'), 
+                                      'attendee_id', 'child_id', 'Delegrated To'),
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', \
                         type="char", multi='sent_by', store=True, size=124, \
-                        help="Specify the user that is acting on behalf of the calendar user"), 
+                        help="Specify the user that is acting on behalf of the calendar user"),
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', \
-                            type="many2one", relation="res.users", multi='sent_by_uid'), 
+                            type="many2one", relation="res.users", multi='sent_by_uid'),
         'cn': fields.function(_compute_data, method=True, string='Common name', \
-                            type="char", size=124, multi='cn', store=True), 
+                            type="char", size=124, multi='cn', store=True),
         'dir': fields.char('URI Reference', size=124, help="Reference to the URI\
-that points to the directory information corresponding to the attendee."), 
+that points to the directory information corresponding to the attendee."),
         'language': fields.function(_compute_data, method=True, string='Language', \
                     type="selection", selection=_lang_get, multi='language', \
                     store=True, help="To specify the language for text values in a\
-property or property parameter."), 
-        'user_id': fields.many2one('res.users', 'User'), 
-        'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
+property or property parameter."),
+        'user_id': fields.many2one('res.users', 'User'),
+        'partner_address_id': fields.many2one('res.partner.address', 'Contact'),
         'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \
-                        relation='res.partner', string='Partner', help="Partner related to contact"), 
-        'email': fields.char('Email', size=124, help="Email of Invited Person"), 
+                        relation='res.partner', string='Partner', help="Partner related to contact"),
+        'email': fields.char('Email', size=124, help="Email of Invited Person"),
         'event_date': fields.function(_compute_data, method=True, string='Event Date', \
-                            type="datetime", multi='event_date'), 
+                            type="datetime", multi='event_date'),
         'event_end_date': fields.function(_compute_data, method=True, \
                             string='Event End Date', type="datetime", \
-                            multi='event_end_date'), 
-        'ref': fields.reference('Event Ref', selection=_links_get, size=128), 
-        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
+                            multi='event_end_date'),
+        'ref': fields.reference('Event Ref', selection=_links_get, size=128),
+        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
      }
     _defaults = {
-        'state': lambda *x: 'needs-action', 
+        'state': lambda *x: 'needs-action',
     }
 
     def get_ics_file(self, cr, uid, event_obj, context=None):
@@ -401,7 +410,7 @@ 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.alarm_id:
             # computes alarm data
             valarm = event.add('valarm')
@@ -422,10 +431,10 @@ property or property parameter."),
             if interval == 'minutes':
                 delta = timedelta(minutes=duration)
             trigger.value = delta
-    
+
             # Compute other details
             valarm.add('DESCRIPTION').value = alarm_data['name'] or 'OpenERP'
-        
+
         for attendee in event_obj.attendee_ids:
             attendee_add = event.add('attendee')
             attendee_add.params['CUTYPE'] = [str(attendee.cutype)]
@@ -435,15 +444,18 @@ property or property parameter."),
         res = cal.serialize()
         return res
     
-    def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
+    def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context=None):
         """
-        Send mail for calendar attendee.
+        Send mail for event invitation to event attendees. 
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs.
+        @param ids: List of attendee’s IDs.
+        @param email_from: Email address for user sending the mail 
         @param context: A standard dictionary for contextual values
         @return: True
         """
+        if not context:
+            context = {}
 
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
         for att in self.browse(cr, uid, ids, context=context):
@@ -457,26 +469,26 @@ property or property parameter."),
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \
                                 att2.email) + ' - Status: ' + att2.state.title())
-            body_vals = {'name': res_obj.name, 
-                        'start_date': res_obj.date, 
-                        'end_date': res_obj.date_deadline or False, 
-                        'description': res_obj.description or '-', 
-                        'location': res_obj.location or '-', 
-                        'attendees': '<br>'.join(att_infos), 
-                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
-                        'sign': sign, 
+            body_vals = {'name': res_obj.name,
+                        'start_date': res_obj.date,
+                        'end_date': res_obj.date_deadline or False,
+                        'description': res_obj.description or '-',
+                        'location': res_obj.location or '-',
+                        'attendees': '<br>'.join(att_infos),
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User',
+                        'sign': sign,
                         'company': company
             }
             body = html_invitation % body_vals
             attach = self.get_ics_file(cr, uid, res_obj, context=context)
             if mail_to and email_from:
                 tools.email_send(
-                    email_from,
-                    mail_to,
-                    sub,
-                    body,
-                    attach=attach and [('invitation.ics', attach)] or None,
-                    subtype='html',
+                    email_from, 
+                    mail_to, 
+                    sub, 
+                    body, 
+                    attach=attach and [('invitation.ics', attach)] or None, 
+                    subtype='html', 
                     reply_to=email_from
                 )
             return True
@@ -487,7 +499,7 @@ property or property parameter."),
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
-        @param user_id: User id
+        @param user_id: Changed value of User id
         @return: dictionary of value. which put value in email and availability fields.
         """
 
@@ -498,24 +510,27 @@ property or property parameter."),
         return {'value': {'email': user.address_id.email, 'availability':user.availability}}
 
     def do_tentative(self, cr, uid, ids, context=None, *args):
-        """ @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 ids: List of calendar attendee’s IDs
-            @param *args: Get Tupple value
-            @param context: A standard dictionary for contextual values """
+        """ Makes event invitation as Tentative
+        @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 ids: List of calendar attendee’s IDs
+        @param *args: Get Tupple value
+        @param context: A standard dictionary for contextual values 
+        """
 
         self.write(cr, uid, ids, {'state': 'tentative'}, context)
 
     def do_accept(self, cr, uid, ids, context=None, *args):
         """
-        Update state which value is accepted.
+        Update state of invitation as Accepted and 
+        if the invited user is other then event user it will make a copy of this event for invited user
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
+        @param context: A standard dictionary for contextual values 
         @return: True
         """
-
         if not context:
             context = {}
 
@@ -532,21 +547,23 @@ property or property parameter."),
         return True
 
     def do_decline(self, cr, uid, ids, context=None, *args):
-        """ @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 ids: List of calendar attendee’s IDs
-            @param *args: Get Tupple value
-            @param context: A standard dictionary for contextual values """
+        """ Marks event invitation as Declined
+        @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 ids: List of calendar attendee’s IDs
+        @param *args: Get Tupple value
+        @param context: A standard dictionary for contextual values """
 
         self.write(cr, uid, ids, {'state': 'declined'}, context)
 
     def create(self, cr, uid, vals, context=None):
-        """ @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 vals: Get Values
-            @param context: A standard dictionary for contextual values """
+        """ Overrides orm create method.
+        @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 vals: Get Values
+        @param context: A standard dictionary for contextual values """
 
         if not context:
             context = {}
@@ -561,46 +578,50 @@ property or property parameter."),
 calendar_attendee()
 
 class res_alarm(osv.osv):
+    """Resource Alarm """
     _name = 'res.alarm'
     _description = 'Basic Alarm Information'
+
     _columns = {
-        'name':fields.char('Name', size=256, required=True), 
+        'name':fields.char('Name', size=256, required=True),
         'trigger_occurs': fields.selection([('before', 'Before'), \
                                             ('after', 'After')], \
-                                        'Triggers', required=True), 
+                                        'Triggers', required=True),
         'trigger_interval': fields.selection([('minutes', 'Minutes'), \
                                                 ('hours', 'Hours'), \
                                                 ('days', 'Days')], 'Interval', \
-                                                required=True), 
-        'trigger_duration': fields.integer('Duration', required=True), 
+                                                required=True),
+        'trigger_duration': fields.integer('Duration', required=True),
         'trigger_related': fields.selection([('start', 'The event starts'), \
                                             ('end', 'The event ends')], \
-                                            'Related to', required=True), 
+                                            'Related to', required=True),
         'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
-are both optional, but if one occurs, so MUST the other"""), 
-        'repeat': fields.integer('Repeat'), 
+are both optional, but if one occurs, so MUST the other"""),
+        'repeat': fields.integer('Repeat'),
         '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.")
     }
     _defaults = {
-        'trigger_interval': lambda *x: 'minutes', 
-        'trigger_duration': lambda *x: 5, 
-        'trigger_occurs': lambda *x: 'before', 
-        'trigger_related': lambda *x: 'start', 
-        'active': lambda *x: 1, 
+        'trigger_interval': lambda *x: 'minutes',
+        'trigger_duration': lambda *x: 5,
+        'trigger_occurs': lambda *x: 'before',
+        'trigger_related': lambda *x: 'start',
+        'active': lambda *x: 1,
     }
 
-    def do_alarm_create(self, cr, uid, ids, model, date, context={}):
+    def do_alarm_create(self, cr, uid, ids, model, date, context=None):
         """
-        Create Alarm for meeting.
+        Create Alarm for event.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of res alarm’s IDs.
         @param model: Model name.
+        @param date: Event date
         @param context: A standard dictionary for contextual values
         @return: True
         """
-
+        if not context:
+            context = {}
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
@@ -615,20 +636,20 @@ true, it will allow you to hide the event alarm information without removing it.
             self.do_alarm_unlink(cr, uid, [data.id], model)
             if basic_alarm:
                 vals = {
-                    'action': 'display', 
-                    'description': data.description, 
-                    'name': data.name, 
-                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))], 
-                    'trigger_related': basic_alarm.trigger_related, 
-                    'trigger_duration': basic_alarm.trigger_duration, 
-                    'trigger_occurs': basic_alarm.trigger_occurs, 
-                    'trigger_interval': basic_alarm.trigger_interval, 
-                    'duration': basic_alarm.duration, 
-                    'repeat': basic_alarm.repeat, 
-                    'state': 'run', 
-                    'event_date': data[date], 
-                    'res_id': data.id, 
-                    'model_id': model_id, 
+                    'action': 'display',
+                    'description': data.description,
+                    'name': data.name,
+                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))],
+                    'trigger_related': basic_alarm.trigger_related,
+                    'trigger_duration': basic_alarm.trigger_duration,
+                    'trigger_occurs': basic_alarm.trigger_occurs,
+                    'trigger_interval': basic_alarm.trigger_interval,
+                    'duration': basic_alarm.duration,
+                    'repeat': basic_alarm.repeat,
+                    'state': 'run',
+                    'event_date': data[date],
+                    'res_id': data.id,
+                    'model_id': model_id,
                     'user_id': uid
                  }
                 alarm_id = alarm_obj.create(cr, uid, vals)
@@ -638,16 +659,17 @@ true, it will allow you to hide the event alarm information without removing it.
         cr.commit()
         return True
 
-    def do_alarm_unlink(self, cr, uid, ids, model, context={}):
+    def do_alarm_unlink(self, cr, uid, ids, model, context=None):
         """
         Delete alarm specified in ids
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of res alarm’s IDs.
-        @param model: Model name.
+        @param model: Model name for which alarm is to be cleared.
         @return: True
         """
-
+        if not context:
+            context = {}
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
@@ -670,51 +692,53 @@ class calendar_alarm(osv.osv):
     __attribute__ = {}
 
     _columns = {
-        'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'),
+        'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
         'name': fields.char('Summary', size=124, help="""Contains the text to be \
                      used as the message subject for email \
-                     or contains the text to be used for display"""),
+                     or contains the text to be used for display"""), 
         'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
                 ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
-                required=True, help="Defines the action to be invoked when an alarm is triggered"),
+                required=True, help="Defines the action to be invoked when an alarm is triggered"), 
         'description': fields.text('Description', help='Provides a more complete \
                             description of the calendar component, than that \
-                            provided by the "SUMMARY" property'),
+                            provided by the "SUMMARY" property'), 
         'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
-                                      'alarm_id', 'attendee_id', 'Attendees', readonly=True),
+                                      'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
         'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
                      which is rendered when the alarm is triggered for audio,
                     * File which is intended to be sent as message attachments for email,
                     * Points to a procedure resource, which is invoked when\
-                      the alarm is triggered for procedure."""),
-        'res_id': fields.integer('Resource ID'),
-        'model_id': fields.many2one('ir.model', 'Model'),
-        'user_id': fields.many2one('res.users', 'Owner'),
-        'event_date': fields.datetime('Event Date'),
-        'event_end_date': fields.datetime('Event End Date'),
-        'trigger_date': fields.datetime('Trigger Date', readonly="True"),
+                      the alarm is triggered for procedure."""), 
+        'res_id': fields.integer('Resource ID'), 
+        'model_id': fields.many2one('ir.model', 'Model'), 
+        'user_id': fields.many2one('res.users', 'Owner'), 
+        'event_date': fields.datetime('Event Date'), 
+        'event_end_date': fields.datetime('Event End Date'), 
+        'trigger_date': fields.datetime('Trigger Date', readonly="True"), 
         'state':fields.selection([
-                    ('draft', 'Draft'),
-                    ('run', 'Run'),
-                    ('stop', 'Stop'),
-                    ('done', 'Done'),
-                ], 'State', select=True, readonly=True),
+                    ('draft', 'Draft'), 
+                    ('run', 'Run'), 
+                    ('stop', 'Stop'), 
+                    ('done', 'Done'), 
+                ], 'State', select=True, readonly=True), 
      }
 
     _defaults = {
-        'action': lambda *x: 'email', 
-        'state': lambda *x: 'run', 
+        'action': lambda *x: 'email',
+        'state': lambda *x: 'run',
      }
-    def create(self, cr, uid, vals, context={}):
+
+    def create(self, cr, uid, vals, context=None):
         """
-        create new record.
+        Overrides orm create method.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param vals: dictionary of fields value.{‘name_of_the_field’: value, ...}
         @param context: A standard dictionary for contextual values
         @return: new record id for calendar_alarm.
         """
-
+        if not context:
+            context = {}
         event_date = vals.get('event_date', False)
         if event_date:
             dtstart = datetime.strptime(vals['event_date'], "%Y-%m-%d %H:%M:%S")
@@ -731,7 +755,7 @@ class calendar_alarm(osv.osv):
 
     def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
                        context=None):
-        """
+        """Scheduler for event reminder
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -754,11 +778,11 @@ class calendar_alarm(osv.osv):
         for alarm in self.browse(cr, uid, alarm_ids):
             if alarm.action == 'display':
                 value = {
-                   'name': alarm.name, 
-                   'act_from': alarm.user_id.id, 
-                   'act_to': alarm.user_id.id, 
-                   'body': alarm.description, 
-                   'trigger_date': alarm.trigger_date, 
+                   'name': alarm.name,
+                   'act_from': alarm.user_id.id,
+                   'act_to': alarm.user_id.id,
+                   'body': alarm.description,
+                   'trigger_date': alarm.trigger_date,
                    'ref_doc1': '%s,%s' % (alarm.model_id.model, alarm.res_id)
                 }
                 request_id = request_obj.create(cr, uid, value)
@@ -788,9 +812,9 @@ class calendar_alarm(osv.osv):
                     mail_to.append(att.user_id.address_id.email)
                 if mail_to:
                     tools.email_send(
-                        tools.config.get('email_from', False), 
-                        mail_to, 
-                        sub, 
+                        tools.config.get('email_from', False),
+                        mail_to,
+                        sub,
                         body
                     )
             self.write(cr, uid, [alarm.id], {'state':'done'})
@@ -808,7 +832,7 @@ class calendar_event(osv.osv):
         return [(x.lower(), x) for x in pytz.all_timezones]
 
     def onchange_allday(self, cr, uid, ids, allday, context={}):
-        """
+        """Sets duration as 24 Hours if event is selcted for all day
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -820,23 +844,23 @@ class calendar_event(osv.osv):
             return {}
         event = self.browse(cr, uid, ids, context=context)[0]
         value = {
-                 'date': event.date and event.date[:11] + '00:00:00', 
-                 'date_deadline': event.date_deadline and event.date_deadline[:11] + '00:00:00', 
                  'duration': 24 
                  }
         return {'value': value}
     
-    def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, allday=False, context={}):
-        """
+    def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, allday=False, context=None):
+        """Returns duration and/or end date based on values passed
         @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 ids: List of calendar event’s IDs.
-        @param start_date: Get starting date
-        @param duration: Get Duration between start date and end date or False
-        @param end_date: Get Ending Date or False
+        @param start_date: Starting date
+        @param duration: Duration between start date and end date
+        @param end_date: Ending Datee
         @param context: A standard dictionary for contextual values
         """
+        if not context:
+            context = {}
         value = {}
         if not start_date:
             return value
@@ -845,10 +869,7 @@ class calendar_event(osv.osv):
             value['duration'] = duration
 
         if allday: # For all day event
-            start = start_date[:11] + '00:00:00'
             value = {
-                 'date': start, 
-                 'date_deadline': start, 
                  'duration': 24
                  }
             return {'value': value}
@@ -865,19 +886,21 @@ class calendar_event(osv.osv):
 
         return {'value': value}
 
-    def _set_rrulestring(self, cr, uid, id, name, value, arg, context):
+    def _set_rrulestring(self, cr, uid, id, name, value, arg, context=None):
         """
-        Set rule string.
+        Sets values of fields that defines event recurrence from the value of rrule string
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param id: List of calendar event's ids.
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
+        if not context:
+            context = {}
         cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
                     mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
                     day=0,select1='date',month_list=Null ,byday=Null where id=%s" % (self._table, id))
-        
+
         if not value:
             cr.execute("UPDATE %s set rrule_type='none' where id=%s" % (self._table, id))
             return True
@@ -906,19 +929,19 @@ class calendar_event(osv.osv):
                     for day in val['byday'].split(','):
                         new_val[day] = True
                     val.pop('byday')
-    
+
                 if val.get('until'):
                     until = parser.parse(''.join((re.compile('\d')).findall(val.get('until'))))
                     new_val['end_date'] = until.strftime('%Y-%m-%d')
                     val.pop('until')
                     new_val.pop('until')
-    
+
                 if val.get('bymonthday'):
                     new_val['day'] = val.get('bymonthday')
                     val.pop('bymonthday')
                     new_val['select1'] = 'date'
                     new_val.pop('bymonthday')
-    
+
                 if val.get('byday'):
                     d = val.get('byday')
                     if '-' in d:
@@ -928,12 +951,12 @@ class calendar_event(osv.osv):
                         new_val['byday'] = d[:1]
                         new_val['week_list'] = d[1:3].upper()
                     new_val['select1'] = 'day'
-    
+
                 if val.get('bymonth'):
                     new_val['month_list'] = val.get('bymonth')
                     val.pop('bymonth')
                     new_val.pop('bymonth')
-            
+
             for k, v in new_val.items():
                 temp = ", %s='%s'" % (k, v)
                 qry += temp
@@ -941,16 +964,16 @@ class calendar_event(osv.osv):
         whr = " where id=%(id)s"
         qry = qry + whr
         val.update({
-            'table': self._table, 
-            'rule_type': rrule_type, 
-            'id': id, 
+            'table': self._table,
+            'rule_type': rrule_type,
+            'id': id,
         })
         cr.execute(qry % val)
         return True
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
         """
-        Get rule string.
+        Gets Recurrence rule string according to value type RECUR of iCalendar from the values given.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param id: List of calendar event's ids.
@@ -968,7 +991,7 @@ class calendar_event(osv.osv):
                         raise osv.except_osv('Warning!', 'Interval can not be Negative')
                     if datas.get('count', 0) < 0:
                         raise osv.except_osv('Warning!', 'Count can not be Negative')
-                    rrule_custom = self.compute_rule_string(cr, uid, datas,\
+                    rrule_custom = self.compute_rule_string(cr, uid, datas, \
                                                          context=context)
                     result[event] = rrule_custom
                 else:
@@ -977,40 +1000,40 @@ class calendar_event(osv.osv):
         return result
 
     _columns = {
-        'id': fields.integer('ID'), 
-        'sequence': fields.integer('Sequence'), 
-        'name': fields.char('Description', size=64, required=True), 
-        'date': fields.datetime('Date'), 
-        'date_deadline': fields.datetime('Deadline'), 
-        'create_date': fields.datetime('Created', readonly=True), 
-        'duration': fields.float('Duration'), 
-        'description': fields.text('Your action'), 
+        'id': fields.integer('ID'),
+        'sequence': fields.integer('Sequence'),
+        'name': fields.char('Description', size=64, required=False),
+        'date': fields.datetime('Date'),
+        'date_deadline': fields.datetime('Deadline'),
+        'create_date': fields.datetime('Created', readonly=True),
+        'duration': fields.float('Duration'),
+        'description': fields.text('Your action'),
         'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
-             ('confidential', 'Confidential')], 'Mark as'),
-        'location': fields.char('Location', size=264, help="Location of Event"),
+             ('confidential', 'Confidential')], 'Mark as'), 
+        'location': fields.char('Location', size=264, help="Location of Event"), 
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show as'), 
-        'base_calendar_url': fields.char('Caldav URL', size=264), 
+                                                'Show as'),
+        'base_calendar_url': fields.char('Caldav URL', size=264),
         'exdate': fields.text('Exception Date/Times', help="This property \
-defines the list of date/time exceptions for arecurring calendar component."), 
+defines the list of date/time exceptions for arecurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
-rule or repeating pattern for an exception to a recurrence set"), 
+rule or repeating pattern for an exception to a recurrence set"),
         'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
                                     string='Recurrent Rule', store=True, \
                                     fnct_inv=_set_rrulestring, help='Defines a\
  rule or repeating pattern for recurring events\n\
 e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
-        FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'), 
+        FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
-        'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
-        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
-        'recurrent_uid': fields.integer('Recurrent ID'), 
-        'recurrent_id': fields.datetime('Recurrent ID date'), 
+                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'),
+        'alarm_id': fields.many2one('res.alarm', 'Alarm'),
+        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
+        'recurrent_uid': fields.integer('Recurrent ID'),
+        'recurrent_id': fields.datetime('Recurrent ID date'),
         'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, \
-                         string='Timezone', store=True), 
-        'user_id': fields.many2one('res.users', 'Responsible'), 
+                         string='Timezone', store=True),
+        'user_id': fields.many2one('res.users', 'Responsible'),
         'freq': fields.selection([('None', 'No Repeat'), \
                                 ('secondly', 'Secondly'), \
                                 ('minutely', 'Minutely'), \
@@ -1018,44 +1041,44 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                                 ('daily', 'Daily'), \
                                 ('weekly', 'Weekly'), \
                                 ('monthly', 'Monthly'), \
-                                ('yearly', 'Yearly')], 'Frequency'), 
-        'interval': fields.integer('Interval'), 
-        'count': fields.integer('Count'), 
-        'mo': fields.boolean('Mon'), 
-        'tu': fields.boolean('Tue'), 
-        'we': fields.boolean('Wed'), 
-        'th': fields.boolean('Thu'), 
-        'fr': fields.boolean('Fri'), 
-        'sa': fields.boolean('Sat'), 
-        'su': fields.boolean('Sun'), 
+                                ('yearly', 'Yearly')], 'Frequency'),
+        'interval': fields.integer('Interval'),
+        'count': fields.integer('Count'),
+        'mo': fields.boolean('Mon'),
+        'tu': fields.boolean('Tue'),
+        'we': fields.boolean('Wed'),
+        'th': fields.boolean('Thu'),
+        'fr': fields.boolean('Fri'),
+        'sa': fields.boolean('Sat'),
+        'su': fields.boolean('Sun'),
         'select1': fields.selection([('date', 'Date of month'), \
-                                    ('day', 'Day of month')], 'Option'), 
-        'day': fields.integer('Date of month'), 
+                                    ('day', 'Day of month')], 'Option'),
+        'day': fields.integer('Date of month'),
         'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
                                    ('WE', 'Wednesday'), ('TH', 'Thursday'), \
                                    ('FR', 'Friday'), ('SA', 'Saturday'), \
-                                   ('SU', 'Sunday')], 'Weekday'), 
+                                   ('SU', 'Sunday')], 'Weekday'),
         'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
                                    ('3', 'Third'), ('4', 'Fourth'), \
                                    ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
         'month_list': fields.selection(months.items(), 'Month'), 
         'end_date': fields.date('Repeat Until'), 
-        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel',\
-                                 'event_id', 'attendee_id', 'Attendees'),
+        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', \
+                                 'event_id', 'attendee_id', 'Attendees'), 
         'allday': fields.boolean('All Day'), 
         '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.")
     }
 
     _defaults = {
-         'class': lambda *a: 'public', 
-         'show_as': lambda *a: 'busy', 
-         'freq': lambda *x: 'None', 
-         'select1': lambda *x: 'date', 
-         'interval': lambda *x: 1, 
-         'active': lambda *x: 1, 
+         'class': lambda *a: 'public',
+         'show_as': lambda *a: 'busy',
+         'freq': lambda *x: 'None',
+         'select1': lambda *x: 'date',
+         'interval': lambda *x: 1,
+         'active': lambda *x: 1,
     }
-    
+
     def open_event(self, cr, uid, ids, context=None):
         """
         Open Event From for Editing
@@ -1067,11 +1090,11 @@ true, it will allow you to hide the event alarm information without removing it.
         """
         if not context:
             context = {}
-            
+
         data_obj = self.pool.get('ir.model.data')
-        
+
         value = {}
-        
+
         id2 = data_obj._get_id(cr, uid, 'base_calendar', 'event_form_view')
         id3 = data_obj._get_id(cr, uid, 'base_calendar', 'event_tree_view')
         id4 = data_obj._get_id(cr, uid, 'base_calendar', 'event_calendar_view')
@@ -1088,32 +1111,32 @@ true, it will allow you to hide the event alarm information without removing it.
                     'view_mode': 'form,tree', 
                     'res_model': 'calendar.event', 
                     'view_id': False, 
-                    'views': [(id2, 'form'), (id3, 'tree'), (id4, 'calendar')],
+                    'views': [(id2, 'form'), (id3, 'tree'), (id4, 'calendar')], 
                     'type': 'ir.actions.act_window', 
                     'res_id': base_calendar_id2real_id(id), 
                     'nodestroy': True
                     }
-        
+
         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: Get Event_id
-        @param real_date: Get Real Date
+        @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 Tuppel Value
-
+        @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', 
+                        '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 []
@@ -1125,13 +1148,14 @@ true, it will allow you to hide the event alarm information without removing it.
 
     def modify_all(self, cr, uid, event_ids, defaults, context=None, *args):
         """
-        Modify name, date, date_deadline fields.
+        Modifies the recurring event 
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param event_ids: List of crm meeting’s IDs.
+        @param context: A standard dictionary for contextual values
         @return: True
         """
-        
+
         for event_id in event_ids:
             event_id = base_calendar_id2real_id(event_id)
 
@@ -1146,11 +1170,12 @@ true, it will allow you to hide the event alarm information without removing it.
                 qry += ", location = '%(location)s'"
             qry += "WHERE id = %s" % (event_id)
             cr.execute(qry %(defaults))
-            
+
         return True
 
     def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
-        """
+        """Gives virtual event ids for recurring events based on value of Recurrence Rule
+        This method gives ids of dates that comes between start date and end date of calendar views  
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1167,7 +1192,7 @@ true, it will allow you to hide the event alarm information without removing it.
         result = []
         if ids and (base_start_date or base_until_date):
             cr.execute("select m.id, m.rrule, m.date, m.date_deadline, \
-                            m.exdate from " + self._table + \
+                            m.exdate, m.exrule from " + self._table + \
                             " m where m.id in ("\
                             + ','.join(map(lambda x: str(x), ids))+")")
 
@@ -1214,7 +1239,7 @@ true, it will allow you to hide the event alarm information without removing it.
                         new_rule = '%s=%s' % (name, value)
                         new_rrule_str.append(new_rule)
                     new_rrule_str = ';'.join(new_rrule_str)
-                    rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date)
+                    rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule'])
                     for rdate in rdates:
                         r_date = datetime.strptime(rdate, "%Y-%m-%d %H:%M:%S")
                         if start_date and r_date < start_date:
@@ -1229,15 +1254,16 @@ true, it will allow you to hide the event alarm information without removing it.
         if isinstance(select, (str, int, long)):
             return ids and ids[0] or False
         return ids
-    
+
     def compute_rule_string(self, cr, uid, datas, context=None, *args):
         """
-        Compute rule string.
+        Compute rule string according to value type RECUR of iCalendar from the values given.
         @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 datas: dictionary of freq and interval value.
-        @return: string value which compute FREQILY;INTERVAL
+        @param context: A standard dictionary for contextual values
+        @return: String value of the format RECUR of iCalendar
         """
 
         weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
@@ -1248,9 +1274,9 @@ true, it will allow you to hide the event alarm information without removing it.
         freq = datas.get('freq')
         if freq == 'None':
             return ''
-        
+
         interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
-        
+
         if freq == 'weekly':
 
             byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
@@ -1286,7 +1312,7 @@ 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, 
+    def search(self, cr, uid, args, offset=0, limit=100, order=None,
             context=None, count=False):
         """
         Overrides orm search method.
@@ -1295,6 +1321,8 @@ true, it will allow you to hide the event alarm information without removing it.
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
         @param offset: The Number of Results to Pass
         @param limit: The Number of Results to Return
+        @param context: A standard dictionary for contextual values
+        @param count: If its True the method returns number of records instead of ids
         @return: List of id
         """
         args_without_date = []
@@ -1317,14 +1345,16 @@ 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):
         """
-        Writes values in one or several fields.
+        Overrides orm write method.
         @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 ids: List of crm meeting's ids
         @param vals: Dictionary of field value.
+        @param context: A standard dictionary for contextual values
         @return: True
         """
         if not context:
@@ -1348,7 +1378,7 @@ true, it will allow you to hide the event alarm information without removing it.
             event_id = base_calendar_id2real_id(event_id)
             if not event_id in new_ids:
                 new_ids.append(event_id)
-        
+
         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'):
             alarm_obj = self.pool.get('res.alarm')
@@ -1364,6 +1394,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of crm meeting's ids
+        @param context: A standard dictionary for contextual values
         @return: the object list.
         """
         if isinstance(ids, (str, int, long)):
@@ -1378,15 +1409,19 @@ true, it will allow you to hide the event alarm information without removing it.
 
         return res
 
-    def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
         """
         Overrides orm Read method.Read List of fields for calendar event.
         @param cr: the current row, from the database cursor,
         @param user: the current user’s ID for security checks,
         @param ids: List of calendar event's id.
         @param fields: List of fields.
+        @param context: A standard dictionary for contextual values
         @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
         """
+        if not context:
+            context = {}
+
         if isinstance(ids, (str, int, long)):
             select = [ids]
         else:
@@ -1408,14 +1443,17 @@ true, it will allow you to hide the event alarm information without removing it.
             return result and result[0] or False
         return result
 
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         """
         Duplicate record on specified id.
         @param self: the object pointer.
         @param cr: the current row, from the database cursor,
         @param id: id of record from which we duplicated.
+        @param context: A standard dictionary for contextual values
         @return: Duplicate record id.
         """
+        if not context:
+            context = {}
         res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
@@ -1428,6 +1466,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param self: the object pointer.
         @param cr: the current row, from the database cursor,
         @param id: List of calendar event's id.
+        @param context: A standard dictionary for contextual values
         @return: True
         """
         res = False
@@ -1454,15 +1493,18 @@ true, it will allow you to hide the event alarm information without removing it.
                 alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
         return res
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         """
         Create new record.
         @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 vals: dictionary of every field value.
+        @param context: A standard dictionary for contextual values
         @return: new created record id.
         """
+        if not context:
+            context = {}
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
@@ -1478,7 +1520,7 @@ class calendar_todo(osv.osv):
     _description = "Calendar Task"
 
     def _get_date(self, cr, uid, ids, name, arg, context):
-        """ 
+        """
         Get Date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -1494,7 +1536,7 @@ class calendar_todo(osv.osv):
         return res
 
     def _set_date(self, cr, uid, id, name, value, arg, context):
-        """ 
+        """
         Set Date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -1512,8 +1554,8 @@ class calendar_todo(osv.osv):
 
     _columns = {
         'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
-                            string='Duration', store=True, type='datetime'), 
-        'duration': fields.integer('Duration'), 
+                            string='Duration', store=True, type='datetime'),
+        'duration': fields.integer('Duration'),
     }
 
     __attribute__ = {}
@@ -1526,7 +1568,7 @@ class ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
 
     def search_count(self, cr, user, args, context=None):
-        """ 
+        """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param user: the current user’s ID for security checks,
@@ -1539,9 +1581,9 @@ class ir_attachment(osv.osv):
             args1.append(map(lambda x:str(x).split('-')[0], arg))
         return super(ir_attachment, self).search_count(cr, user, args1, context)
 
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
-        """ 
+        """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1555,8 +1597,8 @@ class ir_attachment(osv.osv):
         for i, arg in enumerate(new_args):
             if arg[0] == 'res_id':
                 new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
-                            limit=limit, order=order, 
+        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
+                            limit=limit, order=order,
                             context=context, count=False)
 ir_attachment()
 
@@ -1565,12 +1607,12 @@ class ir_values(osv.osv):
 
     def set(self, cr, uid, key, key2, name, models, value, replace=True, \
             isobject=False, meta=False, preserve_user=False, company=False):
-        """ 
+        """
         Set IR Values
         @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 model: Get The Model 
+        @param model: Get The Model
         """
 
         new_model = []
@@ -1582,16 +1624,17 @@ class ir_values(osv.osv):
         return super(ir_values, self).set(cr, uid, key, key2, name, new_model, \
                     value, replace, isobject, meta, preserve_user, company)
 
-    def get(self, cr, uid, key, key2, models, meta=False, context={}, \
+    def get(self, cr, uid, key, key2, models, meta=False, context=None, \
              res_id_req=False, without_user=True, key2_req=True):
-        """ 
+        """
         Get IR Values
         @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 model: Get The Model 
+        @param model: Get The Model
         """
-
+        if not context:
+            context = {}
         new_model = []
         for data in models:
             if type(data) in (list, tuple):
@@ -1607,38 +1650,36 @@ class ir_model(osv.osv):
 
     _inherit = 'ir.model'
 
-    def read(self, cr, uid, ids, fields=None, context={}, 
+    def read(self, cr, uid, ids, fields=None, context=None, 
             load='_classic_read'):
         """ 
-        Read IR Model
+        Overrides orm read method.
         @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 ids: List of IR Model’s IDs.
-        @param context: A standard dictionary for contextual values 
+        @param context: A standard dictionary for contextual values
         """
-
-        if isinstance(ids, (str, int, long)):
-            ids = [ids]
-
+        if not context:
+            context = {}
         data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
                         context=context, load=load)
         if data:
             for val in data:
                 val['id'] = base_calendar_id2real_id(val['id'])
-        return data
+        return isinstance(ids, (str, int, long)) and data[0] or data
 
 ir_model()
 
 class virtual_report_spool(web_services.report_spool):
 
     def exp_report(self, db, uid, object, ids, datas=None, context=None):
-        """ 
+        """
         Export Report
         @param self: The object pointer
         @param db: get the current database,
         @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values 
+        @param context: A standard dictionary for contextual values
         """
 
         if object == 'printscreen.list':
@@ -1658,19 +1699,19 @@ class res_users(osv.osv):
 
     def _get_user_avail(self, cr, uid, ids, context=None):
         """ 
-        Get USer Availability
+        Get User Availability
         @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 ids: List of res user’s IDs.
-        @param context: A standard dictionary for contextual values 
+        @param context: A standard dictionary for contextual values
         """
 
         current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         res = {}
         attendee_obj = self.pool.get('calendar.attendee')
         attendee_ids = attendee_obj.search(cr, uid, [
-                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime), 
+                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime),
                     ('state', '=', 'accepted'), ('user_id', 'in', ids)
                     ])
 
@@ -1689,12 +1730,12 @@ class res_users(osv.osv):
 
     def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):
         """ 
-        Get USer Availability Function
+        Get User Availability Function
         @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 ids: List of res user’s IDs.
-        @param context: A standard dictionary for contextual values 
+        @param context: A standard dictionary for contextual values
         """
 
         return self._get_user_avail(cr, uid, ids, context=context)
@@ -1702,8 +1743,9 @@ class res_users(osv.osv):
     _columns = {
             'availability': fields.function(_get_user_avail_fun, type='selection', \
                     selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True), 
+                    string='Free/Busy', method=True),
     }
+
 res_users()
 
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 0c8a52260ef..d31266c9090 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+		
+		<!--		Attendee form view-->
 
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>
@@ -65,6 +67,8 @@
                 </form>
             </field>
         </record>
+		
+		<!--		Attendee tree view-->
 
         <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
             <field name="name">calendar.attendee.tree</field>
@@ -77,10 +81,14 @@
                     <field name="partner_address_id" string="Contact" />
                     <field name="role" />
                     <field name="state" />
+                    <field name="cutype" invisible="1"/>
+                    <field name="rsvp" invisible="1"/>
                 </tree>
             </field>
         </record>
-
+		
+		<!--		Attendee search view-->
+		
         <record id="base_calendar_attendee_search_view" model="ir.ui.view">
             <field name="name">calendar.attendee.search</field>
             <field name="model">calendar.attendee</field>
@@ -99,11 +107,26 @@
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
+                   <newline/>
+					<group expand="0" string="Group By..." colspan="16">
+						<filter string="Type" icon="terp-project" help="Invitation Type"
+					        domain="[]" context="{'group_by':'cutype'}" />
+					    <filter string="Role" icon="terp-project"
+					        domain="[]" context="{'group_by':'role'}" />
+					    <filter string="Required Reply" icon="terp-crm"
+					        domain="[]" context="{'group_by':'rsvp'}" />
+					    <separator orientation="vertical" />
+					    <filter string="User" icon="terp-partner" domain="[]"
+					        context="{'group_by':'user_id'}" />
+					    <filter string="Contact" icon="terp-partner" domain="[]"
+					        context="{'group_by':'partner_address_id'}" />
+					</group>
                </search>
             </field>
         </record>
         
-        
+        <!--		Action for attendee view-->
+
 		<record id="action_view_attendee_form" model="ir.actions.act_window">
 	         <field name="name">Event Invitations</field>
 	         <field name="type">ir.actions.act_window</field>
@@ -115,10 +138,12 @@
 	     </record>
 		
 		<!-- Calenadar's menu -->
+		
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="10" />
 		
 		<!-- Invitation menu -->
+		
 		<menuitem id="menu_attendee_invitations"
 			name="Event Invitations" parent="base.menu_calendar_configuration"
 			sequence="10" action="action_view_attendee_form" />
@@ -138,9 +163,6 @@
                     <field name="trigger_interval" select="1" />
                     <field name="trigger_occurs" select="1" />
                     <field name="trigger_related" select="1" />
-                    <separator string="" colspan="4" />
-                    <field name="duration" />
-                    <field name="repeat" />
                 </form>
             </field>
         </record>
@@ -162,7 +184,8 @@
             </field>
         </record>
             
-		
+		<!--		Action for alarms view-->
+
         <record id="action_res_alarm_view" model="ir.actions.act_window">
             <field name="name">Available Alarms</field>
             <field name="type">ir.actions.act_window</field>
@@ -170,6 +193,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+		
+		<!--		Menu for Alarms-->
 
         <menuitem id="menu_crm_meeting_avail_alarm"
             groups="base.group_extended"
@@ -405,6 +430,7 @@
 	        </record>
 		
 		<!-- Event menu  -->
+
 		<menuitem id="menu_events"
 				name="Events" parent="base.menu_calendar_configuration"
 				sequence="5" action="action_view_event" />
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
index 27614aacd88..8b45dc18a17 100644
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/base_calendar/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,12 +15,13 @@
 #    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 calendar_event_edit_all
 import base_calendar_invite_attendee
+import base_calendar_set_exrule
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
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 4fe55998e59..bea5ea66a84 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -13,37 +13,38 @@
 					<field name="type" />
 					<field name="send_mail" />
 					<newline />
-					<group col="1" colspan="4"
+					<group col="2" colspan="6"
 						attrs="{'invisible': [('type', '!=', 'external')]}">
 						<field name="email" colspan="4"
 							attrs="{'required': [('type', '=', 'external')]}" />
 					</group>
-					<group col="1" colspan="4"
+					<group col="2" colspan="6"
 						attrs="{'invisible': [('type', '!=', 'internal')]}">
 						<separator string="Users" colspan="4" />
 						<field name="user_ids" select="1" colspan="4"
 							nolabel="1" />
 						<newline />
 					</group>
-					<group col="2" colspan="4"
+					<group col="2" colspan="6"
 						attrs="{'invisible': [('type', '!=', 'partner')]}">
 						<field name="partner_id" colspan="2"
 							on_change="onchange_partner_id(partner_id)"
 							attrs="{'required': [('type', '=', 'partner')]}" />
 						<newline />
 						<separator string="Partner Contacts"
-							colspan="4" />
+							colspan="6" />
 						<field name="contact_ids" select="1" colspan="4"
 							nolabel="1" domain="[('partner_id', '=', partner_id)]"
 							attrs="{'readonly': [('type', '!=', 'partner')]}" />
 					</group>
 					<newline />
 					<separator string="" colspan="6" />
-					<label string="" colspan="2" />
+					<group col="4" colspan="4">
 					<button icon='gtk-cancel' special="cancel"
 						string="Cancel" />
 					<button name="do_invite" string="Invite"
 						type="object" icon="gtk-ok" />
+					</group>
 				</form>
 			</field>
 		</record>
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
new file mode 100644
index 00000000000..ec7fcc50e9e
--- /dev/null
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py
@@ -0,0 +1,162 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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/>.
+#
+##############################################################################
+
+from base_calendar import base_calendar
+from osv import fields, osv
+from tools.translate import _
+import tools
+import mx.DateTime
+import re
+
+
+months = {
+    1: "January", 2: "February", 3: "March", 4: "April", \
+    5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \
+    10: "October", 11: "November", 12: "December"
+}
+
+class base_calendar_set_exrule(osv.osv_memory):
+    """
+    Set Exrule.
+    """
+
+    _name = "base.calendar.set.exrule"
+    _description = "Set Exrule"
+
+    _columns = {
+      'freq': fields.selection([('None', 'No Repeat'), \
+                                ('secondly', 'Secondly'), \
+                                ('minutely', 'Minutely'), \
+                                ('hourly', 'Hourly'), \
+                                ('daily', 'Daily'), \
+                                ('weekly', 'Weekly'), \
+                                ('monthly', 'Monthly'), \
+                                ('yearly', 'Yearly')], 'Frequency',required=True),
+        'interval': fields.integer('Interval'),
+        'count': fields.integer('Count'),
+        'mo': fields.boolean('Mon'),
+        'tu': fields.boolean('Tue'),
+        'we': fields.boolean('Wed'),
+        'th': fields.boolean('Thu'),
+        'fr': fields.boolean('Fri'),
+        'sa': fields.boolean('Sat'),
+        'su': fields.boolean('Sun'),
+        'select1': fields.selection([('date', 'Date of month'), \
+                                    ('day', 'Day of month')], 'Option'),
+        'day': fields.integer('Date of month'),
+        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
+                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
+                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
+                                   ('SU', 'Sunday')], 'Weekday'),
+        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
+                                   ('3', 'Third'), ('4', 'Fourth'), \
+                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
+        'month_list': fields.selection(months.items(),'Month'),
+        'end_date': fields.date('Repeat Until'),
+
+    }
+
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @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 fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        crm_obj = self.pool.get('crm.meeting')
+        for meeting in crm_obj.browse(cr, uid, context.get('active_ids', [])):
+            if not meeting.rrule:
+                raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency after Apply Exception Rule"))
+        return False
+
+    def compute_exrule_string(self, cr, uid, ids, context=None):
+        """
+        Compute rule string.
+        @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 datas: dictionary of freq and interval value.
+        @return: string value which compute FREQILY;INTERVAL
+        """
+
+        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
+        weekstring = ''
+        monthstring = ''
+        yearstring = ''
+
+        for datas in self.read(cr, uid, ids, context=context):
+            freq = datas.get('freq')
+            if freq == 'None':
+                return ''
+
+            interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
+
+            if freq == 'weekly':
+
+                byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
+                if byday:
+                    weekstring = ';BYDAY=' + ','.join(byday)
+
+            elif freq == 'monthly':
+                if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+                    raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+                if datas.get('select1')=='day':
+                    monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+                elif datas.get('select1')=='date':
+                    monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
+
+            elif freq == 'yearly':
+                if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+                    raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+                bymonth = ';BYMONTH=' + str(datas.get('month_list'))
+                if datas.get('select1')=='day':
+                    bystring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+                elif datas.get('select1')=='date':
+                    bystring = ';BYMONTHDAY=' + str(datas.get('day'))
+                yearstring = bymonth + bystring
+
+            if datas.get('end_date'):
+                datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
+            enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
+                                 ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
+
+            exrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \
+                                + enddate + monthstring + yearstring
+            ex_id = base_calendar.base_calendar_id2real_id(context['active_id'])
+            model = context.get('model', False)
+            model_obj = self.pool.get(model)
+            exrule_value = model_obj.write(cr, uid,ex_id,{
+                            'exrule': exrule_string,
+                            })
+            return {}
+
+        _defaults = {
+         'freq': lambda *x: 'None',
+         'select1': lambda *x: 'date',
+         'interval': lambda *x: 1,
+    }
+
+base_calendar_set_exrule()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml b/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
new file mode 100644
index 00000000000..cc88dc90c02
--- /dev/null
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="view_base_calendar_set_exrule" model="ir.ui.view">
+            <field name="name">base.calendar.set.exrule.form</field>
+            <field name="model">base.calendar.set.exrule</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Set Exrule">
+	  			<separator string="Select data for ExRule" colspan="8"/>
+                    <group col="8" colspan="6">
+                        <field name="freq" />
+                        <field name="interval" />
+                        <field name="count" />
+                        <field name="end_date" />
+                    </group>
+                    <group col="8" colspan="8" name="Select weekdays"
+                        attrs="{'invisible' : [('freq','!=','weekly')]}">
+                        <field name="mo" colspan="1" />
+                        <field name="tu" colspan="1" />
+                        <field name="we" colspan="1" />
+                        <field name="th" colspan="1" />
+                        <field name="fr" colspan="1" />
+                        <field name="sa" colspan="1" />
+                        <field name="su" colspan="1" />
+                        <newline />
+                    </group>
+                   <group col="8" colspan="6"
+                        attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+                        <group col="2" colspan="1">
+                            <field name="select1" />
+                        </group>
+                        <group col="2" colspan="1"
+                            attrs="{'invisible' : [('select1','=','day')]}">
+                            <field name="day"
+                                attrs="{'required' : [('select1','=','date')]}"/>
+                        </group>
+                      <group col="3" colspan="1"
+                            attrs="{'invisible' : [('select1','=','date')]}">
+                            <field name="byday" string="The"
+                                attrs="{'required' : [('select1','=','day')]}"/>
+                            <field name="week_list" nolabel="1"
+                                attrs="{'required' : [('select1','=','day')]}"/>
+                        </group>
+                       <group col="1" colspan="1"
+                            attrs="{'invisible' : [('freq','!=','yearly')]}">
+                            <field name="month_list" string="of"
+                                colspan="1"
+                                attrs="{'required' : [('freq','=','yearly')]}"/>
+                        </group>
+                    </group>
+             	<group colspan="4" col="6">
+	        	 <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+	             <button  icon="gtk-ok" string="ok" name="compute_exrule_string" type="object"/>
+	      </group>
+         </form>
+         </field>
+	</record>
+
+        <record id="action_base_calendar_set_exrule" model="ir.actions.act_window">
+            <field name="name">Set Exrule</field>
+            <field name="res_model">base.calendar.set.exrule</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+           <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 9b4cc656acc..7b963ef09ee 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -19,14 +19,13 @@
 #
 ##############################################################################
 
-import netsvc
 from osv import fields, osv
 
 class res_partner_contact(osv.osv):
     """ Partner Contact """
 
     _name = "res.partner.contact"
-    _description = "res.partner.contact"
+    _description = "Contact"
 
     def _title_get(self,cr, user, context={}):
         """
@@ -116,22 +115,6 @@ res_partner_contact()
 
 class res_partner_address(osv.osv):
 
-    def search(self, cr, user, args, offset=0, limit=None, order=None,
-            context=None, count=False):
-        """ search parnter address
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user
-            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-            @param offset: The Number of Results to Pass
-            @param limit: The Number of Results to Return
-            @param context: A standard dictionary for contextual values
-        """
-
-        if context and context.has_key('address_partner_id' ) and context['address_partner_id']:
-            args.append(('partner_id', '=', context['address_partner_id']))
-        return super(res_partner_address, self).search(cr, user, args, offset, limit, order, context, count)
-
     #overriding of the name_get defined in base in order to remove the old contact name
     def name_get(self, cr, user, ids, context={}):
         """
@@ -208,6 +191,8 @@ class res_partner_job(osv.osv):
                 if arg[2] and not count:
                     search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
                     contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, limit=limit, order=order, context=context, count=count)
+                    if not contact_ids:
+                         continue
                     contacts = contact_obj.browse(cr, user, contact_ids, context=context)
                     for contact in contacts:
                         job_ids.extend([item.id for item in contact.job_ids])
@@ -224,11 +209,11 @@ class res_partner_job(osv.osv):
     _order = 'sequence_contact'
 
     _columns = {
-        'name': fields.related('address_id','partner_id', type='many2one',\
+        'name': fields.related('address_id', 'partner_id', type='many2one',\
                      relation='res.partner', string='Partner', help="You may\
                      enter Address first,Partner will be linked automatically if any."),
-        'address_id': fields.many2one('res.partner.address','Address', \
-                        help='Address which is linked to the Partner'),
+        'address_id': fields.many2one('res.partner.address', 'Address', \
+                        help='Address which is linked to the Partner'), # TO Correct: domain=[('partner_id', '=', name)]
         'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
         'function_id': fields.many2one('res.partner.function','Partner Function', \
                             help="Function of this contact with this partner"),
@@ -251,7 +236,34 @@ class res_partner_job(osv.osv):
         'sequence_contact' : lambda *a: 0,
         'state': lambda *a: 'current',
     }
+    
+    def onchange_partner(self, cr, uid, _, partner_id, context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user,
+            @param _: List of IDs,
+            @partner_id : ID of the Partner selected,
+            @param context: A standard dictionary for contextual values
+        """
+        return {'value': {'address_id': False}}
 
+    def onchange_address(self, cr, uid, _, address_id, context=None):
+        """
+            @@param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user,
+            @param _: List of IDs,
+            @address_id : ID of the Address selected,
+            @param context: A standard dictionary for contextual values
+        """
+        partner_id = False
+        if address_id:
+            address = self.pool.get('res.partner.address')\
+                        .browse(cr, uid, address_id, context)
+            partner_id = address.partner_id.id
+        return {'value': {'name': partner_id}}
+    
 res_partner_job()
 
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 49147fb2112..42f2e51b2ee 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -52,7 +52,7 @@
                             <form string="Functions and Addresses">
                                <group string="Partner" colspan="2" col="4">
                                    <field name="function_id"/>
-                                   <field name="address_id" context="{'address_partner_id': name}"/>
+                                   <field name="address_id"/>
                                    <field name="name"/>
                                    <field name="date_start" />
                                    <field name="date_stop" />
@@ -357,23 +357,19 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Contact Functions">
-                <notebook>
-                    <page string="General">
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1" context="{'address_partner_id': name}"/>
-                        <field name="contact_id" select="1"/>
-                        <field name="function_id" select="1"/>
-                        <field name="email" widget="email"/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="extension"/>
-                        <field name="sequence_contact" groups="base.group_user"/>
-                        <field name="sequence_partner" groups="base.group_user"/>
-                        <field name="date_start" groups="base.group_user"/>
-                        <field name="date_stop" groups="base.group_user"/>
-                        <field name="state" />
-                    </page>
-                </notebook>
+	             <field name="name" select="1" on_change="onchange_partner(name)"/>
+	             <field name="address_id" select="1" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
+	             <field name="contact_id" select="1"/>
+	             <field name="function_id" select="1"/>
+	             <field name="email" widget="email"/>
+	             <field name="phone"/>
+	             <field name="fax"/>
+	             <field name="extension"/>
+	             <field name="sequence_contact" groups="base.group_user"/>
+	             <field name="sequence_partner" groups="base.group_user"/>
+	             <field name="date_start" groups="base.group_user"/>
+	             <field name="date_stop" groups="base.group_user"/>
+	             <field name="state" />
             </form>
         </field>
     </record>
diff --git a/addons/base_contact/i18n/oc.po b/addons/base_contact/i18n/oc.po
new file mode 100644
index 00000000000..01b24d6c21b
--- /dev/null
+++ b/addons/base_contact/i18n/oc.po
@@ -0,0 +1,357 @@
+# Occitan (post 1500) 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-05-18 08:57+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
+msgstr "Seq. del contacte"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+msgid "res.partner.contact"
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: base_contact
+#: field:res.partner.job,function_id:0
+msgid "Partner Function"
+msgstr "Foncion del partenari"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: view:res.partner.address:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr "Contactes"
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Seq. del partenari"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: base_contact
+#: field:res.partner.contact,first_name:0
+msgid "First Name"
+msgstr "Pichon nom"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_job
+msgid "Contact Partner Function"
+msgstr "Foncion del contacte del partenari"
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr "Autre"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Contacte cap a foncion"
+
+#. module: base_contact
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Partenari cap a adreça"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "# de contactes"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_function0
+msgid "Function"
+msgstr "Foncion"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Lenga"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Telefòn"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr "Definir los contactes e lors foncions"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Títol"
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Foncions del contacte"
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+msgid "Base Contact"
+msgstr "Basa Contacte"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance of this job title in the list of job title of the linked "
+"partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "Corrièr electronic"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Data de fin d'emplec"
+
+#. module: base_contact
+#: view:res.partner:0
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr "Adreça"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Foncions dels contactes"
+
+#. module: base_contact
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr "Nacionalitat"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of importance of this address in the list of addresses of the linked "
+"contact"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Emplec principal"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: base_contact
+#: field:res.partner.contact,function_id:0
+msgid "Main Function"
+msgstr "Foncion principala"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: base_contact
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact Process"
+msgstr "Tractar los contactes de basa"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Seq."
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Extension"
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Telefonet"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Informacion suplementària"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Foncions e adreças"
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: base_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Contacte"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr "Emplegaire principal"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Foncion cap a adreça"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Partner Contacts"
+msgstr "Contactes del partenari"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Contacte del partenari"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Partenaris"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_addresses0
+#: view:res.partner:0
+msgid "Addresses"
+msgstr "Adreças"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Nom d'ostal"
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: view:res.partner.job:0
+msgid "General"
+msgstr "General"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General Information"
+msgstr "Informacions generalas"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: base_contact
+#: field:res.partner.job,date_start:0
+msgid "Date Start"
+msgstr "Data de començament"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Site web"
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Data de naissença"
diff --git a/addons/base_iban/base_iban_view.xml b/addons/base_iban/base_iban_view.xml
index d93e9ffb086..00203665c50 100644
--- a/addons/base_iban/base_iban_view.xml
+++ b/addons/base_iban/base_iban_view.xml
@@ -42,6 +42,17 @@
                 </field>
             </field>
         </record>
+        <record id="view_partner_iban_list" model="ir.ui.view">
+            <field name="name">res.partner.form.iban.inherit.list</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                	<field name="iban"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/base_iban/i18n/oc.po b/addons/base_iban/i18n/oc.po
new file mode 100644
index 00000000000..e1e7020e801
--- /dev/null
+++ b/addons/base_iban/i18n/oc.po
@@ -0,0 +1,64 @@
+# Occitan (post 1500) 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-05-18 08:28+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_iban
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "zip"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Numèro Internacional de Compte Bancari"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr "bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr "iban"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "N° IBAN del compte"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr "acc_number"
diff --git a/addons/base_module_merge/i18n/oc.po b/addons/base_module_merge/i18n/oc.po
new file mode 100644
index 00000000000..e4cc7b748e1
--- /dev/null
+++ b/addons/base_module_merge/i18n/oc.po
@@ -0,0 +1,155 @@
+# Occitan (post 1500) 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-05-18 08:33+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr "Categoria"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Information"
+msgstr "Informacion"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,init:0
+msgid "Module Merging"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,author:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,directory_name:0
+msgid "Directory Name"
+msgstr "Nom del dorsièr"
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Demo Data"
+msgstr "Donadas de demo"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_filename:0
+msgid "Filename"
+msgstr "Nom del fichièr"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,version:0
+msgid "Version"
+msgstr "Version"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module Recording"
+msgstr "Modul d'Enregistrament"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Thanks in advance for your contribution."
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,description:0
+msgid "Full Description"
+msgstr "Descripcion completa"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,name:0
+msgid "Module Name"
+msgstr "Nom de modul"
+
+#. module: base_module_merge
+#: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
+#: model:ir.ui.menu,name:base_module_merge.menu_wizard_base_module_merger
+msgid "Merge module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_file:0
+msgid "Module .zip File"
+msgstr "Fichièr zip del Modul"
+
+#. module: base_module_merge
+#: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
+msgid "Module Merger"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module successfully created !"
+msgstr "Modul creat amb succès !"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,website:0
+msgid "Documentation URL"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,init,modules_list:0
+msgid "Modules"
+msgstr "Moduls"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,save:0
+#: wizard_button:base_module_merge.module_merge,init,info:0
+msgid "Continue"
+msgstr "Contunhar"
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Normal Data"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid ""
+"If you think your module could interrest others people, we'd like you to "
+"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
+"the website or using features of the 'base_module_publish' module."
+msgstr ""
+
+#. module: base_module_merge
+#: help:base_module_merge.module_merge,init,modules_list:0
+msgid "Select Modules which you want to merge in single module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,data_kind:0
+msgid "Type of Data"
+msgstr "Tipe de Donada"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+msgid "Module Information"
+msgstr "Informacion sul Modul"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,end:0
+#: wizard_button:base_module_merge.module_merge,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,save,end:0
+msgid "Close"
+msgstr "Tampar"
diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py
index ab50afe1293..f3d802451f4 100644
--- a/addons/base_module_quality/speed_test/speed_test.py
+++ b/addons/base_module_quality/speed_test/speed_test.py
@@ -19,12 +19,28 @@
 #
 ##############################################################################
 
-from osv import fields, osv
 from tools.translate import _
 import pooler
 
 from base_module_quality import base_module_quality
 
+class CounterCursor(object):
+    def __init__(self, real_cursor):
+        self.cr = real_cursor
+        self.count = 0
+
+    def reset(self):
+        self.count = 0
+
+    def execute(self, query, params=None):
+        if query.lower().startswith('select '):
+            self.count += 1
+        return self.cr.execute(query, params)
+
+    def __getattr__(self, attr):
+        return getattr(self.cr, attr)
+
+
 class quality_test(base_module_quality.abstract_quality_check):
 
     def __init__(self):
@@ -63,6 +79,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need
         result_dict = {}
         result_dict2 = {}
         self.result_details += _("<html>O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is hardly wished.\n</html>")
+        ccr = CounterCursor(cr)
         for obj, ids in obj_ids.items():
             code_base_complexity = 0
             code_half_complexity = 0
@@ -73,22 +90,22 @@ This test checks the speed of the module. Note that at least 5 demo data is need
             list2 = []
             if size:
                 speed_list = []
-                #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries)
                 try:
-                    pool.get(obj).read(cr, uid, [ids[0]])
-                    cnt = cr.count
-                    pool.get(obj).read(cr, uid, [ids[0]])
-                    code_base_complexity = cr.count - cnt
-
-                    pool.get(obj).read(cr, uid, ids[:size/2])
-                    cnt = cr.count
-                    pool.get(obj).read(cr, uid, ids[:size/2])
-                    code_half_complexity = cr.count - cnt
-
+                    # perform the operation once to put data in cache
                     pool.get(obj).read(cr, uid, ids)
-                    cnt = cr.count
-                    pool.get(obj).read(cr, uid, ids)
-                    code_size_complexity = cr.count - cnt
+
+                    ccr.reset()
+                    pool.get(obj).read(ccr, uid, [ids[0]])
+                    code_base_complexity = ccr.count
+
+                    ccr.reset()
+                    pool.get(obj).read(ccr, uid, ids[:size/2])
+                    code_half_complexity = ccr.count
+
+                    ccr.reset()
+                    pool.get(obj).read(ccr, uid, ids)
+                    code_size_complexity = ccr.count
+
                 except Exception, e:
                     list2 = [obj, _("Error in Read method")]
                     speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method:" + str(e))]
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 33c2608c85a..764753f5cc2 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -35,7 +35,7 @@ class report_creator(osv.osv):
     #
     def export_data(self, cr, uid, ids, fields_to_export, context=None):
         
-        if not context:
+        if context is None:
             context = {}
         data_l = self.read(cr, uid, ids, ['sql_query'], context)
         final_datas = []
@@ -61,7 +61,7 @@ class report_creator(osv.osv):
         @param Fields: List of field of customer reports form.
         @return: Dictionary of Fields
         """
-        if not context:
+        if context is None:
             context = {}
             
         data = context and context.get('report_id', False) or False
@@ -95,7 +95,7 @@ class report_creator(osv.osv):
         @param user: the current user’s ID for security checks,
         @return: Dictionary of Fields, arch and toolbar.
         """
-        if not context:
+        if context is None:
             context = {}
           
         data = context and context.get('report_id', False) or False    
@@ -116,9 +116,11 @@ class report_creator(osv.osv):
             
         arch = '<?xml version="1.0" encoding="utf-8"?>\n'
         if view_type == 'graph':
-            arch  += '<graph string="%s" type="%s" orientation="%s">' % (report.name, report.view_graph_type, report.view_graph_orientation)
+            orientation_eval = {'horz':'horizontal','vert' :'vertical'}
+            orientation = eval(report.view_graph_orientation,orientation_eval)
+            arch +='<graph string="%s" type="%s" orientation="%s">' % (report.name, report.view_graph_type, orientation)
+            i = 0
             for val in ('x','y'):
-                i = 0
                 for f in report.field_ids:
                     if f.graph_mode == val:
                         if f.field_id.model:
@@ -191,7 +193,9 @@ class report_creator(osv.osv):
         @param fields: List of fields.
         @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
         """
-        data = context and context.get('report_id', False) or False
+        if context is None:
+            context = {}
+        data = context.get('report_id', False)
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).read(cr, user, ids, fields, context, load)
         ctx = context or {}
@@ -225,8 +229,9 @@ class report_creator(osv.osv):
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
         @return: List of id 
         """
-
-        context_id = context and context.get('report_id', False) or False
+        if context is None:
+            context = {}
+        context_id = context.get('report_id', False)
         
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count)
@@ -372,9 +377,10 @@ class report_creator(osv.osv):
                 t = self.pool.get(f.field_id.model_id.model)._table
                 if f.group_method == 'group':
                     fields.append('\t'+t+'.'+f.field_id.name+' as field'+str(i))
+                    groupby.append(t+'.'+f.field_id.name)
                 else:
                     fields.append('\t'+f.group_method+'('+t+'.'+f.field_id.name+')'+' as field'+str(i))
-                groupby.append(t+'.'+f.field_id.name)
+                    
                 i += 1
             models = self._path_get(cr, uid, obj.model_ids, obj.filter_ids)
             check = self._id_get(cr, uid, ids[0], context)
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
index 9ba1fc6dfaa..7f7a8178ded 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
@@ -309,27 +309,32 @@ class PyOpenOffice(object):
         return new_c
 
 def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
-    import libxslt
-    import libxml2
+    from lxml import etree
+    from StringIO import StringIO
+
     tool = PyOpenOffice(output, save_pict = save_pict)
     res = tool.unpackNormalize(sxw_file)
-    styledoc = libxml2.parseDoc(xsl)
-    style = libxslt.parseStylesheetDoc(styledoc)
-    doc = libxml2.parseMemory(res,len(res))
-    result = style.applyStylesheet(doc, None)
-
-    root = result.xpathEval("/document/stylesheet")
+    
+    f = StringIO(xsl)
+    styledoc = etree.parse(f)
+    style = etree.XSLT(styledoc)
+    
+    f = StringIO(res)
+    doc = etree.parse(f)
+    result = style(doc)
+    root = etree.XPathEvaluator(result)("/document/stylesheet")
+    
     if root:
         root=root[0]
-        images = libxml2.newNode("images")
+        images = etree.Element("images")
         for img in tool.images:
-            node = libxml2.newNode('image')
-            node.setProp('name', img)
-            node.setContent( base64.encodestring(tool.images[img]))
-            images.addChild(node)
-        root.addNextSibling(images)
+            node = etree.Element('image', name=img)
+            node.text = base64.encodestring(tool.images[img])
+            images.append(node)
+        root.append(images)
+
     try:
-        xml = style.saveResultToString(result)
+        xml = str(result)
         return xml
     except:
         return result
@@ -349,7 +354,7 @@ if __name__ == "__main__":
     import StringIO
 
     fname = sys.argv[1]
-    f = StringIO.StringIO(file(fname).read())
+    f = fname
     xsl_file = 'normalized_oo2rml.xsl'
     z = zipfile.ZipFile(fname,"r")
     mimetype = z.read('mimetype')
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index bdc503a06f1..a9fde39ffde 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -74,21 +74,26 @@ class base_gtkcontactform(osv.osv_memory):
              'contact_me':fields.boolean('Contact Me'),
              }
     def execute(self, cr, uid, ids, context=None):
-        company_id = self.pool.get('base.setup.company').search(cr, uid, [])
-        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id)
-        company_data = company_data and company_data[0] or False
+        if context is None:
+            context = {}
+
+        company_id = self.pool.get('base.setup.company').search(cr, uid, [], context=context)
+        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
+        company_data = company_data and company_data[0] or {}
         country = ''
-        if company_data and company_data.get('country_id', False):
-            country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'])['name']
-        for res in self.read(cr, uid, ids):
+        
+        if company_data.get('country_id', False):
+            country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
+        
+        for res in self.read(cr, uid, ids, context=context):
             email = res.get('email','')
-            result = "\ncompany: "+ str(company_data.get('name',''))
-            result += "\nname: " + str(res.get('name',''))
-            result += "\njob: " + str(res.get('job',''))
+            result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
+            result += "\nname: " + tools.ustr(res.get('name',''))
+            result += "\njob: " + tools.ustr(res.get('job',''))
             result += "\nphone: " + str(res.get('phone',''))
-            result += "\ncity: " + str(company_data.get('city',''))
+            result += "\ncity: " + tools.ustr(company_data.get('city',''))
             result += "\ncountry: " + str(country)
-            result += "\nindustry: " + str(res.get('industry', ''))
+            result += "\nindustry: " + tools.ustr(res.get('industry', ''))
             result += "\ntotal_employees: " + str(res.get('total_employees', ''))
             result += "\nplan_use: " +  str(res.get('use_openerp', False))
             result += "\nalready_using_openerp: " + str(res.get('already_using_openerp', False))
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
new file mode 100644
index 00000000000..0d613b0573b
--- /dev/null
+++ b/addons/base_setup/i18n/th.po
@@ -0,0 +1,277 @@
+# Thai 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-05-20 04:32+0000\n"
+"Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
+"Language-Team: Thai <th@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-05-21 03:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,city:0
+#: wizard_field:base_setup.base_setup,init,city:0
+#: wizard_field:base_setup.base_setup,update,city:0
+msgid "City"
+msgstr "อำเภอ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid ""
+"You can start configuring the system or connect directly to the database "
+"using the default setup."
+msgstr "คุณอาจจะเริ่มตั้งค่าหรือใช้ค่าพื้นฐานเบื้องต้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,zip:0
+#: wizard_field:base_setup.base_setup,init,zip:0
+#: wizard_field:base_setup.base_setup,update,zip:0
+msgid "Zip code"
+msgstr "รหัสไปรษณีย์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid "Select a Profile"
+msgstr "เลือกแบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,config:0
+msgid "Start Configuration"
+msgstr "เริ่มการตั้งค่า"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"You'll be able to install more modules later through the Administration menu."
+msgstr "คุณสามารถลงโมดูลใหม่ๆได้ในเมนูการบริหารระบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"A profile sets a pre-selection of modules for specific needs. These profiles "
+"have been setup to help you discover the different aspects of OpenERP. This "
+"is just an overview, we have 300+ available modules."
+msgstr ""
+"รูปแบบโมดูลเป็นเพียงการตั้งค่าแนะนำในการใช้งานเพื่อตั้งค่าได้ง่ายขึ้น "
+"แต่เรามีโมดูลที่สามารถหาติดตั้งได้มากกว่า 500 โมดูล"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,update:0
+#: wizard_button:base_setup.base_setup,init,company:0
+msgid "Next"
+msgstr "ถัดไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,email:0
+#: wizard_field:base_setup.base_setup,init,email:0
+#: wizard_field:base_setup.base_setup,update,email:0
+msgid "E-mail"
+msgstr "อีเมล์"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,state_id:0
+#: wizard_field:base_setup.base_setup,init,state_id:0
+#: wizard_field:base_setup.base_setup,update,state_id:0
+msgid "State"
+msgstr "จังหวัด"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Your new database is now fully installed."
+msgstr "ฐานข้อมูลใหม่ตั้งตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,profile:0
+#: wizard_field:base_setup.base_setup,init,profile:0
+#: wizard_field:base_setup.base_setup,update,profile:0
+msgid "Profile"
+msgstr "รูปแบบ"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer1:0
+#: wizard_field:base_setup.base_setup,init,rml_footer1:0
+#: wizard_field:base_setup.base_setup,update,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "หัวรายงาน 1"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer2:0
+#: wizard_field:base_setup.base_setup,init,rml_footer2:0
+#: wizard_field:base_setup.base_setup,update,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "ท้ายรายงาน 2"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "General Information"
+msgstr "ข้อมูลทั่วไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street2:0
+#: wizard_field:base_setup.base_setup,init,street2:0
+#: wizard_field:base_setup.base_setup,update,street2:0
+msgid "Street2"
+msgstr "ตำบล"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report Information"
+msgstr "ข้อมูลรายงาน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,phone:0
+#: wizard_field:base_setup.base_setup,init,phone:0
+#: wizard_field:base_setup.base_setup,update,phone:0
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Define Main Company"
+msgstr "ตั้งบริษัทหลัก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,name:0
+#: wizard_field:base_setup.base_setup,init,name:0
+#: wizard_field:base_setup.base_setup,update,name:0
+msgid "Company Name"
+msgstr "ชื่อบริษัท"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer2:0
+#: help:base_setup.base_setup,init,rml_footer2:0
+#: help:base_setup.base_setup,update,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้เปลี่ยนโดยใส่ข้อมูลของธนาคาร\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,country_id:0
+#: wizard_field:base_setup.base_setup,init,country_id:0
+#: wizard_field:base_setup.base_setup,update,country_id:0
+msgid "Country"
+msgstr "ประเทศ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+#: wizard_view:base_setup.base_setup,finish:0
+#: wizard_view:base_setup.base_setup,init:0
+#: wizard_view:base_setup.base_setup,update:0
+#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
+#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
+msgid "Setup"
+msgstr "ตั้งค่า"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer1:0
+#: help:base_setup.base_setup,init,rml_footer1:0
+#: help:base_setup.base_setup,update,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้ท่านนำข้อมูลเกี่ยวกับทางกฏหมาย\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,update:0
+msgid "Summary"
+msgstr "สรุป"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,update,finish:0
+msgid "Install"
+msgstr "ติดตั้ง"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Installation Done"
+msgstr "ติดตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_header1:0
+#: help:base_setup.base_setup,init,rml_header1:0
+#: help:base_setup.base_setup,update,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+"ข้อมูลนี่จะอยู่ในด้านบนขวาของรายงานท่าน\n"
+"กรุณาใส่ สโลแกน\n"
+"\"Open Source Business Solutions\"."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_header1:0
+#: wizard_field:base_setup.base_setup,init,rml_header1:0
+#: wizard_field:base_setup.base_setup,update,rml_header1:0
+msgid "Report Header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr "กรุณาใช้โลโก้ขนาด 450X150 px"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,currency:0
+#: wizard_field:base_setup.base_setup,init,currency:0
+#: wizard_field:base_setup.base_setup,update,currency:0
+msgid "Currency"
+msgstr "อัตราแลกเปลี่ยน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street:0
+#: wizard_field:base_setup.base_setup,init,street:0
+#: wizard_field:base_setup.base_setup,update,street:0
+msgid "Street"
+msgstr "ที่อยู่"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,menu:0
+msgid "Use Directly"
+msgstr "ใช้ทันที"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,init,menu:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,logo:0
+#: wizard_field:base_setup.base_setup,init,logo:0
+#: wizard_field:base_setup.base_setup,update,logo:0
+msgid "Logo"
+msgstr "โลโก้"
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr "โครงสร้าง ตั้งค่า"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,init:0
+#: wizard_button:base_setup.base_setup,update,company:0
+msgid "Previous"
+msgstr "ก่อนหน้า"
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index c072891179a..5f6318ec5a1 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -152,5 +152,23 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
                     context=context)
 base_setup_company()
 
+class res_currency(osv.osv):
+    _inherit = 'res.currency'
+    
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+#        We can use the following line,if we want to restrict this name_get for company setup only
+#        But, its better to show currencies as name(Code).
+#        if not (context.get('active_model','') == 'ir.actions.todo'):
+#            return super(res_currency,self).name_get(cr, uid, ids, context=context)
+        if not len(ids):
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
+        return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['code']) + ')')   for x in reads]
+        
+res_currency()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/board_association/i18n/lt.po b/addons/board_association/i18n/lt.po
index cf53291f10b..581b5bc4c83 100644
--- a/addons/board_association/i18n/lt.po
+++ b/addons/board_association/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 15:20+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-19 09:15+0000\n"
+"Last-Translator: Rytis Ūsalis <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-04-17 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
@@ -40,7 +40,7 @@ msgstr ""
 #. module: board_association
 #: view:board.board:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mano užduotys"
 
 #. module: board_association
 #: view:board.board:0
diff --git a/addons/board_document/i18n/oc.po b/addons/board_document/i18n/oc.po
new file mode 100644
index 00000000000..4f6aa7e41d2
--- /dev/null
+++ b/addons/board_document/i18n/oc.po
@@ -0,0 +1,90 @@
+# Occitan (post 1500) 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-05-18 09:06+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Fichièrs novèls"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager
+msgid "Document Dashboard"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Wall of Shame"
+msgstr "Paret de la Vergonha"
+
+#. module: board_document
+#: view:board.board:0
+msgid "File Size by Month"
+msgstr "Talha dels Fichièrs per Mes"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Month"
+msgstr "Fichièrs per Mes"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager1
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager1
+msgid "Statistics by User"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Resource Type"
+msgstr "Fichièrs per Tipe de Ressorsa"
+
+#. module: board_document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_document
+#: model:ir.module.module,shortdesc:board_document.module_meta_information
+msgid "Dashboard for Document Management"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr "Fichièrs per Partenari"
+
+#. module: board_document
+#: model:ir.ui.menu,name:board_document.menu_board_document
+msgid "Document"
+msgstr "Document"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Fichièrs per Utilizaire"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Document board"
+msgstr "Tablèu dels Documents"
diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml
index d26b4b2e6cf..44e2b98c96c 100644
--- a/addons/board_hr/board_hr_view.xml
+++ b/addons/board_hr/board_hr_view.xml
@@ -11,7 +11,7 @@
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+            <field name="domain">[('state','in',('draft', 'confirm')),('user_id','=',uid)]</field>
             <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
         </record>
 
diff --git a/addons/board_manufacturing/i18n/oc.po b/addons/board_manufacturing/i18n/oc.po
new file mode 100644
index 00000000000..67f60dc5222
--- /dev/null
+++ b/addons/board_manufacturing/i18n/oc.po
@@ -0,0 +1,74 @@
+# Occitan (post 1500) 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-05-18 09:03+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Procurement in Exception"
+msgstr "Aprovisionament en excepcion"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Next production orders"
+msgstr "Òrdre de fabricacion seguent"
+
+#. module: board_manufacturing
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Deliveries (Out packing)"
+msgstr "Liurasons"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr "Tablèu de bòrd de produccion"
+
+#. module: board_manufacturing
+#: model:ir.ui.menu,name:board_manufacturing.next_id_87
+msgid "Production"
+msgstr "Produccion"
+
+#. module: board_manufacturing
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_manufacturing
+#: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
+#: model:ir.ui.menu,name:board_manufacturing.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr "Tablèu de bòrd de produccion"
+
+#. module: board_manufacturing
+#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
+msgid "Board for manufacturing"
+msgstr "Tablèu per la produccion"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Stock value variation"
+msgstr "Variacion de la valor de l'emmagazinatge"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Workcenter futur load"
+msgstr ""
diff --git a/addons/board_manufacturing/i18n/pl.po b/addons/board_manufacturing/i18n/pl.po
index 26654a8a158..7f70507e0a7 100644
--- a/addons/board_manufacturing/i18n/pl.po
+++ b/addons/board_manufacturing/i18n/pl.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-21 15:58+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
+"PO-Revision-Date: 2010-05-23 20:02+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-05-24 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Procurement in Exception"
-msgstr ""
+msgstr "Niepoprawne nabycia"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -34,7 +34,7 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Deliveries (Out packing)"
-msgstr ""
+msgstr "Dostawy do klientów"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -49,7 +49,7 @@ msgstr "Produkcja"
 #. module: board_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: board_manufacturing
 #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
@@ -65,9 +65,9 @@ msgstr "Konsola dla produkcji"
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Stock value variation"
-msgstr ""
+msgstr "Zmiany wartości zapasów"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Workcenter futur load"
-msgstr "Przyszłe obiciążenie centrum roboczego"
+msgstr "Obciążenie centrów roboczych"
diff --git a/addons/board_project/board_project_issue_view.xml b/addons/board_project/board_project_issue_view.xml
index eaf3a2f8612..60103007985 100644
--- a/addons/board_project/board_project_issue_view.xml
+++ b/addons/board_project/board_project_issue_view.xml
@@ -7,24 +7,72 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('create_date', '&gt;=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
+            <field name="domain">[('user_id','=',uid),('state','in',['draft','open'])]</field>
            <field name="view_id" ref="project_issue.project_issue_tree_view"/>
         </record>
 
+        <record id="action_view_pending_project_issue_tree" model="ir.actions.act_window">
+            <field name="name">Project issues</field>
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
+           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
+        </record>
+
+        <record id="action_project_issue_graph_state" model="ir.actions.act_window">
+            <field name="name">Project Issue</field>
+            <field name="res_model">project.issue.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+            <field name="view_id" ref="project_issue.view_project_issue_report_graph"/>
+        </record>
+
+        <record id="view_project_issue_graph_stage" model="ir.ui.view">
+            <field name="name">project.issue.report.graph</field>
+            <field name="model">project.issue.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="vertical" string="Project Issue" type="bar">
+                    <field name="stage_id"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="action_project_issue_graph_stage" model="ir.actions.act_window">
+            <field name="name">Project Issue</field>
+            <field name="res_model">project.issue.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+            <field name="view_id" ref="view_project_issue_graph_stage"/>
+        </record>
+
         <record id="board_project_issue_form" model="ir.ui.view">
             <field name="name">board.project.issue.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Issue Board">
-                    <vpaned>
+                <form string="My Board">
+                    <hpaned>
                         <child1>
-                   			<action colspan="4" height="220" name="%(action_view_current_project_issue_tree)d" string="Current Project Issues" width="510"/>
+                            <action colspan="4"  name="%(action_view_current_project_issue_tree)d" string="Current Issues" width="510"/>
+                            <action colspan="4"  name="%(action_view_pending_project_issue_tree)d" string="Pending Issues" width="510"/>
                         </child1>
                         <child2>
-                   			<action colspan="4" height="220" name="%(project.action_task_by_days_graph)d" string="Project Tasks By Days" width="510"/>
+                        <vpaned>
+                            <child1>
+                                <action colspan="4"  name="%(action_project_issue_graph_state)d" string="Issues By State" />
+                            </child1>
+                            <child2>
+                                <action colspan="4"  name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
+                            </child2>
+                        </vpaned>
                         </child2>
-                    </vpaned>
+                    </hpaned>
                 </form>
             </field>
         </record>
diff --git a/addons/board_project/i18n/oc.po b/addons/board_project/i18n/oc.po
new file mode 100644
index 00000000000..c1452a23e89
--- /dev/null
+++ b/addons/board_project/i18n/oc.po
@@ -0,0 +1,140 @@
+# Occitan (post 1500) 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-05-18 09:08+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mon planning de projèctes"
+
+#. module: board_project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:board_project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Fuèlh de preséncia"
+
+#. module: board_project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_project
+msgid "My projects"
+msgstr "Mos projèctes"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Las Datas Limitas de mos Prètzfaches"
+
+#. module: board_project
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Mos prètzfaches"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Nòtas publicas"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project
+#: model:ir.ui.menu,name:board_project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tablèu de bòrd de projècte"
+
+#. module: board_project
+#: model:ir.module.module,shortdesc:board_project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mos comptes de facturar"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project_manager
+#: model:ir.ui.menu,name:board_project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Tablèu de bòrd de gestion de projècte"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mas datas limitas"
+
+#. module: board_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Fuèlh de preséncia de l'utilizaire"
+
+#. module: board_project
+#: model:ir.ui.menu,name:board_project.next_id_86
+msgid "Project"
+msgstr "Projècte"
+
+#. module: board_project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Tablèu del responsable del projècte"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mos prètzfaches dobèrts"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mon Tablèu"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Mon tablèu de prètzfaches"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Mon Fuèlh de preséncia"
diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml
index 2370e247eec..5548b3f2838 100644
--- a/addons/board_purchase/board_purchase_view.xml
+++ b/addons/board_purchase/board_purchase_view.xml
@@ -8,6 +8,15 @@
             name="Purchase"
             parent="base.dashboard"/>
 
+		<record id="purchase_draft" model="ir.actions.act_window">
+            <field name="name">Draft Purchases</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field> 
+            <field name="search_view_id" ref="purchase.purchase_order_tree"/>
+        </record>
 		<record id="purchase_waiting" model="ir.actions.act_window">
             <field name="name">Quotation Request</field>
             <field name="type">ir.actions.act_window</field>
@@ -26,7 +35,7 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="220" name="%(purchase.purchase_rfq)d" string="Draft Purchase Order"  width="510"/>
+                            <action colspan="4" height="220" name="%(purchase_draft)d" string="Draft Purchase Order"  width="510"/>
                             <action colspan="4" height="220" name="%(purchase_waiting)d" string="Purchase Order in Waiting"  width="510"/>
                         </child1>
                         <child2>
diff --git a/addons/board_sale/i18n/oc.po b/addons/board_sale/i18n/oc.po
new file mode 100644
index 00000000000..459943a5940
--- /dev/null
+++ b/addons/board_sale/i18n/oc.po
@@ -0,0 +1,74 @@
+# Occitan (post 1500) 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-05-18 09:06+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_sale
+#: model:ir.module.module,shortdesc:board_sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Tablèu de Bòrd de las Vendas"
+
+#. module: board_sale
+#: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
+#: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
+msgid "Sale Dashboard"
+msgstr "Tablèu de Bòrd de las Vendas"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Vendas del Mes"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Tablèu de Bòrd del Gestionari de las Vendas"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Cas del Mes"
+
+#. module: board_sale
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Mos Devises Dobèrts"
+
+#. module: board_sale
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_sale
+#: model:ir.ui.menu,name:board_sale.next_id_88
+msgid "Sales"
+msgstr "Vendas"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Estatisticas dels Cases"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "10 melhoras Vendas del Mes"
diff --git a/addons/board_sale/i18n/pl.po b/addons/board_sale/i18n/pl.po
index 17a94959895..cb1e90aac00 100644
--- a/addons/board_sale/i18n/pl.po
+++ b/addons/board_sale/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-14 16:28+0000\n"
+"PO-Revision-Date: 2010-05-21 19:22+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-05-15 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
@@ -40,7 +40,7 @@ msgstr "Konsola szefa sprzedaży"
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases of the month"
-msgstr "Zdarzenia miesiąca"
+msgstr "Sprawy miesiąca"
 
 #. module: board_sale
 #: constraint:ir.ui.view:0
@@ -65,9 +65,9 @@ msgstr "Sprzedaż"
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases statistics"
-msgstr "Statystyka zdarzeń"
+msgstr "Statystyka spraw"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Top ten sales of the month"
-msgstr "Dziesięć najlepszych sprzedaży w miesiącu"
+msgstr "Najlepsze sprzedaże w miesiącu"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 4b6297b77bf..3bc1f703454 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Customer & Supplier Relationship Management', 
-    'version': '1.0', 
-    'category': 'Generic Modules/CRM & SRM', 
+    'name': 'Customer & Supplier Relationship Management',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
     'description': """The generic Open ERP Customer Relationship Management
 system enables a group of people to intelligently and efficiently manage
 leads, opportunities, meeting, phonecall etc.
@@ -41,70 +41,70 @@ appropriate staff, and making sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and Open ERP.""", 
-    'author': 'Tiny', 
-    'website': 'http://www.openerp.com', 
+between mails and Open ERP.""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
     'depends': [
-        'base', 
-        'base_action_rule', 
-        'process', 
-        'mail_gateway', 
-        'base_calendar', 
-        'resource', 
-    ], 
+        'base',
+        'base_action_rule',
+        'process',
+        'mail_gateway',
+        'base_calendar',
+        'resource',
+    ],
     'init_xml': [
-        'crm_data.xml', 
-        'crm_meeting_data.xml', 
-        'crm_lead_data.xml', 
-        'crm_meeting_data.xml', 
-        'crm_opportunity_data.xml', 
-        'crm_phonecall_data.xml', 
-    ], 
+        'crm_data.xml',
+        'crm_meeting_data.xml',
+        'crm_lead_data.xml',
+        'crm_meeting_data.xml',
+        'crm_opportunity_data.xml',
+        'crm_phonecall_data.xml',
+    ],
 
     'update_xml': [
-        'wizard/crm_lead_to_partner_view.xml', 
-        'wizard/crm_lead_to_opportunity_view.xml', 
+        'wizard/crm_lead_to_partner_view.xml',
+        'wizard/crm_lead_to_opportunity_view.xml',
 
-        'wizard/crm_phonecall_to_phonecall_view.xml', 
-        'wizard/crm_phonecall_to_partner_view.xml', 
-        'wizard/crm_phonecall_to_opportunity_view.xml', 
+        'wizard/crm_phonecall_to_phonecall_view.xml',
+        'wizard/crm_phonecall_to_partner_view.xml',
+        'wizard/crm_phonecall_to_opportunity_view.xml',
 
-        'wizard/crm_opportunity_to_phonecall_view.xml', 
-        'wizard/crm_partner_to_opportunity_view.xml', 
+        'wizard/crm_opportunity_to_phonecall_view.xml',
+        'wizard/crm_partner_to_opportunity_view.xml',
 
-        'wizard/crm_forward_to_partner_view.xml', 
-        'wizard/crm_send_email_view.xml', 
-        'crm_view.xml', 
+        'wizard/crm_forward_to_partner_view.xml',
+        'wizard/crm_send_email_view.xml',
+        'crm_view.xml',
 
-        'crm_action_rule_view.xml', 
-        'crm_lead_view.xml', 
-        'crm_lead_menu.xml', 
-        
-        'crm_meeting_view.xml', 
-        'crm_meeting_menu.xml', 
-        
-        'crm_phonecall_view.xml', 
-        'crm_phonecall_menu.xml', 
-        
-        'crm_opportunity_view.xml', 
-        'crm_opportunity_menu.xml', 
-        
-        'security/crm_security.xml', 
-        'security/ir.model.access.csv', 
+        'crm_action_rule_view.xml',
+        'crm_lead_view.xml',
+        'crm_lead_menu.xml',
 
-        'report/crm_lead_report_view.xml', 
-        'report/crm_phonecall_report_view.xml', 
+        'crm_meeting_view.xml',
+        'crm_meeting_menu.xml',
 
-        'process/crm_configuration_process.xml', 
+        'crm_phonecall_view.xml',
+        'crm_phonecall_menu.xml',
+
+        'crm_opportunity_view.xml',
+        'crm_opportunity_menu.xml',
+
+        'security/crm_security.xml',
+        'security/ir.model.access.csv',
+
+        'report/crm_lead_report_view.xml',
+        'report/crm_phonecall_report_view.xml',
+
+        'process/crm_configuration_process.xml',
         'crm_installer_view.xml'
-    ], 
+    ],
     'demo_xml': [
-        'crm_demo.xml', 
-        'crm_lead_demo.xml', 
-        'crm_meeting_demo.xml', 
-        'crm_opportunity_demo.xml', 
+        'crm_demo.xml',
+        'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
+        'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml'
-    ], 
+    ],
     'test': [
 #            'test/test_crm_lead.yml', 
 #            'test/test_crm_meeting.yml', 
@@ -113,6 +113,6 @@ between mails and Open ERP.""",
              ], 
     'installable': True, 
     'active': False, 
-    'certificate': '0079056041421', 
+    'certificate': '0079056041421',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 091114a77b3..ba45efd4b3b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -202,7 +202,11 @@ class crm_case(object):
             return {'value': {'email_from': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
         return {'value': {'email_from': address.email}}
-
+    
+    def _history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
+        mailgate_pool = self.pool.get('mailgate.thread')
+        return mailgate_pool._history(cr, uid, cases, keyword, history=history, email=email, details=details, email_from=email_from, message_id=message_id, context=context)
+    
     def case_open(self, cr, uid, ids, *args):
         """Opens Case
         @param self: The object pointer
@@ -311,6 +315,107 @@ class crm_case(object):
         self._action(cr, uid, cases, 'draft')
         return True
         
+    def remind_partner(self, cr, uid, ids, context={}, attach=False):
+
+        """
+        @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 ids: List of Remind Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        return self.remind_user(cr, uid, ids, context, attach,
+                destination=False)
+
+    def remind_user(self, cr, uid, ids, context={}, attach=False,destination=True):
+
+        """
+        @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 ids: List of Remind user's IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        for case in self.browse(cr, uid, ids):
+            if not case.section_id.reply_to:
+                raise osv.except_osv(_('Error!'), ("Reply To is not specified in the sales team"))
+            if not case.email_from:
+                raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case"))
+            if case.section_id.reply_to and case.email_from:
+                src = case.email_from
+                dest = case.section_id.reply_to
+                body = ""
+                body = case.email_last or case.description               
+                if not destination:
+                    src, dest = dest, src
+                    if body and case.user_id.signature:
+                        body += '\n\n%s' % (case.user_id.signature)
+
+                body = self.format_body(body)
+                dest = [dest]
+
+                attach_to_send = None
+
+                if attach:
+                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', 'mailgate.thread'), ('res_id', '=', case.id)])
+                    attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname','datas'])
+                    attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
+
+                # Send an email
+                flag = tools.email_send(
+                    src,
+                    dest,
+                    "Reminder: [%s] %s" % (str(case.id), case.name, ),
+                    body,
+                    reply_to=case.section_id.reply_to,
+                    openobject_id=str(case.id),
+                    attach=attach_to_send
+                )
+                self._history(cr, uid, [case], _('Send'), history=True, email=dest, details=body, email_from=src)
+                #if flag:
+                #    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
+                #else:
+                #    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
+        return True    
+
+    def _check(self, cr, uid, ids=False, context={}):
+        """
+        Function called by the scheduler to process cases for date actions
+        Only works on not done and cancelled cases
+
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        cr.execute('select * from crm_case \
+                where (date_action_last<%s or date_action_last is null) \
+                and (date_action_next<=%s or date_action_next is null) \
+                and state not in (\'cancel\',\'done\')',
+                (time.strftime("%Y-%m-%d %H:%M:%S"),
+                    time.strftime('%Y-%m-%d %H:%M:%S')))
+
+        ids2 = map(lambda x: x[0], cr.fetchall() or [])
+        cases = self.browse(cr, uid, ids2, context)
+        return self._action(cr, uid, cases, False, context=context)
+
+    def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
+        if not context:
+            context = {}
+        context['state_to'] = state_to
+        rule_obj = self.pool.get('base.action.rule')
+        model_obj = self.pool.get('ir.model')
+        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
+        rule_ids = rule_obj.search(cr, uid, [('name','=',model_ids[0])])
+        return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
+
+    def format_body(self, body):
+        return self.pool.get('base.action.rule').format_body(body)
+
+    def format_mail(self, obj, body):
+        return self.pool.get('base.action.rule').format_mail(obj, body)
 
 class crm_case_section(osv.osv):
     """Sales Team"""
@@ -506,62 +611,6 @@ def _links_get(self, cr, uid, context=None):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-
-class crm_case_log(osv.osv):
-    """ Case Communication History """
-    _name = "crm.case.log"
-    _description = "Case Communication History"
-
-    _order = "id desc"
-    _columns = {
-        'name': fields.char('Status', size=64), 
-        'date': fields.datetime('Date'), 
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
-        'model_id': fields.many2one('ir.model', "Model"), 
-        'res_id': fields.integer('Resource ID'), 
-    }
-
-    _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
-    }
-
-crm_case_log()
-
-class crm_case_history(osv.osv):
-    """Case history"""
-
-    _name = "crm.case.history"
-    _description = "Case history"
-    _order = "id desc"
-    _inherits = {'crm.case.log': "log_id"}
-
-    def _note_get(self, cursor, user, ids, name, arg, context=None):
-        """ Gives case History Description
-        @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 ids: List of case History’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-        res = {}
-        for hist in self.browse(cursor, user, ids, context or {}):
-            res[hist.id] = (hist.email_from or '/') + ' (' + str(hist.date) + ')\n'
-            res[hist.id] += (hist.description or '')
-        return res
-
-    _columns = {
-        'description': fields.text('Description'),
-        'note': fields.function(_note_get, method=True, string="Description", type="text"),
-        'email_to': fields.char('Email To', size=84),
-        'email_from' : fields.char('Email From', size=84),
-        'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'),
-        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True),
-    }
-
-crm_case_history()
-
-
 class users(osv.osv):
     _inherit = 'res.users'
     _description = "Users"
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 82c60e64f23..3a14659672a 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -34,138 +34,24 @@ from osv.orm import except_orm
 
 import crm
 
-class case(osv.osv):
-    """ Case """
-
-    _inherit = 'mailgate.thread'
-    _description = 'case'
-
-    _columns = {
-        'date_action_last': fields.datetime('Last Action', readonly=1),
-        'date_action_next': fields.datetime('Next Action', readonly=1),
-    }
-
-    def remind_partner(self, cr, uid, ids, context={}, attach=False):
-
-        """
-        @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 ids: List of Remind Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        """
-        return self.remind_user(cr, uid, ids, context, attach,
-                destination=False)
-
-    def remind_user(self, cr, uid, ids, context={}, attach=False,destination=True):
-
-        """
-        @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 ids: List of Remind user's IDs
-        @param context: A standard dictionary for contextual values
-
-        """
-        for case in self.browse(cr, uid, ids):
-            if not case.section_id.reply_to:
-                raise osv.except_osv(_('Error!'), ("Reply To is not specified in the sales team"))
-            if not case.email_from:
-                raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case"))
-            if case.section_id.reply_to and case.email_from:
-                src = case.email_from
-                dest = case.section_id.reply_to
-                body = ""
-                body = case.email_last or case.description               
-                if not destination:
-                    src, dest = dest, src
-                    if body and case.user_id.signature:
-                        body += '\n\n%s' % (case.user_id.signature)
-
-                body = self.format_body(body)
-                dest = [dest]
-
-                attach_to_send = None
-
-                if attach:
-                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', 'mailgate.thread'), ('res_id', '=', case.id)])
-                    attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname','datas'])
-                    attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
-
-                # Send an email
-                flag = tools.email_send(
-                    src,
-                    dest,
-                    "Reminder: [%s] %s" % (str(case.id), case.name, ),
-                    body,
-                    reply_to=case.section_id.reply_to,
-                    openobject_id=str(case.id),
-                    attach=attach_to_send
-                )
-                self._history(cr, uid, [case], _('Send'), history=True, email=dest, details=body, email_from=src)
-                #if flag:
-                #    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
-                #else:
-                #    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
-        return True    
-
-    def _check(self, cr, uid, ids=False, context={}):
-        """
-        Function called by the scheduler to process cases for date actions
-        Only works on not done and cancelled cases
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        cr.execute('select * from crm_case \
-                where (date_action_last<%s or date_action_last is null) \
-                and (date_action_next<=%s or date_action_next is null) \
-                and state not in (\'cancel\',\'done\')',
-                (time.strftime("%Y-%m-%d %H:%M:%S"),
-                    time.strftime('%Y-%m-%d %H:%M:%S')))
-
-        ids2 = map(lambda x: x[0], cr.fetchall() or [])
-        cases = self.browse(cr, uid, ids2, context)
-        return self._action(cr, uid, cases, False, context=context)
-
-    def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
-        if not context:
-            context = {}
-        context['state_to'] = state_to
-        rule_obj = self.pool.get('base.action.rule')
-        model_obj = self.pool.get('ir.model')
-        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
-        rule_ids = rule_obj.search(cr, uid, [('name','=',model_ids[0])])
-        return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
-
-    def format_body(self, body):
-        return self.pool.get('base.action.rule').format_body(body)
-
-    def format_mail(self, obj, body):
-        return self.pool.get('base.action.rule').format_mail(obj, body)
-case()
-
 class base_action_rule(osv.osv):
     """ Base Action Rule """
     _inherit = 'base.action.rule'
     _description = 'Action Rules'
     
     _columns = {
-        'trg_section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'trg_max_history': fields.integer('Maximum Communication History'),
-        'trg_categ_id':  fields.many2one('crm.case.categ', 'Category'),
-        'regex_history' : fields.char('Regular Expression on Case History', size=128),
-        'act_section_id': fields.many2one('crm.case.section', 'Set Team to'),
-        'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
-        'act_mail_to_partner': fields.boolean('Mail to partner',help="Check \
-this if you want the rule to send an email to the partner."),
+        'trg_section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'trg_max_history': fields.integer('Maximum Communication History'), 
+        'trg_categ_id':  fields.many2one('crm.case.categ', 'Category'), 
+        'regex_history' : fields.char('Regular Expression on Case History', size=128), 
+        'act_section_id': fields.many2one('crm.case.section', 'Set Team to'), 
+        'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'), 
+        'act_mail_to_partner': fields.boolean('Mail to Partner', help="Check \
+this if you want the rule to send an email to the partner."), 
     }
     
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from',False), context={}):
+    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context={}):
         body = self.format_mail(obj, body)
         if not emailfrom:
             if hasattr(obj, 'user_id')  and obj.user_id and obj.user_id.address_id and obj.user_id.address_id.email:
@@ -178,7 +64,7 @@ this if you want the rule to send an email to the partner."),
         else:
             reply_to = emailfrom
         if not emailfrom:
-            raise osv.except_osv(_('Error!'),
+            raise osv.except_osv(_('Error!'), 
                     _("No E-Mail ID Found for your Company address!"))
         return tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, openobject_id=str(obj.id))
     
@@ -253,7 +139,7 @@ this if you want the rule to send an email to the partner."),
         @param context: A standard dictionary for contextual values """
 
         res = super(base_action_rule, self).state_get(cr, uid, context=context)
-        return res + [('escalate','Escalate')] + crm.AVAILABLE_STATES
+        return res + [('escalate', 'Escalate')] + crm.AVAILABLE_STATES
 
     def priority_get(self, cr, uid, context={}):
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0b970da2bca..a9e8d1c000f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -32,9 +32,10 @@ class crm_lead(osv.osv, crm_case):
     """ CRM Lead Case """
 
     _name = "crm.lead"
-    _description = "Leads Cases"
+    _description = "Lead"
     _order = "priority, id desc"
-    _inherit = ['res.partner.address', 'mailgate.thread']
+    _inherit = ['res.partner.address']
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
@@ -74,7 +75,7 @@ class crm_lead(osv.osv, crm_case):
 
                     duration = float(ans.days)
                     if lead.section_id and lead.section_id.resource_calendar_id:
-                        duration =  float(ans.days) * 24                        
+                        duration =  float(ans.days) * 24
                         new_dates = cal_obj.interval_get(cr,
                             uid,
                             lead.section_id.resource_calendar_id and lead.section_id.resource_calendar_id.id or False,
@@ -95,18 +96,23 @@ class crm_lead(osv.osv, crm_case):
 
     _columns = {
         # From crm.case
-        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+        'name': fields.char('Name', size=64), 
+        'active': fields.boolean('Active', required=False), 
+        'date_action_last': fields.datetime('Last Action', readonly=1),
+        'date_action_next': fields.datetime('Next Action', readonly=1),
+        'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'), 
+                             Define Responsible user and Email account for mail gateway.'),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'email_cc': fields.text('Watchers Emails', size=252 , help="These \
 people will receive a copy of the future communication between partner \
 and users by email"),
-        'description': fields.text('Description'), 
-        'write_date': fields.datetime('Update Date' , readonly=True), 
+        'description': fields.text('Description'),
+        'write_date': fields.datetime('Update Date' , readonly=True),
 
-        # Lead fields 
+        # Lead fields
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
@@ -117,38 +123,38 @@ and users by email"),
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),
-            
-        ],'Type', help="Type is used to separate Leads and Opportunities"),        
+
+        ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.lead')]"),
-        'user_id': fields.many2one('res.users', 'Salesman'),
+        'user_id': fields.many2one('res.users', 'Salesman',help='By Default Salesman is Administrator when create New User'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 method=True, multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="float", store=True),
-        'function_name': fields.char('Function', size=64), 
-        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+        'function_name': fields.char('Function', size=64),
+        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        }
+    }
 
     _defaults = {
-        'active': lambda *a: 1, 
-        'user_id': crm_case._get_default_user, 
-        'email_from': crm_case._get_default_email, 
-        'state': lambda *a: 'draft', 
-        'section_id': crm_case._get_section, 
+        'active': lambda *a: 1,
+        'user_id': crm_case._get_default_user,
+        'email_from': crm_case._get_default_email,
+        'state': lambda *a: 'draft',
+        'section_id': crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
-
+    
     def case_open(self, cr, uid, ids, *args):
         """Overrides cancel for crm_case for setting Open Date
         @param self: The object pointer
@@ -160,7 +166,7 @@ and users by email"),
         res = super(crm_lead, self).case_open(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
-    
+
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting close date
         @param self: The object pointer
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index d4d182a2dc5..aad27f9eb14 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -8,8 +8,9 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
+        <field name="context">{"search_default_user_id":uid,'search_default_current':1}</field>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'search_default_current':1}</field>
+        <field name="context">{'search_default_current':1, 'default_type': 'lead'}</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index aaca747e594..3fbca9d5595 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -47,7 +47,7 @@
                          name="convert_opportunity"
                          string="Convert"
                          help="Convert to Opportunity"
-                         icon="gtk-index"   
+                         icon="gtk-index"
                          type="object"/>
                     <newline />
                     <field name="section_id" colspan="1"
@@ -102,18 +102,18 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state"/>
-                        <button name="case_close" string="Close"
-                            states="open,draft,pending" type="object"
-                            icon="gtk-close" />
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
+                        <button name="case_close" string="Close"
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_pending" string="Pending"
                             states="draft,open" type="object"
                             icon="gtk-media-pause" />
+                        <button name="case_cancel" string="Cancel"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
                             groups="base.group_extended"
@@ -125,7 +125,7 @@
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
-                        <separator string="Categories" colspan="2" col="2"/>
+                        <separator string="Categorization" colspan="2" col="2"/>
                         <field name="company_id"
                             groups="base.group_multi_company"
                             widget="selection" colspan="2" />
@@ -175,7 +175,7 @@
                             <field name="email_to"/>
                             <field name="description"/>
                         </tree>
-                    </field> 
+                    </field>
                     <button colspan="2" string="Send New Email"
                         name="%(action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
@@ -197,7 +197,8 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+            <tree string="Leads Tree"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
+                <field name="date_deadline" invisible="1"/>
                 <field name="create_date"/>
                 <field name="partner_name"/>
                 <field name="name"/>
@@ -289,10 +290,6 @@
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
-                        domain="[('user_id','=',uid)]"
-                        help="My Leads" default="1"
-                    />
                     <filter icon="terp-partner"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
@@ -302,7 +299,7 @@
                     <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id','=',uid)]"
-                        help="My section"/>
+                        help="My Sale Team"/>
                     <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[]"
@@ -313,7 +310,6 @@
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <filter string="Type" icon="terp-crm" domain="[]" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Team" icon="terp-crm" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 67af5bfff16..20ae1176ca6 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -41,9 +41,10 @@ class crm_meeting(osv.osv, crm_case):
     """ CRM Meeting Cases """
 
     _name = 'crm.meeting'
-    _description = "Meeting Cases"
+    _description = "Meeting"
     _order = "id desc"
-    _inherit = ["mailgate.thread", "calendar.event"]
+    _inherit = ["calendar.event"]
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     _columns = {
         # From crm.case
@@ -58,6 +59,7 @@ class crm_meeting(osv.osv, crm_case):
         'id': fields.integer('ID'),
 
         # Meeting fields
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
                         domain="[('object_id.model', '=', 'crm.meeting')]", \
             ),
@@ -157,6 +159,22 @@ class calendar_attendee(osv.osv):
 
 calendar_attendee()
 
+class res_users(osv.osv):
+    _name = 'res.users'
+    _inherit = 'res.users'
+
+    def create(self, cr, uid, data, context={}):
+        user_id = super(res_users, self).create(cr, uid, data, context)
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'ir_ui_view_sc_calendar0')
+        view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+        copy_id = self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+                                    'user_id': user_id}, context=context)
+        return user_id
+
+res_users()
+
+
 class res_partner(osv.osv):
     """ Inherits partner and adds meetings information in the partner form """
     _inherit = 'res.partner'
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3f8e1bd1fde..aaae9541613 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -50,7 +50,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{'search_default_current':1}</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
 
@@ -110,7 +110,8 @@
 
     <menuitem id="menu_attendee_invitations"
 			name="Meeting Invitations" parent="crm.menu_meeting_sale"
-			sequence="10" action="action_view_attendee_form" />
+			sequence="10" action="action_view_attendee_form"
+			groups="base.group_extended" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 6712ffe23ce..ac61809cfad 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,18 +24,18 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Meetings">
-               	<group col="6" colspan="4">
+                <group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
-                        colspan="2" />
+                    	required="1" colspan="2" />
                     <field name="categ_id" widget="selection"
                         string="Meeting Type"
                         groups="base.group_extended"
                         domain="[('object_id.model', '=', 'crm.meeting')]" />
-					<field name="allday" colspan="2" on_change="onchange_allday(allday)" />
-					<field name="date" string="Start Date" required="1"
-                        on_change="onchange_dates(date,duration,False)" />
+                    <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
+                    <field name="date" string="Start Date" required="1"
+                        on_change="onchange_dates(date,duration,False,allday)" />
                     <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False)" />
+                        on_change="onchange_dates(date,duration,False,allday)" />
                     <field name="date_deadline" string="End Date"
                         required="1"
                         on_change="onchange_dates(date,False,date_deadline)" />
@@ -50,6 +50,10 @@
                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
+                           <button string="ExRule"
+       		name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+       		context="{'model' : 'crm.meeting'}"
+       		attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@@ -213,7 +217,6 @@
                 <field name="partner_id" string="Partner" />
                 <field name="date" string="Meeting Date" />
                 <field name="duration" />
-                <field name="user_id" />
                 <field name="state"/>
             </tree>
         </field>
@@ -260,25 +263,21 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
-                       		<filter icon="terp-project" name="current" string="Current"
-	                           domain="[('state','in',('draft', 'open'))]"
-	                           help="Current Meetings"/>
-                           <filter icon="terp-partner" string="My Meetings"
-                               domain="[('user_id','=',uid)]"
-                               help="My Meetings" />
+                           <filter icon="terp-project" name="current" string="Current"
+                                domain="[('state','in',('draft', 'open'))]"
+                                help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
-                           <field name="section_id"
-                               select="1" widget="selection">
+                           <field name="section_id" select="1" widget="selection">
                                <filter icon="terp-crm"
                                    domain="[('section_id','=',context.get('section_id',False))]"
-                                   help="My section" />
+                                   help="My Sale Team" />
                            </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                        <newline/>
-						<group expand="0" string="Group By..." colspan="16">
+					   	<group expand="0" string="Group By..." colspan="16">
 							<filter string="Date" icon="terp-project"
 						        domain="[]" context="{'group_by':'date'}" />
 						    <filter string="Privacy" icon="terp-crm"
@@ -324,7 +323,7 @@
                     </field>
                 </field>
         </record>
-        
+
         <!--  Partners inherited form -->
 
 		<record id="view_meeting_partner_info_form" model="ir.ui.view">
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 308954c297d..3bc9fdd6d81 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -36,12 +36,10 @@ AVAILABLE_STATES = [
 
 class crm_opportunity(osv.osv):
     """ Opportunity Cases """
-
     _name = "crm.lead"
-    _description = "Opportunity Cases"
+    _description = "Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = 'crm.lead'
-
     _columns = {
         # From crm.case
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
@@ -56,7 +54,6 @@ class crm_opportunity(osv.osv):
         'date_deadline': fields.date('Expected Closing'),
         'date_action': fields.date('Next Action'),
          }
-    
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting probability and close date
         @param self: The object pointer
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index cfce1a6aa9a..737e6ac633d 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -2,16 +2,6 @@
 <openerp>
 <data noupdate="1">
 
-	 <act_window
-            id="act_crm_opportunity_crm_meeting_new"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="crm.lead"
-            view_mode="tree,form,calendar,"
-            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-            domain="[('user_id','=',uid), ('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
 	 <act_window
             id="act_crm_opportunity_crm_phonecall_new"
             name="Phone calls"
@@ -22,13 +12,24 @@
             domain="[('user_id','=',uid),('opportunity_id', '=', active_id)]"
             view_type="form"/>
 
+	<act_window
+            id="act_crm_opportunity_crm_meeting_new"
+            name="Meetings"
+            res_model="crm.meeting"
+            src_model="crm.lead"
+            view_mode="tree,form,calendar,"
+            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+            domain="[('user_id','=',uid), ('opportunity_id', '=', active_id)]"
+            view_type="form"/>
+
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
           <field name="view_mode">tree,form,graph</field>
           <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_current':1}</field>
+          <field name="context">{'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
+          <field name="context">{"search_default_user_id":uid}</field>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 7594eb09361..3ce0ce788f6 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -56,7 +56,7 @@
         <field name="arch" type="xml">
             <form string="Opportunities">
                 <group colspan="4" col="7">
-                    <field name="name" string="Opportunity"/>
+                    <field name="name"  required="1" string="Opportunity"/>
                     <label string="Stage:" align="1.0"/>
                     <group colspan="1" col="4">
                         <field name="stage_id" nolabel="1"
@@ -115,57 +115,25 @@
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
+                        <button name="case_pending" string="Pending"
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
                             groups="base.group_extended"
                             icon="gtk-go-up" />
-                        <button name="case_pending" string="Pending"
-                            states="draft,open" type="object"
-                            icon="gtk-media-pause" />
+                        <button name="case_cancel" string="Mark Lost"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_close" string="Mark Won"
                             states="open,draft,pending" type="object"
                             icon="gtk-apply" />
-                        <button name="case_cancel" string="Mark Lost"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
                         <button name="case_reset" string="Reset to New"
                             states="done,cancel" type="object"
                             icon="gtk-convert" />
                     </group>
                 </page>
 
-                <page string="History" groups="base.group_extended">
-                    <group col="2" colspan="2">
-                        <separator string="Dates" colspan="2"/>
-                        <field name="create_date"/>
-                        <field name="write_date"/>
-                        <field name="date_closed"/>
-                        <field name="date_open"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open"/>
-                        <field name="day_close"/>
-                        <field name="referred"/>
-                    </group>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                    	 <tree string="Logs">
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </tree>
-                        <form string="Logs">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </form>
-                    </field>
-                </page>
                  <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -199,6 +167,38 @@
                                name="%(crm_lead_forward_to_partner_act)d"
                                icon="gtk-go-forward" type="action" />
                  </page>
+                <page string="History" groups="base.group_extended">
+                    <group col="2" colspan="2">
+                        <separator string="Dates" colspan="2"/>
+                        <field name="create_date"/>
+                        <field name="write_date"/>
+                        <field name="date_closed"/>
+                        <field name="date_open"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Misc" colspan="2"/>
+                        <field name="active"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
+                        <field name="referred"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref"/>
+                    <field name="ref2"/>
+                    <field name="log_ids" nolabel="1" colspan="4">
+                    	 <tree string="Logs">
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </tree>
+                        <form string="Logs">
+                            <separator string="Action Information" colspan="4"/>
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </form>
+                    </field>
+                </page>
                 </notebook>
             </form>
         </field>
@@ -211,12 +211,13 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel','done')">
+            <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
+                <field name="date_deadline" invisible="1"/>
                 <field name="create_date"/>
                 <field name="name" string="Opportunity"/>
                 <field name="partner_id"/>
                 <field name="stage_id"/>
-                <field name="categ_id" invisible="1"/>
+                <field name="categ_id" invisible="1" groups="base.group_extended"/>
                 <button name="stage_previous" string="Previous"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
@@ -234,7 +235,7 @@
                     icon="gtk-go-forward" />
                 <button name="case_close" string="Won"
                     states="open,draft,pending" type="object"
-                    icon="gtk-close" />
+                    icon="gtk-apply" />
                 <button name="case_pending" string="Pending"
                     states="open,draft" type="object"
                     icon="gtk-media-pause" />
@@ -295,7 +296,7 @@
                         help="My Opportunities" default="1"
                     />
                     <filter icon="terp-partner"
-                        domain="[('user_id','=', False)]"
+                        domain="[('user_id','=', uid)]"
                         help="Unassigned Opportunities" />
                 </field>
                 <field name="section_id"
@@ -303,7 +304,7 @@
                     widget="selection">
                     <filter icon="terp-crm"
                         domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My section" />
+                        help="My Sale Team" />
                 </field>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="16">
@@ -315,8 +316,6 @@
                         domain="[]" context="{'group_by':'categ_id'}" />
 
                     <separator orientation="vertical" />
-                    <filter string="Partner" icon="terp-crm" domain="[]"
-                        context="{'group_by':'partner_id'}" />
                     <filter string="Salesman" icon="terp-crm"
                         domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
                     <separator orientation="vertical" />
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 6244ba1807a..7131a3730d2 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -29,12 +29,15 @@ class crm_phonecall(osv.osv, crm_case):
     """ Phonecall Cases """
 
     _name = "crm.phonecall"
-    _description = "Phonecall Cases"
+    _description = "Phonecall"
     _order = "id desc"
-    _inherit = 'mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     _columns = {
         # From crm.case
+        'name': fields.char('Name', size=64),
+        'active': fields.boolean('Active', required=False), 
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'), 
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 916cd5f64f3..a5caf10b673 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -10,6 +10,7 @@
         view_mode="calendar,tree,form"
         context="{'default_partner_id': active_id, 'default_duration': 1.0}"
         domain="[('partner_id', '=', active_id)]"
+        groups="base.group_extended"
         />
 
 <!-- PHONE CALLS (menu)  -->
@@ -20,6 +21,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3bfa284b017..a72a8df9de8 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -263,9 +263,6 @@
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner"
-                       domain="[('user_id','=',uid)]" help="My Phonecalls"
-                       default="1" />
                    <filter icon="terp-partner"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
@@ -274,7 +271,7 @@
                    select="1" widget="selection" string="Sales Team">
                    <filter icon="terp-crm"
                        domain="[('section_id','=',context.get('section_id',False))]"
-                       help="My section" />
+                       help="My Sale Team" />
                </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 63454ad2848..79e1fc3496b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -16,30 +16,28 @@
             <field name="arch" type="xml">
                 <form string="Sales Team">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" select="1" colspan="2"/>
+                        <field name="parent_id" select="2" widget="selection"/>
                         <field name="code" select="1"/>
                         <newline/>
-                        <field name="resource_calendar_id" select="2"/>
+                        <field name="user_id" select="2"/>
+                        <field name="resource_calendar_id" select="2" widget="selection"/>
+                        <field name="active" select="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Team">
                             <group col="2" colspan="1">
-                                <separator string="Responsible" colspan="2"/>
-                                <field name="parent_id" select="2" widget="selection"/>
-                                <field name="user_id" select="2"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <separator string="Contact Information" colspan="2"/>
+                                <separator string="Mailgateway" colspan="2"/>
                                 <field name="reply_to" select="2"/>
                             </group>
                             <group col="2" colspan="1">
-                                <separator string="Sales Team Property" colspan="2"/>
-                                <field name="active" select="2"/>
+                                <separator string="Configuration" colspan="2"/>
                                 <field name="allow_unlink" select="2"/>
                             </group>
-                            <separator string="Members List" colspan="4"/>
+                            <separator string="Team Members" colspan="4"/>
                             <field name="member_ids" nolabel="1" colspan="4"/>
-                            <separator string="Note" colspan="4"/>
+                        </page>
+                        <page string="Notes">
                             <field name="note" select="1" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
@@ -121,7 +119,6 @@
 
         <menuitem  id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration" groups="base.group_extended"/>
 
-
 <!-- Case Categories Form View -->
 
         <record id="crm_case_categ-view" model="ir.ui.view">
@@ -235,318 +232,6 @@
             </field>
         </record>
 
-<!--Case History Tree View  -->
-
-        <record id="crm_case_history_tree-view" model="ir.ui.view">
-            <field name="name">crm.case.history.tree</field>
-            <field name="model">crm.case.history</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Case History">
-                    <field name="date"/>
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <!--
-                    <field name="som"/>
-                    <field name="canal_id"/>
-                    -->
-                </tree>
-            </field>
-        </record>
-
-<!-- Case Calendar View  -->
-
-        <record id="crm_case_calendar-view" model="ir.ui.view">
-            <field name="name">crm.case.calendar</field>
-            <field name="model">mailgate.thread</field>
-            <field name="type">calendar</field>
-            <field name="arch" type="xml">
-                <calendar color="user_id" date_start="create_date"
-                    date_stop="date_deadline" day_length="12"
-                    string="Cases">
-                    <field name="name" />
-                    <field name="partner_id" />
-                    <field name="state" />
-                </calendar>
-            </field>
-        </record>
-
-<!-- Case Tree View  -->
-
-        <record id="crm_case_tree-view" model="ir.ui.view">
-            <field name="name">crm.case.tree</field>
-            <field name="model">mailgate.thread</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="red:date_deadline&lt;current_date and state=='open';black:state in ('draft', 'cancel','done','pending')" string="Cases">
-                    <field name="id"/>
-                    <field name="section_id"/>
-                    <field name="create_date"/>
-                    <field name="date_deadline"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="state"/>
-                    <button name="case_close"
-                        states="open,draft,pending" string="Close"
-                        type="object" icon="gtk-close" />
-                    <button name="case_open" states="draft,pending"
-                        string="Open" type="object" icon="gtk-go-forward" />
-                    <button name="case_cancel"
-                        states="draft,open,pending" string="Cancel"
-                        type="object" icon="gtk-cancel" />
-                    <button name="case_pending" states="draft,open"
-                        string="Pending" type="object"
-                        icon="gtk-media-pause" />
-                    <button name="case_escalate"
-                        states="open,draft,pending" string="Escalate"
-                        groups="base.group_extended"
-                        type="object" icon="gtk-go-up" />
-                    <button name="case_reset" states="done,cancel"
-                        string="Reset to Draft" type="object"
-                        icon="gtk-convert" />
-                </tree>
-            </field>
-        </record>
-
-<!-- Case Form View  -->
-
-        <record id="crm_case-view" model="ir.ui.view">
-            <field name="name">crm.case.form</field>
-            <field name="model">mailgate.thread</field>
-            <field name="type">form</field>
-            <field name="priority" eval="1"/>
-            <field name="arch" type="xml">
-                <form string="Cases">
-                    <field colspan="4" name="name" select="1"/>
-                    <field colspan="2" name="section_id" widget="selection"/>
-                    <field name="create_date" select="1"/>
-                    <field name="date_deadline"/>
-                    <newline />
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group col="8" colspan="4">
-                                <field colspan="4" name="partner_id"
-                                    on_change="onchange_partner_id(partner_id, email_from)"
-                                    select="1" />
-                                <field colspan="3"
-                                    name="partner_address_id"
-                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                    />
-                                <newline />
-                                <field colspan="3" name="email_from"
-                                    />
-                                <button name="remind_partner"
-                                    states="open,pending"
-                                    string="Send Reminder" type="object"
-                                    icon="gtk-go-forward" />
-                                <field name="user_id" select="1" />
-                                <button name="remind_user"
-                                    states="open,pending"
-                                    string="Send Reminder" type="object"
-                                    icon="gtk-go-forward" />
-                            </group>
-                            <separator colspan="4" string="Description"/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state" select="1"/>
-                                <button name="case_close"
-                                    states="open,draft,pending"
-                                    string="Close" type="object"
-                                    icon="gtk-close" />
-                                <button name="case_open"
-                                    states="draft,pending" string="Open"
-                                    type="object" icon="gtk-go-forward" />
-                                <button name="case_cancel"
-                                    states="draft,open,pending"
-                                    string="Cancel" type="object"
-                                    icon="gtk-cancel" />
-                                <button name="case_pending"
-                                    states="draft,open" string="Pending"
-                                    type="object" icon="gtk-media-pause" />
-                                <button name="case_escalate"
-                                    states="open,draft,pending"
-                                    string="Escalate" type="object"
-                                    groups="base.group_extended"
-                                    icon="gtk-go-up" />
-                                <button name="case_reset"
-                                    states="done,cancel"
-                                    string="Reset to Draft" type="object"
-                                    icon="gtk-convert" />
-                            </group>
-                        </page>
-                        <page string="History" groups="base.group_extended">
-                            <field name="id" select="1"/>
-                            <field name="active"/>
-                            <separator colspan="4" string="Dates"/>
-                            <field name="create_date"/>
-                            <field colspan="4" name="log_ids" nolabel="1">
-                                <form string="Actions">
-                                    <separator colspan="4" string="Action Information"/>
-                                    <field colspan="4" name="name"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Emails" groups="base.group_extended">
-                           <group colspan="4">
-                               <field colspan="4" name="email_cc" string="CC"/>
-                           </group>
-                           <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                               <form string="Communication history">
-                                   <group col="6" colspan="4">
-                                       <field name="date"/>
-                                       <field name="email_to"/>
-                                       <field name="email_from"/>
-                                   </group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.case'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.case'}"
-                               icon="gtk-go-forward" type="action" />
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-<!-- Case Search View  -->
-
-		
-        <record id="view_crm_case_filter" model="ir.ui.view">
-            <field name="name">crm.case.select</field>
-            <field name="model">mailgate.thread</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Case">
-                    <group col='6' colspan='4'>
-                        <filter icon="terp-partner" string="My Cases"
-                            domain="[('user_id','=',uid)]" separator="1"
-                            default="1" help="Cases Related to Current User" />
-                        <field name="state" select="1">
-                            <filter icon="gtk-new"
-                                domain="[('state','in',('draft', 'open'))]"
-                                help="Current Cases" />
-                            <filter icon="gtk-yes"
-                                domain="[('state','=','open')]" help="Open Cases" />
-                            <filter icon="gtk-media-pause"
-                                domain="[('state','=','pending')]"
-                                help="Pending Cases" />
-                        </field>
-                        <separator orientation="vertical" />
-                        <field name="name" select='1' />
-                        <field name="user_id" select="1"
-                            widget="selection" />
-                    </group>
-                    <field name="section_id"
-                        default="context.get('section_id', False)" select="1"
-                        widget="selection"/>
-                </search>
-            </field>
-        </record>
-
-        <record id="crm_case_categ0-act" model="ir.actions.act_window">
-            <field name="name">Cases</field>
-            <field name="res_model">mailgate.thread</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm_case_tree-view"/>
-            <field name="search_view_id" ref="view_crm_case_filter"/>
-        </record>
-
-        <record id="crm_case_categ0-act_open" model="ir.actions.act_window">
-            <field name="name">Open Cases</field>
-            <field name="res_model">mailgate.thread</field>
-            <field name="view_type">form</field>
-            <field name="domain">
-                [('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
-            </field>
-            <field name="search_view_id" ref="view_crm_case_filter"/>
-        </record>
-
-        <record id="crm_case_section_open_act" model="ir.actions.act_window">
-            <field name="name">Cases</field>
-            <field name="res_model">mailgate.thread</field>
-            <field name="domain">[('section_id','child_of',[active_id])]</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar</field>
-        </record>
-        <record id="ir_open_section_case" model="ir.values">
-            <field eval="'tree_but_open'" name="key2"/>
-            <field eval="'crm.case.section'" name="model"/>
-            <field name="name">Open Cases</field>
-            <field eval="'ir.actions.act_window,%d'%crm_case_section_open_act" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-
-<!--Case History Form View  -->
-
-        <record id="crm_case_history-view" model="ir.ui.view">
-            <field name="name">crm.case.history.form</field>
-            <field name="model">crm.case.history</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Cases">
-                    <separator colspan="4" string="Case Description"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="model_id"/>
-                    <field name="res_id"/>
-                    <field name="som"/>
-                    <field name="canal_id"/>
-                    <field colspan="4" name="description"/>
-                </form>
-            </field>
-        </record>
-
-<!--Case History Search View  -->
-
-        <record id="crm_case_history_search" model="ir.ui.view">
-        <field name="name">crm.case.history.select</field>
-        <field name="model">crm.case.history</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-                <search string="Search Histories">
-                       <filter icon="terp-crm" string="My Histories"
-                           domain="[('user_id','=',uid)]"
-                           help="My Histories" />
-                       <separator orientation="vertical"/>
-                     <group col="6" colspan="2">
-                       <field name="date" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
-                    <field name="section_id"
-                        default="context.get('section_id', False)"
-                        select="1" widget="selection"/>
-                     </group>
-                </search>
-            </field>
-        </record>
-
-<!--Case History Action -->
-
-        <record id="crm_case_history-act" model="ir.actions.act_window">
-            <field name="name">Histories</field>
-            <field name="res_model">crm.case.history</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="crm_case_history_tree-view"/>
-            <field name="search_view_id" ref="crm_case_history_search"/>
-        </record>
 
 <!-- Segmentation line Tree View  -->
 
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index aaf1103bcd8..d0b526f542e 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 9a00ef01bb0..00d2f7958e5 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-02-24 10:59+0000\n"
-"Last-Translator: Carlo Vettore <Unknown>\n"
+"PO-Revision-Date: 2010-05-21 06:51+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-04-17 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -2506,7 +2506,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr "Riunione del cliente"
+msgstr "Riunione con il cliente"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 285b5cc25b8..a0d430695ac 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-05-14 20:14+0000\n"
+"PO-Revision-Date: 2010-05-21 17:59+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-05-15 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -33,6 +33,7 @@ msgstr ""
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
 msgstr ""
+"Zaznacz, jeśli chcesz aby reguła wysłała wiadomość do osoby odpowiedzialnej."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -42,12 +43,12 @@ msgstr "Tytuł"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Sprawy wg sekcji i kategorii"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr "Zamknij ślad"
+msgstr "Zamknij sygnał"
 
 #. module: crm
 #: view:crm.job:0
@@ -60,12 +61,12 @@ msgstr "    7 Dni    "
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Zarządza usługą Helpdesku."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr "Zadania Oczekujące"
+msgstr "Wstrzymane prace"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
@@ -80,7 +81,7 @@ msgstr "Planowane koszty"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Zamknij zgłoszenie pracy"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -95,7 +96,7 @@ msgstr "Nazwa etapu"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
-msgstr "Przypadki"
+msgstr "Sprawy"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -114,7 +115,7 @@ msgstr "Zasoby ludzkie"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Sprawy wg szans, kategorii i typów"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
@@ -122,24 +123,24 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
-"Zarządza skargami dostawców i klientów, wliczając twoje działania naprawcze "
-"i prewencyjne."
+"Zarządza reklamacjami dostawców i klientów, oraz twoimi działaniami "
+"naprawczymi i prewencyjnymi."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr "Ilość"
+msgstr "Kwota"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Spotkanie albo rozmowa telefoniczna w sprawie szansy"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Naprawione"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -164,13 +165,13 @@ msgstr "Kampania"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr "Szukaj w Okazjach"
+msgstr "Szukaj szans"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr "Przypadki w Sekcjach i Etapach"
+msgstr "Sprawy wg sekcji i etapów"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
@@ -198,8 +199,8 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
-"Sekcja do której należy Przypadek. Zdefiniuj odpowiedzialnego użytkownika "
-"oraz konto Email dla bramy pocztowej."
+"Sekcja do której należy Sprawa. Zdefiniuj odpowiedzialnego użytkownika oraz "
+"konto Email dla bramy pocztowej."
 
 #. module: crm
 #: view:crm.case:0
@@ -228,7 +229,7 @@ msgstr "Partner"
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr ""
+msgstr "Sekcja sprawy"
 
 #. module: crm
 #: view:crm.job:0
@@ -238,7 +239,7 @@ msgstr "Proponowane wynagrodzenie"
 #. module: crm
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
-msgstr ""
+msgstr "Ustala kolejność wyświetlania listy sekcji spraw."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -251,12 +252,12 @@ msgstr "Rozmowa telefoniczna"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr "Zdarzenia wg sekcji i etapów"
+msgstr "Sprawy wg sekcji i etapów"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
 msgid "Mail to these emails"
-msgstr ""
+msgstr "Wyślij wiadomości do tych adresów email."
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -298,7 +299,7 @@ msgstr "Sekcje"
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
 msgstr ""
-"Ścieżki zidentyfikowanych okazji biznesowych dla twoich kanałów sprzedaży."
+"Śledzi zidentyfikowane szanse biznesowe dla twoich kanałów sprzedaży."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -313,7 +314,7 @@ msgstr "Data ostatniej akcji"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Ocena"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
@@ -335,7 +336,7 @@ msgstr "Kategorie"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uwaga!"
 
 #. module: crm
 #: view:crm.case:0
@@ -377,7 +378,7 @@ msgstr "Połączenie do istniejącego partnera"
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Typ opóźnienia"
 
 #. module: crm
 #: view:crm.claim:0
@@ -397,7 +398,7 @@ msgstr "Następna rozmowa kwalifikacyjna"
 #. module: crm
 #: field:crm.case.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Wyrażenie regularne dla historii sprawy"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
@@ -407,7 +408,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Spotkanie szansy"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -416,22 +417,24 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
 msgstr ""
+"Kanały są różnymi, dostępnymi trybami komunikacji z klientem. Do każdej "
+"szansy możesz dowiązać kanał, który jest jej źródłem."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Reguły wyjątku"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
-msgstr ""
+msgstr "Szanse biznesowe"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Zaakceptowano jako reklamację"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -439,6 +442,8 @@ msgid ""
 "The rule use a AND operator. The case must match all non empty fields so "
 "that the rule execute the action described in the 'Actions' tab."
 msgstr ""
+"Reguła stosuje operator I. Sprawa musi pasować do wszystkich niepustych pól, "
+"aby została wykonana akcja zapisana w zakładce 'Akcje'."
 
 #. module: crm
 #: field:crm.case,history_line:0
@@ -488,7 +493,7 @@ msgstr "Kategoria"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i etapów"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -520,7 +525,7 @@ msgstr "Informacja o akcji"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user_phone)s = Responsible phone"
-msgstr ""
+msgstr "%(case_user_phone)s = Telefon odpowiedzialnego"
 
 #. module: crm
 #: constraint:ir.model:0
@@ -543,7 +548,7 @@ msgstr "Warunki"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr "Otwarte przypadki"
+msgstr "Otwarte sprawy"
 
 #. module: crm
 #: field:crm.case.log,name:0
@@ -560,7 +565,7 @@ msgstr "Stan"
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Utwórz szansę"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -585,7 +590,7 @@ msgstr "Drzewo spotkań"
 #: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Przekaż"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
@@ -601,7 +606,7 @@ msgstr "Zarządzanie relacjami z klientami i dostawcami"
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Dodaj DW"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -614,12 +619,12 @@ msgstr "Czerwiec"
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "Domyślne (0=Nic)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Odrzucone przez firmę"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
@@ -642,17 +647,17 @@ msgstr "Październik"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Propozycja wartości"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_id)s = Case ID"
-msgstr ""
+msgstr "%(case_id)s = ID sprawy"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Nowy biznes"
 
 #. module: crm
 #: help:crm.case,email_from:0
@@ -681,7 +686,7 @@ msgstr "Opis rozmowy telefonicznej"
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "Kategoria przypadku"
+msgstr "Kategoria sprawy"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -696,7 +701,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Reklamacja postępowania"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -706,8 +711,8 @@ msgstr ""
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
-"Musisz zdefiniować użytkownika odpowiedzialnego za zdarzenie, aby zastosować "
-"tę akcję!"
+"Musisz zdefiniować użytkownika odpowiedzialnego za sprawę, aby zastosować tę "
+"akcję!"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -735,7 +740,7 @@ msgstr "Praca - proces zatrudnienia"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr "Zdarzenia związane"
+msgstr "Sprawy powiązane"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -758,7 +763,7 @@ msgstr "Historia komunikacji"
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Nowe reklamacje"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -768,23 +773,23 @@ msgstr "Formularz spotkań"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Negocjacje/Przegląd"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Partner jest już zdefiniowany dla tej rozmowy."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr "Zdarzenia wg szans i etapów"
+msgstr "Sprawy wg szans i etapów"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Data reklamacji"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -820,7 +825,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Istniejący biznes"
 
 #. module: crm
 #: field:crm.case,probability:0
@@ -831,7 +836,7 @@ msgstr "Prawdopodobieństwo (%)"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr "Zdarzenia - sygnały"
+msgstr "Sprawy - sygnały"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -839,12 +844,14 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 "cases in this section"
 msgstr ""
+"Adres umieszczony w 'Reply-To' ('Odpowiedz na adres') dla wszystkich "
+"wiadomości wysłanych przez OpenERP w sprawach z tej sekcji"
 
 #. module: crm
 #: view:crm.case.rule:0
 #: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
-msgstr "Reguła zdarzenia"
+msgstr "Reguła sprawy"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -856,7 +863,7 @@ msgstr "Reguła zdarzenia"
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Szansa"
 
 #. module: crm
 #: view:crm.case:0
@@ -866,7 +873,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Wiadomości e-mail"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
@@ -881,18 +888,18 @@ msgstr "Zatrzymaj proces"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Reklamacja rzeczowa"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Przeszukaj rozmowy"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Dalej"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -907,13 +914,13 @@ msgstr "Wartość"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Zapisz w formacie .ics"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -922,6 +929,9 @@ msgid ""
 "criterions. If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Zaznacz to, jeśli kategoria ma być ograniczona do partnerów odpowiadających "
+"kryteriom segmentacji. Jeśli zaznaczone, to usuń kategorię z partnerów, "
+"którzy nie odpowiadają kryteriom segmentacji."
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -959,7 +969,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on States"
-msgstr ""
+msgstr "Warunki stanów"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_type:0
@@ -969,12 +979,12 @@ msgstr "Data wyzwolenia"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Search Histories"
-msgstr ""
+msgstr "Przeszukuj historie"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
-msgstr ""
+msgstr "Ustala kolejność wyświetlania listy etapów spraw."
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support3
@@ -982,7 +992,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Szanse"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -1008,7 +1018,7 @@ msgstr "Kwota zakupów"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "Kierunek"
 
 #. module: crm
 #: help:crm.case,email_cc:0
@@ -1024,12 +1034,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Akcja serwera do wykonania"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_rule-act
@@ -1041,18 +1051,18 @@ msgstr "Reguły"
 #: wizard_view:crm.job.meeting_set,init:0
 #: wizard_view:crm.phonecall.meeting_set,init:0
 msgid "Plan Meeting"
-msgstr ""
+msgstr "Zaplanuj spotkanie"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Ustaw stan na"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Nie ma wiadomości do odpowiedzi"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1062,7 +1072,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Utwórz partnera"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1072,17 +1082,17 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_description)s = Case description"
-msgstr ""
+msgstr "%(case_description)s = Opis sprawy"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Moje fundusze"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Tel. komórkowy"
 
 #. module: crm
 #: field:crm.case.rule,name:0
@@ -1098,27 +1108,27 @@ msgstr "Planowane koszty"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_history
 msgid "Case history"
-msgstr ""
+msgstr "Historia sprawy"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Młodszy inżynier"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Moje spotkania"
 
 #. module: crm
 #: field:crm.case.categ,name:0
 msgid "Case Category Name"
-msgstr ""
+msgstr "Nazwa kategorii sprawy"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Prewencyjnie"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1128,7 +1138,7 @@ msgstr "Dodaj obserwatorów (DW)"
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Eksportuj ICS"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -1138,13 +1148,14 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "Nie możesz przypisać do zamkniętej sprawy"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
+"Zaznacz, jeśli chcesz aby reguła wysyłała przypomnienie mailem do partnera."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
@@ -1154,12 +1165,12 @@ msgstr ""
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Spotkania"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Fields"
-msgstr ""
+msgstr "Warunki na pola sprawy"
 
 #. module: crm
 #: field:crm.case,date_action_next:0
@@ -1179,27 +1190,27 @@ msgstr "Ostateczny czas ukończenia"
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Anuluj"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nazwa kategorii"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Segmentacja partnera"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "Reguła rekurencyjna"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of case"
-msgstr "Kategoria przypadku"
+msgstr "Kategoria sprawy"
 
 #. module: crm
 #: field:crm.email.add.cc,subject:0
@@ -1208,12 +1219,12 @@ msgstr "Kategoria przypadku"
 #: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Temat"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr ""
+msgstr "Uczestnicy"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1243,31 +1254,50 @@ msgid ""
 "The CRM module has a email gateway for the synchronisation interface\n"
 "between mails and Open ERP."
 msgstr ""
+"Podstawowy moduł Zarządzania Relacjami z Klientami (CRM) Open ERP\n"
+"pozwala grupie ludzi inteligentnie i efektywnie zarządzać sygnałami, "
+"szansami,\n"
+"zadaniami, problemami, zgłoszeniami, błędami, reklamacjami, kampaniami itp.\n"
+"Moduł zarządza kluczowymi dziedzinami jak komunikacja, identyfikacja, \n"
+"priorytezacja, powiązania i powiadamianie.\n"
+"\n"
+"OpenERP zapewnia, że sprawy są skutecznie obsługiwane przez \n"
+"użytkowników, klientów i dostawców. System automatycznie wysyła \n"
+"przypomnienia, przekazuje odpowiedzialność, wysyła zgłoszenia, wyzwala\n"
+"specjalne metody i wykonuje inne akcje na podstawie twoich własnych reguł.\n"
+"\n"
+"Najważniejszą cechą systemu jest, że klient nie musi wykonywać żadnych \n"
+"specjalnych czynności. Wystarczy, że wyśle wiadomość do centrum zgłoszeń.\n"
+"OpenERP podziękuje za wiadomość, przekieruje ją do odpowiednich osób i \n"
+"zapewni, że cała przyszła korespondencja trafi w odpowiednie miejsce.\n"
+"\n"
+"Moduł CRM zawiera bramę korespondencyjną do łączenia OpenERP z \n"
+"systemem pocztowym."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Partner potencjalny jest konwertowany do partnera biznesowego."
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Case Name"
-msgstr ""
+msgstr "Wyrażenie regularne dla nazwy sprawy"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "Oczekujące reklamacje"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Sprawy wg szans, kategorii i etapów"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Drukuj"
 
 #. module: crm
 #: field:crm.case,som:0
@@ -1282,12 +1312,12 @@ msgstr "Stan emocji"
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Refused"
-msgstr ""
+msgstr "Kandydat odrzucony"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1317,7 +1347,7 @@ msgstr "Data utworzenia"
 #: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Spotkanie"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1338,12 +1368,12 @@ msgstr "Przywróć do projektu"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
 msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i kategorii2"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
 msgid "Closed Won"
-msgstr ""
+msgstr "Zamknięte z sukcesem"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1352,7 +1382,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.act_res_partner_canal_2_crm_case_opened
 #: model:ir.actions.act_window,name:crm.act_res_users_2_crm_case_opened
 msgid "Open cases"
-msgstr "Otwarte praypadki"
+msgstr "Otwarte sprawy"
 
 #. module: crm
 #: field:crm.case,stage_id:0
@@ -1362,7 +1392,7 @@ msgstr "Otwarte praypadki"
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etap"
 
 #. module: crm
 #: constraint:ir.ui.view:0
@@ -1375,48 +1405,51 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "section without removing it."
 msgstr ""
+"Jeśli pole aktywne jest ustawione na true (prawda), to będziesz mógł ukryć "
+"sekcję sprawy bez jej usuwania."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Nauka i edukacja"
 
 #. module: crm
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this phonecall ?"
 msgstr ""
+"Jesteś pewien, że chcesz utworzyć partnera na podstawie tej rozmowy ?"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Etapy"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Spodziewany dochód"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Data spotkania"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Partner"
-msgstr ""
+msgstr "Konwertuj do partnera"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "Następne spotkania"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1427,32 +1460,32 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr ""
+msgstr "Nie możesz usunąć tej sprawy. Powinieneś ją raczej anulować."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subskrybuj"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
 msgid "Minimum Priority"
-msgstr ""
+msgstr "Minimalny priorytet"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
 msgid "Meeting Generic Wizard"
-msgstr ""
+msgstr "Podstawowy kreator spotkań"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Reklamacje wartości"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "Wiadomość..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
@@ -1462,19 +1495,19 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Sprawy wg sekcji i kategorii2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr "wykonano"
+msgstr ""
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "Przypomnienie"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1482,28 +1515,30 @@ msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
 msgstr ""
+"Zaznacz, jeśli chcesz stosować tę zakładkę jako część reguły segmentacji. "
+"Jeśli nie zaznaczone, to kryteria poniżej zostaną zignorowane."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr "otwarty"
+msgstr ""
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
 msgid "Remind with attachment"
-msgstr ""
+msgstr "Przpomnij z załącznikiem"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "Strona WWW"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
 msgid "Remind responsible"
-msgstr ""
+msgstr "Przpomnij odpowiedzialnym"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1516,23 +1551,25 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Pomaga organizować proces zatrudniania: ocena, spotkania, integracja "
+"wiadomości..."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Fundusze"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr "projekt"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Oczekuje na odpowiedź"
 
 #. module: crm
 #: field:crm.case,date:0
@@ -1546,23 +1583,23 @@ msgstr "Data"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "Nazwisko kandydata"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Self Generated"
-msgstr ""
+msgstr "Samogenerowane"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Nie do naprawienia"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "Skonwertowano"
 
 #. module: crm
 #: view:crm.case:0
@@ -1572,7 +1609,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "Odpowiedz na ostatnią wiadomość"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1582,7 +1619,7 @@ msgstr "Opis segmentacji"
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Ustala miejsce spotkania"
 
 #. module: crm
 #: view:crm.case:0
@@ -1597,17 +1634,17 @@ msgstr "Historia"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "Sprawy rekrutacji"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Praca - Drzewo rekrutacji"
 
 #. module: crm
 #: field:crm.case.rule,regex_name:0
 msgid "Regular Expression on Case Name"
-msgstr ""
+msgstr "Wyrażenie regularne dla nazwy sprawy"
 
 #. module: crm
 #: field:crm.case,state:0
@@ -1616,7 +1653,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 #. module: crm
 #: view:crm.case:0
@@ -1667,22 +1704,22 @@ msgstr "Anuluj"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Brak ID email dla adresu twojej firmy !"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "Przeszukaj fundusze"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of claim"
-msgstr ""
+msgstr "Typ reklamacji"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Drzewo wsparcia helpdesku"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -1692,33 +1729,33 @@ msgstr "Ogólny opis"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim Cost"
-msgstr ""
+msgstr "Koszt reklamacji"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "Zaplanuj rozmowę"
 
 #. module: crm
 #: field:crm.case,ref:0
 msgid "Reference"
-msgstr "Odnośnik"
+msgstr "Numer"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Reguła wyjątku"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "Zaznacz to, jeśli chcesz aby reguła wysyłała wiadomość do partnera."
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
@@ -1733,22 +1770,22 @@ msgstr "Ustaw priorytet na"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
 msgid "Needs Analysis"
-msgstr ""
+msgstr "Wymaga analizy"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Przeszukaj reklamacje"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_body:0
 msgid "Mail body"
-msgstr ""
+msgstr "Treść wiadomości"
 
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Zarządza kalendarzem spotkań użytkownika"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1763,7 +1800,7 @@ msgstr "Kwota sprzedaży"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Add a CC"
-msgstr ""
+msgstr "Dodaj DW"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1781,7 +1818,7 @@ msgstr "Nazwa"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "Etap sprzedaży"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
@@ -1791,13 +1828,13 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
 msgid "Mail to watchers (CC)"
-msgstr ""
+msgstr "Wiadomość dla obserwatorów (DW)"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "Następne spotkanie"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1806,21 +1843,23 @@ msgid ""
 "No E-Mail ID Found for your Company address or missing reply address in "
 "section!"
 msgstr ""
+"Nie znaleziono ID email dla adresu twojej firmy lub brak adresu zwrotnego w "
+"sekcji!"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr "Pozwala usuwać przypadki inne niż projekty"
+msgstr "Pozwala usuwać sprawy inne niż w stanie projekt"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
 msgid "Closed Lost"
-msgstr ""
+msgstr "Zamknięte z porażką"
 
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Obsługa błędów"
 
 #. module: crm
 #: view:crm.case:0
@@ -1844,7 +1883,7 @@ msgstr "Wysoki"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Konwertuj potencjalnego do partnera biznesowego"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1859,22 +1898,22 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
 msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "Propozycja/Oferta ceny"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Delay After Trigger Date:"
-msgstr ""
+msgstr "Opóźnienie po dacie wyzwolenia"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "WWW"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "Typ kampanii"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1886,7 +1925,7 @@ msgstr "Obliczanie stanu emocji"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
@@ -1896,12 +1935,12 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
 msgid "Histories"
-msgstr ""
+msgstr "Historie"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
 msgid "Graduate"
-msgstr ""
+msgstr "Wykształcenie"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
@@ -1910,6 +1949,7 @@ msgid ""
 "Note that you can also use the calendar view to graphically schedule your "
 "next meeting."
 msgstr ""
+"Zauważ, że możesz stosować kalendarz do graficznego planowania spotkań."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1924,13 +1964,13 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "Uczestnik"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Błąd wiadomości"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1938,12 +1978,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Przychodzące"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
@@ -1956,6 +1996,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Pozwoli ci synchronizować kalendarze OpenERP z twoim telefonem, outlook, "
+"Sunbird, ical, ..."
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -1963,7 +2005,7 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "Ten rok"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -1981,7 +2023,7 @@ msgstr "Najwyższy"
 #. module: crm
 #: view:crm.job:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Data umowy"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -1992,11 +2034,13 @@ msgstr "Dni"
 #: help:crm.menu.config_wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Stosowane przez firmy do śledzenia błędów i zgłoszeń do wsparcia dla "
+"oprogramowania"
 
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Współdzielony kalendarz"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -2006,7 +2050,7 @@ msgstr "Odpowiedz do"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
 msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Sprawy wg sygnałów i typów"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2017,12 +2061,12 @@ msgstr "Minuty"
 #: field:report.crm.case.section.categ2,amount_revenue:0
 #: field:report.crm.case.section.stage,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Szac. dochód"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Potrzeba stanowiska"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
@@ -2037,12 +2081,12 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Claims Info"
-msgstr ""
+msgstr "Informacja o reklamacji"
 
 #. module: crm
 #: field:crm.case.category2,name:0
 msgid "Case Category2 Name"
-msgstr ""
+msgstr "Nazwa kategorii2 sprawy"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2050,29 +2094,29 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Konwertuj do szansy"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
 msgid "Held"
-msgstr ""
+msgstr "Odebrane"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Wsparcie helpdesk"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support4
 #: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Zwiększenie funduszu"
 
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Niezmienione"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2081,12 +2125,12 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Konwertuj do partnera"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
 msgid "Case State"
-msgstr "Stan przypadku"
+msgstr "Stan sprawy"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2107,17 +2151,17 @@ msgstr "Priorytet"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "Źródło"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Lokalizacja"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Sposób zapłaty"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2132,17 +2176,17 @@ msgstr ""
 #: view:crm.job:0
 #: view:crm.lead:0
 msgid "Stage: "
-msgstr ""
+msgstr "Etap: "
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Case section"
-msgstr "Sekcja przypadku"
+msgstr "Sekcja sprawy"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Zaplanuj zwykłe spotkanie albo telefoniczne"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2163,12 +2207,12 @@ msgstr "Pola do zmiany"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "Telesprzedaż"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
 msgid "Cases Histories"
-msgstr "Historie przypadków"
+msgstr "Historie spraw"
 
 #. module: crm
 #: field:crm.case,create_date:0
@@ -2190,7 +2234,7 @@ msgstr "Pozycja segmentacji"
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Planowana data"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2203,16 +2247,17 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Pomaga wprowadzić rezultat rozmowy lub zaplanować rozmowy do wykonania."
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
 msgid "Import ICS File"
-msgstr ""
+msgstr "Importuj plik ICS"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee Detail"
-msgstr ""
+msgstr "Szczegóły uczestnika"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job3
@@ -2225,58 +2270,58 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
 msgid "Prospecting"
-msgstr ""
+msgstr "Ocenianie"
 
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Email pracownika"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
 msgid "Meeting Cases"
-msgstr ""
+msgstr "Sprawy spotkań"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "Informacja o stanowisko"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "Anuluj spotkanie"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "Stanowiska"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date)s = Data utworzenia"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone3
 #: view:crm.phonecall:0
 msgid "Not Held"
-msgstr ""
+msgstr "Nie odebrane"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_user:0
 msgid "Mail to responsible"
-msgstr ""
+msgstr "Mail do odpowiedzialnych"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Praca - Formularz rekrutacji"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
@@ -2286,12 +2331,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
 msgid "Opportunity Cases"
-msgstr ""
+msgstr "Sprawy szans"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Support Query"
-msgstr ""
+msgstr "Zapytanie o wsparcie"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2304,7 +2349,7 @@ msgstr "Szablon emaila do wysłania"
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support2
@@ -2314,23 +2359,23 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Sygnały"
 
 #. module: crm
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "Wyślij e-mail"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 msgid "Set case state to"
-msgstr ""
+msgstr "Ustaw stan sprawy na"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Karta kredytowa"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2343,7 +2388,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Przeszukuj stanowiska"
 
 #. module: crm
 #: field:crm.case.history,log_id:0
@@ -2354,17 +2399,17 @@ msgstr "Log"
 #: help:crm.menu.config_wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr ""
+msgstr "To może pomóc stowarzyszeniom w poszukiwaniu funduszy."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Przywróć do niepotwierdzonych"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "Wsparcie helpdesku"
 
 #. module: crm
 #: field:crm.case,email_cc:0
@@ -2382,7 +2427,7 @@ msgstr "Uwaga"
 #: field:report.crm.case.section.categ2,delay_close:0
 #: field:report.crm.case.section.stage,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "Zamknij opóźnienie"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -2408,18 +2453,18 @@ msgstr "Zamknięty"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "Nazwa 2 kandydata"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr "anuluj"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Spotkanie wewnętrzne"
 
 #. module: crm
 #: view:crm.case:0
@@ -2428,7 +2473,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "Wydarzenia"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
@@ -2455,27 +2500,27 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Spotkanie z klientem"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
 msgid "Attachment2"
-msgstr ""
+msgstr "Załącznik2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc3:0
 msgid "Attachment3"
-msgstr ""
+msgstr "Załącznik3"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "Stopień"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
 msgid "Attachment1"
-msgstr ""
+msgstr "Załącznik1"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
@@ -2486,7 +2531,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "Rozmowy telefoniczne"
 
 #. module: crm
 #: help:crm.case,active:0
@@ -2494,6 +2539,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "without removing it."
 msgstr ""
+"Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
+"sprawę bez jej usuwania."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_menu_config_wizard
@@ -2503,24 +2550,24 @@ msgstr ""
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case History"
-msgstr "Historia przypadku"
+msgstr "Historia sprawy"
 
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Czek"
 
 #. module: crm
 #: field:crm.case,active:0
 #: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
-msgstr "Aktywny"
+msgstr "Aktywne"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_attach:0
@@ -2528,6 +2575,8 @@ msgid ""
 "Check this if you want that all documents attached to the case be attached "
 "to the reminder email sent."
 msgstr ""
+"Zaznacz to, jeśli chcesz aby wszystkie dokumenty załączone do sprawy zostały "
+"dołączone do przypomnień."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2542,12 +2591,12 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Phone"
-msgstr ""
+msgstr "Telefon kandydata"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Wyślij wiadomość"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2564,23 +2613,25 @@ msgstr "Miesiące"
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
 msgid "To Assign"
-msgstr ""
+msgstr "Do przypisania"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Podaj poprawny URL !"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Kiedy rzeczywisty projekt/szansa została wykryta"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
+"Jesteś pewien, że chcesz utworzyć partnera na podstawie tego zgłoszenia do "
+"pracy ?"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,create_partner,action:0
@@ -2597,7 +2648,7 @@ msgstr "Akcja"
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
-msgstr ""
+msgstr "Reklamacje"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2607,28 +2658,28 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
 msgid "History of Events"
-msgstr ""
+msgstr "Historia wydarzeń"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "Kategoria2 sprawy"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
 #: wizard_field:crm.send.mail,init,to:0
 msgid "To"
-msgstr ""
+msgstr "Do"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user_email)s = Responsible email"
-msgstr ""
+msgstr "%(case_user_email)s = email odpowiedzialnego"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "Sprzedaż"
 
 #. module: crm
 #: view:crm.case:0
@@ -2639,18 +2690,18 @@ msgstr "Ogólne"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "Przydzielony"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "Usunięty"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Inne"
 
 #. module: crm
 #: view:crm.case:0
@@ -2660,17 +2711,17 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Wykonano"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr "Maks. interwału"
+msgstr "Maks. interwał"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
 msgid "All Opportunities"
-msgstr ""
+msgstr "Wszystkie sprawy"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2704,17 +2755,17 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Istnieje już partner z tą samą nazwą"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "Phonecall Cases"
-msgstr ""
+msgstr "Sprawy telefoniczne"
 
 #. module: crm
 #: help:crm.case.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of case rules."
-msgstr ""
+msgstr "Ustala kolejność wyświetlania listy reguł spraw"
 
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
@@ -2741,23 +2792,23 @@ msgstr "Odpowiedzialny"
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Niepoprawny"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Ustal spotkanie"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Kalendarz spotkań"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Sprawy wg etapów i szacunków"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2766,6 +2817,8 @@ msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
 msgstr ""
+"Nie możesz przekazać tej sprawy.\n"
+"Jesteś na najwyższym poziomie."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2775,7 +2828,7 @@ msgstr "Nazwa sygnału"
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Reklamacja/Opis akcji"
 
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
@@ -2797,17 +2850,17 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Odmowa pracownika"
 
 #. module: crm
 #: field:crm.case,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nazwisko pracownika"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Pierwsza rozmowa"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2815,17 +2868,17 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Bieżący miesiąc"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Dostępność (tygodnie)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Drzewo szans"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2838,16 +2891,23 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Stan jest ustawiony na 'Projekt', gdy sprawa jest tworzona.                  "
+"                \n"
+"Jeśli sprawa jest w toku, to stan jest ustawiony na 'Otwarte'.               "
+"                   \n"
+"Kiedy sprawa jest zakończona, stan jest 'Wykonano'.                          "
+"        \n"
+"Jeśli sprawa wymaga interwencji, to stan jest 'Oczekiwanie'."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Open Jobs"
-msgstr ""
+msgstr "Otwarte stanowiska"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Adres email"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2855,16 +2915,18 @@ msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
 msgstr ""
+"Obliczenia są wykonywane na wszystkich zdarzeniach, które wystąpiły w "
+"trakcie tego interwału, w ostatnich X okresach."
 
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Sprawa związana"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Akcja serwera"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
@@ -2874,33 +2936,33 @@ msgstr "Wszystkie reklamacje"
 #. module: crm
 #: field:crm.case.log,user_id:0
 msgid "User Responsible"
-msgstr ""
+msgstr "Użytkownik odpowiedzialny"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Email not sent !"
-msgstr ""
+msgstr "Wiadomość nie wysłana !"
 
 #. module: crm
 #: wizard_field:crm.phonecall.partner_create,init,close:0
 msgid "Close Phonecall"
-msgstr ""
+msgstr "Zamknij rozmowę"
 
 #. module: crm
 #: field:crm.case,email_last:0
 msgid "Latest E-Mail"
-msgstr ""
+msgstr "Ostatni email"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Communication History"
-msgstr ""
+msgstr "Wyrażenia reg. dla historii komunikacji"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Wymagaj projektu"
 
 #. module: crm
 #: field:crm.case,id:0
@@ -2910,18 +2972,18 @@ msgstr ""
 #. module: crm
 #: field:crm.case,log_ids:0
 msgid "Logs History"
-msgstr ""
+msgstr "Zapisuje historię"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Podsumowanie szans"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Search Case"
-msgstr ""
+msgstr "Przeszukaj sprawę"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2931,13 +2993,13 @@ msgstr "Kontynuuj proces"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case Description"
-msgstr "Opis przypadku"
+msgstr "Opis sprawy"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Przypisz do"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
@@ -2947,27 +3009,27 @@ msgstr "Ostatnia akcja"
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Czas trwania"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
 msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i etapu"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "Kandydat zatrudniony"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Proces zatrudniania"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
-msgstr "Wszystkie przypadki"
+msgstr "Wszystkie sprawy"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
@@ -2986,7 +3048,7 @@ msgstr "Źródło sygnału"
 #: field:report.crm.case.section.categ2,nbr:0
 #: field:report.crm.case.section.stage,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# spraw"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -2996,7 +3058,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Provide path for Remote Calendar"
-msgstr ""
+msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3007,28 +3069,28 @@ msgstr "Segmentacja"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Formularz funduszy"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Przeszukuj spotkania"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Utwórz nowego partnera"
 
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "W toku"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3038,24 +3100,24 @@ msgstr "Uruchomione"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user)s = Responsible name"
-msgstr ""
+msgstr "%(case_user)s = Nazwa odpowiedzialnego"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Cele"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Sprawy wg sekcji i typu"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Obsługa posprzedażna"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -3068,12 +3130,12 @@ msgstr ""
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nazwa pliku"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr "Szukaj sygnału"
+msgstr "Przeszukuj sygnały"
 
 #. module: crm
 #: help:crm.case.rule,active:0
@@ -3081,6 +3143,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case rule "
 "without removing it."
 msgstr ""
+"Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
+"regułę sprawy bez jej usuwania."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3098,7 +3162,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "Wszystkie zgłoszenia na stanowisko"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3110,7 +3174,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulowano"
 
 #. module: crm
 #: view:crm.job:0
@@ -3127,27 +3191,27 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr ""
+msgstr "Odpowiedni"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Nazwa szansy"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Reguła rekurencyjna"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Importuj ICS"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Podsumowanie rozmowy"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -3157,17 +3221,17 @@ msgstr "Operator"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_log
 msgid "Case Communication History"
-msgstr "Historia komunikacji przypadku"
+msgstr "Historia komunikacji sprawy"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
 msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "Sprawy wg szans i typów"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_subject)s = Case subject"
-msgstr ""
+msgstr "%(case_subject)s = Temat sprawy"
 
 #. module: crm
 #: field:crm.case,section_id:0
@@ -3201,12 +3265,12 @@ msgstr ""
 #: code:addons/crm/wizard/crm_job_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "Dla tego zgłoszenia do pracy partner jest juz zdefiniowany."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "Nowe"
 
 #. module: crm
 #: field:crm.case,description:0
@@ -3235,27 +3299,27 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim
 msgid "Claim Cases"
-msgstr ""
+msgstr "Sprawy reklamacji"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Reminders (includes the content of the case)"
-msgstr ""
+msgstr "Przypomnienie email (zawiera sprawę)"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr "Zdarzenia wg sygnałów i etapów"
+msgstr "Sprawy wg sygnałów i etapów"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Daty/Czasy wyjątków"
 
 #. module: crm
 #: view:crm.meeting.generic_wizard:0
 msgid "Generic Wizard"
-msgstr ""
+msgstr "Podstawowy kreator"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
@@ -3265,7 +3329,7 @@ msgstr "Tworzenie szansy z sygnału"
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Raportowanie"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3286,17 +3350,17 @@ msgstr ""
 #: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
-msgstr "Oczekuje"
+msgstr "Oczekiwanie"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Potencjalna szansa"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Oczekiwane wynagrodzenie"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3306,28 +3370,28 @@ msgstr "Konfiguracja"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
 msgid "Send New Mail"
-msgstr ""
+msgstr "Wyślij nową wiadomość"
 
 #. module: crm
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Niepoprawne argumenty"
 
 #. module: crm
 #: field:crm.meeting,transparent:0
 msgid "Trensparent"
-msgstr ""
+msgstr "Przezroczysty"
 
 #. module: crm
 #: view:crm.case:0
 msgid "My Cases"
-msgstr ""
+msgstr "Moje sprawy"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead7
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Word of mouth"
-msgstr ""
+msgstr "Ustna wiadomość"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3338,32 +3402,32 @@ msgstr "Temat sygnału"
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Konwertuj do szansy"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "Planowane"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
 msgid "Customer Office"
-msgstr ""
+msgstr "Biuro klienta"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Email"
-msgstr ""
+msgstr "Email kandydata"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage: "
-msgstr ""
+msgstr "Etap sprzedaży: "
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "Typ akcji"
 
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
@@ -3373,7 +3437,7 @@ msgstr "Ustaw odpowiedzialnego na"
 #. module: crm
 #: view:crm.job:0
 msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Spotkanie z kandydatami"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3384,6 +3448,11 @@ msgid ""
 "has decreased because he probably bought goods to another supplier. Use this "
 "functionality for recurring businesses."
 msgstr ""
+"Okres jest średnią (w dniach) pomiędzy dwiema sprzedażami lub dwoma zakupami "
+"dla tej segmentacji. To jest stosowane głównie do wykrycia, czy partner nie "
+"kupował u nas zbyt długo, co może oznaczać, że jego stan emocji obniżył się, "
+"ponieważ prawdopodobnie dokonał zakupów u innego dostawcy. Stosuj te "
+"funkcjonalność do biznesów powtarzalnych."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3391,27 +3460,27 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Search Cases by User"
-msgstr ""
+msgstr "Przeszukuj sprawy wg użytkownika"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "Warunki dla historii komunikacji"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_partner:0
 msgid "Mail to partner"
-msgstr ""
+msgstr "Mail do partnera"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Drzewo funduszy"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
@@ -3421,7 +3490,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
 msgid "All Funds"
-msgstr ""
+msgstr "Wszystkie fundusze"
 
 #. module: crm
 #: field:crm.case.section,calendar:0
@@ -3433,7 +3502,7 @@ msgstr "Kalendarz"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "Sprzedawca"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
@@ -3455,12 +3524,12 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Zaplanuj spotkanie"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Kultura i sztuka"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3468,18 +3537,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Ruch wychodzący"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Historize"
-msgstr ""
+msgstr "Zapisz do historii"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potwierdzone"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3491,7 +3560,7 @@ msgstr "Nie uruchomiony"
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Prawdopodobieństwo sukcesu"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3511,7 +3580,7 @@ msgstr "Projekt"
 #. module: crm
 #: field:crm.case.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Opóźnienie po dacie wyzwolenia"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3537,7 +3606,7 @@ msgstr "Normalny"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr ""
+msgstr "Musisz podac email pertnera, aby zastosować tę akcję!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3546,17 +3615,17 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Powinieneś sprawdzić, czy ten partner już istnieje."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Qualication"
-msgstr ""
+msgstr "Kwalifikacje"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Change RRule"
-msgstr ""
+msgstr "Zmień regułę"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
@@ -3566,14 +3635,14 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i typu"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3581,7 +3650,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
@@ -3602,14 +3671,14 @@ msgstr "Sekcja nadrzędna"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Zaplanuj rozmowę telefoniczną"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
-msgstr ""
+msgstr "Nie można wysłać wiadomości z pustą treścią."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3617,12 +3686,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Umowa"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -3637,7 +3706,7 @@ msgstr "Planowany dochód"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Służba zdrowia"
 
 #. module: crm
 #: view:crm.case:0
@@ -3651,7 +3720,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
-msgstr ""
+msgstr "Przydziel"
 
 #. module: crm
 #: field:crm.case,partner_address_id:0
@@ -3661,17 +3730,17 @@ msgstr "Kontakt do partnera"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "Biuro"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
 msgid "Fund Raising Cases"
-msgstr ""
+msgstr "Sprawy podwyższania funduszy"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Etap sprawy"
 
 #. module: crm
 #: view:crm.case:0
@@ -3700,49 +3769,49 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Partner"
-msgstr ""
+msgstr "Warunki na partnera sprawy"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Section Code"
-msgstr ""
+msgstr "Kod sekcji"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,date:0
 #: wizard_field:crm.phonecall.meeting_set,init,date:0
 msgid "Meeting date"
-msgstr ""
+msgstr "Data spotkania"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "POUFNE"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Treść wiaodmości"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet2
 msgid "Not fixed"
-msgstr ""
+msgstr "Nie ustalone"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead3
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Employee"
-msgstr ""
+msgstr "Pracownik"
 
 #. module: crm
 #: field:crm.case,email_from:0
 msgid "Partner Email"
-msgstr ""
+msgstr "Email partnera"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "% = The '%' Character"
-msgstr ""
+msgstr "% = Znak '%'"
 
 #. module: crm
 #: view:crm.case:0
@@ -3763,18 +3832,20 @@ msgstr "Opis"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Wiadomości wewnętrzne"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
 msgid ""
 "Check this if you want the rule to send a reminder by email to the user."
 msgstr ""
+"Zaznacz to, jeśli chcesz aby reguła wysłała przypomnienie mailem do "
+"użytkownika."
 
 #. module: crm
 #: view:crm.case:0
@@ -3786,7 +3857,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
-msgstr ""
+msgstr "DW"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3796,7 +3867,7 @@ msgstr "Obowiązkowe / Opcjonalne"
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importuj"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3813,7 +3884,7 @@ msgstr ""
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
 msgid "Case"
-msgstr "Przypadek"
+msgstr "Sprawa"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3829,19 +3900,19 @@ msgstr "Najniższy"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Zaplanuj spotkanie"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Priority Range"
-msgstr ""
+msgstr "Warunki na zakres priorytetu"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3849,17 +3920,19 @@ msgid ""
 "If the partner has not purchased (or buied) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Jeśli partner nie zakupił nic przez ten okres, to zmniejsz jego stan emocji "
+"o ten współczynnik. To jest dzielenie."
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 #: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Poczta masowa"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Actions"
-msgstr ""
+msgstr "Akcje email"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,name:0
@@ -3867,22 +3940,22 @@ msgstr ""
 #: field:report.crm.case.section.categ2,name:0
 #: field:report.crm.case.section.stage,name:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Gotówka"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Fundusze wg kategorii"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Pierwszy kontakt z tą okazją"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3890,42 +3963,42 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet5
 msgid "Future"
-msgstr ""
+msgstr "Przyszłe"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Zapisz plik ICS"
 
 #. module: crm
 #: wizard_field:caldav.crm.subscribe,init,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
 
 #. module: crm
 #: view:crm.case.log:0
 msgid "Case logs"
-msgstr ""
+msgstr "Log sprawy"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Timing"
-msgstr ""
+msgstr "Warunki na czas"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk
 msgid "Helpdesk Cases"
-msgstr ""
+msgstr "Sprawy helpdesku"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
 msgid "Export ICS File"
-msgstr ""
+msgstr "Eksportuj plik ICS"
 
 #. module: crm
 #: field:crm.case.rule,sequence:0
@@ -3938,38 +4011,38 @@ msgstr "Numeracja"
 #: wizard_view:caldav.crm.import,init:0
 #: wizard_field:caldav.crm.import,init,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Wybierz plik ICS"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,display:0
 msgid "Import Message"
-msgstr ""
+msgstr "Importuj wiadomość"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "Zmienna kontrolna"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree
 msgid "Cases by section"
-msgstr "Przypadki wg sekcji"
+msgstr "Sprawy wg sekcji"
 
 #. module: crm
 #: view:crm.job:0
 msgid "New Jobs"
-msgstr ""
+msgstr "Nowe stanowiska"
 
 #. module: crm
 #: field:crm.menu.config_wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Operacje zwiększania funduszy"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Biuletyn"
 
 #~ msgid "My "
 #~ msgstr "Moje "
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 22ee8947778..d848e510234 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-02-02 17:06+0000\n"
-"Last-Translator: pedrobom <pedrobomlimeira@gmail.com>\n"
+"PO-Revision-Date: 2010-05-22 04:53+0000\n"
+"Last-Translator: Guilherme Santos <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-04-17 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-23 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -111,7 +111,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos Humanos"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
@@ -229,7 +229,7 @@ msgstr "Seção de caso"
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr "Salário proposto"
+msgstr "Salário Proposto"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
@@ -272,7 +272,7 @@ msgstr "Palavras-chave especiais a serem utilizadas no corpo"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr "Envia Novo Email"
+msgstr "Enviar Novo Email"
 
 #. module: crm
 #: view:crm.case.history:0
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 78a5ffa34c8..c1d64ee332c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -63,7 +63,7 @@
         </record>
 
 <!-- Leads by user and section Search View -->
-		
+
 		<record id="view_report_crm_lead_filter" model="ir.ui.view">
             <field name="name">crm.lead.report.select</field>
             <field name="model">crm.lead.report</field>
@@ -119,7 +119,7 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="1" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -144,14 +144,14 @@
                         <filter string="Section" icon="terp-sale"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
-                        	
+
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-sale"
                         	domain="[]" context="{'group_by':'state'}" />
 
 						<filter string="Stage" icon="terp-sale" domain="[]"
 							context="{'group_by':'stage_id'}" />
-					
+
                         <filter string="Category" icon="terp-sale"
                         	domain="[]" context="{'group_by':'categ_id'}" />
 
@@ -180,9 +180,9 @@
             <tree string="Opportunities">
 				<field name="name" invisible="1"/>
 				<field name="month" invisible="1"/>
-				<field name="section_id" invisible="1"/>
+				<field name="section_id" invisible="1" groups="base.group_extended"/>
 				<field name="user_id" invisible="1"/>
-    			<field name="company_id" invisible="1"/>
+    			<field name="company_id" invisible="1" groups="base.group_extended"/>
 				<field name="partner_id" invisible="1"/>
 				<field name="day" invisible="1"/>
 				<field name="nbr" string="#Opportunities" sum="#Opportunities"/>
@@ -220,7 +220,7 @@
             <field name="view_id" ref="view_report_crm_lead_graph"/>
             <field name="act_window_id" ref="action_report_crm_lead"/>
        </record>
-	
+
 	<record id="action_report_crm_opportunity" model="ir.actions.act_window">
             <field name="name">Opportunities</field>
             <field name="res_model">crm.lead.report</field>
@@ -244,7 +244,7 @@
             <field name="view_id" ref="view_report_crm_lead_graph"/>
             <field name="act_window_id" ref="action_report_crm_opportunity"/>
        </record>
-	
+
        <menuitem name="Leads" id="menu_report_crm_leads_tree"
            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_lead" />
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index f78044ea38e..1f90f74f281 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -6,12 +6,8 @@
 "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1
 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1
 "access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
-"access_crm_case_log","crm.case.log","model_crm_case_log","crm.group_crm_user",1,1,1,1
-"access_crm_case_history","crm.case.history","model_crm_case_history","crm.group_crm_user",1,1,1,1
-"o","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
+"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
 "access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
-"access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1
-"access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1
 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0
 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 0a051d2310d..bfdbe912fed 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -16,7 +16,6 @@
      login: user_crm
      name: user_crm
      password: user_crm
-
   
 -  |
    I start by creating a new lead "New Customer" and I provide an address to this
@@ -25,7 +24,7 @@
    !record {model: crm.lead, id: crm_lead_newcustomer0}:
      email_from: info@mycustomer.com
      name: New Customer
-     partner_name: Sandip zala
+     partner_name: Capegemini
      phone: (855) 924-4364
      mobile: (333) 715-1450
      section_id: crm.section_sales_department
@@ -41,6 +40,11 @@
 -   
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
+- |
+  I check that lead is now in 'open' state.
+-
+  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
+     - state == "open"  
        
 -  |
    As the lead seems to be a real business opportunity, I will convert it to a
@@ -49,8 +53,8 @@
 -  
    !python {model: crm.lead}: |
      lead = self.browse(cr, uid, ref('crm_lead_newcustomer0'))
-     if not lead.partner_id:
-       self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
+     action = self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
+     assert action['res_model'] == 'crm.lead2opportunity.partner'
 -
    |
    Now, select "create a new partner" option in this wizard.
@@ -66,7 +70,7 @@
   Now, I give value to this wizard field.     
 -
   !record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}: 
-      name:  Sandip zala
+      name:  Capegemini
       planned_revenue: 0.00
       probability: 0.00
 -
@@ -79,8 +83,8 @@
    I can check that a lead and a business opportunity is now assigned to this
    lead.
 -
-  # !python {model: crm.lead, id: crm_lead_newcustomer0}: 
-    #   - opportunity_id.id != False
+   # !python {model: crm.lead, id: crm_lead_newcustomer0}: 
+   #   - opportunity_id == False
          
 -  |
    I check that the partner associated to this lead as the same country, phone number
@@ -109,4 +113,4 @@
 - |
   I Reply to last Email to lead with some document attached.and check that communication history generated or not.
 
-  
\ No newline at end of file
+  
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index feb87e0a879..f2020659aed 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -4,44 +4,55 @@
   !record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
     date: '2010-04-21 18:59:00'
     name: Interview call
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    partner_mobile: (+32)2 211 34 83
     section_id: crm.section_sales_department
+- |
+  Now , I select partner by click on "Create a Partner" button.
+  	 
+- 
+  !record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
+    action: exist
+    partner_id: base.res_partner_9
+
+- 
+  Now, click on "Continue" button of this wizard.
+- 
+  !python {model: crm.phonecall2partner}: |
+    self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})    
     
 - |
   As the success of phonecall seems to be a real business opportunity, I will convert
   it to opportunity by clicking on the "Convert to Opportunity" button.
+- 
+  !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_interviewcall0}:
+    name: Interview call
+    partner_id: base.res_partner_9
+    planned_revenue: 0.0
+    probability: 0.0  
+-
+   Now, I click on "Convert" button of this wizard.    
 -    
-#  !python {model: crm.phonecall2opportunity}: |
-#    self.action_apply(cr, uid, [1], {'active_id': ref('crm_phonecall_interviewcall0')})  
-
+  !python {model: crm.phonecall2opportunity}: |
+     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
 -
   # This is not working, find a way to do that in YAML
-      
+  
 - |
   I can see that a business opportunity is now assigned to this phonecall
-- |
-  I check that the partner associated to this as the same country, phone number
-  and name than the phonecall.
-- |
-  In order to avoid the duplication of similar partner, OpenERP should be able to
-  detect if the partner exists or if it should be created from the phonecall during the
-  conversion.
-- |
-  In order to test this, I log as the user "user_crm2"
-- |
-  Then, I create the same phonecall than the preceeding one but I change the name
-  of the phonecall.  But this customer keeps the same email.
-- |
-  This time OpenERP should detect that this customer already exists in the
-  partner base and I check that in the wizard, proposes me to link to this existing
-  partner instead of creating another one.
-- |
-  I confirm the conversion wizard.
+-
+  !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
+      - opportunity_id == True
+      
 - |
   And I check that the phonecall and the newly created business opportunity is linked
-  to the partner
+  to same  partner
+-
+  !python {model:  crm.phonecall}: | 
+    xid= ref('crm_phonecall_interviewcall0')
+    obj_phonecall = self.browse(cr, uid, xid)
+    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
+    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
+    assert obj_phonecall.partner_id == obj_opp.partner_id
+  
 - |
   I schedule Meeting on this current phonecall by clicking on "schedule
   Meeting"
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 98d5392faa3..153f136cfb2 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -176,7 +176,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
 
         this = self.browse(cr, uid, ids[0], context=context)
 
-        hist_obj = self.pool.get('crm.case.history')
         smtp_pool = self.pool.get('email.smtpclient')
         case_pool = self.pool.get(model)
         case = case_pool.browse(cr, uid, res_id, context=context)
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f4cecbe508f..12edf5edc6d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -57,7 +57,6 @@ class crm_lead2opportunity(osv.osv_memory):
 
         lead_obj = self.pool.get('crm.lead')
         data_obj = self.pool.get('ir.model.data')
-        history_obj = self.pool.get('crm.case.history')
         model_obj = self.pool.get('ir.model')
 
         # Get Opportunity views
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index ee6c1522e22..2f7f8540e7f 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -42,12 +42,15 @@
        </record>
 
        <!-- Lead to Partner wizard -->
-
-       <act_window id="action_crm_lead2partner"
-            key2="client_action_multi" name="Create a Partner"
-            res_model="crm.lead2partner" src_model="crm.lead"
-            view_id="view_crm_lead2partner_create" 
-            view_mode="form" target="new" view_type="form" />
+	    
+		<record id="action_crm_lead2partner" model="ir.actions.act_window">
+            <field name="name">Create a Partner</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">crm.lead2partner</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_crm_lead2partner_create"/>
+            <field name="target">new</field>
+        </record>
 
      </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 41c32a9fa42..7bda631e032 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -39,7 +39,8 @@
     		key2="client_action_multi" name="Create Opportunity"
     		res_model="crm.partner2opportunity" src_model="res.partner"
     		view_id="view_crm_lead2partner_create"
-    		view_mode="form" target="new" view_type="form" />
+    		view_mode="form" target="new" view_type="form"
+    		groups="base.group_extended"/>
 
  	</data>
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 524384328f3..c7da406f687 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -43,11 +43,15 @@
 
 	 <!-- Phonecall to Partner wizard -->
 
-	   <act_window id="action_crm_phonecall2partner"
-    		key2="client_action_multi" name="Create a Partner"
-    		res_model="crm.phonecall2partner" src_model="crm.phonecall"
-    		view_id="view_crm_phonecall2partner_create"
-    		view_mode="form" target="new" view_type="form" />
+		<record id="action_crm_phonecall2partner" model="ir.actions.act_window">
+            <field name="name">Create a Partner</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">crm.phonecall2partner</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_crm_phonecall2partner_create"/>
+            <field name="target">new</field>
+        </record>
+		
 
  	</data>
 </openerp>
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 87537ebc240..8458172104a 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -98,7 +98,9 @@ class crm_send_new_email(osv.osv_memory):
                 message_id = hist.message_id
                 model = hist.model_id.model
                 model_pool = self.pool.get(model)
-                case = model_pool.browse(cr, uid, hist.res_id)
+                res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
+                res_id = res_ids and res_ids[0] or False        
+                case = model_pool.browse(cr, uid, res_id)
             emails = [obj.email_to] + (obj.email_cc or '').split(',')
             emails = filter(None, emails)
             body = obj.text
@@ -197,7 +199,9 @@ class crm_send_new_email(osv.osv_memory):
                 return {}
 
             model_pool = self.pool.get(model)
-            case = model_pool.browse(cr, uid, hist.res_id)
+            res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
+            res_id = res_ids and res_ids[0] or False            
+            case = model_pool.browse(cr, uid, res_id)
             if 'email_to' in fields:
                 res.update({'email_to': case.email_from or hist.email_from or False})
             if 'email_from' in fields:
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index a535efbdb81..d9a7a2b34c0 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -29,10 +29,15 @@ class crm_claim(osv.osv, crm.crm_case):
     _name = "crm.claim"
     _description = "Claim Cases"
     _order = "id desc"
-    _inherit = 'mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
+
     _columns = {
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'id': fields.integer('ID', readonly=True), 
         'name': fields.char('Name', size=128, required=True), 
+        'active': fields.boolean('Active', required=False), 
+        'date_action_last': fields.datetime('Last Action', readonly=1),
+        'date_action_next': fields.datetime('Next Action', readonly=1),
         'description': fields.text('Description'), 
         'create_date': fields.datetime('Creation Date' , readonly=True), 
         'write_date': fields.datetime('Update Date' , readonly=True), 
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index b0d17495dee..7fb1c08f84b 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -14,7 +14,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
         </record>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 4228096e670..7a3dd4cc829 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -246,8 +246,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current"
-                       domain="[('state','in',('draft', 'open'))]" name="current"
+                   <filter icon="gtk-new" string="Current" name="current"
+                       domain="[('state','in',('draft', 'open'))]"
                        separator="1" help="Current Claims" default="1"
                    />
                    <filter icon="gtk-execute"
@@ -264,20 +264,12 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
-                               domain="[('user_id','=',uid)]" help="My Claims"
-                               default="1" />
                            <filter icon="terp-partner"
                                domain="[('user_id','=', False)]"
                                help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1"
-                       widget="selection"
-                       default="context.get('section_id', False)">
-                       <filter icon="terp-crm"
-                           domain="[('section_id','=',context.get('section_id',False))]"
-                           help="My section" />
-                   </field>
+                       widget="selection"/>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="10" col="20">
                        <filter string="Deadline" icon="terp-crm"
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 4650528fa72..356c3baec73 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -28,11 +28,15 @@ class crm_fundraising(osv.osv, crm.crm_case):
     _name = "crm.fundraising"
     _description = "Fund Raising Cases"
     _order = "id desc"
-    _inherit ='mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     _columns = {
+            'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
             'id': fields.integer('ID'), 
-            'name': fields.char('Name', size=128, required=True), 
+            'name': fields.char('Name', size=128, required=True),
+            'active': fields.boolean('Active', required=False), 
+            'date_action_last': fields.datetime('Last Action', readonly=1),
+            'date_action_next': fields.datetime('Next Action', readonly=1), 
             'description': fields.text('Description'), 
             'create_date': fields.datetime('Creation Date' , readonly=True), 
             'write_date': fields.datetime('Update Date' , readonly=True), 
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index 9a8d6dee46f..e681594045b 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -12,8 +12,8 @@
         <field name="name">Funds</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
-        <field name="context">{"search_default_current":1}</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
+        <field name="context">{"search_default_user_id":uid,"search_default_current":1}</field>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
     </record>
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9a2b3b4c524..68fcd768d74 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -249,8 +249,7 @@
             </field>
         </record>
 
-<!-- Fund Raising Search View -->
-
+        <!-- Fund Raising Search View -->
         <record id="view_crm_case_fund_filter" model="ir.ui.view">
                 <field name="name">CRM - Funds Search</field>
                 <field name="model">crm.fundraising</field>
@@ -269,12 +268,6 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
-                            <filter icon="terp-partner" string="My Funds"
-                                default="1" domain="[('user_id','=',uid)]"
-                                separator="1"
-                                help="Funds Related to Current User"
-                                />
-                            <separator orientation="vertical" />
                             <field name="state" select="1" />
                             <field name="name" select='1'
                                 string="Fund Description" />
@@ -306,6 +299,5 @@
                     </search>
                 </field>
             </record>
-
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 4329ef7d73b..d07d2261013 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -28,11 +28,15 @@ class crm_helpdesk(osv.osv, crm.crm_case):
     _name = "crm.helpdesk"
     _description = "Helpdesk Cases"
     _order = "id desc"
-    _inherit = 'mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     _columns = {
+            'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
             'id': fields.integer('ID', readonly=True), 
             'name': fields.char('Name', size=128, required=True), 
+            'active': fields.boolean('Active', required=False), 
+            'date_action_last': fields.datetime('Last Action', readonly=1), 
+            'date_action_next': fields.datetime('Next Action', readonly=1), 
             'description': fields.text('Description'), 
             'create_date': fields.datetime('Creation Date' , readonly=True), 
             'write_date': fields.datetime('Update Date' , readonly=True), 
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 5030fd65506..f671e3b77e0 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -11,6 +11,7 @@
         <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
     </record>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 93311395510..27ccee6ef0d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -236,11 +236,7 @@
                     <separator orientation="vertical"/>
                     <field name="name" select='1' string="Query"/>
                     <field name="partner_id" />
-                    <field name="user_id" select="1" widget="selection">
-                        <filter icon="terp-partner"
-                            domain="[('user_id','=',uid)]"
-                            help="My Helpdesk Requests" default="1" />
-                    </field>
+                    <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id" select="1" widget="selection" string="Sales Team">
                         <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
diff --git a/addons/crm_profiling/i18n/pl.po b/addons/crm_profiling/i18n/pl.po
index 5c30fe31019..b032c9d7c32 100644
--- a/addons/crm_profiling/i18n/pl.po
+++ b/addons/crm_profiling/i18n/pl.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-12-10 00:48+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
+"PO-Revision-Date: 2010-05-21 20:20+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -49,7 +49,7 @@ msgstr ""
 #. module: crm_profiling
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -70,7 +70,7 @@ msgstr "Opis"
 #. module: crm_profiling
 #: field:crm.segmentation,answer_no:0
 msgid "Excluded Answers"
-msgstr ""
+msgstr "Wyłączone odpowiedzi"
 
 #. module: crm_profiling
 #: view:crm_profiling.answer:0
@@ -111,12 +111,12 @@ msgstr "Kwestionariusz"
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć profilów rekurencyjnych."
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr ""
+msgstr "Stosuj reguły profili"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -127,7 +127,7 @@ msgstr "Dostępne odpowiedzi"
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
 msgid "Included Answers"
-msgstr ""
+msgstr "Włączone odpowiedzi"
 
 #. module: crm_profiling
 #: help:crm.segmentation,profiling_active:0
@@ -147,7 +147,7 @@ msgstr "Pytania"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr ""
+msgstr "Profil nadrzędny"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,end:0
@@ -158,12 +158,12 @@ msgstr "Anuluj"
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Segmentacja partnera"
 
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
 msgid "Using a questionnaire"
-msgstr "Uzywanie kwestionariusza"
+msgstr "Używanie kwestionariusza"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,open,compute:0
diff --git a/addons/crm_vertical/i18n/id.po b/addons/crm_vertical/i18n/id.po
index 78fa6ce730c..2001657f4ab 100644
--- a/addons/crm_vertical/i18n/id.po
+++ b/addons/crm_vertical/i18n/id.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-11-09 13:48+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-18 10:59+0000\n"
+"Last-Translator: Pandu Pradana <p4ndupr4d4n4@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-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
 #: model:ir.module.module,description:crm_vertical.module_meta_information
 msgid "Simplification of the interface for CRM."
-msgstr ""
+msgstr "Penyederhanaan dari antar-muka CRM."
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 35b3ed481e9..4b87e4c790e 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -26,7 +26,7 @@ from tools.translate import _
 
 class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
-    _description = "Carrier and delivery grids"
+    _description = "Carrier"
 
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
@@ -144,7 +144,7 @@ delivery_grid()
 
 class delivery_grid_line(osv.osv):
     _name = "delivery.grid.line"
-    _description = "Delivery line of grid"
+    _description = "Delivery Grid Line"
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6a8058ff8bc..427f5bfd6f2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -128,7 +128,7 @@
             <field name="arch" type="xml">
                 <group name="logistic" position="inside">
                     <field name="id" invisible="True"/>
-                    <field name="carrier_id" context="{'order_id':id}"/>
+                    <field name="carrier_id" context="{'order_id':active_id}"/>
                 </group>
             </field>
         </record>
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 948a85c35c7..e459c423b59 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -7,3 +7,5 @@
 "access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","sale.group_sale_manager",1,1,1,1
 "access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
 "access_delivery_carrier_stock_worker","delivery.carrier stock_worker","model_delivery_carrier","stock.group_stock_user",1,0,0,0
+"access_delivery_sale_order_manager","delivery.sale.order","model_delivery_sale_order","sale.group_sale_manager",1,1,1,1
+"access_delivery_sale_order","delivery.sale.order","model_delivery_sale_order","sale.group_sale_user",1,0,0,0
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 6d8d5a17bd1..91dfed96f11 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -29,7 +29,7 @@ import decimal_precision as dp
 # Overloaded stock_picking to manage carriers :
 class stock_picking(osv.osv):
     _name = "stock.picking"
-    _description = "Picking list"
+    _description = "Packing List"
     _inherit = 'stock.picking'
 
     def _cal_weight(self, cr, uid, ids, name, args, context=None):
@@ -55,7 +55,7 @@ class stock_picking(osv.osv):
         'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'),
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
-                 'stock.move': (_get_picking_line, ['product_id','product_uos_qty'], 20),
+                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
         }
 
diff --git a/addons/delivery/test/delivery_test.yml b/addons/delivery/test/delivery_test.yml
index cbc30822368..9225cbca66b 100644
--- a/addons/delivery/test/delivery_test.yml
+++ b/addons/delivery/test/delivery_test.yml
@@ -3,9 +3,8 @@
   And there are two methods for doing that 
      Delivery based on order quantities,
      Delivery based on delivered quantities.
-  
 -     
- I create the partner associated with the transport.
+  I create the partner associated with the transport.
 - 
   I create partner.
 - 
@@ -17,8 +16,6 @@
     name: The Post
     property_account_payable: account.a_pay
     property_account_receivable: account.a_recv
-    
-    
 - 
   
   I create associated product for delivery.
@@ -34,9 +31,7 @@
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
     warranty: 0.0
-    
 -    
-
   I create the Delivery Method.
 - 
   !record {model: delivery.carrier, id: delivery_carrier_theopenerpexperss0}:
@@ -74,7 +69,6 @@
         
     name: Weight
     sequence: 1
-    
 -
   To check the Delivery based on order quantities , I have created sale order and picking_policy is direct .
 - 
@@ -101,14 +95,13 @@
     picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.shop
-      
 - 
-  Creating a delivery.sale.order record
+  I create delivery.sale.order record.
 - 
   !record {model: delivery.sale.order, id: delivery_sale_order_0}:
     carrier_id: delivery_carrier_theopenerpexperss0
 - 
-   To add the delivery charges on the quotation, I click on Delivery costs button and select the carrier. 
+  To add the delivery charges on the quotation, I click on Delivery costs button and select the carrier. 
 - 
   !python {model: delivery.sale.order}: |
     self.delivery_set(cr, uid, [ref("delivery_sale_order_0")], {"lang": "en_US", "active_model":
@@ -118,9 +111,8 @@
   I confirm the sale order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}    
-    
 -
- To check the  Invoicing based on deliveries.I create new sale order and picking_policy is Complete Delivery.
+  To check the  Invoicing based on deliveries.I create new sale order and picking_policy is Complete Delivery.
 - 
   !record {model: sale.order, id: sale_order_test_complete0}:
     name: Test/Complete Deliver  
@@ -143,8 +135,6 @@
     partner_shipping_id: base.res_partner_address_7        
     pricelist_id: product.list0        
     order_policy: picking
-    
-    
 - 
   I confirm the sale order.
 - 
@@ -162,6 +152,4 @@
     so=self.pool.get('sale.order').browse(cr,uid,ref('sale_order_test_complete0')) 
     self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
       "tz": False, "active_model": "stock.picking", "contact_display": "partner",
-      "active_ids": [so.picking_ids[0].id], "active_id": so.picking_ids[0].id })
-
-    
+      "active_ids": [so.picking_ids[0].id], "active_id": so.picking_ids[0].id }) 
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 25e172d2817..56e52aa9b69 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -31,7 +31,7 @@ from tools.translate import _
 
 class document_directory(osv.osv):
     _name = 'document.directory'
-    _description = 'Document directory'
+    _description = 'Directory'
     _order = 'name desc'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
@@ -286,7 +286,7 @@ class document_directory_dctx(osv.osv):
         appended to all children down the tree.
     """
     _name = 'document.directory.dctx'
-    _description = 'Directory dynamic context'
+    _description = 'Directory Dynamic Context'
     _columns = {
         'dir_id': fields.many2one('document.directory', 'Directory', required=True),
         'field': fields.char('Field', size=20, required=True, select=1, help="The name of the field. Note that the prefix \"dctx_\" will be prepended to what is typed here."),
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 421c423b900..d20870ff825 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -95,7 +95,7 @@ class document_storage(osv.osv):
     the same tree of filesystem storage.
     """
     _name = 'document.storage'
-    _description = 'Document storage media'
+    _description = 'Storage Media'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index b8bee399f82..c6d59fa3d29 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -42,7 +42,6 @@
             <field name="arch" type="xml">
                 <search string="All users files">
                 	<group col="12" colspan="4">
-                		<filter icon="terp-stock" string="My" domain="[('user','=',uid)]" help="My Files"/>
                         <separator orientation="vertical"/>
 						<filter icon="terp-stock" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
 						<filter icon="terp-stock" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
@@ -65,6 +64,7 @@
             <field name="res_model">report.document.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
+            <field name="context">{"search_default_user":uid}</field>
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
diff --git a/addons/document_ftp/doc_conf_wizard.py b/addons/document_ftp/doc_conf_wizard.py
index 72011c39759..1399bc276b5 100644
--- a/addons/document_ftp/doc_conf_wizard.py
+++ b/addons/document_ftp/doc_conf_wizard.py
@@ -30,7 +30,7 @@ import os
 class document_configuration_wizard(osv.osv_memory):
 
     _name='document.configuration.wizard'
-    _description = 'Auto Directory configuration'
+    _description = 'Auto Directory Configuration'
     _inherit = 'res.config'
     _rec_name = 'host'
     _columns = {
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 58fe3cc358b..70870b50783 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -123,7 +123,7 @@ class abstracted_fs:
     def db_list(self):
         #return pooler.pool_dic.keys()
         s = netsvc.ExportService.getService('db')
-        result = s.exp_list()
+        result = s.exp_list(document=True)
         self.db_name_list = []
         for db_name in result:
             db, cr = None, None
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index 06c72022fe7..a0e35563857 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -23,32 +23,32 @@
 
     <record model="document.directory.ics.fields" id="dir_field1">
         <field name="name">dtstart</field>
-        <field name="field_id" ref="crm.field_crm_case_create_date"/>
+        <field name="field_id" ref="crm.field_crm_meeting_create_date"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field6">
         <field name="name">dtend</field>
-        <field name="field_id" ref="crm.field_crm_case_date_deadline"/>
+        <field name="field_id" ref="crm.field_crm_meeting_date_deadline"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field2">
         <field name="name">summary</field>
-        <field name="field_id" ref="crm.field_crm_case_name"/>
+        <field name="field_id" ref="crm.field_crm_meeting_name"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field3">
         <field name="name">uid</field>
-        <field name="field_id" ref="field_crm_case_code"/>
+        <field name="field_id" ref="field_crm_meeting_code"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field4">
         <field name="name">description</field>
-        <field name="field_id" ref="crm.field_crm_case_description"/>
+        <field name="field_id" ref="crm.field_crm_meeting_description"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
     <record model="document.directory.ics.fields" id="dir_field5">
         <field name="name">url</field>
-        <field name="field_id" ref="crm.field_crm_case_email_from"/>
+        <field name="field_id" ref="crm.field_crm_meeting_email_from"/>
         <field name="content_id" ref="dir_content_calendar"/>
     </record>
 
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py
index 00f8927eb18..56998a9408a 100644
--- a/addons/document_ics/document_ics.py
+++ b/addons/document_ics/document_ics.py
@@ -177,7 +177,6 @@ class document_directory_content(osv.osv):
             fexprs[n.name] = n.expr
 
         if 'uid' not in fields:
-            print "uid not in ", fields
             # FIXME: should pass
             return True
         for child in parsedCal.getChildren():
@@ -189,7 +188,6 @@ class document_directory_content(osv.osv):
                 if enl =='uid':
                     uuid = event.value
                 if not enl in fields:
-                        # print "skip", enl
                         continue
                 if fields[enl] and funcs[enl] == 'field':
                     if ICS_TAGS[enl]=='normal':
@@ -216,7 +214,6 @@ class document_directory_content(osv.osv):
             # end for
 
             if not uuid:
-                print "Skipping cal", child
                 # FIXME: should pass
                 continue
 
diff --git a/addons/document_ics/document_view.xml b/addons/document_ics/document_view.xml
index 0cbfb6f81e2..39b6908dc76 100644
--- a/addons/document_ics/document_view.xml
+++ b/addons/document_ics/document_view.xml
@@ -45,7 +45,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
         <field name="arch" type="xml">
-            <field name="priority" position="after">
+            <field name="show_as" position="after">
                 <field name="code"/>
             </field>
         </field>
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index 829e71f8bb1..79a9107259d 100644
--- a/addons/document_ics/i18n/fr.po
+++ b/addons/document_ics/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 17:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-21 20:29+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -37,17 +37,17 @@ msgstr "Erreur ! Vous ne pouvez pas créer de Répertoires récursivement."
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Procédure de recrutement"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure Calendars for CRM Sections"
-msgstr ""
+msgstr "Configure les calendriers pour les sections de la CRM"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Support"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
@@ -57,7 +57,7 @@ msgstr "Champ Open ERP"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -67,7 +67,7 @@ msgstr "Contenu"
 #. module: document_ics
 #: field:document.ics.crm.wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Calendrier des Rendez Vous"
 
 #. module: document_ics
 #: model:crm.case.section,name:document_ics.section_meeting
@@ -82,12 +82,14 @@ msgstr "url"
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on softwares"
 msgstr ""
+"Utilisé par les sociétés pour suivre des anomalies et des demandes de "
+"supports sur les logiciels"
 
 #. module: document_ics
 #: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
@@ -95,6 +97,8 @@ msgid ""
 "This Configuration step use to create Calendars in document for all Case "
 "Sections"
 msgstr ""
+"Cette étape de configuration est utilisé pour créer un calendrier dans la  "
+"GED pour toutes les sections"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -107,6 +111,8 @@ msgid ""
 "Help you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Aide à organiser le processus d'embauche: évaluation, rendez vous, gestion "
+"des emails"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -116,28 +122,30 @@ msgstr "description"
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr ""
+msgstr "Configurer les Calendriers pour ces Sections "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Suivi des occasions identifiées d'affaires pour vos canaux de vente."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
 msgstr ""
+"Ceci peut aider les associations dans leur procédure de collecte de fonds et "
+"de suivi."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Diriger un service d'assistance"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Opérations de levée de fonds"
 
 #. module: document_ics
 #: field:document.directory.content,ics_object_id:0
@@ -147,12 +155,12 @@ msgstr "Objet"
 #. module: document_ics
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de sections récursives."
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
 msgid "Support for iCal based on Document Management System"
-msgstr ""
+msgstr "Support iCal basé sur la gestion documentaire"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -173,6 +181,7 @@ msgstr "Valeur ICS"
 #: model:ir.module.module,description:document_ics.module_meta_information
 msgid "Allows to synchronise calendars with others applications."
 msgstr ""
+"Autorise la syncrhonisation des calendriers avec les autres applications."
 
 #. module: document_ics
 #: constraint:ir.ui.view:0
@@ -189,12 +198,12 @@ msgstr ""
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Gère le calendrier des rendez-vous des utilisateurs"
 
 #. module: document_ics
 #: field:document.directory.content,ics_domain:0
@@ -207,6 +216,8 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Gérér les réclamations fournisseurs et clients, incluant vos actions "
+"correctives ou préventives."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -221,17 +232,17 @@ msgstr "Correspondance ICS"
 #. module: document_ics
 #: view:crm.case:0
 msgid "Duration(In Hour)"
-msgstr ""
+msgstr "Durée (en heure)"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Calendrier partagé"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr ""
+msgstr "Réclamations"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
@@ -239,6 +250,8 @@ msgid ""
 "Help you to encode the result of a phone call or to planify a list of phone "
 "calls to process."
 msgstr ""
+"Aide à encoder le résultat d'une conversation téléphonique ou à plannifier "
+"une liste"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -248,12 +261,12 @@ msgstr "dtstart"
 #. module: document_ics
 #: field:document.ics.crm.wizard,phonecall:0
 msgid "Phone Calls"
-msgstr ""
+msgstr "Appels téléphoniques"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Suivi des Bugs"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -263,12 +276,12 @@ msgstr "catégories"
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
 msgid "Prospect"
-msgstr ""
+msgstr "Prospect"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Create Pre-Configured Calendars"
-msgstr ""
+msgstr "Création de calendriers pré-configurer"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -278,7 +291,7 @@ msgstr "créé"
 #. module: document_ics
 #: field:crm.case,code:0
 msgid "Calendar Code"
-msgstr ""
+msgstr "Code Calendrier"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -288,7 +301,7 @@ msgstr "résumé"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
 msgid "document.ics.crm.wizard"
-msgstr ""
+msgstr "document.ics.crm.wizard"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -308,14 +321,14 @@ msgstr "Correspondance des champs"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
-msgstr ""
+msgstr "Opportunités d'affaire"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstamp"
-msgstr ""
+msgstr "dtstamp"
diff --git a/addons/event/event.py b/addons/event/event.py
index ffdeb84d15d..1985cf9cc7d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -27,23 +27,12 @@ import tools
 from tools.translate import _
 from crm import crm
 
-class crm_case_log(osv.osv):
-    _inherit = 'crm.case.log'
-    _description = 'crm.case.log'
-    def create(self, cr, uid, vals, *args, **kwargs):
-            if not 'name' in vals:
-                vals['name']='Historize'
-            return super(osv.osv,self).create(cr, uid, vals, *args, **kwargs)
-    _defaults = {
-        'user_id': lambda self,cr,uid,context: uid,
-    }
-crm_case_log()
 
 class event_type(osv.osv):
     _name = 'event.type'
     _description= 'Event type'
     _columns = {
-        'name': fields.char('Event type', size=64, required=True),
+        'name': fields.char('Event type', size=64, required=True), 
     }
 event_type()
 
@@ -54,58 +43,53 @@ class event(osv.osv):
     _order = 'date_begin'
 
     def copy(self, cr, uid, id, default=None, context=None):
-        return super(event, self).copy(cr, uid,id, default={'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'),'state':'draft'})
+        return super(event, self).copy(cr, uid, id, default={'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'), 'state': 'draft'})
 
     def button_draft(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state':'draft'})
+        return self.write(cr, uid, ids, {'state': 'draft'})
 
     def button_cancel(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state':'cancel'})
+        return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def button_done(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state':'done'})
+        return self.write(cr, uid, ids, {'state': 'done'})
 
     def button_confirm(self, cr, uid, ids, context={}):
         for eve in self.browse(cr, uid, ids):
             if eve.mail_auto_confirm:
                 #send reminder that will confirm the event for all the people that were already confirmed
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id','=',eve.id),('state','not in',['draft','cancel'])])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id), ('state', 'not in', ['draft', 'cancel'])])
                 if reg_ids:
                     self.pool.get('event.registration').mail_user_confirm(cr, uid, reg_ids)
-        return self.write(cr, uid, ids, {'state':'confirm'})
+        return self.write(cr, uid, ids, {'state': 'confirm'})
 
     def _get_register(self, cr, uid, ids, name, args, context=None):
         res={}
         for event in self.browse(cr, uid, ids, context):
-            query = """select sum(nb_register) from crm_case c left join crm_case_section s on (c.section_id=s.id) right join event_event e on (e.section_id=s.id) right join event_registration r on (r.case_id=c.id) where e.section_id = %s and c.state in ('open','done')"""
-            cr.execute(query,(event.section_id.id,))
+            res[event.id] = {}
+            state = 'draft'
+            if name[0] == 'register_current':
+                state = 'open'
+            query = """SELECT sum(r.nb_register) 
+                        from event_registration r 
+                        where state=%s and event_id=%s"""
+
+            cr.execute(query, (state, event.id, ))
             res2 = cr.fetchone()
             if res2 and res2[0]:
-                res[event.id] = res2[0]
+                res[event.id][name[0]] = res2[0]
             else:
-                res[event.id] = 0
+                res[event.id][name[0]] = 0
         return res
 
-    def _get_prospect(self, cr, uid, ids, name, args, context=None):
-        res={}
-        for event in self.browse(cr, uid, ids, context):
-            query = """select sum(nb_register) from crm_case c left join crm_case_section s on (c.section_id=s.id) right join event_event e on (e.section_id=s.id) right join event_registration r on (r.case_id=c.id) where e.section_id = %s and c.state = 'draft'"""
-            cr.execute(query,(event.section_id.id,))
-            res2 = cr.fetchone()
-            if res2 and res2[0]:
-                res[event.id] = res2[0]
-            else:
-                res[event.id] = 0
-        return res
-
-    def write(self, cr, uid, ids,vals, *args, **kwargs):
-        res = super(event,self).write(cr, uid, ids,vals, *args, **kwargs)
+    def write(self, cr, uid, ids, vals, *args, **kwargs):
+        res = super(event, self).write(cr, uid, ids, vals, *args, **kwargs)
         if 'date_begin' in vals and vals['date_begin']:
             for eve in self.browse(cr, uid, ids):
                 #change the deadlines of the registration linked to this event
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id','=',eve.id)])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
                 if reg_ids:
-                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'date_deadline':vals['date_begin']})
+                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'date_deadline': vals['date_begin']})
 
         #change the description of the registration linked to this event
         if 'mail_auto_confirm' in vals:
@@ -117,36 +101,36 @@ class event(osv.osv):
                 vals['mail_confirm']=False
         if 'mail_confirm' in vals:
             for eve in self.browse(cr, uid, ids):
-                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id','=',eve.id)])
+                reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
                 if reg_ids:
-                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'description':vals['mail_confirm']})
+                    self.pool.get('event.registration').write(cr, uid, reg_ids, {'description': vals['mail_confirm']})
         return res
 
     _columns = {
-        'type': fields.many2one('event.type', 'Type'),
-        'section_id': fields.many2one('crm.case.section', 'Case section', required=True),
-        'register_max': fields.integer('Maximum Registrations'),
-        'register_min': fields.integer('Minimum Registrations'),
-        'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations'),
-        'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'),
-        'date_begin': fields.datetime('Beginning date', required=True),
-        'date_end': fields.datetime('Ending date', required=True),
-        'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'State', readonly=True, required=True,
+        'type': fields.many2one('event.type', 'Type'), 
+        'section_id': fields.many2one('crm.case.section', 'Case section', required=True), 
+        'register_max': fields.integer('Maximum Registrations'), 
+        'register_min': fields.integer('Minimum Registrations'), 
+        'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current'), 
+        'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect'), 
+        'date_begin': fields.datetime('Beginning date', required=True), 
+        'date_end': fields.datetime('Ending date', required=True), 
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True, 
                                   help='If event is created, the state is \'Draft\'.\n If event is confirmed for the particular dates the state is set to \'Confirmed\'.\
-                                  \nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'),
-        'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'),
-        'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
-        'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'),
-        'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
-        'product_id':fields.many2one('product.product','Product', required=True),
+                                  \nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'), 
+        'mail_auto_registr': fields.boolean('Mail Auto Register', help='Check this box if you want to use the automatic mailing for new registration'), 
+        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), 
+        'mail_registr': fields.text('Registration Email', help='This email will be sent when someone subscribes to the event.'), 
+        'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), 
+        'product_id': fields.many2one('product.product', 'Product', required=True), 
     }
 
     _defaults = {
-        'state': lambda *args: 'draft',
-        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'),
-        'user_id': lambda self,cr,uid,ctx: uid,
-
+        'state': lambda *args: 'draft', 
+        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'), 
+        'user_id': lambda self, cr, uid, ctx: uid, 
     }
+
 event()
 
 class event_registration(osv.osv):
@@ -156,48 +140,45 @@ class event_registration(osv.osv):
         current_registration = self.browse(cr, uid, [ids[0]])[0]
         total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
         if total_confirmed <= current_registration.event_id.register_max or current_registration.event_id.register_max == 0:
-            self.write(cr, uid, [ids[0]], {'state':'open'}, context=context)
+            self.write(cr, uid, [ids[0]], {'state': 'open'}, context=context)
             self._history(cr, uid, [ids[0]], 'Open', history=True)
             self.mail_user(cr, uid, [ids[0]])
             return True
         else:
-            model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_event_confirm_registration')], context=context)
+            model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'view_event_confirm_registration')], context=context)
             resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
             context.update({'reg_id': ids[0]})
             return {
-                'name': _('Confirm Registration'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'event.confirm.registration',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
+                'name': _('Confirm Registration'), 
+                'context': context, 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'event.confirm.registration', 
+                'views': [(resource_id, 'form')], 
+                'type': 'ir.actions.act_window', 
+                'target': 'new', 
                 'nodestroy': True
             }
 
-    def _history(self, cr, uid,ids,keyword, history=False, email=False, context={}):
+    def _history(self, cr, uid, ids, keyword, history=False, email=False, context={}):
         for case in self.browse(cr, uid, ids):
-            if not case.case_id:
-                return True
             data = {
-                'name': keyword,
-                'som': case.som.id,
-                'canal_id': case.canal_id.id,
-                'user_id': uid,
-                'case_id': case.case_id.id
+                'name': keyword, 
+                'som': case.som.id, 
+                'canal_id': case.canal_id.id, 
+                'user_id': uid, 
             }
-            obj = self.pool.get('crm.case.log')
-            obj.create(cr, uid, data, context)
+            obj = self.pool.get('mailgate.message')
+            obj.create(cr, uid, data, context=context)
         return True
 
     def button_reg_close(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'done',})
+        self.write(cr, uid, ids, {'state': 'done', })
         self._history(cr, uid, ids, 'Done', history=True)
         return True
 
     def button_reg_cancel(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'cancel',})
+        self.write(cr, uid, ids, {'state': 'cancel', })
         self._history(cr, uid, ids, 'Cancel', history=True)
         return True
 
@@ -207,7 +188,7 @@ class event_registration(osv.osv):
         args[0]['date_deadline']= event.date_begin
         args[0]['description']= event.mail_confirm
         res = super(event_registration, self).create(cr, uid, *args, **argv)
-        self._history(cr, uid,[res], 'Created', history=True)
+        self._history(cr, uid, [res], 'Created', history=True)
         return res
 
     def write(self, cr, uid, *args, **argv):
@@ -218,71 +199,76 @@ class event_registration(osv.osv):
             args[1]['description']= event.mail_confirm
         return super(event_registration, self).write(cr, uid, *args, **argv)
 
-    def mail_user_confirm(self,cr,uid,ids):
-        reg_ids=self.browse(cr,uid,ids)
+    def mail_user_confirm(self, cr, uid, ids):
+        reg_ids = self.browse(cr,uid,ids)
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
-            dest = [reg_id.email_from]
+            dest = []
+            if reg_id.email_from:
+                dest += [reg_id.email_from]
             if reg_id.email_cc:
                 dest += [reg_id.email_cc]
             if dest and src:
-                tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
+                tools.email_send(src, dest, 'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.id))
             if not src:
                 raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
         return False
 
-    def mail_user(self,cr,uid,ids):
-        reg_ids=self.browse(cr,uid,ids)
+    def mail_user(self, cr, uid, ids):
+        reg_ids = self.browse(cr, uid, ids)
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
-            dest = [reg_id.email_from]
+            dest = []
+            if reg_id.email_from:
+                dest += [reg_id.email_from]
             if reg_id.email_cc:
                 dest += [reg_id.email_cc]
             if reg_id.event_id.mail_auto_confirm or reg_id.event_id.mail_auto_registr:
                 if dest and src:
-                    if reg_id.event_id.state in ['draft', 'fixed', 'open','confirm','running'] and reg_id.event_id.mail_auto_registr:
-                        tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, openobject_id = str(reg_id.case_id.id))
-                    if (reg_id.event_id.state in ['confirm','running']) and reg_id.event_id.mail_auto_confirm:
-                        tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
+                    if reg_id.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and reg_id.event_id.mail_auto_registr:
+                        tools.email_send(src, dest, 'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, openobject_id = str(reg_id.id))
+                    if (reg_id.event_id.state in ['confirm', 'running']) and reg_id.event_id.mail_auto_confirm:
+                        tools.email_send(src, dest, 'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.id))
                 if not src:
                     raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
         return False
 
     def _create_invoice_lines(self, cr, uid, ids, vals):
-        return self.pool.get('account.invoice.line').create(cr, uid,vals )
+        return self.pool.get('account.invoice.line').create(cr, uid, vals)
 
     _name= 'event.registration'
     _description = 'Event Registration'
-    _inherits = {'crm.case': 'case_id'}
+    _inherit = 'crm.meeting'
+
     _columns = {
-        'case_id':fields.many2one('crm.case','Case'),
-        'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft':[('readonly',False)]}),
-        'event_id':fields.many2one('event.event', 'Event Related', required=True),
-        "partner_invoice_id":fields.many2one('res.partner', 'Partner Invoiced'),
-        "contact_id":fields.many2one('res.partner.contact', 'Partner Contact'), #TODO: filter only the contacts that have a function into the selected partner_id
-        "unit_price": fields.float('Unit Price'),
-        "badge_title":fields.char('Badge Title',size=128),
-        "badge_name":fields.char('Badge Name',size=128),
-        "badge_partner":fields.char('Badge Partner',size=128),
-        "invoice_label":fields.char("Label Invoice",size=128,required=True),
-        "tobe_invoiced":fields.boolean("To be Invoiced"),
-        "invoice_id":fields.many2one("account.invoice","Invoice"),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id)]"),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'email_cc': fields.text('Watchers Emails', size=252 , help="These \
+people will receive a copy of the future communication between partner \
+and users by email"),
+        'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft': [('readonly', False)]}), 
+        'event_id': fields.many2one('event.event', 'Event Related', required=True), 
+        "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced'), 
+        "contact_id": fields.many2one('res.partner.contact', 'Partner Contact'), #TODO: filter only the contacts that have a function into the selected partner_id
+        "unit_price": fields.float('Unit Price'), 
+        "badge_title": fields.char('Badge Title', size=128), 
+        "badge_name": fields.char('Badge Name', size=128), 
+        "badge_partner": fields.char('Badge Partner', size=128), 
+        "invoice_label": fields.char("Label Invoice", size=128, required=True), 
+        "tobe_invoiced": fields.boolean("To be Invoiced"), 
+        "invoice_id": fields.many2one("account.invoice", "Invoice"), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
+        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."), 
         'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
                                                                        "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."), 
     }
+    
     _defaults = {
-        'nb_register': lambda *a: 1,
-        'tobe_invoiced' : lambda *a: True,
-        'name': lambda *a: 'Registration',
-        'state': lambda *b: 'draft'
+        'nb_register': lambda *a: 1, 
+        'tobe_invoiced': lambda *a: True, 
+        'name': lambda *a: 'Registration', 
     }
 
     def onchange_badge_name(self, cr, uid, ids, badge_name):
@@ -290,7 +276,7 @@ class event_registration(osv.osv):
         if not badge_name:
             return data
         data['name'] = 'Registration: ' + badge_name
-        return {'value':data}
+        return {'value': data}
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner):
         data ={}
@@ -300,109 +286,76 @@ class event_registration(osv.osv):
         data['badge_name'] = contact_id.name
         data['badge_title'] = contact_id.title
         if partner:
-            partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id','=',partner)])
-            job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])
+            partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '=', partner)])
+            job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])
             if job_ids:
                 data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).email
-        d = self.onchange_badge_name(cr, uid, ids,data['badge_name'])
+        d = self.onchange_badge_name(cr, uid, ids, data['badge_name'])
         data.update(d['value'])
 
-        return {'value':data}
+        return {'value': data}
 
     def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
         context={}
         if not event_id:
-            return {'value':{'unit_price' : False ,'invoice_label' : False }}
-        data_event =  self.pool.get('event.event').browse(cr,uid,event_id)
+            return {'value': {'unit_price': False , 'invoice_label': False }}
+        data_event =  self.pool.get('event.event').browse(cr, uid, event_id)
         if data_event.product_id:
             if not partner_invoice_id:
-                unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id],context=context)[data_event.product_id.id]
-                return {'value':{'unit_price' : unit_price , 'invoice_label' : data_event.product_id.name}}
-            data_partner = self.pool.get('res.partner').browse(cr,uid,partner_invoice_id)
-            context.update({'partner_id':data_partner})
-            unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist':data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value':{'unit_price' :unit_price , 'invoice_label' : data_event.product_id.name}}
-        return {'value':{'unit_price' : False,'invoice_label' : False}}
+                unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
+                return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+            data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
+            context.update({'partner_id': data_partner})
+            unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
+            return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+        return {'value': {'unit_price': False, 'invoice_label': False}}
 
 
     def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False):
         data={}
         data['badge_partner'] = data['contact_id'] = data['partner_invoice_id'] = data['email_from'] = data['badge_title'] = data['badge_name'] = False
         if not part:
-            return {'value':data}
+            return {'value': data}
         data['partner_invoice_id']=part
         # this calls onchange_partner_invoice_id
-        d = self.onchange_partner_invoice_id(cr, uid, ids, event_id,part)
+        d = self.onchange_partner_invoice_id(cr, uid, ids, event_id, part)
         # this updates the dictionary
         data.update(d['value'])
         addr = self.pool.get('res.partner').address_get(cr, uid, [part])
         if addr:
             if addr.has_key('default'):
-                job_ids = self.pool.get('res.partner.job').search(cr, uid, [('address_id','=',addr['default'])])
+                job_ids = self.pool.get('res.partner.job').search(cr, uid, [('address_id', '=', addr['default'])])
                 if job_ids:
                     data['contact_id'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).contact_id.id
-                    d = self.onchange_contact_id(cr, uid, ids, data['contact_id'],part)
+                    d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part)
                     data.update(d['value'])
         partner_data = self.pool.get('res.partner').browse(cr, uid, part)
         data['badge_partner'] = partner_data.name
-        return {'value':data}
+        return {'value': data}
 
     def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
         data={}
         context={}
         data['unit_price']=False
         if not event_id:
-            return {'value':data}
-        data_event =  self.pool.get('event.event').browse(cr,uid,event_id)
+            return {'value': data}
+        data_event =  self.pool.get('event.event').browse(cr, uid, event_id)
 
         if data_event.product_id:
             if not partner_invoice_id:
-                data['unit_price']=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id],context=context)[data_event.product_id.id]
-                return {'value':data}
-            data_partner = self.pool.get('res.partner').browse(cr,uid,partner_invoice_id)
-            context.update({'partner_id':data_partner})
-            data['unit_price'] = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist':data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value':data}
-        return {'value':data}
+                data['unit_price']=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
+                return {'value': data}
+            data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
+            context.update({'partner_id': data_partner})
+            data['unit_price'] = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
+            return {'value': data}
+        return {'value': data}
 
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
-            return {'value':{}}
+            return {'value': {}}
         cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}
-
-    def _map_ids(self,method,cr, uid, ids, *args, **argv):
-        case_data = self.browse(cr,uid,ids)
-        new_ids=[]
-        for case in case_data:
-            if case.case_id:
-                new_ids.append(case.case_id.id)
-        return getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-
-
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_pending(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_log(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_log',cr,uid,ids,*args,**argv)
-    def case_log_reply(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_log_reply',cr,uid,ids,*args,**argv)
-    def add_reply(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('add_reply',cr,uid,ids,*args,**argv)
-    def remind_partner(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('remind_partner',cr,uid,ids,*args,**argv)
-    def remind_user(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('remind_user',cr,uid,ids,*args,**argv)
-
+        return {'value': {'probability': cat}}
 
 event_registration()
 
@@ -413,12 +366,12 @@ class report_event_registration(osv.osv):
     _description = "Events on registrations"
     _auto = False
     _columns = {
-        'name': fields.char('Event',size=20),
-        'date_begin': fields.datetime('Beginning date', required=True),
-        'date_end': fields.datetime('Ending date', required=True),
-        'draft_state': fields.integer('Draft Registration',size=20),
-        'confirm_state': fields.integer('Confirm Registration',size=20),
-        'register_max': fields.integer('Maximum Registrations'),
+        'name': fields.char('Event', size=20), 
+        'date_begin': fields.datetime('Beginning date', required=True), 
+        'date_end': fields.datetime('Ending date', required=True), 
+        'draft_state': fields.integer('Draft Registration', size=20), 
+        'confirm_state': fields.integer('Confirm Registration', size=20), 
+        'register_max': fields.integer('Maximum Registrations'), 
     }
     def init(self, cr):
         cr.execute("""
@@ -428,8 +381,8 @@ class report_event_registration(osv.osv):
                 c.name as name,
                 e.date_begin as date_begin,
                 e.date_end as date_end,
-                (SELECT sum(nb_register) FROM event_registration x , crm_case c  WHERE x.case_id=c.id and c.section_id=e.section_id and state in ('draft')) as draft_state,
-                (SELECT sum(nb_register) FROM event_registration x , crm_case c  WHERE x.case_id=c.id and c.section_id=e.section_id and state in ('open')) as confirm_state,
+                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.section_id=e.section_id and state in ('draft')) as draft_state,
+                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.section_id=e.section_id and state in ('open')) as confirm_state,
                 e.register_max as register_max
                 from
                 event_event e,crm_case_section c
@@ -444,19 +397,21 @@ class report_event_type_registration(osv.osv):
     _description = "Event type on registration"
     _auto = False
     _columns = {
-        'name': fields.char('Event Type',size=20),
-        'nbevent':fields.integer('Number Of Events'),
-        'draft_state': fields.integer('Draft Registrations',size=20),
-        'confirm_state': fields.integer('Confirm Registrations',size=20),
+        'name': fields.char('Event Type', size=20), 
+        'nbevent': fields.integer('Number Of Events'), 
+        'draft_state': fields.integer('Draft Registrations', size=20), 
+        'confirm_state': fields.integer('Confirm Registrations', size=20), 
         }
+        
+        
     def init(self, cr):
         cr.execute("""
             create or replace view report_event_type_registration as (
                 select
                 count(t.id) as id,
                 t.name as name,
-                (select sum(nb_register) from event_registration r , crm_case c , event_event e  where c.section_id=e.section_id and r.case_id=c.id and c.state='draft' and e.type=t.id ) as draft_state ,
-                (select sum(nb_register) from event_registration r , crm_case c , event_event e  where c.section_id=e.section_id and r.case_id=c.id and c.state='open' and e.type=t.id ) as  confirm_state,
+                (select sum(c.nb_register) from event_registration c, event_event e  where c.section_id=e.section_id and c.state='draft' and e.type=t.id ) as draft_state ,
+                (select sum(c.nb_register) from event_registration c, event_event e  where c.section_id=e.section_id and c.state='open' and e.type=t.id ) as  confirm_state,
                 count(t.id) as nbevent
                 from
                     event_event e
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index cb13b0662a8..37ac26ac7b4 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -33,8 +33,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
+        <menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30" groups="base.group_extended"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
 
         <!-- The base section for all events -->
 
@@ -126,7 +126,6 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group col="10" colspan="4">
-                        <filter icon="gtk-execute" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
                         <filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
@@ -147,6 +146,7 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
+           <field name="context">{"search_default_user_id":uid}</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
 
@@ -221,23 +221,26 @@
                         <field name="ref2" colspan="4"/>
                     </page>
                     <page string="History">
-                        <field name="history_line" colspan="4" nolabel="1" mode="tree,form">
-                            <form string="Communication history">
-                                <field name="date"/>
-                                <field name="som"/>
-                                <newline/>
-                                <field name="canal_id"/>
-                                <field name="email"/>
-                                <newline/>
-                                <field name="description" colspan="4"/>
-                            </form>
-                            <tree string="Communication history">
-                                <field name="date"/>
-                                <field name="description"/>
-                                <field name="som"/>
-                                <field name="user_id"/>
-                                <field name="canal_id"/>
-                            </tree>
+                        <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+	                        <form string="Communication history">
+							    <group col="6" colspan="4">
+							        <field name="date"/>
+							        <field name="email_to"/>
+							        <field name="email_from"/>
+								</group>
+							   <newline/>
+							   <field name="description" colspan="4" nolabel="1"/>
+							   <button colspan="4"
+							       string="Reply to Last Email"
+							       name="%(crm.action_crm_send_mail)d"
+							       context="{'mail':'reply', 'model': 'crm.lead'}"
+							       icon="gtk-undo" type="action" />
+							</form>
+							<tree string="Communication history">
+							   <field name="description"/>
+							   <field name="email_to"/>
+							   <field name="date"/>
+							</tree>
                         </field>
                         <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
                             <tree string="Actions">
@@ -271,7 +274,6 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group col="12" colspan="4">
-                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Registrations"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
                         <filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
@@ -292,6 +294,7 @@
           <field name="view_type">form</field>
           <field name="domain"></field>
           <field name="view_mode">tree,form</field>
+          <field name="context">{"search_default_user_id":uid}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
         <menuitem
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index db731e1ccd3..e80f0eeae0c 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -2,11 +2,11 @@
 <openerp>
 	<data>
 		<record id="menu_event_config" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager')])]"/>
+			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>
 		</record>
 
 		<record id="menu_report_event" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager')])]"/>
+			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager'), ref('base.group_extended')])]"/>
 		</record>
 	</data>
 </openerp>
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 98b262ea5f3..9eccb065448 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -5,3 +5,8 @@
 "access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1
 "access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0
 "access_report_event_type_registration","report.event.type.registration","model_report_event_type_registration","crm.group_crm_user",1,0,0,0
+"access_event_confirm_registration","event.confirm.registration","model_event_confirm_registration","crm.group_crm_user",1,0,0,0
+"access_event_confirm_registration_manager","event.confirm.registration manager","model_event_confirm_registration","crm.group_crm_manager",1,1,1,1
+"access_event_make_invoice","event.make.invoice","model_event_make_invoice","crm.group_crm_user",1,1,1,1
+"access_event_partners_list","event.partners.list","model_event_partners_list","crm.group_crm_user",1,0,0,0
+"access_event_registration_list","event.registration.list","model_event_registration_list","crm.group_crm_user",1,0,0,0
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
index f8a9d02de7d..0e64c0abe53 100644
--- a/addons/event/wizard/event_confirm_registration.py
+++ b/addons/event/wizard/event_confirm_registration.py
@@ -27,21 +27,23 @@ class event_confirm_registration(osv.osv_memory):
     """
     _name = "event.confirm.registration"
     _description = "Event Registraion"
+
     _columns = {
-        'msg': fields.text('Message', readonly=True),
+                'msg': fields.text('Message', readonly=True), 
                }
     _defaults={
-       'msg':lambda *a:'The event limit is reached. What do you want to do?'
+                'msg':lambda *a:'The event limit is reached. What do you want to do?'
                }
 
     def confirm(self, cr, uid, ids, context):
         registration_obj = self.pool.get('event.registration')
         reg_id = context.get('reg_id', False) or context.get('active_id', False)
         if reg_id:
-            registration_obj.write(cr, uid, [reg_id], {'state':'open',})
+            registration_obj.write(cr, uid, [reg_id], {'state':'open', })
             registration_obj._history(cr, uid, [reg_id], 'Open', history=True)
-            registration_obj.mail_user(cr,uid,[reg_id])
+            registration_obj.mail_user(cr, uid, [reg_id])
         return {}
 
 event_confirm_registration()
-# 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/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 1df4d2f2277..1e8505a74e9 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -68,8 +68,11 @@ class event_make_invoice(osv.osv_memory):
                 inv_reject = inv_reject + 1
                 inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
                 continue
-            partner_address_list = reg.partner_invoice_id and self.pool.get('res.partner').address_get(cr, uid, [reg.partner_invoice_id.id], adr_pref=['invoice'])
-            partner_address_id = partner_address_list['invoice']
+            else:
+                val_invoice = pool_obj.get('account.invoice').onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
+                val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
+                partner_address_id = val_invoice['value']['address_invoice_id']
+                
             if not partner_address_id:
                 inv_reject = inv_reject + 1
                 inv_rej_reason += "ID "+str(reg.id)+": Registered partner doesn't have an address to make the invoice. \n"
@@ -82,8 +85,9 @@ class event_make_invoice(osv.osv_memory):
                 tax_ids.append(tax.id)
 
             vals = value['value']
+            c_name = reg.contact_id and ('-' + self.pool.get('res.partner.contact').name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
             vals.update({
-                'name': reg.name,
+                'name': reg.invoice_label + '-' + c_name,
                 'price_unit': reg.unit_price,
                 'quantity': reg.nb_register,
                 'product_id':reg.event_id.product_id.id,
@@ -91,23 +95,14 @@ class event_make_invoice(osv.osv_memory):
             })
             inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
 
-            inv = {
-                'name': reg.invoice_label,
+            val_invoice['value'].update({
                 'origin': reg.invoice_label,
-                'type': 'out_invoice',
                 'reference': False,
-                'account_id': reg.partner_invoice_id.property_account_receivable.id,
-                'partner_id': reg.partner_invoice_id.id,
-                'address_invoice_id':partner_address_id,
-                'address_contact_id':partner_address_id,
                 'invoice_line': [(6,0,[inv_line_ids])],
-                'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
                 'comment': "",
-                'payment_term':reg.partner_invoice_id.property_payment_term.id,
-                'fiscal_position': reg.partner_invoice_id.property_account_position.id
-            }
+            })
 
-            inv_id = inv_obj.create(cr, uid, inv)
+            inv_id = inv_obj.create(cr, uid, val_invoice['value'])
             list_inv.append(inv_id)
             obj_event_reg.write(cr, uid, reg.id, {'invoice_id': inv_id, 'state': 'done'})
             obj_event_reg._history(cr, uid, [reg.id], 'Invoiced', history=True)
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
index d8087b7a569..4803d118610 100644
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -36,10 +36,8 @@ class event_registration_list(osv.osv_memory):
             'type': 'ir.actions.act_window'
             }
 
-        cr.execute('SELECT section_id FROM event_event WHERE id = %s', (context['active_id'],))
-        res = cr.fetchone()
         return {
-            'domain': [('section_id', '=', res[0])],
+            'domain': [('section_id', '=', context['active_id'])],
             'name': 'Event Registrations',
             'view_type': 'form',
             'view_mode': 'tree,form',
diff --git a/addons/event_project/i18n/fr.po b/addons/event_project/i18n/fr.po
index 356357e877b..1e87919bf74 100644
--- a/addons/event_project/i18n/fr.po
+++ b/addons/event_project/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 16:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-21 21:05+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
@@ -24,7 +24,7 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: event_project
 #: model:ir.actions.wizard,name:event_project.wizard_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "Tâches"
 
 #. module: event_project
 #: wizard_button:event.project,init,done:0
@@ -39,6 +39,10 @@ msgid ""
 "    This module allow you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"Organisation et gestion des évènements.\n"
+"\n"
+"    Ce module vous autorise à créer un rétro-planning pour gérer vos "
+"évènements.\n"
 
 #. module: event_project
 #: view:event.event:0
@@ -48,7 +52,7 @@ msgstr "Tâches Restantes"
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event - Project"
-msgstr ""
+msgstr "Évènement - Projet"
 
 #. module: event_project
 #: field:event.event,project_id:0
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index aad88a7ef50..7fd52a7fc8b 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -38,7 +38,8 @@
     'init_xml': [],
     'update_xml': [
         "fetchmail_view.xml",
-        "fetchmail_data.xml"
+        "fetchmail_data.xml",
+        'security/ir.model.access.csv',
     ],
     'demo_xml': [
 
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
new file mode 100644
index 00000000000..907aa187913
--- /dev/null
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_email_server","email.server","model_email_server",,1,1,1,1
+"access_mail_server_history","mail.server.history","model_mail_server_history",,1,1,1,1
+"access_email_server_tools","email.server.tools","model_email_server_tools",,1,1,1,1
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index ef1160132a5..f31969129d8 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -101,7 +101,7 @@ ir_action_window()
 
 class res_users(osv.osv):
     _inherit = 'res.users'
-    _description = 'res.users'
+    _description = 'User'
 
     def _parent_compute(self, cr, uid, ids, name, args, context={}):
         result = {}
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 47efc17825e..2b3dc6e4ea9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -360,7 +360,7 @@
 
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="department_id" widget="selection">
+                     <field name="department_id" widget="selection">
                             <filter icon="terp-crm"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             help="My Departments Jobs"/>
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 11884c53d2f..35ec30cc260 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-12 20:04+0000\n"
+"PO-Revision-Date: 2010-05-21 19:41+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-05-13 04:36+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -42,7 +42,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:hr.module_meta_information
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Zasoby ludzkie"
+msgstr "Zasoby kadrowe"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
@@ -263,7 +263,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Powiązany użytkownik"
 
 #. module: hr
 #: field:hr.employee,category_id:0
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 27458ac2e85..043941eed88 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -27,7 +27,7 @@ from tools.translate import _
 
 class hr_action_reason(osv.osv):
     _name = "hr.action.reason"
-    _description = "Action reason"
+    _description = "Action Reason"
     _columns = {
         'name' : fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
         'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index c29b97853ca..87b03b27557 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 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: 2010-02-14 21:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-18 11:29+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-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -112,7 +112,7 @@ msgstr "Bir zaman aralığı seçiniz..."
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Tarih Kaydedildi"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -123,7 +123,7 @@ msgstr "Giriş"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Total period:"
-msgstr ""
+msgstr "Toplam periyod:"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
@@ -139,12 +139,12 @@ msgstr "Mart"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "August"
-msgstr "Agustos"
+msgstr "Ağustos"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "May"
-msgstr "Mayis"
+msgstr "Mayıs"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,so_ask_si,last_time:0
@@ -175,7 +175,7 @@ msgstr "Personel Devam Kontrolü"
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Sebep"
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -218,17 +218,17 @@ msgstr "Başlangıç Tarihi"
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr ""
+msgstr "Mevcut"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr ""
+msgstr "Yok"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "February"
-msgstr "Subat"
+msgstr "Şubat"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -238,7 +238,7 @@ msgstr "Ekim"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,si_ask_so,last_time:0
 msgid "Your last sign out"
-msgstr "Son Çıkış imzanız"
+msgstr "Son çıkışınız"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
@@ -248,7 +248,7 @@ msgstr "Min. Gecikme"
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr ""
+msgstr "Eylem türü"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -270,7 +270,7 @@ msgstr "Analiz Bilgisi"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,init,state:0
 msgid "Current state"
-msgstr "Güncel Durum"
+msgstr "Mevcut durum"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -298,7 +298,7 @@ msgstr ""
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr "İşlem"
+msgstr "Eylem"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.report,init,print:0
@@ -314,7 +314,7 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "November"
-msgstr "Kasim"
+msgstr "Kasım"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
@@ -347,12 +347,12 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "September"
-msgstr "Eylul"
+msgstr "Eylül"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "December"
-msgstr "Aralik"
+msgstr "Aralık"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -362,7 +362,7 @@ msgstr "Personel Devam Süresi"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_month,init:0
 msgid "Select a month"
-msgstr "Bir Ay Seç"
+msgstr "Ay seçin"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,month:0
@@ -382,7 +382,7 @@ msgstr "Devam Süresi Hata Raporu"
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,year:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,end:0
@@ -397,4 +397,4 @@ msgstr "İptal"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Operation"
-msgstr "Operasyon"
+msgstr "İşlem"
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 9951a9e3982..74d1bcd8d7b 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -153,7 +153,7 @@
                </search>
             </field>
         </record>
-
+        
         <record id="hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
             <field name="model">hr.contract</field>
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index de5ebc99fa0..4122d40f142 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e2b1532d17f..fe25cd7ab23 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -346,7 +346,6 @@
                    <group col='10' colspan='4'>
                         <filter icon="terp-crm" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
-                        <filter string="My" icon="terp-partner" name="my" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
@@ -362,7 +361,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
-            <field name="context">{"search_default_todo":1,"search_default_my":1}</field>
+            <field name="context">{"search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 3f3948c00db..e43c73ed108 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -8,3 +8,5 @@
 "access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,0,0,0
 "access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_manager",1,1,1,1
 "access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report",,1,0,0,0
+"access_hr_evaluation_reminder_manager","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_reminder","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_user",1,0,0,0
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4e1e3033a92..5e40e6e5773 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -50,7 +50,7 @@ class hr_expense_expense(osv.osv):
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
 
     _name = "hr.expense.expense"
-    _description = "HR Expense"
+    _description = "Expense"
     _columns = {
         'name': fields.char('Expense Sheet', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index ffd1792de77..14bc05b6454 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -131,11 +131,6 @@
                         domain="[('state','=','draft')]"
                         string="Draft"
                         help="Draft Expense"/>
-                	  <filter
-                        icon="terp-hr"
-                        string="My Expenses"
-                        default="1"
-                        domain="[('user_id','=',uid)]"/>
                       <separator orientation="vertical"/>
                       <filter
                         icon="terp-hr"
@@ -151,7 +146,7 @@
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection" string="User">
-                        <filter icon="terp-hr"
+                      		<filter icon="terp-hr"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
@@ -172,6 +167,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index cc3f282e9fa..2b0f6b4addf 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -45,9 +45,13 @@ class hr_expense_report(osv.osv):
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
+        'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
+        'no_of_products':fields.integer('# of Products', readonly=True),
+        'no_of_account':fields.integer('# of Accounts', readonly=True),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('confirm', 'Waiting confirmation'),
@@ -67,6 +71,7 @@ class hr_expense_report(osv.osv):
                      date_trunc('day',s.create_date) as date,
                      s.employee_id,
                      s.journal_id,
+                     s.currency_id,
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
                      s.invoice_id,
@@ -75,27 +80,33 @@ class hr_expense_report(osv.osv):
                      to_char(date_trunc('day',s.create_date), 'MM') as month,
                      to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
+                     l.analytic_account as analytic_account,
                      sum(l.unit_quantity * u.factor) as product_qty,
                      s.user_id as user_id,
                      s.company_id as company_id,
                      sum(l.unit_quantity*l.unit_amount) as price_total,
                      (sum(l.unit_quantity*l.unit_amount)/sum(l.unit_quantity * u.factor))::decimal(16,2) as price_average,
                      count(*) as nbr,
+                     (select unit_quantity from hr_expense_line where id=l.id and product_id is not null) as no_of_products,
+                     (select count(analytic_account) from hr_expense_line where id=l.id and analytic_account is not null) as no_of_account,
                      s.state
-                     from
-                 hr_expense_line l
-                 left join
-                     hr_expense_expense s on (s.id=l.expense_id)
-                     left join product_uom u on (u.id=l.uom_id)
+                 from hr_expense_line l
+                 left join hr_expense_expense s on (s.id=l.expense_id)
+                 left join product_uom u on (u.id=l.uom_id)
                  group by
                      date_trunc('day',s.create_date),
+                     to_char(date_trunc('day',s.create_date), 'YYYY'),
+                     to_char(date_trunc('day',s.create_date), 'MM'),
                      to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD'),
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      l.product_id,
+                     l.analytic_account,
                      s.invoice_id,
+                     s.currency_id,
                      s.department_id,
                      l.uom_id,
+                     l.id,
                      s.user_id,
                      s.state,
                      s.journal_id,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index c376df3e4d7..7a50cb71140 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -14,12 +14,16 @@
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="invoice_id" invisible="1"/>
+                <field name="analytic_account" invisible="1"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
+                <field name="currency_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
+                <field name="no_of_products" sum="# of Products"/>
+                <field name="no_of_account" sum="# of Accounts"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="state" invisible="1"/>
@@ -47,7 +51,7 @@
         <field name="arch" type="xml">
             <search string="Expenses">
             	<group>
-            		<filter icon="terp-hr" string="This Year"
+            		<filter icon="terp-hr" string="Last 365 Days"
 	                  	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                   	    help="Expenses during last 7 year"/>
 	                <filter icon="terp-hr" string="This Month"
@@ -74,15 +78,13 @@
 	                   		help = "Accepted Expenses"/>
 	  				<separator orientation="vertical"/>
 	                <field name="user_id" widget="selection">
-                        <filter icon="terp-hr"
-                        		string="My Expenses"
-                        		help = "My Expenses"
-                        		domain="[('user_id','=',uid)]" />
                         <filter icon="terp-hr"
 	                        		string="Expenses Non Assigned User"
 	                        		help="Expenses Non Assigned User"
 	                        		domain="[('user_id','=',False)]"/>
                     </field>
+                    <field name="product_id"/>
+                    <field name="employee_id" widget="selection"/>
 				</group>
 				<newline/>
 				<group expand="0" string="Extended options..." colspan="10" col="12">
@@ -99,13 +101,11 @@
 	                   		domain="[('state','=','cancelled')]"
 	                   		help = "Cancelled Expenses"/>
 	                <separator orientation="vertical"/>
-                    <field name="employee_id" widget="selection"/>
-                    <field name="product_id" widget="selection"/>
                     <field name="department_id" widget="selection"/>
-                    <newline/>
                     <field name="journal_id" widget="selection"/>
+                    <field name="currency_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-  				    <separator orientation="vertical"/>
+                    <newline/>
                     <field name="date_confirm"/>
                     <field name="date_valid"/>
                 </group>
@@ -115,13 +115,16 @@
                     <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
+                    <filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/>
+                    <filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/>
                     <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
                     <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
                     <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                 </group>
             </search>
@@ -133,7 +136,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index aa00dab4fa1..43ae736b9ff 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "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","hr.group_hr_user",1,1,1,1
 "access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1
+"access_hr_expense_report","hr.expense.report","model_hr_expense_report","hr.group_hr_user",1,0,0,0
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 3337c09ea13..1d99a417d34 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -21,7 +21,7 @@
 #
 ##############################################################################
 import time
-
+import datetime
 import pooler
 import netsvc
 from osv import fields, osv
@@ -29,7 +29,7 @@ from tools.translate import _
 
 class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
-    _description = "Leave Types"
+    _description = "Leave Type"
 
     def get_days_cat(self, cr, uid, ids, category_id, return_false, context={}):
         res = {}
@@ -106,7 +106,7 @@ hr_holidays_status()
 
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
-    _description = "Holidays"
+    _description = "Leave"
     _order = "type desc, date_from asc"
 
     def _employee_get(obj, cr, uid, context=None):
@@ -182,14 +182,14 @@ class hr_holidays(osv.osv):
                                     }
         return result
 
-    def _get_number_of_days(date_from, date_to):
+    def _get_number_of_days(self, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
 
         DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
         from_dt = datetime.datetime.strptime(date_from, DATETIME_FORMAT)
         to_dt = datetime.datetime.strptime(date_to, DATETIME_FORMAT)
         timedelta = to_dt - from_dt
-        diff_day = timedelta.days + float(timedelata.seconds) / 86400
+        diff_day = timedelta.days + float(timedelta.seconds) / 86400
         return diff_day
 
     def _update_user_holidays(self, cr, uid, ids):
@@ -204,14 +204,16 @@ class hr_holidays(osv.osv):
                     self.unlink(cr, uid, list_ids)
 
     def _check_date(self, cr, uid, ids):
-        if ids:
-            cr.execute('select number_of_days_temp from hr_holidays where id in ('+','.join(map(str, ids))+')')
-            res =  cr.fetchall()
-            if res and res[0][0] and res[0][0] < 0:
+        for rec in self.read(cr, uid, ids, ['number_of_days_temp','date_from','date_to']):
+            if rec['number_of_days_temp'] < 0:
+                return False
+            date_from = time.strptime(rec['date_from'], '%Y-%m-%d %H:%M:%S')
+            date_to = time.strptime(rec['date_to'], '%Y-%m-%d %H:%M:%S')
+            if date_from > date_to:
                 return False
         return True
 
-    _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])]
+    _constraints = [(_check_date, 'Start date should not be larger than end date!\nNumber of Days should be greater than 1!', ['number_of_days_temp'])]
 
     def unlink(self, cr, uid, ids, context={}):
         leave_obj = self.pool.get('resource.calendar.leaves')
@@ -235,7 +237,7 @@ class hr_holidays(osv.osv):
         return result
 
     def onchange_date_to(self, cr, uid, ids, date_from, date_to):
-        return onchange_date_from(cr, uid, ids, date_to, date_from)
+        return self.onchange_date_from(cr, uid, ids, date_to, date_from)
 
     def onchange_sec_id(self, cr, uid, ids, status, context={}):
         warning = {}
@@ -430,7 +432,7 @@ class resource_calendar_leaves(osv.osv):
     _description = "Leave Detail"
     _columns = {
         'holiday_id': fields.many2one("hr.holidays", "Holiday"),
-                }
+    }
 
 resource_calendar_leaves()
-# 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/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 9d0158f14b2..245cacc6dee 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,13 +7,14 @@ 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: 2010-04-30 21:12+0000\n"
-"Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
+"PO-Revision-Date: 2010-05-18 13:49+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@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-05-05 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -49,7 +50,7 @@ msgstr "Azul claro"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr "Café"
+msgstr "Marrón"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -89,7 +90,7 @@ msgstr "hasta"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr "Cian Claro"
+msgstr "Cian claro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -185,12 +186,12 @@ msgstr "Estado Vacaciones"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr "Estado de Vacaciones"
+msgstr "Estado de vacaciones"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "Vacation end day"
-msgstr "Fecha Fin Vacaciones"
+msgstr "Fecha fin vacaciones"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
@@ -261,7 +262,7 @@ msgstr "Empleado"
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Validation"
-msgstr "Esperando Validación"
+msgstr "Esperando validación"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
@@ -276,7 +277,7 @@ msgstr "Salmón claro"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr "Abano"
+msgstr "Trigo"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
@@ -292,20 +293,20 @@ msgstr "Mis peticiones"
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr "Número de Días"
+msgstr "Número de días"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr "Estado de Vacaciones"
+msgstr "Estado vacaciones"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr "Opciones de Reporte"
+msgstr "Opciones del informe"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
@@ -368,7 +369,7 @@ msgstr "Lavanda"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
 msgid "hr.holidays.log"
-msgstr "Log de Vacaciones"
+msgstr "hr.holidays.log"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
@@ -383,7 +384,7 @@ msgstr "Calendario"
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Vacation start day"
-msgstr "Inicio de Vacaciones"
+msgstr "Fecha inicio de vacaciones"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -422,21 +423,36 @@ msgid ""
 "            for example, you maybe will do it for the user 'admin'.\n"
 msgstr ""
 "Recursos Humanos: Registro y seguimiento de Vacaciones\n"
-"Este modulo permite administrar las vacaciones y peticiones. Para cada "
-"empleado se puede definir un numero de vacaciones disponibles.\n"
-"Ademas:\n"
-"Sincronizacion con la agenda (usando el modulo de CRM) es posible: "
-"automatizar la creacion de casos cuando una peticion es aceptada, tiene un "
-"link para los estados de vacaciones. Puede configurar esta info en el color "
-"de su preferencia.\n"
-"Estado de Vacaciones:\n"
-"Un empleado puede crear peticiones negativas (pedir -2 dias por ejemplo). es "
-"es considerado por el sistema como una peticion de mas dias de ausencia.\n"
-"Hay 2 maneras para imprimir las vacaciones:\n"
-"Elegir empleados por departamento y usar un asistente.\n"
-"O imprimir un empleado especifico.\n"
-"Ademas el asistente permite elegir las vacaciones validadas y confirmadas o "
-"solo una.\n"
+"    Este módulo permite administrar las vacaciones y peticiones de "
+"vacaciones. Para cada empleado se puede definir un numero de vacaciones "
+"disponibles.\n"
+"    Además:\n"
+"    - Es posible sincronizar con la agenda (usando el módulo de CRM): Para "
+"poder automatizar la creación de casos cuando una petición es aceptada, "
+"tiene que relacionar un estado de vacaciones con una sección de casos. Puede "
+"configurar esta información y también el color preferido en RRHH / "
+"Configuración / Estado de vacaciones.\n"
+"    - Un empleado puede crear peticiones negativas (pedir -2 días por "
+"ejemplo). Esto el sistema lo considera como una petición de más días de "
+"ausencia. Incrementará su total de vacaciones disponibles de este tipo (si "
+"la petición es aceptada).\n"
+"    - Hay 2 maneras de imprimir las vacaciones:\n"
+"        * La primera permite seleccionar empleados por departamento y está "
+"disponible desde el menú\n"
+"              RRHH / Petición de vacaciones / Imprimir resumen de "
+"vacaciones\n"
+"        * La segunda permite seleccionar el informe de vacaciones para "
+"ciertos empleados. Desde la lista\n"
+"              RRHH / Empleados / Empleados\n"
+"          seleccione los empleados que desee, haga clic en el icono de "
+"imprimir y seleccione la opción\n"
+"              'Imprimir resumen de vacaciones de los empleados'\n"
+"    - El asistente permite elegir si quiere imprimir las vacaciones "
+"confirmadas y validadas o sólo las validadas. Estos estados deben "
+"configurarse por un usuario del grupo 'HR' con el rol de 'holidays'. Puede "
+"definirlo en la pestaña de seguridad en la ficha de usuario en el menú\n"
+"              Administración / Usuarios / Usuarios\n"
+"      por ejemplo, quizá quiere hacerlo para el usuario 'admin'.\n"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
@@ -447,7 +463,7 @@ msgstr "Notificación"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr "Petición de Vacaciones"
+msgstr "Empleado rellena una petición de vacaciones"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
@@ -508,7 +524,7 @@ msgstr "Mis peticiones de vacaciones"
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr "Color de Estado"
+msgstr "Color del estado"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
@@ -569,7 +585,7 @@ msgstr "Activo"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
 msgid "My Holidays Request Draft"
-msgstr "Mis peticiones en Borrador"
+msgstr "Mis peticiones en borrador"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
@@ -680,7 +696,7 @@ msgstr "Caso"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr "Vacaiones por usuario"
+msgstr "Vacaciones por usuario"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
@@ -705,7 +721,7 @@ msgstr "Rojo"
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr "Gestión de Vacaciones"
+msgstr "Recursos humanos: Gestión de vacaciones"
 
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 4a1972f1f7d..5499a914f6c 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -25,8 +25,9 @@ class available_holidays_report(osv.osv):
     _name = "available.holidays.report"
     _auto = False
     _columns = {
-        'date': fields.datetime('Date', readonly=True),
+        'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=15, readonly=True),
         '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),
@@ -35,6 +36,7 @@ class available_holidays_report(osv.osv):
         'max_leave': fields.float('Allocated Leaves', readonly=True),
         'taken_leaves': fields.float('Taken Leaves', readonly=True),
         'remaining_leave': fields.float('Remaining Leaves',readonly=True),
+        'department_id':fields.many2one('hr.department','Department',readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
     }
     def init(self, cr):
@@ -46,8 +48,10 @@ class available_holidays_report(osv.osv):
                     date_trunc('day',h.create_date) as date,
                     to_char(s.create_date, 'YYYY') as year,
                     to_char(s.create_date, 'MM') as month,
+                    to_char(s.create_date, 'YYYY-MM-DD') as day,
                     h.employee_id as employee_id,
                     h.user_id as user_id,
+                    h.department_id,
                     h.state as state,
                     h.holiday_status_id as holiday_status_id,
                     sum(number_of_days) as remaining_leave,
@@ -68,7 +72,8 @@ class available_holidays_report(osv.osv):
                 and s.active <> 'f'
                 group by h.holiday_status_id, h.employee_id,
                          date_trunc('day',h.create_date),to_char(s.create_date, 'YYYY'),
-                         to_char(s.create_date, 'MM'),h.user_id,h.state
+                         to_char(s.create_date, 'MM'),to_char(s.create_date, 'YYYY-MM-DD'),h.user_id,
+                         h.state,h.department_id
 
             )""")
 available_holidays_report()
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 18ea7d58d45..a89655b503c 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -10,40 +10,32 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Available Holidays">
-                    <field name="employee_id"/>
-                    <field name="holiday_status_id"/>
-                    <field name="max_leave"/>
-                    <field name="taken_leaves"/>
+                    <field name="employee_id" invisible="1"/>
+                    <field name="holiday_status_id" invisible="1"/>
+                    <field name="department_id" invisible="1"/>
+                    <field name="max_leave" sum="Allocated Leaves"/>
+                    <field name="taken_leaves" sum="Taken Leaves"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="remaining_leave"/>
+                    <field name="remaining_leave" sum="Remaining Leaves"/>
                     <field name="year" invisible="1"/>
+                    <field name="day" invisible="1"/>
                 	<field name="month" invisible="1"/>
                 	<field name="date" invisible="1"/>
                 </tree>
             </field>
         </record>
 
-        <record id="view_hr_available_holidays_report_form" model="ir.ui.view">
-            <field name="name">available.holidays.report.form</field>
-            <field name="model">available.holidays.report</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-               <tree string="Available Holidays">
-                    <field name="employee_id" select="1"/>
-                    <field name="holiday_status_id" select="1"/>
-                    <field name="remaining_leave"/>
-                </tree>
-            </field>
-        </record>
         <record id="view_hr_available_holidays_report_graph" model="ir.ui.view">
             <field name="name">available.holidays.report.graph</field>
             <field name="model">available.holidays.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Available Holidays" type="bar">
-                    <field name="holiday_status_id"/>
+                    <field name="employee_id"/>
+                    <field name="max_leave" operator="+"/>
+                    <field name="taken_leaves" operator="+"/>
                     <field name="remaining_leave" operator="+"/>
-                    <field group="True" name="employee_id"/>
+                    <field group="True" name="holiday_status_id"/>
                 </graph>
             </field>
         </record>
@@ -55,32 +47,47 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-		                <filter icon="terp-hr"
-		                    	string="This Year"
-		                    	domain="[('year','=',time.strftime('%%Y'))]"
-		                    	help="Leaves of the year"/>
-		                <filter icon="terp-hr"
-		                    	string="This Month"
-		                    	domain="[('month','=',time.strftime('%%m'))]"
-		                    	help="Leaves of this month"/>
+		            	<filter icon="terp-hr" 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="Leaves in this year"/>
+		                <filter icon="terp-hr" 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="Leaves in this month"/>
+			            <filter icon="gtk-media-rewind"
+		                    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="Leaves during last 7 days"/>
 		                <separator orientation="vertical"/>
-		                <field name="employee_id"/>
+<<<<<<< TREE
+						<field name="employee_id"/>
 		                <field name="user_id" widget="selection">
-		                    <filter icon="terp-sale"
-		                        	string="My Leaves"
-		                        	default="1"
-		                        	domain="[('user_id','=',uid)]"/>
+		                    <filter icon="terp-hr"
+		                        string="My Leaves"
+		                        domain="[('user_id','=',uid)]"/>
 		                </field>
+		            </group>
+		            <newline/>
+	                <group expand="0" string="Extended options..." colspan="10" col="12">
+	                    <field name="holiday_status_id" widget="selection"/>
+	                	<field name="department_id" widget="selection"/>
+=======
+		                <field name="employee_id"/>
+		                <field name="user_id" widget="selection"/>
+>>>>>>> MERGE-SOURCE
 	                </group>
 	                <newline/>
 	                <group expand="1" string="Group By..." colspan="10" col="12">
 	                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
 	                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
+	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Month" icon="terp-sale" context="{'group_by':'date'}"/>
-	                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
+	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
 	                </group>
 	            </search>
 	        </field>
@@ -93,6 +100,7 @@
             <field name="res_model">available.holidays.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
+            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_hr_available_holidays_report_search"/>
 
         </record>
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 87f01cfb17c..29127922dac 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -28,16 +28,19 @@ class hr_holidays_report(osv.osv):
     _auto = False
     _rec_name = 'date'
     _columns = {
-        'date': fields.datetime('Date', readonly=True),
+        'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=15, readonly=True),
         '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),
-        'date_from' : fields.datetime('Start Date', readonly=True),
-        'date_to' : fields.datetime('End Date', readonly=True),
-        'number_of_days_temp': fields.float('Number of Days', readonly=True),
+        'date_from' : fields.date('Start Date', readonly=True),
+        'date_to' : fields.date('End Date', readonly=True),
+        'number_of_days_temp': fields.float('#Days', readonly=True),
         'employee_id' : fields.many2one('hr.employee', "Employee's Name",readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type",readonly=True),
+        'department_id':fields.many2one('hr.department','Department',readonly=True),
         'state': fields.selection([('draft', 'Draft'),
                                    ('confirm', 'Waiting Validation'),
                                    ('refuse', 'Refused'),
@@ -52,14 +55,17 @@ class hr_holidays_report(osv.osv):
             create or replace view hr_holidays_report as (
                  select
                      min(s.id) as id,
-                     date_trunc('seconds',s.create_date) as date,
+                     date_trunc('day',s.create_date) as date,
                      date_trunc('day',s.date_from) as date_from,
                      date_trunc('day',s.date_to) as date_to,
-                     s.number_of_days_temp,
+                     sum(s.number_of_days_temp) as number_of_days_temp,
                      s.employee_id,
                      s.user_id as user_id,
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
+                     to_char(s.create_date, 'YYYY-MM-DD') as day,
+                     s.holiday_status_id,
+                     s.department_id,
                      s.state
                      from
                  hr_holidays s
@@ -67,7 +73,8 @@ class hr_holidays_report(osv.osv):
                  s.employee_id is not null
                  group by
                      s.create_date,s.state,s.date_from,s.date_to,
-                     s.number_of_days_temp,s.employee_id,s.user_id
+                     s.employee_id,s.user_id,s.holiday_status_id,
+                     s.department_id
             )
         """)
 hr_holidays_report()
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 4af9bdb8f51..e508e242827 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -7,14 +7,18 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Leaves Statistics">
-                <field name="date"/>
-                <field name="employee_id"/>
-                <field name="date_from"/>
-                <field name="date_to"/>
-                <field name="number_of_days_temp"/>
+                <field name="date" invisible="1"/>
+                <field name="employee_id" invisible="1"/>
+                <field name="user_id" invisible="1"/>
+                <field name="date_from" invisible="1"/>
+                <field name="date_to" invisible="1"/>
+                <field name="number_of_days_temp" sum="#Days"/>
+                <field name="holiday_status_id" invisible="1"/>
+                <field name="department_id" invisible="1"/>
                 <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
-                <field name="state"/>
+                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -27,6 +31,7 @@
              <graph string="Leaves Statistics" type="bar">
                  <field name="employee_id"/>
                  <field name="number_of_days_temp" operator="+"/>
+                 <field name="state" group = "True"/>
              </graph>
          </field>
     </record>
@@ -37,45 +42,71 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Leaves">
-                <filter icon="terp-hr"
-                    string="This Year"
-                    domain="[('year','=',time.strftime('%%Y'))]"
-                    help="Leaves of the year"/>
-                <filter icon="terp-hr"
-                    string="This Month"
-                    domain="[('month','=',time.strftime('%%m'))]"
-                    help="Leaves of this month"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-hr"
-                    string="Draft"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-hr"
-                    string="Validate"
-                    domain="[('state','=','validate')]"/>
-                <filter icon="terp-hr"
-                    string="Start Leaves"
-                    domain="[('date_from','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                <filter icon="terp-hr"
-                    string="End Leaves"
-                    domain="[('date_to','=',time.strftime('%%Y/%%m/%%d'))]"/>
-
-                <separator orientation="vertical"/>
-                <field name="employee_id"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-sale"
-                        string="My Leaves"
-                        default="1"
-                        domain="[('user_id','=',uid)]"/>
-                </field>
-                <field name="date"/>
+            	<group>
+	            	<filter icon="terp-hr" 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="Leaves in this year"/>
+	                <filter icon="terp-hr" 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="Leaves in this month"/>
+		            <filter icon="gtk-media-rewind"
+	                    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="Leaves during last 7 days"/>
+	                <separator orientation="vertical"/>
+	                <filter string="Draft"
+	                	icon="terp-hr"
+	                	domain="[('state','=','draft')]"
+	                	help = "Draft Leaves"/>
+	                <filter string="Waiting Validation"
+	                	icon="terp-hr"
+	                	domain="[('state', '=' ,'confirm')]"
+	                	help = "In progress Leaves"/>
+	               	<filter string="Validated"
+	               		icon="terp-hr"
+	               		domain="[('state','=','validate')]"
+	               		help = "Pending Leaves"/>
+					<separator orientation="vertical"/>
+					<field name="employee_id"/>
+	                <field name="user_id" widget="selection">
+	                    <filter icon="terp-hr"
+	                        string="My Leaves"
+	                        domain="[('user_id','=',uid)]"/>
+	                </field>
+	            </group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <filter icon="terp-hr"
+                    		string="Refused"
+                        name="done"
+                    		domain="[('state','=','refuse')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_from"/>
+                    <separator orientation="vertical"/>
+                    <field name="holiday_status_id" widget="selection"/>
+                    <newline/>
+                    <filter icon="terp-hr"
+                    		string="Cancelled"
+                    		domain="[('state','=','cancel')]"/>
+                    <separator orientation="vertical"/>
+                	<field name="date_to"/>
+                	<separator orientation="vertical"/>
+                	<field name="department_id" widget="selection"/>
+                </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="Employee" name="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
+                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
                     <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'date'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                 </group>
             </search>
         </field>
@@ -86,7 +117,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_employee': 1}</field>
+        <field name="context">{'search_default_month':1,'search_default_Employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f8372527a6c..42d643f165d 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -55,13 +55,15 @@ hr_recruitment_stage()
 
 class hr_applicant(osv.osv, crm.crm_case):
     _name = "hr.applicant"
-    _description = "Applicant Cases"
+    _description = "Applicant"
     _order = "id desc"
-    _inherit ='mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     _columns = {
-        'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
-        'description': fields.text('Description'),
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False),
+        'name': fields.char('Name', size=128, required=True), 
+        'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."), 
+        'description': fields.text('Description'), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'),
@@ -103,6 +105,16 @@ class hr_applicant(osv.osv, crm.crm_case):
         'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response' : fields.integer("Response"),
     }
+    
+    _defaults = {
+        'active': lambda *a: 1, 
+        'user_id': crm.crm_case._get_default_user, 
+        'email_from': crm.crm_case. _get_default_email, 
+        'state': lambda *a: 'draft',
+        'section_id': crm.crm_case. _get_section, 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+    }
 
     def onchange_job(self,cr, uid, ids, job, context={}):
         result = {}
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 760c7f08f2f..1723c802b0a 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -9,6 +9,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view_job"/>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
 
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4ad4dd214c1..a3bf7a08ab9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -224,7 +224,6 @@
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
                <field name="user_id" widget="selection">
-                    <filter domain="[('user_id','=',uid)]" help="My Recruitements" icon="gtk-execute" default="1"/>
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="gtk-execute" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 49c33084412..00d15ef3f21 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -105,6 +105,8 @@ class hr_recruitment_report(osv.osv):
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed"),
         'salary_exp' : fields.float("Salary Expected"),
+        'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
         'available' : fields.float("Availability")
 
     }
@@ -121,7 +123,9 @@ class hr_recruitment_report(osv.osv):
                      to_char(s.create_date, 'MM') as month,
                      to_char(s.create_date, 'YYYY-MM-DD') as day,
                      s.state,
+                     s.partner_id,
                      s.company_id,
+                     s.partner_address_id,
                      s.user_id,
                      s.job_id,
                      s.type_id,
@@ -140,6 +144,8 @@ class hr_recruitment_report(osv.osv):
                      date_trunc('day',s.create_date),
                      date_trunc('day',s.date_closed),
                      s.state,
+                     s.partner_id,
+                     s.partner_address_id,
                      s.company_id,
                      s.user_id,
                      s.stage_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 8e0c3f0845a..2315e707911 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -10,9 +10,11 @@
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="job_id" invisible="1"/>
-                <field name="stage_id" invisible="1"  widget="selection"/>
+                <field name="stage_id" invisible="1" />
                 <field name="department_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="partner_address_id" invisible="1"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -72,7 +74,7 @@
                    		help = "Pending tasks"/>
   					<separator orientation="vertical"/>
 					<field name="department_id" widget="selection">
-                       <filter icon="terp-hr"
+						<filter icon="terp-hr"
                            string="My Recruitments "
                            help="My Department Recruitments"
                            domain="[('user_id','=',uid)]"/>
@@ -84,10 +86,6 @@
                 <separator orientation="vertical"/>
                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-hr"
-                        string="My Recruitments"
-                        help="My Recruitments"
-                        domain="[('user_id','=',uid)]"/>
                     <filter icon="terp-hr"
                         string="Recruitments non assigned"
                         help="Recruitments non assigned"
@@ -100,29 +98,36 @@
                     		string="Hired"
                         name="done"
                     		domain="[('state','=','done')]"/>
-                    <filter icon="terp-hr"
-                    		string="Refused"
-                    		domain="[('state','=','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
                   	<field name="job_id" widget="selection"/>
                   	<newline/>
-                  	<field name="type_id" widget="selection"/>
-                    <field name="date"/>
+                  	<filter icon="terp-hr"
+                    		string="Refused"
+                    		domain="[('state','=','cancel')]"/>
+                    <separator orientation="vertical"/>
                     <field name="date_closed"/>
+                    <separator orientation="vertical"/>
+                  	<field name="type_id" widget="selection"/>
+                  	<field name="partner_id"/>
+                  	<field name="partner_address_id"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By ..." colspan="10" col="12">
                    <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Stage" name="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
+                   <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
-                   <filter string="Jobs" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
+                   <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
+            	   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
             	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
             	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
@@ -136,7 +141,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 3e611ae02e8..f8898499c4d 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_manager",1,1,1,1
+"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report",,1,0,0,0
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 25c61483391..1530f18981c 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -39,7 +39,7 @@ hr_employee()
 class hr_analytic_timesheet(osv.osv):
     _name = "hr.analytic.timesheet"
     _table = 'hr_analytic_timesheet'
-    _description = "Timesheet line"
+    _description = "Timesheet Line"
     _inherits = {'account.analytic.line': 'line_id'}
     _order = "id desc"
     _columns = {
@@ -60,7 +60,7 @@ class hr_analytic_timesheet(osv.osv):
 #        if prod_id and unit_amount:
         if prod_id:
             # find company
-            company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context)
+            company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
             res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,company_id,unit, context)
         return res
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 6c52c99d081..d7c12b14df7 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -51,7 +51,6 @@
                 <search string="Timesheet">
                     <group col='8' colspan='4'>
                         <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
-                        <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="account_id" select="1" widget="selection"/>
@@ -72,6 +71,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="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 4b8fad8fab5..c20c7110b63 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -25,7 +25,7 @@ from tools.translate import _
 
 class hr_timesheet_invoice_factor(osv.osv):
     _name = "hr_timesheet_invoice.factor"
-    _description = "Invoice rate"
+    _description = "Invoice Rate"
     _columns = {
         'name': fields.char('Internal name', size=128, required=True),
         'customer_name': fields.char('Name', size=128),
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index cb6c8d5771c..07d37b270ef 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -61,10 +61,6 @@
 	                            help="Timesheet lines during last 7 days"/>
 	                    <separator orientation="vertical"/>
 	  					<field name="user_id" widget="selection">
-	                        <filter icon="terp-hr"
-	                        		string="My timesheet lines"
-	                        		help = "My timesheet lines"
-	                        		domain="[('user_id','=',uid)]" />
 	                        <filter icon="terp-hr"
 	                        		string="Non Assigned timesheets to users"
 	                        		help="Non Assigned timesheets to users"
@@ -100,10 +96,10 @@
             <field name="res_model">report.timesheet.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_line_search"/>
         </record>
-        <menuitem action="action_timesheet_line_stat_all" id="menu_report_timesheet_line_all" parent="hr.menu_hr_reporting"/>
+        <!--menuitem action="action_timesheet_line_stat_all" id="menu_report_timesheet_line_all" parent="hr.menu_hr_reporting"/-->
 
 
         <!-- Statistics report on timesheet by user -->
@@ -169,7 +165,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group col="10" colspan="4">
-                        <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
                         <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
@@ -187,6 +182,7 @@
             <field name="res_model">report_timesheet.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_timesheet_user_search"/>
         </record>
         <!-- <menuitem action="action_timesheet_user_stat_all" id="menu_report_timesheet_user_all" parent="hr.menu_hr_reporting"/> -->
@@ -224,7 +220,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
-                    <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets to invoice"/>
                     <separator orientation="vertical"/>
                     <field name="account_id" select="1"/>
                     <field name="manager_id" select="1"/>
@@ -253,6 +248,7 @@
             <field name="res_model">report_timesheet.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_timesheet_invoice_search"/>
         </record>
        <!--  <menuitem action="action_timesheet_invoice_stat_all" id="menu_report_timesheet_invoice_all" parent="hr.menu_hr_reporting"/> -->
@@ -308,7 +304,6 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group col="10" colspan="4">
-                        <filter icon="terp-hr" string="My Daily Timesheets" domain="[('user_id','=',uid)]" help="My Daily Timesheets by account"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
                         <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
@@ -327,6 +322,7 @@
             <field name="res_model">report_timesheet.account.date</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_timesheet_account_date_search"/>
         </record>
         <!--  <menuitem action="action_timesheet_account_date_stat_all" id="menu_report_timesheet_account_date_all" parent="hr.menu_hr_reporting"/>-->
@@ -382,7 +378,6 @@
             <field name="arch" type="xml">
                 <form string="Timesheet by account">
                     <group col="10" colspan="4">
-                        <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets by account"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
                         <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b7d395ac2e0..d6d9e38247b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -364,7 +364,7 @@ class hr_timesheet_line(osv.osv):
                 res[line_id] = False
         return res
 
-    def _sheet_search(self, cursor, user, obj, name, args, context):
+    def _sheet_search(self, cursor, user, obj, name, args, context=None):
         if not len(args):
             return []
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -482,7 +482,7 @@ class hr_attendance(osv.osv):
                 res[line_id] = False
         return res
 
-    def _sheet_search(self, cursor, user, obj, name, args, context={}):
+    def _sheet_search(self, cursor, user, obj, name, args, context=None):
         if not len(args):
             return []
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -581,7 +581,7 @@ hr_attendance()
 
 class hr_timesheet_sheet_sheet_day(osv.osv):
     _name = "hr_timesheet_sheet.sheet.day"
-    _description = "Timesheets by period"
+    _description = "Timesheets by Period"
     _auto = False
     _order='name'
     _columns = {
@@ -662,7 +662,7 @@ hr_timesheet_sheet_sheet_day()
 
 class hr_timesheet_sheet_sheet_account(osv.osv):
     _name = "hr_timesheet_sheet.sheet.account"
-    _description = "Timesheets by period"
+    _description = "Timesheets by Period"
     _auto = False
     _order='name'
     _columns = {
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index eae4e8e1e9a..89fd0dd45cf 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -192,7 +192,6 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
-                        <filter name="my_timesheet" icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" />
                         <separator orientation="vertical"/>
                         <filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
@@ -220,7 +219,7 @@
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_my_timesheet':1}</field>
+            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
 
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index ee016df56d7..3dd8d161c5f 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -33,7 +33,11 @@ class timesheet_report(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'name': fields.char('Description', size=64,readonly=True),
+        'product_id' : fields.many2one('product.product', 'Product'),
+        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'nbr': fields.integer('#Nbr',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
@@ -45,9 +49,8 @@ class timesheet_report(osv.osv):
             ('draft','Draft'),
             ('confirm','Confirmed'),
             ('done','Done')], 'State', readonly=True),
-        'total_att': fields.float('Total Timesheet',readonly=True),
-        'total_ts': fields.float('Total Attendance',readonly=True),
-        'total_diff': fields.float('Difference', readonly=True),
+        'quantity': fields.float('#Quantity',readonly=True),
+        'cost': fields.float('#Cost',readonly=True),
         }
 
     def init(self, cr):
@@ -64,10 +67,12 @@ class timesheet_report(osv.osv):
                         to_char(htss.date_current,'MM') as month,
                         to_char(htss.date_current, 'YYYY-MM-DD') as day,
                         count(*) as nbr,
-                        sum(day.total_attendance) as total_att,
-                        sum(day.total_timesheet) as total_ts,
-                        sum(day.total_difference) as total_diff,
+                        sum(aal.unit_amount) as quantity,
+                        sum(aal.amount) as cost,
                         aal.account_id,
+                        aal.product_id,
+                        aal.to_invoice,
+                        aal.general_account_id,
                         htss.user_id,
                         htss.company_id,
                         htss.department_id,
@@ -75,7 +80,6 @@ class timesheet_report(osv.osv):
                     from account_analytic_line as aal
                     left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
                     left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
-                    left join hr_timesheet_sheet_sheet_day AS day ON (htss.id = day.sheet_id)
                     group by
                         to_char(htss.date_current,'YYYY'),
                         to_char(htss.date_current,'MM'),
@@ -84,6 +88,9 @@ class timesheet_report(osv.osv):
                         htss.date_from,
                         htss.date_to,
                         htss.date_current,
+                        aal.to_invoice,
+                        aal.product_id,
+                        aal.general_account_id,
                         htss.name,
                         htss.company_id,
                         htss.state,
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 976b2a6f8ea..517937848ff 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -7,10 +7,9 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet" type="bar">
-                    <field name="name" />
-                	<field name="total_att" operator = "+"/>
-                	<field name="total_ts" operator = "+"/>
-                	<field name="user_id" group = "True"/>
+                    <field name="user_id" />
+                	<field name="quantity" operator = "+"/>
+                	<field name="state" group = "True"/>
                 </graph>
             </field>
         </record>
@@ -25,12 +24,15 @@
                     <field name="user_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>
                     <field name="date_to" invisible="1"/>
-					<field name="total_att" sum="Total Timesheet"/>
-					<field name="total_diff" sum="Total Attendance"/>
-                    <field name="total_ts" sum="Difference"/>
+					<field name="quantity" sum="#Quantity"/>
+					<field name="cost" sum="#Cost"/>
                     <field name="state" invisible="1"/>
                     <field name="department_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
+                    <field name="to_invoice" invisible="1"/>
+                    <field name="product_id" invisible="1"/>
+                    <field name="account_id" invisible="1"/>
+                    <field name="general_account_id" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
@@ -43,7 +45,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
-                    <group col="10" colspan="4">
+                    <group col="10" colspan="12">
                         <filter icon="terp-hr" string="This Year"
 	                    	    domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Timesheet in this year"/>
@@ -63,15 +65,9 @@
 	                    <filter icon="terp-hr"
 	                    		string="Confirmed"
 	                    		domain="[('state','=','confirm')]"/>
-	                    <filter icon="terp-hr"
-	                    		string="Done"
-	                    		domain="[('state','=','done')]"/>
 	                    <separator orientation="vertical"/>
+	                    <field name="product_id"/>
 	  					<field name="user_id" widget="selection">
-	                        <filter icon="terp-hr"
-	                        		string="My timesheet"
-	                        		help = "My timesheet "
-	                        		domain="[('user_id','=',uid)]" />
 	                        <filter icon="terp-hr"
 	                        		string="Non Assigned timesheets to users"
 	                        		help="Non Assigned timesheets to users"
@@ -80,26 +76,40 @@
 	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter icon="terp-hr"
-                    		string="New"
-                    		domain="[('state','=','new')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="department_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                </group>
+	                <group expand="0" string="Extended options..." colspan="10" col="12">
+	                	<filter icon="terp-hr"
+	                    		string="New"
+	                    		domain="[('state','=','new')]"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="date_from"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="account_id"/>
+	                    <field name="department_id" widget="selection"/>
+	                    <newline/>
+	                    <filter icon="terp-hr"
+		                    		string="Done"
+		                    		domain="[('state','=','done')]"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="date_to"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="general_account_id"/>
+	                    <field name="to_invoice" widget="selection"/>
+	                </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
 	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
 	                    <separator orientation="vertical"/>
+	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
+	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
+	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
 	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
 	                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-hr" context="{'group_by':'date_current'}"/>
+	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
 	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                     </group>
                 </search>
@@ -111,7 +121,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
             <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.menu_hr_reporting"/>
diff --git a/addons/html_view/security/ir.model.access.csv b/addons/html_view/security/ir.model.access.csv
new file mode 100644
index 00000000000..0b1057cfd1e
--- /dev/null
+++ b/addons/html_view/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_html_view","html.view","model_html_view",,1,0,0,0
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 2a6aafe2989..e46115c5639 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -31,7 +31,7 @@ class idea_category(osv.osv):
     """ Category of Idea """
 
     _name = "idea.category"
-    _description = "Category for an idea"
+    _description = "Idea Category"
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
@@ -251,7 +251,7 @@ class idea_comment(osv.osv):
     """ Apply Idea for Comment """
 
     _name = 'idea.comment'
-    _description = 'Comments'
+    _description = 'Comment'
     _rec_name = 'content'
 
     _columns = {
@@ -274,7 +274,7 @@ class idea_vote(osv.osv):
     """ Apply Idea for Vote """
 
     _name = 'idea.vote'
-    _description = 'Vote for Idea'
+    _description = 'Idea Vote'
     _rec_name = 'score'
 
     _columns = {
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 38ac9eda0a7..b268a64d991 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -214,8 +214,6 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group col="10" colspan="4">
-                    <filter icon="gtk-execute" string="My Ideas" domain="[('user_id','=',uid)]" help="My Ideas"/>
-                    <separator orientation="vertical"/>
                     <filter icon="gtk-execute" string="Draft"
                         domain="[('state','=','draft')]" help="Draft Ideas" />
                     <filter icon="gtk-execute" string="Open"
@@ -223,7 +221,7 @@
                     <separator orientation="vertical"/>
                     <field name="title" select="1"/>
                     <field name="category_id" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="12" col="10">
@@ -257,6 +255,7 @@
         <field name="res_model">idea.idea</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_idea_idea_search"/>
     </record>
 
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 6c13990fc45..c8fdb530a45 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -45,7 +45,8 @@
                 'account_report',
                 'base_vat',
                 'base_iban',
-                'account_chart'
+                'account_chart',
+                'account_coda',
                 ],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index e11815a7234..e4a9c52a437 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -7029,8 +7029,8 @@
             <field name="description">V-EXTRA 0</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_a47"/>
-            <field name="ref_base_code_id" ref="vat_code_a49"/>
+            <field name="base_code_id" ref="vat_code_a46"/>
+            <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
         </record>
     <!-- Purchases VAT -->
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 1a29940ada6..8a53b029fa7 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -22,7 +22,7 @@ from osv import osv
 
 class res_company(osv.osv):
     _inherit = "res.company"
-    _description = 'res.company'
+    _description = 'Company'
 
     def _get_default_ad(self, addresses):
         city = post_code = address = country_code = ""
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index daadf3d4b22..fbb5c74c18c 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1,2 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_vat_listing_clients","vat.listing.clients","model_vat_listing_clients",,1,1,1,1
+"access_partner_vat_intra","partner.vat.intra","model_partner_vat_intra",,1,1,1,1
+"access_partner_vat","partner.vat","model_partner_vat",,1,1,1,1
+"access_partner_vat_list","partner.vat.list","model_partner_vat_list",,1,1,1,1
+"access_l1on_be_vat_declaration","l1on_be.vat.declaration","model_l1on_be_vat_declaration",,1,1,1,1
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index d141fd44f1d..3ee7a427265 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -36,7 +36,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'file_save': fields.binary('Save File'),
         'ask_resitution': fields.boolean('Ask Restitution'),
         'ask_payment': fields.boolean('Ask Payment'),
-        'client_nihil': fields.boolean('Last Declaration of Entreprise',help='Thick this case only if it concerns only the last statement on the civil or cessation of activity'),
+        'client_nihil': fields.boolean('Last Declaration of Enterprise',help='Tick this case only if it concerns only the last statement on the civil or cessation of activity'),
     }
 
     _defaults = {
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index f3e4b23771e..faaf4805417 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -14,11 +14,11 @@
             <field name="arch" type="xml">
 			<form string="Select Period">
                	<group  colspan="4" >
-					    <field name="period_id" select="1"/>
-              <field name="ask_resitution"/>
-              <field name="ask_payment"/>
-              <field name="client_nihil"/>
-              		<button colspan="1" name="create_xml" string="Create XML" type="object"/>
+					<field name="period_id" select="1"/>
+					<field name="ask_resitution"/>
+					<field name="ask_payment"/>
+					<field name="client_nihil"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
               	 </group>
               	 <separator string="XML Flie has been Created." colspan="4"/>
               	 <group colspan="4" >
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index f70b913fd88..1e9727d4785 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -7,34 +7,34 @@ 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-07-27 16:34+0000\n"
-"Last-Translator: Christian Draux - reseaucerta.org <Unknown>\n"
+"PO-Revision-Date: 2010-05-21 17:47+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Redevances de crédit-bail immobilier"
-msgstr ""
+msgstr "Redevances de crédit-bail immobilier"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "période du"
-msgstr ""
+msgstr "période du"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Autres réserves"
-msgstr ""
+msgstr "Autres réserves"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "ACTIF IMMOBILISÉ"
-msgstr ""
+msgstr "ACTIF IMMOBILISÉ"
 
 #. module: l10n_fr
 #: model:ir.actions.todo,note:l10n_fr.config_call_account_template_fr_pcg
@@ -58,23 +58,23 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Capital [dont versé...]"
-msgstr ""
+msgstr "Capital [dont versé...]"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Réserves statutaires ou contractuelles"
-msgstr ""
+msgstr "Réserves statutaires ou contractuelles"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "nstallations techniques,matériel et outillage"
-msgstr ""
+msgstr "installations techniques,matériel et outillage"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 #: rml:l10n.fr.cdr:0
 msgid "TOTAL III"
-msgstr ""
+msgstr "TOTAL III"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_asset
@@ -89,12 +89,12 @@ msgstr "Produits"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Charges sociales"
-msgstr ""
+msgstr "Charges sociales"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "PRODUITS EXCEPTIONNELS"
-msgstr ""
+msgstr "PRODUITS EXCEPTIONNELS"
 
 #. module: l10n_fr
 #: wizard_view:l10n.fr.bilan.report,init:0
@@ -104,18 +104,18 @@ msgstr "Sélectionner l'année"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Différences négatives de change"
-msgstr ""
+msgstr "Différences négatives de change"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Autres charges"
-msgstr ""
+msgstr "Autres charges"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 #: rml:l10n.fr.cdr:0
 msgid "Tenue de Compte :"
-msgstr ""
+msgstr "Tenue de Compte :"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_payable
@@ -125,72 +125,72 @@ msgstr "À payer"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "( IV )"
-msgstr ""
+msgstr "( IV )"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
 msgid "Hors Euro"
-msgstr ""
+msgstr "Hors Euro"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Fonds commercial"
-msgstr ""
+msgstr "Fonds commercial"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "isponibilités"
-msgstr ""
+msgstr "Disponibilités"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "+ IV+ V+ VI"
-msgstr ""
+msgstr "+ IV+ V+ VI"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "De participation"
-msgstr ""
+msgstr "De participation"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "TOTAL IV"
-msgstr ""
+msgstr "TOTAL IV"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "PROVISIONS"
-msgstr ""
+msgstr "PROVISIONS"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "vances et acomptes"
-msgstr ""
+msgstr "Avances et acomptes"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Autres dettes"
-msgstr ""
+msgstr "Autres dettes"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "articipations"
-msgstr ""
+msgstr "Participations"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "atières premières et autres approvisionnements"
-msgstr ""
+msgstr "Matières premières et autres approvisionnements"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "P"
-msgstr ""
+msgstr "P"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stocks
@@ -200,17 +200,17 @@ msgstr "Actif circulant"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "T"
-msgstr ""
+msgstr "T"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Dettes fournisseurs et comptes rattachés"
-msgstr ""
+msgstr "Dettes fournisseurs et comptes rattachés"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Provisions pour charges"
-msgstr ""
+msgstr "Provisions pour charges"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_dettes
@@ -225,12 +225,12 @@ msgstr "Sélectionner une période"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "RÉSERVES"
-msgstr ""
+msgstr "RÉSERVES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "TOTAL GÉNÉRAL (I + II + III + IV)"
-msgstr ""
+msgstr "TOTAL GÉNÉRAL (I + II + III + IV)"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_tax
@@ -240,74 +240,74 @@ msgstr "Taxe"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Dotations aux amortissements, aux dépréciations et aux provisions"
-msgstr ""
+msgstr "Dotations aux amortissements, aux dépréciations et aux provisions"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Achats de matières premières et autres approvisionnements"
-msgstr ""
+msgstr "Achats de matières premières et autres approvisionnements"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Avances et acomptes reçus sur commandes en cours"
-msgstr ""
+msgstr "Avances et acomptes reçus sur commandes en cours"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Quotes-parts de résultat sur opérations faites en commun (II)"
-msgstr ""
+msgstr "Quotes-parts de résultat sur opérations faites en commun (II)"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "VALEURS MOBILIÈRES DE PLACEMENT"
-msgstr ""
+msgstr "VALEURS MOBILIÈRES DE PLACEMENT"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 #: rml:l10n.fr.cdr:0
 msgid "TOTAL I"
-msgstr ""
+msgstr "TOTAL I"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Autres intérêts et produits assimilés"
-msgstr ""
+msgstr "Autres intérêts et produits assimilés"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Dettes sur immobilisations et comptes rattachés"
-msgstr ""
+msgstr "Dettes sur immobilisations et comptes rattachés"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Créances clients et comptes rattachés"
-msgstr ""
+msgstr "Créances clients et comptes rattachés"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Report à nouveau"
-msgstr ""
+msgstr "Report à nouveau"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "IMMOBILISATIONS INCORPORELLES"
-msgstr ""
+msgstr "IMMOBILISATIONS INCORPORELLES"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
 msgid "France"
-msgstr ""
+msgstr "France"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "rêts"
-msgstr ""
+msgstr "Prêts"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Sous-total A - Montant net du chiffre d'affaires"
-msgstr ""
+msgstr "Sous-total A - Montant net du chiffre d'affaires"
 
 #. module: l10n_fr
 #: wizard_button:l10n.fr.bilan.report,init,report:0
@@ -318,32 +318,32 @@ msgstr "Imprimer"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Amortissements et dépréciations"
-msgstr ""
+msgstr "Amortissements et dépréciations"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Net"
-msgstr ""
+msgstr "Net"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "TOTAL I ( A + B )"
-msgstr ""
+msgstr "TOTAL I ( A + B )"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "itres immobilisés de l'activité de portefeuille"
-msgstr ""
+msgstr "Titres immobilisés de l'activité de portefeuille"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "( VI )"
-msgstr ""
+msgstr "( VI )"
 
 #. module: l10n_fr
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de modèles de compte récursifs"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_provision
@@ -353,7 +353,7 @@ msgstr "Provisions"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Variation des stocks"
-msgstr ""
+msgstr "Variation des stocks"
 
 #. module: l10n_fr
 #: model:ir.actions.report.xml,name:l10n_fr.l10n_fr_pcg_bilan
@@ -365,22 +365,22 @@ msgstr "Bilan"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Emprunts obligataires convertibles"
-msgstr ""
+msgstr "Emprunts obligataires convertibles"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "TOTAL ACTIF ("
-msgstr ""
+msgstr "TOTAL ACTIF ("
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "CHARGES ( hors taxes )"
-msgstr ""
+msgstr "CHARGES ( hors taxes )"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Produits nets sur cessions de valeurs mobilières de placement"
-msgstr ""
+msgstr "Produits nets sur cessions de valeurs mobilières de placement"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,report_id:0
@@ -400,27 +400,27 @@ msgstr "Engagements"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Avances et acomptes"
-msgstr ""
+msgstr "Avances et acomptes"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_7
 msgid "TVA sur les encaissements"
-msgstr ""
+msgstr "TVA sur les encaissements"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Sous-total B"
-msgstr ""
+msgstr "Sous-total B"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "M"
-msgstr ""
+msgstr "M"
 
 #. module: l10n_fr
 #: model:ir.module.module,description:l10n_fr.module_meta_information
@@ -433,17 +433,17 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Concessions, brevets, licences,..., droits et valeurs similaires"
-msgstr ""
+msgstr "Concessions, brevets, licences,..., droits et valeurs similaires"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Instruments de trésorerie"
-msgstr ""
+msgstr "Instruments de trésorerie"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Écarts de conversion passif"
-msgstr ""
+msgstr "Écarts de conversion passif"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_expense
@@ -453,37 +453,37 @@ msgstr "Charges"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "ACTIF"
-msgstr ""
+msgstr "ACTIF"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "DETTES"
-msgstr ""
+msgstr "DETTES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Sur immobilisations : dotations aux amortissements"
-msgstr ""
+msgstr "Sur immobilisations : dotations aux amortissements"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "mmobilisations corporelles en cours"
-msgstr ""
+msgstr "Immobilisations corporelles en cours"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Autres"
-msgstr ""
+msgstr "Autres"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Dotation aux amortissements et aux dépréciations"
-msgstr ""
+msgstr "Dotation aux amortissements et aux dépréciations"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "PRODUITS D'EXPLOITATION"
-msgstr ""
+msgstr "PRODUITS D'EXPLOITATION"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -491,136 +491,138 @@ msgid ""
 "Reprises sur provisions, dépréciations (et amortissements) et transferts de "
 "charges"
 msgstr ""
+"Reprises sur provisions, dépréciations (et amortissements) et transferts de "
+"charges"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "PRODUITS - CHARGES"
-msgstr ""
+msgstr "PRODUITS - CHARGES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "RÉSULTAT DE L'EXERCICE [bénéfice ou perte]"
-msgstr ""
+msgstr "RÉSULTAT DE L'EXERCICE [bénéfice ou perte]"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Impôts, taxes et versements assimilés"
-msgstr ""
+msgstr "Impôts, taxes et versements assimilés"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "roduits intermédiaires et finis"
-msgstr ""
+msgstr "Produits intermédiaires et finis"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "utres"
-msgstr ""
+msgstr "Autres"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Avances et acomptes versés sur commandes"
-msgstr ""
+msgstr "Avances et acomptes versés sur commandes"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "onstructions"
-msgstr ""
+msgstr "Constructions"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Reprises sur provisions, dépréciations et transferts de charges"
-msgstr ""
+msgstr "Reprises sur provisions, dépréciations et transferts de charges"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "réances rattachées à des participations"
-msgstr ""
+msgstr "Créances rattachées à des participations"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Dotations aux provisions"
-msgstr ""
+msgstr "Dotations aux provisions"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "vous sur votre structure juridique et son fonctionnement comptable."
-msgstr ""
+msgstr "vous sur votre structure juridique et son fonctionnement comptable."
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Sur opérations en capital"
-msgstr ""
+msgstr "Sur opérations en capital"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Charges constatés d'avance"
-msgstr ""
+msgstr "Charges constatés d'avance"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "TOTAL II"
-msgstr ""
+msgstr "TOTAL II"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "CAPITAUX PROPRES"
-msgstr ""
+msgstr "CAPITAUX PROPRES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Frais d'établissement"
-msgstr ""
+msgstr "Frais d'établissement"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Charges à répartir sur plusieurs exercices"
-msgstr ""
+msgstr "Charges à répartir sur plusieurs exercices"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Subventions d'exploitation"
-msgstr ""
+msgstr "Subventions d'exploitation"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Provisions réglementées"
-msgstr ""
+msgstr "Provisions réglementées"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "PRODUITS (hors taxes)"
-msgstr ""
+msgstr "PRODUITS (hors taxes)"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Écart d'équivalence"
-msgstr ""
+msgstr "Écart d'équivalence"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Primes d'émission, de fusion, d'apport"
-msgstr ""
+msgstr "Primes d'émission, de fusion, d'apport"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "utres titres immobilisés"
-msgstr ""
+msgstr "Autres titres immobilisés"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Réserves réglementées"
-msgstr ""
+msgstr "Réserves réglementées"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "CHARGES D'EXPLOITATION"
-msgstr ""
+msgstr "CHARGES D'EXPLOITATION"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "I + II + III + IV + V"
-msgstr ""
+msgstr "I + II + III + IV + V"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
@@ -629,11 +631,14 @@ msgid ""
 "120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
 "nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
 msgstr ""
+"Attention, pour que votre bilan soit correct, vous devez solder les comptes "
+"120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
+"nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Vente de marchandises"
-msgstr ""
+msgstr "Vente de marchandises"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -678,7 +683,7 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "apital souscrit - non appelé"
-msgstr ""
+msgstr "Capital souscrit - non appelé"
 
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_report
@@ -688,27 +693,27 @@ msgstr "Rapport pour l10n_fr"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Compte de résultat"
-msgstr ""
+msgstr "Compte de résultat"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "CRÉANCES"
-msgstr ""
+msgstr "CRÉANCES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Sur opérations de gestion"
-msgstr ""
+msgstr "Sur opérations de gestion"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Redevances de crédit-bail mobilier"
-msgstr ""
+msgstr "Redevances de crédit-bail mobilier"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Primes de remboursement des emprunts"
-msgstr ""
+msgstr "Primes de remboursement des emprunts"
 
 #. module: l10n_fr
 #: field:l10n.fr.report,code:0
@@ -718,27 +723,27 @@ msgstr "Code"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Autres produits"
-msgstr ""
+msgstr "Autres produits"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Participation des salariés aux résultats"
-msgstr ""
+msgstr "Participation des salariés aux résultats"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Subventions d'investissement"
-msgstr ""
+msgstr "Subventions d'investissement"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "STOCK EN COURS"
-msgstr ""
+msgstr "STOCK EN COURS"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Autres achats et charges externes"
-msgstr ""
+msgstr "Autres achats et charges externes"
 
 #. module: l10n_fr
 #: wizard_field:l10n.fr.bilan.report,init,fiscalyear:0
@@ -749,17 +754,17 @@ msgstr "Année fiscale"
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
 msgid "DOM-TOM"
-msgstr ""
+msgstr "DOM-TOM"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Intérêts et charges assimilées"
-msgstr ""
+msgstr "Intérêts et charges assimilées"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Immobilisations incorporelles en cours"
-msgstr ""
+msgstr "Immobilisations incorporelles en cours"
 
 #. module: l10n_fr
 #: wizard_button:l10n.fr.bilan.report,init,end:0
@@ -771,17 +776,17 @@ msgstr "Annuler"
 #: rml:l10n.fr.bilan:0
 #: rml:l10n.fr.cdr:0
 msgid "au"
-msgstr ""
+msgstr "au"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Production immobilisée"
-msgstr ""
+msgstr "Production immobilisée"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Sur actif circulant : dotations aux dépréciations"
-msgstr ""
+msgstr "Sur actif circulant : dotations aux dépréciations"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
@@ -791,13 +796,13 @@ msgstr "Recevable"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Capital souscrit - appelé , non versé"
-msgstr ""
+msgstr "Capital souscrit - appelé , non versé"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 #: rml:l10n.fr.cdr:0
 msgid "( V )"
-msgstr ""
+msgstr "( V )"
 
 #. module: l10n_fr
 #: constraint:ir.model:0
@@ -815,17 +820,17 @@ msgstr "Définition"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Différences positives de change"
-msgstr ""
+msgstr "Différences positives de change"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "errains"
-msgstr ""
+msgstr "Terrains"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Brut"
-msgstr ""
+msgstr "Brut"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_immobilisations
@@ -835,23 +840,23 @@ msgstr "Immobilisations"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "PASSIF"
-msgstr ""
+msgstr "PASSIF"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Écarts de réévaluation"
-msgstr ""
+msgstr "Écarts de réévaluation"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Production stockée"
-msgstr ""
+msgstr "Production stockée"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 #: rml:l10n.fr.cdr:0
 msgid "Imprimé le :"
-msgstr ""
+msgstr "Imprimé le :"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_equity
@@ -861,38 +866,38 @@ msgstr "Capitaux propres"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Impôts sur les bénéfices"
-msgstr ""
+msgstr "Impôts sur les bénéfices"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "TOTAL DES PRODUITS ( I + II + III + IV )"
-msgstr ""
+msgstr "TOTAL DES PRODUITS ( I + II + III + IV )"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Salaires et traitements"
-msgstr ""
+msgstr "Salaires et traitements"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 #: rml:l10n.fr.cdr:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Provisions pour risques"
-msgstr ""
+msgstr "Provisions pour risques"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "n-cours de production [biens et services]"
-msgstr ""
+msgstr "En-cours de production [biens et services]"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Sur immobilisations : dotations aux dépréciations"
-msgstr ""
+msgstr "Sur immobilisations : dotations aux dépréciations"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,code:0
@@ -902,7 +907,7 @@ msgstr "Nom de la variable"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "TOTAL CHARGES ( I + II + III"
-msgstr ""
+msgstr "TOTAL CHARGES ( I + II + III"
 
 #. module: l10n_fr
 #: model:ir.actions.report.xml,name:l10n_fr.l10n_fr_pcg_cdr
@@ -918,17 +923,17 @@ msgstr "Lignes de rapport pour l10n_fr"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_2
 msgid "Zone Euro"
-msgstr ""
+msgstr "Zone Euro"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "E"
-msgstr ""
+msgstr "E"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,name:0
@@ -939,7 +944,7 @@ msgstr "Nom"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stock
@@ -964,27 +969,27 @@ msgstr "Comptes spéciaux"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Emprunts et dettes financières diverses"
-msgstr ""
+msgstr "Emprunts et dettes financières diverses"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Produits constatés d'avance"
-msgstr ""
+msgstr "Produits constatés d'avance"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Charges nettes sur cessions de valeurs mobilières de placement"
-msgstr ""
+msgstr "Charges nettes sur cessions de valeurs mobilières de placement"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "archandises"
-msgstr ""
+msgstr "Marchandises"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Emprunts et dettes auprès des établissements de crédit"
-msgstr ""
+msgstr "Emprunts et dettes auprès des établissements de crédit"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_view
@@ -994,47 +999,47 @@ msgstr "Vue"
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "CHARGES FINANCIÈRES"
-msgstr ""
+msgstr "CHARGES FINANCIÈRES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Quotes-parts de résultat sur opérations faites en commun ( II )"
-msgstr ""
+msgstr "Quotes-parts de résultat sur opérations faites en commun ( II )"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "IMMOBILISATIONS CORPORELLES"
-msgstr ""
+msgstr "IMMOBILISATIONS CORPORELLES"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_6
 msgid "TVA sur le débits"
-msgstr ""
+msgstr "TVA sur le débits"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "Achat de marchandises"
-msgstr ""
+msgstr "Achat de marchandises"
 
 #. module: l10n_fr
 #: model:ir.module.module,shortdesc:l10n_fr.module_meta_information
 msgid "France - Plan Comptable Général"
-msgstr ""
+msgstr "France - Plan Comptable Général"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Écarts de conversion actif"
-msgstr ""
+msgstr "Écarts de conversion actif"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Autres emprunts obligataires"
-msgstr ""
+msgstr "Autres emprunts obligataires"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Réserve légale"
-msgstr ""
+msgstr "Réserve légale"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_cloture
@@ -1044,14 +1049,14 @@ msgstr "Cloture"
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "IMMOBILISATIONS FINANCIÉRES"
-msgstr ""
+msgstr "IMMOBILISATIONS FINANCIÉRES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "CHARGES EXCEPTIONNELLES"
-msgstr ""
+msgstr "CHARGES EXCEPTIONNELLES"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Dettes fiscales et sociales"
-msgstr ""
+msgstr "Dettes fiscales et sociales"
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index a986dc25953..88d080c11bd 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -91,7 +91,7 @@ class lunch_cashmove(osv.osv):
     """ Move cash """
 
     _name = 'lunch.cashmove'
-    _description = "Move cash"
+    _description = "Cash Move"
 
     _columns = {
         'name': fields.char('Name', size=128),
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index 27f596a53b6..b5e56a03ee1 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -32,7 +32,7 @@
     * Easy Integration with any Module""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base','fetchmail'],
+    'depends': ['base'],
     'init_xml': [],
     'update_xml': [
         "mail_gateway_view.xml"
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 81f32d12f60..8534c32c510 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -22,60 +22,38 @@
 from osv import osv, fields
 import time
 
+class one2many_domain(fields.one2many):
+    def set(self, cr, obj, id, field, values, user=None, context=None):
+        if not values:
+            return
+        return super(one2many_domain, self).set(cr, obj, id, field, values, 
+                                            user=user, context=context)
 
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        msg_obj = obj.pool.get('mailgate.message')
+        for thread in obj.browse(cr, user, ids, context=context):
+            final = msg_obj.search(cr, user, self._domain + [('thread_id', '=', thread.id)], context=context)
+            res[thread.id] = final
+        return res
+        
+        
 class mailgate_thread(osv.osv):
     '''
     Mailgateway Thread
     '''
     _name = 'mailgate.thread'
     _description = 'Mailgateway Thread'
-    
-    def _get_log_ids(self, cr, uid, ids, field_names, arg, context=None):
-        """Gets id for case log from history of particular case
-        @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 ids: List of Case IDs
-        @param context: A standard dictionary for contextual values
-        @return:Dictionary of History Ids
-        """
-        if not context:
-            context = {}
-
-        result = {}
-        domain = []
-        history_obj = False
-        model_obj = self.pool.get('ir.model')
-        history_obj = self.pool.get('mailgate.message')
-
-        if 'message_ids' in field_names:
-            name = 'message_ids'
-            domain += [('email_to', '!=', False)]
-            
-        if 'log_ids' in field_names:
-            name = 'log_ids'
-            domain += [('email_to', '=', False)]
-        
-        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
-        domain +=  [('model_id', '=', model_ids[0])]
-        for case in self.browse(cr, uid, ids, context):
-            domain1 = domain + [('res_id', '=', case.id)]
-            history_ids = history_obj.search(cr, uid, domain1, context=context)
-            if history_ids:
-                result[case.id] = {name: history_ids}
-            else:
-                result[case.id] = {name: []}
-        return result
+    _rec_name = 'thread' 
 
     _columns = {
-        'name':fields.char('Name', size=64), 
-        'active': fields.boolean('Active'), 
-        'message_ids': fields.function(_get_log_ids, method=True, type='one2many', \
-                         multi="message_ids", relation="mailgate.message", string="Messages"), 
-        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', \
-                         multi="log_ids", relation="mailgate.message", string="Logs"),
-    }
-    
+        'thread': fields.char('Thread', size=32, required=False),  
+        'message_ids': one2many_domain('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
+        'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False),
+        }
+        
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
         """
         @param self: The object pointer
@@ -89,7 +67,6 @@ class mailgate_thread(osv.osv):
         @param context: A standard dictionary for contextual values"""
         if not context:
             context = {}
-
         # The mailgate sends the ids of the cases and not the object list
         if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
             cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
@@ -102,21 +79,19 @@ class mailgate_thread(osv.osv):
             data = {
                 'name': keyword,
                 'user_id': uid,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'model_id' : model_ids and model_ids[0] or False,
-                'res_id': case.id,
-                'section_id': case.section_id.id,
-                'message_id':message_id
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'thread_id': case.thread_id.id,                
+                'message_id': message_id
             }
 
             if history:
+                data['history'] = True
                 data['description'] = details or case.description
                 data['email_to'] = email or \
-                        (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or tools.config.get('email_from', False)
                 data['email_from'] = email_from or \
-                        (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or tools.config.get('email_from', False)
             res = obj.create(cr, uid, data, context)
@@ -138,10 +113,10 @@ class mailgate_message(osv.osv):
 
     _columns = {
         'name':fields.char('Message', size=64),
+        'model_id': fields.many2one('ir.model', 'Model'),
         'thread_id':fields.many2one('mailgate.thread', 'Thread'),
         'date': fields.datetime('Date'),
-        'model_id': fields.many2one('ir.model', "Model"),
-        'res_id': fields.integer('Resource ID'),
+        'history': fields.boolean('Is History?', required=False), 
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
         'message': fields.text('Description'),
         'email_from': fields.char('Email From', size=84),
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index e735f75b7f0..8b26d5ee47a 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -9,9 +9,8 @@
                 <form string="maligate message">
                     <field name="name" />
                     <field name="date" />
-                    <field name="model_id" />
-                    <field name="res_id" />
                     <field name="user_id" />
+                    <field name="history" />
                     <field name="message_id" />
                     <notebook colspan="4">
 	                    <page>
@@ -51,20 +50,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Mailgateway Thread">
-                    <field name="name" select="1"/>
-                    <separator string="Messages" colspan="4"/>
-                    <field name="message_ids" nolabel="1" colspan="4">
-                    	<tree string="Mailgateway Message">
+                    <field name="thread" select="1"/>
+                    <separator string="Logs" colspan="4"/>
+                    <field name="log_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
+                    	<tree string="Mailgateway Logs">
 		                    <field name="name" select="1" />
 		                    <field name="date" />
 		                </tree>
-	                    <form string="Maligate Message">
+	                    <form string="Maligate Logs">
 		                    <field name="name" />
 		                    <field name="date" />
-		                    <field name="model_id" />
-		                    <field name="res_id" />
 		                    <field name="user_id" />
 		                    <field name="message_id" />
+		                    <field name="history" />
 		                    <notebook colspan="4">
 			                    <page string="Email Details">
 			                    	<group col="4" colspan="4">
@@ -82,6 +80,35 @@
 			                </notebook>
 		                </form>
                     </field>
+                    <separator string="Histories" colspan="4"/>
+                    <field name="message_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
+                        <tree string="Mailgateway Histories">
+                            <field name="name" select="1" />
+                            <field name="date" />
+                        </tree>
+                        <form string="Maligate Histories">
+                            <field name="name" />
+                            <field name="date" />
+                            <field name="user_id" />
+                            <field name="message_id" />
+                            <field name="history" />
+                            <notebook colspan="4">
+                                <page string="Email Details">
+                                    <group col="4" colspan="4">
+                                        <separator string="Email Details" colspan="4"/>
+                                        <field name="email_from" />
+                                        <field name="email_to" />
+                                        <field name="email_cc" />
+                                        <field name="email_bcc" />
+                                   </group>
+                                </page>
+                                <page string="Attachments">
+                                    <separator string="Attachments" colspan="4"/>
+                                    <field name="attachment_ids" nolabel="1" colspan="4" />
+                                </page>
+                            </notebook>
+                        </form>
+                    </field>
                 </form>
             </field>
         </record>
@@ -92,7 +119,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Mailgateway Thread">
-                    <field name="name" select="1" />
+                    <field name="thread" select="1" />
                     <field name="message_ids" />
                 </tree>
             </field>
@@ -120,12 +147,12 @@
 	    </record>
 		
 		
-		 <menuitem id="base.menu_crm_configuration" name="Cases"
+		 <!-- <menuitem id="base.menu_crm_configuration" name="Cases"
             parent="base.menu_base_config" sequence="0"/>
 
         <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
         	parent="base.menu_crm_configuration"  sequence="20"/>
-        	
+        	-->
       	
     </data>
 </openerp>
diff --git a/addons/mail_gateway/security/ir.model.access.csv b/addons/mail_gateway/security/ir.model.access.csv
new file mode 100644
index 00000000000..badba5d4e3e
--- /dev/null
+++ b/addons/mail_gateway/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"mail_gateway_mailgate_message","mail_gateway.mailgate.message","model_mailgate_message","base.group_user",1,1,1,1
+"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","model_mailgate_thread","base.group_user",1,1,1,1
diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
index 94c40dc8a26..d37d8604380 100755
--- a/addons/marketing_campaign/__init__.py
+++ b/addons/marketing_campaign/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import marketing_campaign
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index a4945e53362..3363dd87144 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -36,6 +36,9 @@
     'init_xml': [],
     'update_xml': [
         'marketing_campaign_view.xml',
+        'marketing_campaign_data.xml',    
+         'marketing_campaign_workflow.xml',    
+        'report/campaign_analysis_view.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 7c0dfcc13d5..52733fad159 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -19,10 +19,12 @@
 #
 ##############################################################################
 import time
+import base64
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
 from osv import fields, osv
+import netsvc
 
 _intervalTypes = {
     'hours': lambda interval: relativedelta(hours=interval),
@@ -33,11 +35,11 @@ _intervalTypes = {
 
 class marketing_campaign(osv.osv): #{{{
     _name = "marketing.campaign"
-    _description = "Marketing Campaigns"
+    _description = "Marketing Campaign"
     
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'object_id': fields.many2one('ir.model', 'Objects'),
+        'object_id': fields.many2one('ir.model', 'Objects', required=True),
         'mode':fields.selection([('test', 'Test'),
                                 ('test_realtime', 'Realtime Time'),
                                 ('manual', 'Manual'),
@@ -47,18 +49,51 @@ class marketing_campaign(osv.osv): #{{{
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled'),],
-                                   'State',
-                                   readonly=True), 
+                                   'State',), 
         'activity_ids': fields.one2many('marketing.campaign.activity', 
                                        'campaign_id', 'Activities'),
+        'fixed_cost': fields.float('Fixed Cost'),                                       
         
     }
-
+    
+    _defaults = {
+        'state': lambda *a: 'draft',
+    }
+    
+    def state_running_set(self, cr, uid, ids, *args):
+        campaign = self.browse(cr, uid, ids[0])
+        if not campaign.activity_ids :
+            raise osv.except_osv("Error", "There is no associate activitity for the campaign")
+        act_ids = [ act_id.id for act_id in campaign.activity_ids]
+        act_ids  = self.pool.get('marketing.campaign.activity').search(cr, uid,
+                                [('id', 'in', act_ids), ('start', '=', True)])
+        if not act_ids :
+            raise osv.except_osv("Error", "There is no associate activitity for the campaign")
+        segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
+                                            [('campaign_id', '=', campaign.id),
+                                            ('state', '=', 'draft')])
+        if not segment_ids :
+            raise osv.except_osv("Error", "There is no associate semgnet for the campaign")
+        self.write(cr, uid, ids, {'state': 'running'})
+        return True
+        
+    def state_done_set(self, cr, uid, ids, *args):
+        segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
+                                            [('campaign_id', 'in', ids),
+                                            ('state', '=', 'running')])
+        if segment_ids :
+            raise osv.except_osv("Error", "Camapign cannot be done before all segments are done")            
+        self.write(cr, uid, ids, {'state': 'done'})
+        return True
+        
+    def state_cancel_set(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state': 'cancelled'})
+        return True
 marketing_campaign()#}}}
 
 class marketing_campaign_segment(osv.osv): #{{{
     _name = "marketing.campaign.segment"
-    _description = "Marketing Campaign Segments"
+    _description = "Campaign Segment"
 
     _columns = {
         'name': fields.char('Name', size=64,required=True),
@@ -67,26 +102,93 @@ class marketing_campaign_segment(osv.osv): #{{{
         'object_id': fields.related('campaign_id','object_id',
                                       type='many2one', relation='ir.model',
                                       string='Object'),
-        'ir_filter_id':fields.many2one('ir.filters', 'Filter'),
+        'ir_filter_id': fields.many2one('ir.filters', 'Filter'),
         'sync_last_date': fields.datetime('Date'),
-        'sync_mode':fields.selection([('create', 'Create'),
-                                      ('write', 'Write')],
+        'sync_mode': fields.selection([('create_date', 'Create'),
+                                      ('write_date', 'Write')],
                                       'Mode'),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled')],
-                                   'State',
-                                   readonly=True), 
+                                   'State',), 
         'date_run': fields.datetime('Running'),
         'date_done': fields.datetime('Done'),
     }
+    
+    _defaults = {
+        'state': lambda *a: 'draft',
+        'sync_mode': lambda *a: 'create_date',
+    }
+    
+    def state_running_set(self, cr, uid, ids, *args):
+        segment = self.browse(cr, uid, ids[0])
+        curr_date = time.strftime('%Y-%m-%d %H:%M:%S')
+        if not segment.date_run:
+            raise osv.except_osv("Error", "Segment can't be start before giving running date")
+        if segment.campaign_id.state != 'running' :
+            raise osv.except_osv("Error", "You have to start campaign first")
+        if (segment.date_run >= curr_date):
+                raise osv.except_osv("Error", "Segment cannot start before run date")
+        if not segment.sync_last_date:
+            self.write(cr, uid, ids, {'sync_last_date':curr_date})
+        self.write(cr, uid, ids, {'state': 'running','date_done': curr_date})
+        return True
+        
+    def state_done_set(self, cr, uid, ids, *args):
+        date_done = self.browse(cr, uid, ids[0]).date_done 
+        if (date_done > time.strftime('%Y-%m-%d')):
+            raise osv.except_osv("Error", "Segment cannot be closed before end date")
+
+        wi_ids = self.pool.get("marketing.campaign.workitem").search(cr, uid,
+                                [('state', 'in', ['inprogress', 'todo']),
+                                 ('segment_id', '=', ids[0])])
+        if wi_ids :
+            raise osv.except_osv("Error", "Segment cannot be done before all workitems are processed")            
+        self.write(cr, uid, ids, {'state': 'done'})
+        return True
+        
+    def state_cancel_set(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state': 'cancelled'})
+        return True
+        
+    def process_segment(self, cr, uid, context={}):
+        segment_ids = self.search(cr, uid, [('state', '=', 'running')])
+        action_date = time.strftime('%Y-%m-%d %H:%M:%S')
+        last_action_date = (datetime.now() + _intervalTypes['days'](-1) \
+                                            ).strftime('%Y-%m-%d %H:%M:%S')
+        for segment in self.browse(cr, uid, segment_ids):
+            act_ids = self.pool.get('marketing.campaign.activity').search(cr, 
+                                  uid, [('start', '=', True),
+                                  ('campaign_id', '=', segment.campaign_id.id)])
+            if (segment.sync_last_date and \
+                segment.sync_last_date <= action_date )\
+                 or not segment.sync_last_date :
+                model_obj = self.pool.get(segment.object_id.model)
+                object_ids = model_obj.search(cr, uid, [
+                                        (segment.sync_mode, '<=', action_date),
+                                (segment.sync_mode, '>=', last_action_date)])
+                for o_ids in  model_obj.read(cr, uid, object_ids) :
+                    partner_id = 'partner_id' in o_ids and o_ids['partner_id'] \
+                                        or False
+                    if partner_id:
+                        for act_id in act_ids:
+                            wi_vals = {'segment_id': segment.id,
+                                       'activity_id': act_id,
+                                       'date': action_date,
+                                       'partner_id': partner_id[0],
+                                       'state': 'todo',
+                                        }
+                            self.pool.get('marketing.campaign.workitem').create(
+                                                    cr, uid, wi_vals)
+                self.write(cr, uid, segment.id, {'sync_last_date':action_date}) 
+        return True
 
 marketing_campaign_segment()#}}}
 
 class marketing_campaign_activity(osv.osv): #{{{
     _name = "marketing.campaign.activity"
-    _description = "Marketing Campaign Activities"
+    _description = "Campaign Activity"
 
     _columns = {
         'name': fields.char('Name', size=64),
@@ -96,11 +198,11 @@ class marketing_campaign_activity(osv.osv): #{{{
                                       string='Object'),
         'start': fields.boolean('Start'),
         'condition': fields.text('Condition'),
-        'type':fields.selection([('email', 'E-mail'),
+        'type': fields.selection([('email', 'E-mail'),
                                   ('paper', 'Paper'),
                                   ('action', 'Action'),
                                   ('subcampaign', 'Sub-Campaign')],
-                                   'Type'),
+                                  'Type', required=True),
         'email_template_id': fields.many2one('poweremail.templates','Email Template'),
         'report_id': fields.many2one('ir.actions.report.xml', 'Reports'),         
         'report_directory_id': fields.many2one('document.directory', 'Directory'),
@@ -111,11 +213,14 @@ class marketing_campaign_activity(osv.osv): #{{{
         'from_ids': fields.one2many('marketing.campaign.transition',
                                             'activity_from_id',
                                             'Previous Activities'), 
-        'subcampaign_id' :fields.many2one('marketing.campaign', 'Sub-Campaign'),
-        'subcampaign_segment_id' :fields.many2one('marketing.campaign.segment',
+        'subcampaign_id': fields.many2one('marketing.campaign', 'Sub-Campaign'),
+        'subcampaign_segment_id': fields.many2one('marketing.campaign.segment',
                                                    'Sub Campaign Segment'),
-
+        'variable_cost': fields.float('Variable Cost'),
+        'revenue': fields.float('Revenue')
         }
+
+   
     def search(self, cr, uid, args, offset=0, limit=None, order=None, 
                                         context=None, count=False):
         if context == None:
@@ -130,11 +235,30 @@ class marketing_campaign_activity(osv.osv): #{{{
         return super(marketing_campaign_activity, self).search(cr, uid, args, 
                                            offset, limit, order, context, count)
 
+    def process(self, cr, uid, act_id, wi_id, context={}):
+        activity = self.browse(cr, uid, act_id)
+        workitem = self.pool.get('marketing.campaign.workitem').browse(cr, uid, wi_id)
+        if activity.type == 'paper' :
+            service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
+            (report_data, format) = service.create(cr, uid, [activity.report_id.id], {}, {})
+            attach_vals = {
+                    'name': '%s_%s_%s'%(activity.report_id.report_name,
+                                        activity.name,workitem.partner_id.name),
+                    'datas_fname': '%s.%s'%(activity.report_id.report_name,
+                                                activity.report_id.report_type),
+                    'parent_id': activity.report_directory_id.id,
+                    'datas': base64.encodestring(report_data),
+                    'file_type': format
+                    }
+            self.pool.get('ir.attachment').create(cr, uid, attach_vals)
+#        elif activity.type == 'email' :
+
+        return True    
 marketing_campaign_activity()#}}}
 
 class marketing_campaign_transition(osv.osv): #{{{
     _name = "marketing.campaign.transition"
-    _description = "Campaign Transitions"
+    _description = "Campaign Transition"
 
     _columns = {
         'activity_from_id': fields.many2one('marketing.campaign.activity',
@@ -146,12 +270,19 @@ class marketing_campaign_transition(osv.osv): #{{{
                                            ('months', 'Months'),
                                             ('years','Years')],'Interval Type')
         }
+
+    def default_get(self, cr, uid, fields, context={}):
+        value = super(marketing_campaign_transition, self).default_get(cr, uid,
+                                                                fields, context)
+        if context.has_key('type_id'):
+            value[context['type_id']] = context['activity_id']
+        return value
     
 marketing_campaign_transition() #}}}
 
 class marketing_campaign_workitem(osv.osv): #{{{
     _name = "marketing.campaign.workitem"
-    _description = "Campaign Workitems"
+    _description = "Campaign Workitem"
 
     _columns = {
         'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
@@ -165,19 +296,24 @@ class marketing_campaign_workitem(osv.osv): #{{{
         'date': fields.datetime('Execution Date'),
         'partner_id': fields.many2one('res.partner', 'Partner',required=True),
         'state': fields.selection([('todo', 'ToDo'), ('inprogress', 'In Progress'), 
-        ('exception', 'Exception'), ('done', 'Done'),
-        ('cancelled', 'Cancelled')], 'State')
+                                   ('exception', 'Exception'), ('done', 'Done'),
+                                   ('cancelled', 'Cancelled')], 'State')
         }
+    _defaults = {
+        'state': lambda *a: 'draft',
+    }
 
     def process_chain(self, cr, uid, workitem_id, context={}):
         workitem = self.browse(cr, uid, workitem_id)
-        to_ids = [to_ids.id for to_ids in workitem.activity_id.to_ids]
         mct_obj = self.pool.get('marketing.campaign.transition')
-        process_to_id = mct_obj.search(cr,uid, [('id', 'in', to_ids),
-                                       ('activity_from_id','=', 'activity_id')])
+        process_to_id = mct_obj.search(cr,uid, [
+                           ('activity_from_id','=', workitem.activity_id.id)])
         for mct_id in mct_obj.browse(cr, uid, process_to_id):
-            launch_date = datetime.datetime.now() + _intervalTypes[ \
-                                    mct_id.interval_type](mct_id.interval_nbr)            
+            if mct_id.interval_type and mct_id.interval_nbr :
+                launch_date = (datetime.now() + _intervalTypes[ \
+                                mct_id.interval_type](mct_id.interval_nbr) \
+                                ).strftime('%Y-%m-%d %H:%M:%S')
+            launch_date = time.strftime('%Y-%m-%d %H:%M:%S')
             workitem_vals = {'segment_id': workitem.segment_id.id,
                             'activity_id': mct_id.activity_to_id.id,
                             'date': launch_date,
@@ -187,16 +323,38 @@ class marketing_campaign_workitem(osv.osv): #{{{
             self.create(cr, uid, workitem_vals)
             
     def process(self, cr, uid, workitem_ids, context={}):
-        #for wi in self.browse(cr, uid, workitem_ids):
-        #    if wi.state == 'todo'# we searched the wi which are in todo state 
+        for wi in self.browse(cr, uid, workitem_ids):
+            if wi.state == 'todo' :# we searched the wi which are in todo state 
                     #then y v keep this filter again 
+                eval_context = {
+                    'pool': self.pool,
+                    'cr': cr,
+                    'uid': uid,
+                    'wi': wi,
+                    'object': wi.activity_id,
+                    'transition' : wi.activity_id.to_ids
+                }
+                val = {}                    
+                exec wi.activity_id.condition.replace('\r','') in \
+                                                 eval_context, val
+                if 'action' in val and val['action']:
+                    try :
+                        self.pool.get('marketing.campaign.activity').process(cr, 
+                                        uid, wi.activity_id.id, wi.id, context)
+                        self.write(cr, uid, wi.id, {'state':'done'})
+                        self.process_chain(cr, uid, wi.id, context)
+                    except Exception,e:
+                        self.write(cr, uid, wi.id, {'state':'exception'})
+                else :
+                    self.write(cr, uid, wi.id, {'state':'cancelled'})
+                    
         return True
         
     def process_all(self, cr, uid, context={}):
-        workitem_ids = self.search(cr, uid, [('type', '=', 'todo'),
+        workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
                         ('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))])
         if workitem_ids:
-            self.parocess(cr, uid, workitem_ids, context)
+            self.process(cr, uid, workitem_ids, context)
     
 marketing_campaign_workitem() #}}}  
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/marketing_campaign_data.xml b/addons/marketing_campaign/marketing_campaign_data.xml
index b3e18ee5b5d..81402dd73c2 100644
--- a/addons/marketing_campaign/marketing_campaign_data.xml
+++ b/addons/marketing_campaign/marketing_campaign_data.xml
@@ -6,13 +6,25 @@
 
         <record model="ir.cron" id="ir_cron_marketing_campaign_every_hour">
             <field name="name">Check Workitem</field>
-            <field name="interval_number">60</field>
-            <field name="interval_type">minutes</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
             <field name="model" eval="'marketing.campaign.workitem'"/>
             <field name="function" eval="'process_all'"/>
             <field name="args" eval="'()'"/>
         </record>
+        
+        <record model="ir.cron" id="ir_cron_marketing_campaign_every_day">
+            <field name="name">Check Segment</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field><!-- it s every day -->
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="model" eval="'marketing.campaign.segment'"/>
+            <field name="function" eval="'process_segment'"/>
+            <field name="args" eval="'()'"/>
+        </record>
+                
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index eefffcf7ff1..f013f37e853 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -2,7 +2,6 @@
 <openerp>
 	<data>
 		<menuitem name="Direct Marketing" id="menu_marketing" parent="base.menu_base_partner"/>
-	
 	<!--
     ======================
     Marketing Campaign
@@ -15,57 +14,64 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Campaign">
-               <group colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="object_id" readonly="True" select="1"/>
-                    <field name="mode"/>
+            	<group colspan="4">
+		            <field name="name" select="1"/>
+		            <field name="object_id" select="1"/>
+		            <field name="mode"/>
+		            <field name="fixed_cost"/>
                 </group>
-               <field name="activity_ids" nolabel = "1" colspan="4">
+                <field name="activity_ids" nolabel = "1" colspan="4">
                		<form string="Activities">
-	                <field name="name" select="1" />
-	                <field name="object_id" readonly="True"/>  
-	                 <field name="start"/>              
-	                <field name="condition" colspan="4"/>
-	                <newline/>
-	                <field name="type"/>
-	                <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
-	                    <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
-	                </group>
-	                <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
-	                    <field name="report_id" attrs="{'required':[('type','=','paper')]}" />
-	                    <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
-	                </group>
-	                <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >                
-	                    <field name="server_action_id" attrs="{'required':[('type','=','action')]}" />
-	                </group>
-	                <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >                
-	                    <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
-	                    <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
-	                </group>                
-	                <field name="to_ids" nolabel="1" colspan="4" mode="tree">
-	                    <tree string="All Transitions" editable="bottom">
-	                        <field name="activity_from_id"/>
-	                        <field name="activity_to_id"/>
-	                        <field name="interval_nbr"/>
-	                        <field name="interval_type"/>
-	                    </tree>
-                	</field>
-            </form>
-		    <tree string="All Activities">
-                <field name="name" select="1"/>
-                <field name="object_id"/>
-                <field name="start"/>
-                <field name="condition"/>
-                <field name="type"/>
-                <field name="report_id"/>
-                 <field name="to_ids"/>
-                <field name="subcampaign_id"/>
-                <field name="subcampaign_segment_id"/>
-            </tree>
-		    </field>    
+			            <field name="name" select="1" />
+			            <field name="object_id" readonly="True"/>  
+			            <field name="start"/>              
+			            <field name="condition" colspan="4"/>
+		                <field name="variable_cost" select="1"/>	                
+			            <field name="type"/>
+	                	<group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
+	                    	<field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
+	                	</group>
+	                	<group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
+	                    	<field name="report_id" attrs="{'required':[('type','=','paper')]}" />
+	                    	<field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
+	                	</group>
+	                	<group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >                
+	                    	<field name="server_action_id" attrs="{'required':[('type','=','action')]}" />
+	                	</group>
+	                	<group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >                
+	                        <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
+	                    	<field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
+	                	</group>                
+	                	<field name="to_ids" nolabel="1" colspan="4" mode="tree"  		default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
+	                    	<tree string="All Transitions" editable="bottom">
+	                        	<field name="activity_from_id"/>
+	                        	<field name="activity_to_id"/>
+	                        	<field name="interval_nbr"/>
+	                        	<field name="interval_type"/>
+	                    	</tree>
+                		</field>
+            		</form>
+		    		<tree string="All Activities">
+                		<field name="name" select="1"/>
+                		<field name="object_id"/>
+                		<field name="start"/>
+                		<field name="condition"/>
+                		<field name="variable_cost" select="1"/>	                
+                		<field name="type"/>
+                		<field name="report_id"/>
+                 		<field name="to_ids"/>
+                		<field name="subcampaign_id"/>
+                		<field name="subcampaign_segment_id"/>
+            		</tree>
+		    	</field>    
             	<separator string="Status" colspan="4" />
-            	<field name="state" nolabel = "1" colspan="4"/>
-            </form>
+                <group col="10" colspan="4">
+                    <field name="state" readonly="1" select="2" nolabel="1"/>
+                    <button name="state_running_set" string="Run" states="draft" />
+                    <button name="state_done_set" string="Done" states="running" />
+                    <button name="state_cancel_set" string="Cancelled" states="running"/>
+                </group>
+          	</form>
         </field>
     </record>
 
@@ -74,34 +80,34 @@
         <field name="model">marketing.campaign</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="All Campaigns">
-                <field name="name" select="1"/>
-                <field name="object_id" select="1"/>
-                <field name="mode"/>
-                <field name="state"/>
+        	<tree string="All Campaigns">
+				<field name="name" select="1"/>
+				<field name="object_id" select="1"/>
+				<field name="mode"/>
+				<field name="fixed_cost"/>
+				<field name="state"/>
             </tree>
         </field>
     </record>
 
-
     <record id="view_marketing_campaign_diagram" model="ir.ui.view">
         <field name="name">marketing.campaign.diagram</field>
         <field name="model">marketing.campaign</field>
         <field name="type">diagram</field>
         <field name="arch" type="xml">
-            <diagram string="Campaign Editor">
-			  <node object="marketing.campaign.activity" shape="rectangle:type!='subcampaign'" bgcolor="gray:start==True">
-			    <field name="name"/>
-			    <field name="type"/>
-                <field name="start" invisible="1"/>
-                <field name="condition"/> 
-			  </node>
-			  <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id">
-			    <field name="activity_from_id"/>
-			    <field name="activity_to_id"/>
-			    <field name="interval_nbr"/>
-     			<field name="interval_type"/>
-			  </arrow>
+        	<diagram string="Campaign Editor">
+				<node object="marketing.campaign.activity" shape="rectangle:type!='subcampaign'" bgcolor="gray:start==True">
+			    	<field name="name"/>
+			    	<field name="type"/>
+                	<field name="start" invisible="1"/>
+                	<field name="condition"/> 
+			  	</node>
+			  	<arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id">
+			    	<field name="activity_from_id"/>
+			    	<field name="activity_to_id"/>
+			    	<field name="interval_nbr"/>
+     				<field name="interval_type"/>
+			  	</arrow>
 			</diagram>
         </field>
     </record>
@@ -129,22 +135,27 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Segments">
-            <group colspan="4">
-                <field name="name" select="1"/>
-                <newline/>
-                <field name="campaign_id" select="1"/>
-                <field name="object_id" select="1" readonly="True"/>
-                <newline/>
-                <field name="ir_filter_id" select="1"/>
-                <newline/>
-                <field name="date_run"/>
-                <field name="date_done"/>
-                <separator string="Synchronization" colspan="4" />
-               	<field name="sync_last_date"/>
-                <field name="sync_mode"/>
-            </group>
+            	<group colspan="4">
+                	<field name="name" select="1" colspan="4"/>
+                	<newline/>
+                	<field name="campaign_id" select="1"/>
+                	<field name="object_id" select="1" readonly="True"/>
+                	<newline/>
+                	<field name="ir_filter_id" select="1"/>
+                	<newline/>
+                	<field name="date_run" attrs="{'readonly':[('date_run','!=',False)]}"/>
+                	<field name="date_done"/>
+                	<separator string="Synchronization" colspan="4" />
+               		<field name="sync_last_date"/>
+               		<field name="sync_mode" required="True"/>
+            	</group>
                 <separator string="Status" colspan="4" />
-                <field name="state" nolabel = "1" colspan="4"/>
+                <group col="10" colspan="4">
+                    <field name="state" readonly="1" select="2" nolabel="1"/>
+                    <button name="state_running_set" string="Run" states="draft" />
+                    <button name="state_done_set" string="Done" states="running" />
+                    <button name="state_cancel_set" string="Cancelled" states="running" />
+                </group>
             </form>
         </field>
     </record>
@@ -162,7 +173,7 @@
                 <field name="date_done"/>
                 <field name="sync_last_date" string="Sync Date"/>
                 <field name="sync_mode" string="Sync Mode"/>
-                <field name="state"/>
+                <field name="state" />
             </tree>
         </field>
     </record>
@@ -193,7 +204,7 @@
                 <field name="name" select="1" />
                 <field name="start"/>
                 <field name="campaign_id" select="1"/>
-                <field name="object_id"/>                
+                <field name="object_id" readonly="True"/>                
                 <field name="condition" colspan="4"/>
                 <newline/>
                 <field name="type"/>
@@ -211,7 +222,7 @@
                     <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
                     <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
                 </group>                
-                <field name="to_ids" nolabel="1"  colspan="4" mode="tree,form" >
+                <field name="to_ids" nolabel="1" colspan="4" mode="tree,form">
                     <tree string="All Transitions" editable="bottom">
                         <field name="activity_from_id" />
                         <field name="activity_to_id" />
@@ -229,16 +240,16 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="All Activities">
-                <field name="name" select="1"/>
-                <field name="campaign_id" select="1"/>
-                <field name="start"/>
-                <field name="object_id"/>
-                <field name="condition"/>
-                <field name="type"/>
-                <field name="report_id"/>
-                 <field name="to_ids" />
-                <field name="subcampaign_id"/>
-                <field name="subcampaign_segment_id"/>
+				<field name="name" select="1"/>
+				<field name="campaign_id" select="1"/>
+				<field name="start"/>
+				<field name="object_id"/>
+				<field name="condition"/>
+				<field name="type"/>
+				<field name="report_id"/>
+				<field name="to_ids" />
+				<field name="subcampaign_id"/>
+				<field name="subcampaign_segment_id"/>
             </tree>
         </field>
     </record>
@@ -251,10 +262,9 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_activity_tree"/>
     </record>
-    <!--
-
-    <menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" />-->
-
+    
+   	<!--menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" /-->
+    
     <!--
     ======================
     Marketing Workitems
@@ -287,7 +297,7 @@
                 <field name="segment_id" select="1"/>
                 <field name="activity_id" context="{'segment_id':segment_id}" select="1"/>
                 <field name="object_id" readonly="True"/>
-                 <field name="partner_id" select="1"/>
+                <field name="partner_id" select="1"/>
                 <field name="res_id"/>
                 <field name="date" select="1"/>
                 <separator string="Status" colspan="4"/>
@@ -306,6 +316,6 @@
     </record>
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
-		
+    
 	</data>
 </openerp>
diff --git a/addons/marketing_campaign/marketing_campaign_workflow.xml b/addons/marketing_campaign/marketing_campaign_workflow.xml
new file mode 100644
index 00000000000..a31515efd58
--- /dev/null
+++ b/addons/marketing_campaign/marketing_campaign_workflow.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+          
+    <!-- ==================Marketing Campaigns================== -->
+    
+        <record id="wkf_marketing_campaign" model="workflow">
+            <field name="name">marketing.campaign.basic</field>
+            <field name="osv">marketing.campaign</field>
+            <field name="on_create">True</field>
+        </record>
+
+        				<!-- Activity -->
+        <record id="act_marketing_campaign_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+
+        <record id="act_marketing_campaign_running" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign"/>
+            <field name="name">running</field>
+            <field name="kind">function</field>
+            <field name="action">state_running_set()</field>
+        </record>
+
+        <record id="act_marketing_campaign_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign"/>
+            <field name="name">done</field>
+            <field name="kind">function</field>
+            <field name="action">state_done_set()</field>
+        </record>
+        
+        <record id="act_marketing_campaign_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign"/>
+            <field name="name">cancel</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">function</field>
+            <field name="action">state_cancel_set()</field>
+        </record>
+
+        					<!-- Transition -->
+        <record id="trans_marketing_campaign_draft_running" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_draft"/>
+            <field name="act_to" ref="act_marketing_campaign_running"/>
+            <field name="signal">state_running_set</field>
+        </record>
+        
+        <record id="trans_campaign_running_done" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_running"/>
+            <field name="act_to" ref="act_marketing_campaign_done"/>
+            <field name="signal">state_done_set</field>
+        </record>
+        
+        <record id="trans_campaign_running_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_running"/>
+            <field name="act_to" ref="act_marketing_campaign_cancel"/>
+            <field name="signal">state_cancel_set</field>
+        </record>
+        
+         <!-- ==================Marketing Campaign Segment================== -->
+    
+        <record id="wkf_marketing_campaign_segment" model="workflow">
+            <field name="name">marketing.campaign.segment.basic</field>
+            <field name="osv">marketing.campaign.segment</field>
+            <field name="on_create">True</field>
+        </record>
+
+        				<!-- Activity -->
+        <record id="act_marketing_campaign_segment_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+
+        <record id="act_marketing_campaign_segment_running" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
+            <field name="name">running</field>
+            <field name="kind">function</field>
+            <field name="action">state_running_set()</field>
+        </record>
+
+        <record id="act_marketing_campaign_segment_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
+            <field name="name">done</field>
+            <field name="kind">function</field>
+            <field name="action">state_done_set()</field>
+        </record>
+        
+        <record id="act_marketing_campaign_segment_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
+            <field name="name">cancel</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">function</field>
+            <field name="action">state_cancel_set()</field>
+        </record>
+
+        					<!-- Transition -->
+        <record id="trans_marketing_campaign_segment_draft_running" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_segment_draft"/>
+            <field name="act_to" ref="act_marketing_campaign_segment_running"/>
+            <field name="signal">state_running_set</field>
+        </record>
+        
+        <record id="trans_campaign_segment_running_done" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_segment_running"/>
+            <field name="act_to" ref="act_marketing_campaign_segment_done"/>
+            <field name="signal">state_done_set</field>
+        </record>
+        
+        <record id="trans_campaign_segment_running_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_segment_running"/>
+            <field name="act_to" ref="act_marketing_campaign_segment_cancel"/>
+            <field name="signal">state_cancel_set</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/marketing_campaign/report/__init__.py b/addons/marketing_campaign/report/__init__.py
new file mode 100644
index 00000000000..83740cf759b
--- /dev/null
+++ b/addons/marketing_campaign/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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 campaign_analysis
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
new file mode 100644
index 00000000000..590a1b47bc0
--- /dev/null
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -0,0 +1,96 @@
+# -*- 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 tools
+from osv import fields, osv
+
+class campaign_analysis(osv.osv): #{{{
+    _name = "campaign.analysis"
+    _description = "Campaign Analysis"
+    _auto = False
+    _rec_name = 'date'
+    
+    def _total_cost(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+        result = {}
+        for ca_obj in self.browse(cr, uid, ids, context):
+            wi_ids = self.pool.get('marketing.campaign.workitem').search(cr, uid,
+                        [('segment_id.campaign_id', '=', ca_obj.campaign_id.id)])
+            total_cost = ca_obj.activity_id.variable_cost + \
+                                (ca_obj.campaign_id.fixed_cost / len(wi_ids))
+            result[ca_obj.id] = total_cost
+        return result
+            
+    _columns = {
+        'year': fields.char('Year', size=4, readonly=True),
+        '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),
+        'date': fields.date('Date', readonly=True),
+        'campaign_id': fields.many2one('marketing.campaign', 'Campaign', 
+                                                                readonly=True),
+        'activity_id': fields.many2one('marketing.campaign.activity', 'Activity',
+                                                                 readonly=True),
+        'segment_id': fields.many2one('marketing.campaign.segment', 'Segment', 
+                                                                readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'country_id': fields.related('partner_id','address', 'country_id',
+                    type='many2one', relation='res.country',string='Country'),
+        'total_cost' : fields.function(_total_cost, string='Cost', method=True, 
+                                    type="float" ),
+        'revenue': fields.float('Revenue',readonly=True),
+#        'case_id': fields.many2one('crm.lead', 'Opportunity', readonly=True),
+#        'count' : fields.integer('Count', readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'campaign_analysis')
+        
+        cr.execute("""
+                create or replace view campaign_analysis as (
+                select
+                    wi.id as id,
+                    to_char(wi.date, 'YYYY') as year,
+                    to_char(wi.date, 'MM') as month,
+                    wi.date as date,
+                    s.campaign_id as campaign_id,
+                    wi.activity_id as activity_id,
+                    wi.segment_id as segment_id,
+                    wi.partner_id as partner_id ,
+                    act.revenue as revenue
+                from
+                    marketing_campaign_workitem wi
+                    left join res_partner p on (p.id=wi.partner_id)
+                    left join marketing_campaign_segment s on (s.id=wi.segment_id)
+                    left join marketing_campaign_activity act on (act.id= wi.activity_id)
+                group by
+                    to_char(wi.date, 'YYYY'),to_char(wi.date, 'MM'),
+                    s.campaign_id,wi.activity_id,wi.segment_id,wi.partner_id,revenue,
+                    wi.date,wi.id
+                )
+            """)
+    
+campaign_analysis() #}}}
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
new file mode 100644
index 00000000000..b66ec89ca6b
--- /dev/null
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	<record id="view_campaign_analysis_tree" model="ir.ui.view">
+        <field name="name">campaign.analysis.tree</field>
+        <field name="model">campaign.analysis</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Marketing Reports">
+                <field name="year" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="date" invisible="1"/>
+                <field name="campaign_id" invisible="1"/>
+                <field name="activity_id" invisible="1"/>
+                <field name="segment_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="country_id" invisible="1"/>
+                <!--field name="case_id"/-->
+                <!--field name="count"/-->
+                <field name="total_cost" string="Cost"/><!-- sum="Cost"/-->
+                <field name="revenue"/>
+            </tree>
+        </field>
+    </record>
+
+	<record id="view_campaign_analysis_search" model="ir.ui.view">
+        <field name="name">campaign.analysis.search</field>
+        <field name="model">campaign.analysis</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Marketing Reports">
+           		<group>
+	            	<filter icon="terp-account"
+	                    	string="This Year"
+	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
+	                <filter icon="terp-account"
+	                    	string="This Month"
+	                    	domain="[('month','=',time.strftime('%%m'))]"/>
+	                <separator orientation="vertical"/>
+		            <filter icon="terp-account" 
+		            		string="Date" 
+		            		domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
+	                <separator orientation="vertical"/>
+					<field name="campaign_id"/>
+					<field name="activity_id"/>
+					<field name="segment_id"/>
+	                <field name="partner_id"/>
+					<field name="country_id"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Campaign" name="Campaign" icon="terp-sale" context="{'group_by':'campaign_id'}" />
+                    <filter string="Segment" name ="Segment" icon="terp-sale" context="{'group_by':'segment_id'}" />
+                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                </group>                
+            </search>
+        </field>
+    </record>
+
+	<record id="action_campaign_analysis_all" model="ir.actions.act_window">
+        <field name="name">Marketing Report</field>
+        <field name="res_model">campaign.analysis</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1}</field>
+        <field name="search_view_id" ref="view_campaign_analysis_search"/>
+    </record>
+
+    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing" sequence="40"/>
+		
+	</data>
+</openerp>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 8c15c652335..23f9cd19275 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -28,7 +28,7 @@ import decimal_precision as dp
 
 STATE = [
     ('none', 'Non Member'),
-    ('canceled', 'Canceled Member'),
+    ('canceled', 'Cancelled Member'),
     ('old', 'Old Member'),
     ('waiting', 'Waiting Member'),
     ('invoiced', 'Invoiced Member'),
@@ -162,8 +162,9 @@ class membership_line(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids):
             cr.execute('''
-            SELECT i.state FROM
-            account_invoice i WHERE
+            SELECT i.state, i.id FROM
+            account_invoice i
+            WHERE
             i.id = (
                 SELECT l.invoice_id FROM
                 account_invoice_line l WHERE
@@ -186,6 +187,10 @@ class membership_line(osv.osv):
                 state = 'invoiced'
             elif istate == 'paid':
                 state = 'paid'
+                inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1])
+                for payment in inv.payment_ids:
+                    if payment.invoice and payment.invoice.type == 'out_refund':
+                        state = 'canceled'
             elif istate == 'cancel':
                 state = 'canceled'
             res[line.id] = state
@@ -253,11 +258,15 @@ class Partner(osv.osv):
             s = 4
             if partner_data.member_lines:
                 for mline in partner_data.member_lines:
-                    if mline.date_from <= today and mline.date_to >= today:
+                    if mline.date_to >= today:
                         if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
                             mstate = mline.account_invoice_line.invoice_id.state
                             if mstate == 'paid':
                                 s = 0
+                                inv = mline.account_invoice_line.invoice_id
+                                for payment in inv.payment_ids:
+                                    if payment.invoice.type == 'out_refund':
+                                        s = 2
                                 break
                             elif mstate == 'open' and s!=0:
                                 s = 1
@@ -332,14 +341,12 @@ class Partner(osv.osv):
         '''Return the cancel date of membership'''
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
-        for partner_id in ids:
-            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                    limit=1, order='date_cancel')
-            if line_id:
-                res[partner_id] = member_line_obj.read(cr, uid, line_id[0],
-                        ['date_cancel'])['date_cancel']
-            else:
-                res[partner_id] = False
+        for partner in self.browse(cr, uid, ids, context=context):
+            res[partner.id] = False
+            if partner.membership_state == 'canceled':
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
+                if line_id:
+                    res[partner.id] = member_line_obj.read(cr, uid, line_id[0],['date_cancel'])['date_cancel']
         return res
 
     def _get_partners(self, cr, uid, ids, context={}):
@@ -349,20 +356,23 @@ class Partner(osv.osv):
             ids+=ids2
         return ids
 
+    def __get_membership_state(self, *args, **kwargs):
+        return self._membership_state(*args, **kwargs)
+    
     _columns = {
         'associate_member': fields.many2one('res.partner', 'Associate member'),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
         'free_member': fields.boolean('Free member'),
         'membership_amount': fields.float(
-                    'Membership amount', digites=(16, 2),
+                    'Membership amount', digits=(16, 2),
                     help='The price negociated by the partner'),
         'membership_state': fields.function(
-                    _membership_state, method = True,
+                    __get_membership_state, method = True,
                     string = 'Current membership state', type = 'selection',
                     selection = STATE ,store = {
                         'account.invoice':(_get_invoice_partner,['state'], 10),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
-                        'res.partner':(_get_partners, ['free_member', 'membership_state'], 10)
+                        'res.partner':(_get_partners, ['free_member', 'membership_state','associate_member'], 10)
                         }
                     ),
         'membership_start': fields.function(
@@ -388,7 +398,7 @@ class Partner(osv.osv):
                     _membership_cancel, method = True,
                     string = 'Cancel membership date', type='date',
                     store = {
-                        'account.invoice':(_get_invoice_partner,['state'], 10),
+                        'account.invoice':(_get_invoice_partner,['state'], 11),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
                         'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
                         }
@@ -412,7 +422,16 @@ class Partner(osv.osv):
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive associated members.', ['associate_member'])
     ]
-
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}    
+        default = default.copy()
+        default['member_lines'] = []
+        return super(Partner, self).copy(cr, uid, id, default, context)
+    
 Partner()
 
 class product_template(osv.osv):
@@ -439,8 +458,6 @@ class Product(osv.osv):
 
     '''Product'''
     _inherit = 'product.product'
-    _description = 'product.product'
-
     _columns = {
             'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
             'membership_date_from': fields.date('Date from'),
@@ -547,80 +564,6 @@ class ReportPartnerMemberYear(osv.osv):
 ReportPartnerMemberYear()
 
 
-class ReportPartnerMemberYearNew(osv.osv):
-    '''New Membership by Years'''
-
-    _name = 'report.partner_member.year_new'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cr):
-        '''Create the view'''
-        cr.execute("""
-    CREATE OR REPLACE VIEW report_partner_member_year AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) as canceled_number,
-        COUNT(npaid) as paid_number,
-        COUNT(ninvoiced) as invoiced_number,
-        COUNT(nwaiting) as waiting_number,
-        SUM(acanceled) as canceled_amount,
-        SUM(apaid) as paid_amount,
-        SUM(ainvoiced) as invoiced_amount,
-        SUM(awaiting) as waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml.id) AS id
-            FROM membership_membership_line ml
-            JOIN (account_invoice_line ail
-                LEFT JOIN account_invoice ai
-                ON (ail.invoice_id = ai.id))
-            ON (ml.account_invoice_line = ail.id)
-            JOIN res_partner p
-            ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml.id) AS foo
-        GROUP BY year, currency)
-                """)
-
-ReportPartnerMemberYear()
-
-
 class ReportPartnerMemberYearNew(osv.osv):
     '''New Membership by Years'''
 
@@ -703,28 +646,30 @@ ReportPartnerMemberYearNew()
 
 class account_invoice_line(osv.osv):
     _inherit='account.invoice.line'
+    
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context={}
         res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
         member_line_obj = self.pool.get('membership.membership_line')
         for line in self.browse(cr, uid, ids):
-            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
-            if line.product_id and line.product_id.membership and not ml_ids:
-                # Product line has changed to a membership product
-                date_from = line.product_id.membership_date_from
-                date_to = line.product_id.membership_date_to
-                if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
-                    date_from = line.invoice_id.date_invoice
-                line_id = member_line_obj.create(cr, uid, {
-                    'partner': line.invoice_id.partner_id.id,
-                    'date_from': date_from,
-                    'date_to': date_to,
-                    'account_invoice_line': line.id,
-                    })
-            if line.product_id and not line.product_id.membership and ml_ids:
-                # Product line has changed to a non membership product
-                member_line_obj.unlink(cr, uid, ml_ids, context=context)
+            if line.invoice_id.type == 'out_invoice':
+                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+                if line.product_id and line.product_id.membership and not ml_ids:
+                    # Product line has changed to a membership product
+                    date_from = line.product_id.membership_date_from
+                    date_to = line.product_id.membership_date_to
+                    if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+                        date_from = line.invoice_id.date_invoice
+                    line_id = member_line_obj.create(cr, uid, {
+                        'partner': line.invoice_id.partner_id.id,
+                        'date_from': date_from,
+                        'date_to': date_to,
+                        'account_invoice_line': line.id,
+                        })
+                if line.product_id and not line.product_id.membership and ml_ids:
+                    # Product line has changed to a non membership product
+                    member_line_obj.unlink(cr, uid, ml_ids, context=context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
@@ -739,20 +684,21 @@ class account_invoice_line(osv.osv):
     def create(self, cr, uid, vals, context={}):
         result = super(account_invoice_line, self).create(cr, uid, vals, context)
         line = self.browse(cr, uid, result)
-        member_line_obj = self.pool.get('membership.membership_line')
-        ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
-        if line.product_id and line.product_id.membership and not ml_ids:
-            # Product line is a membership product
-            date_from = line.product_id.membership_date_from
-            date_to = line.product_id.membership_date_to
-            if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
-                date_from = line.invoice_id.date_invoice
-            line_id = member_line_obj.create(cr, uid, {
-                'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
-                'date_from': date_from,
-                'date_to': date_to,
-                'account_invoice_line': line.id,
-                })
+        if line.invoice_id.type == 'out_invoice':
+            member_line_obj = self.pool.get('membership.membership_line')
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+            if line.product_id and line.product_id.membership and not ml_ids:
+                # Product line is a membership product
+                date_from = line.product_id.membership_date_from
+                date_to = line.product_id.membership_date_to
+                if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+                    date_from = line.invoice_id.date_invoice
+                line_id = member_line_obj.create(cr, uid, {
+                    'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
+                    'date_from': date_from,
+                    'date_to': date_to,
+                    'account_invoice_line': line.id,
+                    })
         return result
 
 account_invoice_line()
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index b459ab1eb9d..00dde266b4b 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -53,8 +53,8 @@
                     <page string="Membership">
                         <field name="membership" readonly="0"/>
                         <newline/>
-                        <field name="membership_date_from" readonly="0"/>
-                        <field name="membership_date_to" readonly="0"/>
+                        <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                        <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                     </page>
                 </page>
             </field>
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index de35a7c8adc..cb722db567a 100644
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -3,3 +3,5 @@
 "access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
 "access_report_partner_member_year","report.partner_member.year","model_report_partner_member_year","base.group_partner_manager",1,0,0,0
 "access_report_partner_member_year_new","report.partner_member.year_new","model_report_partner_member_year_new","base.group_partner_manager",1,0,0,0
+"access_membership_invoice","membership.invoice","model_membership_invoice",,1,1,1,1
+"access_membership_unpaid_invoice","membership.unpaid.invoice","model_membership_unpaid_invoice",,1,0,0,0
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 34e0d2ef7aa..5db458c1c57 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-30 14:06+0000\n"
-"Last-Translator: TeMPO <info@tempo-consulting.fr>\n"
+"PO-Revision-Date: 2010-05-21 21:09+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -388,7 +388,7 @@ msgstr "Processus des Approvisionnements"
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Date planifiée"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
@@ -1179,7 +1179,7 @@ msgstr "Approvisionnement"
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.product_procurement_wizard
 msgid "Procurement Request"
-msgstr ""
+msgstr "Demande d'approvisionnement"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_price
@@ -1680,7 +1680,7 @@ msgstr "Arrondi de produit"
 #. module: mrp
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Ordre de fabrication"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1995,7 +1995,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End"
-msgstr ""
+msgstr "Planification terminée"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 59e69651b19..130d6a803dc 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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:35+0000\n"
-"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
+"PO-Revision-Date: 2010-05-21 08:19+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -105,7 +105,7 @@ msgstr "Konfiguracja"
 #. module: mrp
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr "Odnośnik"
+msgstr "Numer"
 
 #. module: mrp
 #: view:mrp.production:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index d5cea81933b..966572f772c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -94,7 +94,7 @@ class mrp_routing_workcenter(osv.osv):
     Defines working cycles and hours of a workcenter using routings.
     """
     _name = 'mrp.routing.workcenter'
-    _description = 'Routing workcenter usage'
+    _description = 'Workcenter Usage'
     _columns = {
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
         'name': fields.char('Name', size=64, required=True),
@@ -118,7 +118,7 @@ class mrp_bom(osv.osv):
     Defines bills of material for a product.
     """
     _name = 'mrp.bom'
-    _description = 'Bills of Material'
+    _description = 'Bill of Material'
     
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
         """ Gets child bom.
@@ -314,7 +314,6 @@ class mrp_bom(osv.osv):
                     d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
                     mult = (d + (m and 1.0 or 0.0))
                     cycle = mult * wc_use.cycle_nbr
-                    print mult, wc_use.hour_nbr, wc.time_start, wc.time_stop, cycle
                     result2.append({
                         'name': bom.routing_id.name,
                         'workcenter_id': wc.id,
@@ -351,8 +350,7 @@ mrp_bom()
 
 class mrp_bom_revision(osv.osv):
     _name = 'mrp.bom.revision'
-    _description = 'Bill of material revisions'
-    
+    _description = 'Bill of Material Revision'
     _columns = {
         'name': fields.char('Modification name', size=64, required=True),
         'description': fields.text('Description'),
@@ -419,8 +417,9 @@ class mrp_production(osv.osv):
     Production Orders / Manufacturing Orders
     """
     _name = 'mrp.production'
-    _description = 'Production'
-    _date_name  = 'date_planned'    
+    _description = 'Manufacturing Order'
+    _date_name  = 'date_planned'
+    _log_create = True
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
         """ Calculates total hours and total no. of cycles for a production order.
@@ -648,6 +647,9 @@ class mrp_production(osv.osv):
         """ Changes the production state to Ready and location id of stock move.
         @return: True
         """
+        for (id,name) in self.name_get(cr, uid, ids):
+            message = _('Manufacturing Order ') + " '" + name + "' "+ _("is ready to produce.")
+            self.log(cr, uid, id, message)
         move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state': 'ready'})
         for production in self.browse(cr, uid, ids):
@@ -934,7 +936,7 @@ mrp_production()
 
 class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
-    _description = 'Work Orders'
+    _description = 'Work Order'
     _order = 'sequence'
     
     _columns = {
@@ -954,8 +956,7 @@ mrp_production_workcenter_line()
 
 class mrp_production_product_line(osv.osv):
     _name = 'mrp.production.product.line'
-    _description = 'Production scheduled products'
-    
+    _description = 'Production Scheduled Product'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 8962eb6e1c8..581cc04c05e 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -170,7 +170,7 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
 
         <record id="mrp_bom_1" model="mrp.bom">
@@ -179,21 +179,21 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc2" />
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
             <field name="sequence">8</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC3')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc3"/>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
             <field name="sequence">11</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC4')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc4"/>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -201,7 +201,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -209,7 +209,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_21"/>
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -217,7 +217,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -225,7 +225,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
@@ -233,7 +233,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
@@ -242,14 +242,14 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
             <field name="sequence">33</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC0')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -257,7 +257,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
 
         <record id="mrp_bom_13" model="mrp.bom">
@@ -265,7 +265,7 @@
             <field name="sequence">38</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu3"/>
         </record>
 
         <record id="mrp_bom_kit" model="mrp.bom">
@@ -276,7 +276,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_clavier" model="mrp.bom">
             <field name="name">Keyboard</field>
@@ -284,7 +284,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_24"/>
         </record>
         <record id="mrp_bom_mouse" model="mrp.bom">
             <field name="name">Mouse</field>
@@ -292,7 +292,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_16" model="mrp.bom">
             <field name="name">Moon PC</field>
@@ -300,7 +300,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
         </record>
         <record id="mrp_bom_18" model="mrp.bom">
             <field name="name">Mainboard ASUStek A7N8X</field>
@@ -308,7 +308,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb2"/>
         </record>
         <record id="mrp_bom_19" model="mrp.bom">
             <field name="name">Processor AMD Athlon 2200+</field>
@@ -316,7 +316,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu2"/>
         </record>
         <record id="mrp_bom_1900" model="mrp.bom">
             <field name="name">Regular Case Fan</field>
@@ -324,7 +324,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
         </record>
         <record id="mrp_bom_23" model="mrp.bom">
             <field name="name">DDR 256MB PC333</field>
@@ -332,7 +332,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_11"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram"/>
         </record>
         <record id="mrp_bom_1901" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
@@ -340,7 +340,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram512"/>
         </record>
         <record id="mrp_bom_22" model="mrp.bom">
             <field name="name">DDR 1024MB PC400</field>
@@ -348,7 +348,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_5"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram512"/>
         </record>
         <record id="mrp_bom_24" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -356,7 +356,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_7"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD3')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd3"/>
         </record>
         <record id="mrp_bom_25" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -365,7 +365,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_4"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_26" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -373,7 +373,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_21"/>
         </record>
         <record id="mrp_bom_27" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -381,7 +381,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_28" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -390,7 +390,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_29" model="mrp.bom">
             <field name="name">Processor on demand</field>
@@ -399,7 +399,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_30" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -408,7 +408,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_31" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -417,7 +417,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_32" model="mrp.bom">
             <field name="name">High speed processor config</field>
@@ -426,7 +426,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu2"/>
         </record>
         <record id="mrp_bom_33" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -435,7 +435,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_6"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd2"/>
         </record>
         <record id="mrp_bom_34" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -444,7 +444,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_35" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -453,7 +453,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_36" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -462,7 +462,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd2"/>
         </record>
         <record id="mrp_bom_processor" model="mrp.bom">
             <field name="name">processor</field>
@@ -471,7 +471,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
         </record>
         <record id="mrp_bom_38" model="mrp.bom">
             <field name="name">mainboard</field>
@@ -480,7 +480,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb1"/>
         </record>
         <record id="mrp_bom_fan" model="mrp.bom">
             <field name="name">fan</field>
@@ -489,7 +489,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
         </record>
         <record id="mrp_bom_ram" model="mrp.bom">
             <field name="name">RAM</field>
@@ -498,7 +498,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram"/>
         </record>
         <record id="mrp_bom_41" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -507,7 +507,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_42" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -516,7 +516,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_43" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -525,7 +525,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
 
         <record id="mrp_bom_kit2" model="mrp.bom">
@@ -536,7 +536,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KIT0')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_26"/>
         </record>
         <record id="mrp_bom_mouse2" model="mrp.bom">
             <field name="name">Mouse</field>
@@ -544,7 +544,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_clavier2" model="mrp.bom">
             <field name="name">Keyboard</field>
@@ -552,7 +552,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_24"/>
         </record>
 
     </data>
diff --git a/addons/mrp/mrp_order_point.xml b/addons/mrp/mrp_order_point.xml
index ba2e56e8515..433078263c1 100644
--- a/addons/mrp/mrp_order_point.xml
+++ b/addons/mrp/mrp_order_point.xml
@@ -9,7 +9,7 @@
             <field name="product_min_qty">5.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
@@ -17,7 +17,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
@@ -25,7 +25,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
@@ -33,7 +33,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
@@ -41,7 +41,7 @@
             <field name="product_min_qty">3.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
@@ -49,7 +49,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
     </data>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1c7dce6e30b..02841b64b03 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -166,7 +166,7 @@
             <field name="arch" type="xml">
                 <tree string="Routing Work Centers">
                     <field name="sequence"/>
-                    <field name="workcenter_id" select="1"/>
+                    <field name="workcenter_id"/>
                     <field name="cycle_nbr"/>
                     <field name="hour_nbr"/>
                 </tree>
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 791c376ef92..a9c83b23b7e 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -113,8 +113,9 @@
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        
+
         <!-- Procurement -->
+
         <record id="act_produce" model="workflow.activity">
             <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
             <field name="name">produce</field>
@@ -122,41 +123,9 @@
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
-        <record id="act_produce_check" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
-            <field name="name">produce_check</field>
-        </record>
-        <record id="act_produce_service" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
-            <field name="name">produce_service</field>
-            <field name="kind">function</field>
-            <field name="action">action_produce_assign_service()</field>
-        </record>
-        
-        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
-            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
-            <field name="act_to" ref="act_produce_check"/>
-            <field name="condition">check_produce()</field>
-        </record>
-        <record id="trans_product_check_produce_service" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce_service"/>
-            <field name="condition">not check_product()</field>
-        </record>
-        
-        <record id="trans_produce_service_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="mrp_procurement.act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-        
-        <record id="trans_produce_service_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="mrp_procurement.act_make_done"/>
-        </record>
         
         <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_from" ref="mrp_procurement.act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index 7f48b111d43..d754d6a50ad 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -27,12 +27,16 @@ class mrp_production_order(osv.osv):
     _description = "Production Order Report"
     _auto = False
     _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
+        'year': fields.char('Year',size=64,readonly=True),
         '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),
+        'day': fields.char('Day',size=64,readonly=True),
         'origin': fields.char('Source Document', size=64),
         'nbr': fields.integer('# of Orders', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True, domain=[('type','<>','service')]),
+        'products_to_consume': fields.integer('Products to Consume', readonly=True),
+        'consumed_products': fields.integer('Consumed Products', readonly=True),
+        'date': fields.date('Date', readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty': fields.float('Product Qty', readonly=True),
         'state': fields.selection([('draft','Draft'),
                                    ('picking_except', 'Picking Exception'),
@@ -43,14 +47,15 @@ class mrp_production_order(osv.osv):
                                    ('done','Done')],
                                     'State', readonly=True),
         'date_planned':fields.date('Scheduled Date'),
-        'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True),
+        'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True),
         'date_start': fields.datetime('Start Date',readonly=True),
         'date_finnished': fields.datetime('End Date',readonly=True),
-        'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True),
+        'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True),
         'company_id': fields.many2one('res.company','Company',readonly=True),
-        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)],readonly=True),
-        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null',readonly=True),
+        'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True),
+        'routing_id': fields.many2one('mrp.routing', string='Routing',readonly=True),
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', readonly=True),
         'priority': fields.selection([('0','Not urgent'),
                                       ('1','Normal'),
                                       ('2','Urgent'),
@@ -65,12 +70,27 @@ class mrp_production_order(osv.osv):
             create or replace view mrp_production_order as (
                 select
                      min(l.id) as id,
-                     to_char(s.create_date, 'YYYY') as name,
+                     to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
+                     to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
+                     to_char(s.create_date, 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
+                     l.product_uom,
                      sum(l.product_qty * u.factor) as product_qty,
                      s.company_id as company_id,
                      count(*) as nbr,
+                     (select sum(sm.product_qty) from stock_move as sm
+                        left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
+                        left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
+                        where sm.product_id=ll.product_id and ll.id=l.id
+                        and sm.state not in ('done','cancel')
+                        group by sm.product_id) as products_to_consume,
+                    (select sum(sm.product_qty)/2 from stock_move as sm
+                        left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
+                        left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
+                        where sm.product_id=ll.product_id and ll.id=l.id
+                        and sm.state in ('done','cancel')
+                        group by sm.product_id) as consumed_products,
                      s.location_src_id,
                      s.location_dest_id,
                      s.bom_id,
@@ -82,16 +102,18 @@ class mrp_production_order(osv.osv):
                      s.origin,
                      s.priority,
                      s.state
-                     from
-                 mrp_production_product_line l
-                 left join
-                     mrp_production s on (s.id=l.production_id)
-                     left join product_uom u on (u.id=l.product_uom)
+                 from mrp_production_product_line l
+                 left join mrp_production s on (s.id=l.production_id)
+                 left join product_uom u on (u.id=l.product_uom)
                  group by
                      to_char(s.create_date, 'YYYY'),
                      to_char(s.create_date, 'MM'),
+                     to_char(s.create_date, 'YYYY-MM-DD'),
+                     to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY'),
                      l.product_id,
                      l.product_uom,
+                     s.id,
+                     l.id,
                      s.bom_id,
                      s.routing_id,
                      s.picking_id,
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 1ae2e6b32bb..c9c7a3d4400 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -21,7 +21,7 @@
 					<field name="routing_id" invisible="1"/>
 					<field name="picking_id" invisible="1"/>
                     <field name="priority" invisible="1"/>
-                    <field name="name" invisible="1" />
+                    <field name="year" invisible="1" />
 					<field name="month" invisible="1"/>
 					<field name="location_src_id" invisible="1"/>
 					<field name="location_dest_id" invisible="1"/>
@@ -48,8 +48,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" name="this_year" icon="terp-mrp" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" name="this_month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]"/>
+                   		<filter string="This Year" icon="terp-mrp" domain="[('year','=',time.localtime()[0])]" default="1" />
+						<filter string="This Month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
                         <separator orientation="vertical"/>
 						<filter string="Current" icon="terp-mrp" domain="[('state','in',('open','draft'))]"/>
 						<separator orientation="vertical"/>
@@ -89,7 +89,7 @@
                     	<separator orientation="vertical"/>
                     	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
                     	<filter string="Month" icon="terp-mrp" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'name'}"/>
+                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
                    </group>
                </search>
             </field>
@@ -101,8 +101,8 @@
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
-          <field name="context">{'search_default_Product': 1,'search_default_this_year':1,'search_default_this_month':1}</field>
-            
+          <field name="context">{'search_default_Product': 1}</field>
+
         </record>
 
        	<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index dcb7d4573c1..9bcc92e5c81 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -27,6 +27,77 @@ import ir
 import netsvc
 import time
 
+
+class stock_warehouse_orderpoint(osv.osv):
+    """
+    Defines Minimum stock rules.
+    """
+    _name = "stock.warehouse.orderpoint"
+    _description = "Minimum Inventory Rule"
+    
+    _columns = {
+        'name': fields.char('Name', size=32, required=True),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
+        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
+        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
+        'product_min_qty': fields.float('Min Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'product_max_qty': fields.float('Max Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'qty_multiple': fields.integer('Qty Multiple', required=True,
+            help="The procurement quantity will by rounded up to this multiple."),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement', ondelete="set null"),
+        'company_id': fields.many2one('res.company','Company',required=True),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+        'logic': lambda *a: 'max',
+        'qty_multiple': lambda *a: 1,
+        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
+        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
+    }
+    _sql_constraints = [
+        ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', _('Qty Multiple must be greater than zero.')),
+    ]   
+    
+    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+        """ Finds location id for changed warehouse.
+        @param warehouse_id: Changed id of warehouse.
+        @return: Dictionary of values.
+        """
+        if warehouse_id:
+            w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
+            v = {'location_id': w.lot_stock_id.id}
+            return {'value': v}
+        return {}
+    
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        """ Finds UoM for changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr,uid,product_id)
+            v = {'product_uom': prod.uom_id.id}
+            return {'value': v}
+        return {}
+    
+    def copy(self, cr, uid, id, default=None,context={}):
+        if not default:
+            default = {}
+        default.update({
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+        })
+        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
+    
+stock_warehouse_orderpoint()
+
 class StockMove(osv.osv):
     _inherit = 'stock.move'
     
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 5475d54ffd4..c95ab26dd93 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -9,6 +9,8 @@
     factor: 1.0
     name: Litre
     rounding: 0.01 
+-
+  I create record for product Orange Juice.
 - 
   !record {model: product.product, id: product_product_orangejuice0}:
     categ_id: product.cat1
@@ -18,6 +20,8 @@
     type: product
     uom_id: product_uom_litre0
     uom_po_id: product_uom_litre0
+-
+  I create record for product Orange.
 - 
   !record {model: product.product, id: product_product_orange0}:
     categ_id: product.cat1
@@ -31,6 +35,8 @@
     type: product
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
+-
+  I create record for product Sugar.
 - 
   !record {model: product.product, id: product_product_sugar0}:
     categ_id: product.cat1
@@ -44,6 +50,8 @@
     type: product
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
+-
+  I create record for product Water.
 - 
   !record {model: product.product, id: product_product_water0}:
     categ_id: product.cat1
@@ -54,7 +62,7 @@
     uom_id: product_uom_litre0
     uom_po_id: product_uom_litre0
 -
-  I define the BoM to produce an orange juice
+  I define the BoM to produce an orange juice.
 - 
   !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
     company_id: base.main_company
@@ -64,6 +72,8 @@
     product_qty: 1.0
     product_uom: product_uom_litre0
     type: phantom
+-
+  I create bom lines for BoM for Orange Juice.
 - 
   !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
     bom_lines:
@@ -92,7 +102,7 @@
         product_uom: product_uom_litre0
         type: normal
 -
-  I define Minimum stock rules for my stockable products orange and sugar
+  I define Minimum stock rules for my stockable product "Orange".
 - 
   !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
     company_id: base.main_company
@@ -105,6 +115,8 @@
     product_uom: product.product_uom_kgm
     qty_multiple: 1
     warehouse_id: stock.warehouse0
+-
+  I define Minimum stock rules for my stockable product "Sugar".
 - 
   !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}:
     company_id: base.main_company
@@ -177,14 +189,14 @@
 -
   !function {model: mrp.procurement, name: run_scheduler}:
     - model: mrp.procurement
-      search: "[('origin','=',':MO/00002')]"
+      search: "[('state','!=','cofirmed')]"
 -
   I am checking Internal picking. I see one picking for Orange juice and its 
   stock moves for Oranges, Sugar and Water made correctly.
 -
   !python {model: stock.picking}: |
     from tools.translate import _
-    pick_ids = self.search(cr, uid, [('origin','=',':MO/00002'),('type','=','internal')])
+    pick_ids = self.search(cr, uid, [('type','=','internal')])
     assert pick_ids, _('No Internal Pickings!')
 -
   According to minimum stock rules. I have 2 purchase orders for 
@@ -220,11 +232,15 @@
     assert pick_ids, _('No Incoming Shipments found!')
 -
   I receive both the products. My incoming pickings are done.
+-
+  I create record for the incoming picking wizard.
 -
   !record {model: stock.partial.picking, id: stock_partial_picking0}:
     date: '2010-04-30 16:53:36'
     partner_id: base.res_partner_asus
     address_id: base.res_partner_address_tang
+-
+  I make my pickings done.
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 37d0de5c5a9..c52fa4a339b 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -4,7 +4,7 @@
 -
   I am creating products.   
 - 
-  Creating a product.product record
+  I create record for product Shirt.
 - 
   !record {model: product.product, id: product_product_shirt0}:
     categ_id: product.cat1
@@ -27,7 +27,7 @@
     weight: 0.0
     weight_net: 0.0
 - 
-  Creating a product.product record
+  I create record for product Cloth.
 - 
   !record {model: product.product, id: product_product_cloth0}:
     categ_id: product.cat1
@@ -53,7 +53,7 @@
     weight: 0.0
     weight_net: 0.0
 - 
-  Creating a product.product record
+  I create record for product Buttons.
 - 
   !record {model: product.product, id: product_product_buttons0}:
     categ_id: product.cat1
@@ -81,7 +81,7 @@
 -
   I am creating bills of material for 'Shirt'.      
 - 
-  Creating a mrp.bom record
+  I create bills of material for Shirt.
 - 
   !record {model: mrp.bom, id: mrp_bom_shirt0}:
     bom_lines:
@@ -216,11 +216,15 @@
     from tools.translate import _
     pick_ids = self.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
     assert pick_ids, _('No Incoming Shipments found!')
+-
+  I create record for partial picking.
 -
   !record {model: stock.partial.picking, id: stock_partial_picking0}:
     date: '2010-04-30 16:53:36'
     partner_id: base.res_partner_maxtor
     address_id: base.res_partner_address_wong
+-
+  I make my picking done.
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
@@ -245,17 +249,21 @@
                     })
      pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
 -
-  I Check incoming shipments for buttons. And receive products.
+  I Check incoming shipments for buttons and receive products.
 -
   !python {model: stock.picking}: |
     from tools.translate import _
     pick_ids = self.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
     assert pick_ids, _('No Incoming Shipments found!')
+-
+  I create record for partial picking.
 -
   !record {model: stock.partial.picking, id: stock_partial_picking0}:
     date: '2010-04-30 16:53:36'
     partner_id: base.res_partner_maxtor
     address_id: base.res_partner_address_wong
+-
+  I make my picking done.
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
@@ -303,22 +311,30 @@
     wf_service = netsvc.LocalService("workflow")
     for p_id in prod_ids:
     	wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
+-
+  I create record for producing products with quantity 5.00.
 -
   !record {model: mrp.product.produce, id: mrp_product_produce0}:
     product_qty: 5.00
     mode: 'consume_produce'
+-
+  I produce 2 products with 5.00 quantities each.
 -
   !python {model: mrp.product.produce}: |
     from tools.translate import _
     prod_obj = self.pool.get('mrp.production')
     prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
     self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+  I create record for remaining products with quantity 35.00.
 -
   !record {model: stock.move.consume, id: stock_move_consume0}:
     product_id: product_product_buttons0
     product_qty: 35.00
     product_uom: product.product_uom_unit
     location_id: stock.stock_location_stock
+-
+  I produce remaining product Buttons with 35.00 quantity.
 -
   !python {model: stock.move.consume}: |
     from tools.translate import _
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 5de26180723..861f52e9c61 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -18,7 +18,7 @@
     product_uom: product.product_uom_unit
     product_uos_qty: 0.0
 - 
-  Creating a mrp.production.workcenter.line record
+  I create a record for Workcenter line.
 - 
   !record {model: mrp.production.workcenter.line, id: mrp_production_workcenter_line_assemblyline0}:
     cycle: 5.0
@@ -28,7 +28,7 @@
     sequence: 0.0
     workcenter_id: mrp.mrp_workcenter_0
 - 
-  Creating a mrp.production.product.line record
+  I create second record for Workcenter line.
 - 
   !record {model: mrp.production.product.line, id: mrp_production_product_line_regularprocessorconfig0}:
     name: Regular processor config
@@ -38,7 +38,7 @@
     product_uos_qty: 0.0
     production_id: mrp_production_mo0
 - 
-  Creating a mrp.production.product.line record
+  I create third record for Workcenter line.
 - 
   !record {model: mrp.production.product.line, id: mrp_production_product_line_hddseagategb0}:
     name: HDD Seagate 7200.8 80GB
@@ -48,7 +48,7 @@
     product_uos_qty: 0.0
     production_id: mrp_production_mo0
 - 
-  Creating a mrp.production.product.line record
+  I create fourth record for Workcenter line.
 - 
   !record {model: mrp.production.product.line, id: mrp_production_product_line_atxmidsizetower0}:
     name: ATX Mid-size Tower
@@ -58,7 +58,7 @@
     product_uos_qty: 0.0
     production_id: mrp_production_mo0
 - 
-  Creating a mrp.production.product.line record
+  I create a record for production line.
 - 
   !record {model: mrp.production.product.line, id: mrp_production_product_line_mouse0}:
     name: Mouse
@@ -68,7 +68,7 @@
     product_uos_qty: 0.0
     production_id: mrp_production_mo0
 - 
-  Creating a mrp.production.product.line record
+  I create second record for production line.
 - 
   !record {model: mrp.production.product.line, id: mrp_production_product_line_keyboard0}:
     name: Keyboard
@@ -102,7 +102,7 @@
     pick_ids = self.search(cr, uid, [('state','!=','done'),('type','=','internal')])
     assert pick_ids, _('No Internal Pickings!')
 -
-  I see that there is a manufacturing order for the subproduct of PC1 with ready state.
+  I see that there is a manufacturing order for the sub product of PC1 with ready state.
 -
   !python {model: mrp.production}: |
     from tools.translate import _
@@ -110,17 +110,21 @@
     assert order_ids, _('No manufacturing order!')
 -
   I start producing that product first. So I marked it as started.
+-
+  I create record for producing products with quantity 5.00.
 -
   !record {model: mrp.product.produce, id: mrp_product_produce0}:
     product_qty: 5.00
     mode: 'consume_produce'
+-
+  I produce the product.
 -
   !python {model: mrp.product.produce}: |
     prod_obj = self.pool.get('mrp.production')
     prod_ids = prod_obj.search(cr, uid, [('state','=','confirmed')])
     self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
 -
-  Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
+  Now the manufacturing order for subproduct CPU_GEN is done and manufacturing
   order for PC1 is in ready state.
 -
   !python {model: mrp.production}: |
@@ -131,6 +135,8 @@
   I start producing the product PC1.
 -
   !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+-
+  Finally my production order is done.
 -
   !python {model: mrp.product.produce}: |
     from tools.translate import _
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index b64567a407a..4688f3fb15b 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import netsvc
 
 class mrp_product_produce(osv.osv_memory):
     _name = "mrp.product.produce"
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 77bc60e56dd..d9a862f5ddd 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -27,19 +27,15 @@
     'description': """
     This module allows Just In Time computation of procurement orders.
 
-    If you install this module, you will not have to run the procurement scheduler
-    manually anymore, or wait for it to execute.
-    Each procurement order (resulting from a sale order, for instance) will be computed 
-    when confirmed, without waiting for the procurement scheduler to run.
-    
-    Warning: this does not take into account minimum stock rules (order points), which still 
-    require to run the appropriate scheduler, or wait for it to run nightly.
-     
-    Note that the procurement computation can be resource-intensive, so you may 
-    want to be careful with this, depending on your mrp configuration and system 
-    usage.
+    If you install this module, you will not have to run the regular procurement 
+    scheduler anymore (but you still need to run the minimum order point rule 
+    scheduler, or for example let it run daily.)
+    All procurement orders will be processed immediately, which could in some
+    cases entail a small performance impact.
+
     It may also increase your stock size because products are reserved as soon
-    as possible. In that case, you can not use priorities any more.
+    as possible and the scheduler time range is not taken into account anymore. 
+    In that case, you can not use priorities any more on the different picking.
     
     
     """,
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 46e1dec1e12..e8a97a47d9d 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -185,7 +185,7 @@ class mrp_production(osv.osv):
     def action_production_end(self, cr, uid, ids):
         obj=self.browse(cr,uid,ids)[0]
         for workcenter_line in obj.workcenter_lines:
-            tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,[workcenter_line.id])
+            tmp = self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,[workcenter_line.id])
         return super(mrp_production,self).action_production_end(cr,uid,ids)
     
     def action_in_production(self, cr, uid, ids):
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
index bd5b223779f..cb20f1561fd 100644
--- a/addons/mrp_procurement/mrp_procurement.py
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -68,8 +68,8 @@ class mrp_procurement(osv.osv):
     """
     _name = "mrp.procurement"
     _description = "Procurement"
-    _order = 'priority,date_planned'
-    
+    _order = 'priority,date_planned desc'
+    _log_create = False
     _columns = {
         'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
         'origin': fields.char('Source Document', size=64,
@@ -328,14 +328,11 @@ class mrp_procurement(osv.osv):
                         'product_qty': procurement.product_qty,
                         'product_uom': procurement.product_uom.id,
                         'date_planned': procurement.date_planned,
-                        'state': 'confirmed',
+                        'state': 'draft',
                         'company_id': procurement.company_id.id,
                     })
+                    move_obj.action_confirm(cr, uid, [id], context=context)
                     self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
-                else:
-                    # TODO: check this
-                    if procurement.procure_method == 'make_to_stock' and procurement.move_id.state in ('waiting',):
-                        id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
         self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
         return True
 
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
index 46c4a10fffc..599d11cfe01 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-		<!-- Procurement -->
-
         <record id="wkf_procurement" model="workflow">
             <field name="name">mrp.procurement.basic</field>
             <field name="osv">mrp.procurement</field>
@@ -48,16 +46,16 @@
             <field name="kind">function</field>
             <field name="action">action_move_assigned()</field>
         </record>
-<!--        <record id="act_produce_check" model="workflow.activity">-->
-<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
-<!--            <field name="name">produce_check</field>-->
-<!--        </record>-->
-<!--        <record id="act_produce_service" model="workflow.activity">-->
-<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
-<!--            <field name="name">produce_service</field>-->
-<!--            <field name="kind">function</field>-->
-<!--            <field name="action">action_produce_assign_service()</field>-->
-<!--        </record>-->
+        <record id="act_produce_check" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_check</field>
+        </record>
+        <record id="act_produce_service" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_service</field>
+            <field name="kind">function</field>
+            <field name="action">action_produce_assign_service()</field>
+        </record>
         <record id="act_make_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">ready</field>
@@ -155,16 +153,16 @@
             <field name="act_to" ref="act_make_to_stock"/>
             <field name="condition">check_make_to_stock()</field>
         </record>
-<!--        <record id="trans_confirm_mto_produce_check" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_confirm_mto"/>-->
-<!--            <field name="act_to" ref="act_produce_check"/>-->
-<!--            <field name="condition">check_produce()</field>-->
-<!--        </record>-->
-<!--        <record id="trans_product_check_produce_service" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_check"/>-->
-<!--            <field name="act_to" ref="act_produce_service"/>-->
-<!--            <field name="condition">not check_product()</field>-->
-<!--        </record>-->
+        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_produce_check"/>
+            <field name="condition">check_produce()</field>
+        </record>
+        <record id="trans_product_check_produce_service" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="act_produce_service"/>
+            <field name="condition">not check_product()</field>
+        </record>
         <record id="trans_make_to_stock_make_done" model="workflow.transition">
             <field name="act_from" ref="act_make_to_stock"/>
             <field name="act_to" ref="act_make_done"/>
@@ -172,15 +170,15 @@
             <field name="trigger_model" eval="False"/>
             <field name="trigger_expr_id" eval="False"/>
         </record>
-<!--        <record id="trans_produce_service_cancel" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_service"/>-->
-<!--            <field name="act_to" ref="act_cancel"/>-->
-<!--            <field name="signal">subflow.cancel</field>-->
-<!--        </record>-->
-<!--        <record id="trans_produce_service_make_done" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_service"/>-->
-<!--            <field name="act_to" ref="act_make_done"/>-->
-<!--        </record>-->
+        <record id="trans_produce_service_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+        <record id="trans_produce_service_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_make_done"/>
+        </record>
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
diff --git a/addons/mrp_procurement/schedulers.py b/addons/mrp_procurement/schedulers.py
index 7a89723e5ca..6ebc0f61fad 100644
--- a/addons/mrp_procurement/schedulers.py
+++ b/addons/mrp_procurement/schedulers.py
@@ -197,7 +197,7 @@ class mrp_procurement(osv.osv):
                     if reste > 0:
                         qty += op.qty_multiple - reste                    
                     newdate = DateTime.now() + DateTime.RelativeDateTime(
-                            days=int(op.product_id.seller_delay))
+                            days = int(op.product_id.seller_delay))
                     if op.product_id.supply_method == 'buy':
                         location_id = op.warehouse_id.lot_input_id
                     elif op.product_id.supply_method == 'produce':
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f59da6a751c..e31b4e05594 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -30,7 +30,7 @@ import decimal_precision as dp
 
 class mrp_repair(osv.osv):
     _name = 'mrp.repair'
-    _description = 'Repairs Order'
+    _description = 'Repair Order'
 
     def _amount_untaxed(self, cr, uid, ids, field_name, arg, context):
         """ Calculates untaxed amount.
@@ -346,12 +346,14 @@ class mrp_repair(osv.osv):
                     }
                     invoice_obj.write(cr, uid, [inv_id], invoice_vals, context=context)
                 else:
-                    a = repair.partner_id.property_account_receivable.id
+                    if not repair.partner_id.property_account_receivable:
+                        raise osv.except_osv(_('Error !'), _('No account defined for partner "%s".') % repair.partner_id.name )
+                    account_id = repair.partner_id.property_account_receivable.id
                     inv = {
                         'name': repair.name,
                         'origin':repair.name,
                         'type': 'out_invoice',
-                        'account_id': a,
+                        'account_id': account_id,
                         'partner_id': repair.partner_id.id,
                         'address_invoice_id': repair.address_id.id,
                         'currency_id': repair.pricelist_id.currency_id.id,
@@ -368,11 +370,19 @@ class mrp_repair(osv.osv):
                             name = repair.name + '-' + operation.name
                         else:
                             name = operation.name
+
+                        if operation.product_id.property_account_income:
+                            account_id = operation.product_id.property_account_income
+                        elif operation.product_id.categ_id.property_account_income_categ:
+                            account_id = operation.product_id.categ_id.property_account_income_categ.id
+                        else:
+                            raise osv.except_osv(_('Error !'), _('No account defined for product "%s".') % operation.product_id.name )
+
                         invoice_line_id = inv_line_obj.create(cr, uid, {
                             'invoice_id': inv_id,
                             'name': name,
                             'origin': repair.name,
-                            'account_id': operation.product_id and operation.product_id.property_account_income and operation.product_id.property_account_income.id,
+                            'account_id': account_id, 
                             'quantity': operation.product_uom_qty,
                             'invoice_line_tax_id': [(6,0,[x.id for x in operation.tax_id])],
                             'uos_id': operation.product_uom.id,
@@ -580,7 +590,7 @@ class ProductChangeMixin(object):
 
 class mrp_repair_line(osv.osv, ProductChangeMixin):
     _name = 'mrp.repair.line'
-    _description = 'Repair Operations Lines'
+    _description = 'Repair Line'
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
@@ -668,7 +678,7 @@ mrp_repair_line()
 
 class mrp_repair_fee(osv.osv, ProductChangeMixin):
     _name = 'mrp.repair.fee'
-    _description = 'Repair Fees line'
+    _description = 'Repair Fees Line'
     
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index ecc88ef6aae..de6e8095569 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import netsvc
 from osv import osv,fields
 from tools.translate import _
 
@@ -45,7 +44,7 @@ class repair_cancel(osv.osv_memory):
         if repair_order.invoiced or repair_order.invoice_method == 'none':
             repair_order_obj.action_cancel(cr, uid, [record_id], context=context)            
         else:
-            raise osv.except_osv(_('Warning!'),_('Repair is not cancelled. It is not invoiced.'))
+            raise osv.except_osv(_('Warning!'),_('Repair order is not invoiced.'))
         
         return {}
     
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 22ae9c44bec..e64e757868f 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -24,7 +24,7 @@ from osv import osv
 
 class mrp_subproduct(osv.osv):
     _name = 'mrp.subproduct'
-    _description = 'Mrp Sub Product'
+    _description = 'Sub Product'
     _columns={
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_qty': fields.float('Product Qty', required=True),
@@ -59,18 +59,20 @@ class mrp_production(osv.osv):
     _inherit= 'mrp.production'   
 
     def action_confirm(self, cr, uid, ids):
-         picking_id=super(mrp_production,self).action_confirm(cr, uid, ids)
-         for production in self.browse(cr, uid, ids):
-             source = production.product_id.product_tmpl_id.property_stock_production.id
-             for sub_product in production.bom_id.sub_products:
-                 qty1 = sub_product.product_qty
-                 qty2 = production.product_uos and production.product_uos_qty or False
-                 if sub_product.subproduct_type=='variable':
+        picking_id=super(mrp_production,self).action_confirm(cr, uid, ids)
+        for production in self.browse(cr, uid, ids):
+            source = production.product_id.product_tmpl_id.property_stock_production.id
+            if not production.bom_id:
+                continue
+            for sub_product in production.bom_id.sub_products:
+                qty1 = sub_product.product_qty
+                qty2 = production.product_uos and production.product_uos_qty or False
+                if sub_product.subproduct_type=='variable':
                     if production.product_qty:
                         qty1 *= production.product_qty / (production.bom_id.product_qty or 1.0)
                     if production.product_uos_qty:
                         qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0)
-                 data = {
+                data = {
                     'name':'PROD:'+production.name,
                     'date_planned': production.date_planned,
                     'product_id': sub_product.product_id.id,
@@ -83,9 +85,9 @@ class mrp_production(osv.osv):
                     'move_dest_id': production.move_prod_id.id,
                     'state': 'waiting',
                     'production_id':production.id
-                 }
-                 sub_prod_ids=self.pool.get('stock.move').create(cr, uid,data)
-         return picking_id
+                }
+                sub_prod_ids=self.pool.get('stock.move').create(cr, uid,data)
+        return picking_id
 
 mrp_production()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index 2e6f71b23d4..535e5a56cf0 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -8,41 +8,45 @@ 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-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-05-21 10:24+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+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 ""
+msgstr "Objet affecté par cette règle"
 
 #. module: multi_company
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+"caractères spéciaux !"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
 
 #. module: multi_company
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "La TVA ne semble pas correcte"
 
 #. module: multi_company
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de l'objet invalide dans l'action défini"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -59,18 +63,18 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Société par défaut"
 
 #. module: multi_company
 #: field:multi_company.default,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objet"
 
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi société"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
@@ -83,27 +87,27 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_id:0
 msgid "Main Company"
-msgstr ""
+msgstr "Société Principale"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Condition"
 
 #. module: multi_company
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
-msgstr ""
+msgstr "Société physique ou sera stocké cet enregistrement"
 
 #. module: multi_company
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue !"
 
 #. module: multi_company
 #: field:multi_company.default,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: multi_company
 #: constraint:product.template:0
@@ -113,80 +117,80 @@ msgstr ""
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
 msgid "Odoo Offers"
-msgstr ""
+msgstr "Offre Odoo"
 
 #. module: multi_company
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives"
 
 #. module: multi_company
 #: help:multi_company.default,name:0
 msgid "Name it to easily find a record"
-msgstr ""
+msgstr "Nommer le facilement pour trouver l'enregistrement"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi company"
-msgstr ""
+msgstr "Multi société"
 
 #. module: multi_company
 #: model:ir.model,name:multi_company.model_multi_company_default
 msgid "multi_company.default"
-msgstr ""
+msgstr "multi_company.default"
 
 #. module: multi_company
 #: help:multi_company.default,company_id:0
 msgid "Company where the user is connected"
-msgstr ""
+msgstr "Société ou l'utilisateur sera connecté"
 
 #. module: multi_company
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Société par défaut par objet"
 
 #. module: multi_company
 #: field:multi_company.default,expression:0
 msgid "Expression"
-msgstr ""
+msgstr "Expression"
 
 #. module: multi_company
 #: model:product.template,name:multi_company.product_product_odoo1_product_template
 msgid "Odoo Offer"
-msgstr ""
+msgstr "Offre Odoo"
 
 #. module: multi_company
 #: field:multi_company.default,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
 
 #. module: multi_company
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de catégories récursives"
 
 #. module: multi_company
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur: code EAN non valide"
 
 #. module: multi_company
 #: help:multi_company.default,expression:0
 msgid "Expression, must be True to match"
-msgstr ""
+msgstr "Expression, doit être Vrai pour correspondre"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
 msgid "Default company per Object"
-msgstr ""
+msgstr "Société par défaut par Objet"
 
 #. module: multi_company
 #: code:addons/multi_company/multi_company.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (copie)"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Matching"
-msgstr ""
+msgstr "Correspondance"
diff --git a/addons/olap/i18n/fr.po b/addons/olap/i18n/fr.po
new file mode 100644
index 00000000000..e9c187a4eda
--- /dev/null
+++ b/addons/olap/i18n/fr.po
@@ -0,0 +1,1402 @@
+# 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-26 05:24+0000\n"
+"PO-Revision-Date: 2010-05-21 14:51+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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-05-22 04:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr "Masquer"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr "Temps"
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr "Connexion à une base de données"
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr "MySQL"
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr "Mot de passe de la base de données"
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr "URL de connexion"
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr "Nom du serveur"
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr "Mot de passe pour le login"
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr "ID de l'application"
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr "Explorer le Cube"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr "Dimension du cube Olap"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr " Port utilisé par la connexion"
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr "Clé primaire"
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr "ID de la table"
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr "Cet assistant configurera automatiquement le client Web pour la BI"
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr "Type de base de données"
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr "Paramètres du serveur Olap"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr "Foramtage de chaîne"
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr "Exécuter"
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr "Application connue"
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr "Niveau"
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr "ID de la colonne"
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr "Application Olap"
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr "Nom de la requête"
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr "Requête MDX"
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr "bi.auto.configure.wizard"
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr "Clé primaire"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr "Configuration automatique"
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr "Description du schéma"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr "Chargement de la structure de base de données"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr "Niveau Olap"
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr "Aucun (0000.00)"
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr "Nom d'hôte de la base de données"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr "Configuration automatique des tables"
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr "Nom de l'application"
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr "Colonne relationnelle"
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr "Nom du cube"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr "olap.saved.query"
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr "Nom des colonnes"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr "Hiérarchies Olap"
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr "Prêt"
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr "Tables"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr "Application Olap"
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de modèle invalide pour la définition de l'action"
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr "Le schéma est prêt a être utilisé"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr "Cube Designer"
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr "Connexion à la base de données"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr "Les fichiers journaux ont été effacés avec succès"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr "Schéma Olap"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr "Application"
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr "Requête MDX en sortie"
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr "Table de la clé primaire"
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr "Dimensions Olap"
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr "Utilisateur Tiny ERP"
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr "Port de connexion à la base"
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+"Mettre le port du server. Mettre 8080 if ce n'est pas clair pour vous"
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr "La structure est chargée"
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr "Cube"
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr "Tables disponibles"
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr "Coonfigurer manuellement"
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr "Lié à"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr "Colonne Olap dans la base de données"
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr "Lien du champ"
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr "Séparateur décimal (0,000)"
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr "Agregateur"
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue !"
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr "Recharger la structure"
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr "Charger la structure de données"
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr "Niveau Olap"
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr "Chargé"
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr "Nom de la base de données pour l'analyse."
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr "Dimension"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr "Axe clé"
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr "Enregistrer les requêtes"
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr "Type de mesure"
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr "ID de la base de données"
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr "Hiérarchie"
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr "La structure est configurée"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr "Schéma Olap"
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr "Requête"
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr "Cube Olap"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr "Entrepôt Olap"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr "Champ d'application"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr "Dimension Olap"
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr "Nom du champ de l'application"
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr "Paramètres de connexion"
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr "Colonnes de la base de données"
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr "Nom de la table"
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr "Colonnes ouvertes"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr "Colonnes"
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr "Test de connexion"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr "Mesures Olap"
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+"caractères spéciaux !"
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr "Hiérarchie"
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr "Expression SQL"
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr "Chargements des tables"
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr "Niveaux"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr "Colonnes de base de données"
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr "Actif"
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr "Entier"
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr "Somme"
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr "Compter"
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr "Type de données"
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr "Récupérer les données"
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr "Charger les données"
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr "Requêtes"
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr "Oracle"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr "Cubes Olap"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr "Tables des Cubes Olap"
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr "Nom de la mesure"
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr "Type de connexion"
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr "nombre"
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr "Nom de la base de données"
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr "Montrer"
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr "Table(s) pour le cube"
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr "Mes journaux"
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr "Information"
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr "Sélectionner le Cube"
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr "Connexion à la base de données"
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr "Connecté à la base de données"
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr "Informations générales"
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr "Module"
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr "Masquer"
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr "Hiérarchies"
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr "Configurer les paramètres"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr "Hiérarchie Olap"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr "Nom du champ"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr "Paramètres serveur"
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr "Charger la structure de la base de données"
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr "Nom du niveau"
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr "Schéma"
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr "URL de connexion"
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr "Cubes"
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr "Champs"
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr "Moyenne"
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr "Bases de données"
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr "Tables jointes"
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr "Tables jointes"
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr "PostgreSQL"
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr "Outils"
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr "Décimal"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr "olap"
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr "Nom de colonne"
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr "Nom de la table"
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr "Configuration auto"
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr "Effacer les journaux"
diff --git a/addons/olap_crm/i18n/fr.po b/addons/olap_crm/i18n/fr.po
new file mode 100644
index 00000000000..034219dcdcd
--- /dev/null
+++ b/addons/olap_crm/i18n/fr.po
@@ -0,0 +1,34 @@
+# 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-26 05:29+0000\n"
+"PO-Revision-Date: 2010-05-21 14:53+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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-05-22 04:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+"\n"
+"    Module de vente qui chargera les données dans les tables olap\n"
+"    "
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr "olap_crm"
diff --git a/addons/olap_extract/i18n/fr.po b/addons/olap_extract/i18n/fr.po
new file mode 100644
index 00000000000..ec38bffe470
--- /dev/null
+++ b/addons/olap_extract/i18n/fr.po
@@ -0,0 +1,59 @@
+# 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-26 05:29+0000\n"
+"PO-Revision-Date: 2010-05-21 14:54+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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-05-22 04:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr "olap_extract"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr "OK"
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr "Extraction Olap"
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+"\n"
+"    Extraire la structure du schéma.\n"
+"    "
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr "Nom du module"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr "Nouveau nom de module"
diff --git a/addons/olap_sale/i18n/fr.po b/addons/olap_sale/i18n/fr.po
new file mode 100644
index 00000000000..2a4e7c47c93
--- /dev/null
+++ b/addons/olap_sale/i18n/fr.po
@@ -0,0 +1,34 @@
+# 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-26 05:29+0000\n"
+"PO-Revision-Date: 2010-05-21 15:14+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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-05-22 04:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+"\n"
+"    Module de ventes qui chargera les données dans les tables olap\n"
+"    "
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr "olap_sale"
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 57276219861..1f8ccc80162 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -49,7 +49,7 @@ class singer_statement(osv.osv):
     """ Singer Statements """
     
     _name = 'singer.statement'
-    _description = 'Statements'
+    _description = 'Statement'
 
     def _sub_total(self, cr, uid, ids, name, arg, context=None):
        
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index 6ae0cfda0bb..c3eea52b8d2 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 18:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-21 10:26+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -52,7 +52,7 @@ msgstr "Numéro de pièce"
 #. module: point_of_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom du Modèle non valide dans la définition de l'action."
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -92,7 +92,7 @@ msgstr "Ventes (résumé)"
 #. module: point_of_sale
 #: help:pos.order,user_id:0
 msgid "This is the logged in user (not necessarily the salesman)."
-msgstr ""
+msgstr "Ceci est l'utilisateur connecté (pas nécessairement le vendeur)."
 
 #. module: point_of_sale
 #: wizard_view:pos.sale.get,init:0
@@ -142,7 +142,7 @@ msgstr "Réf. Partenaire"
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+msgstr "Tél : + 32 (0) 2 231 04 35"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
@@ -242,7 +242,7 @@ msgstr "Qté"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Logged in User"
-msgstr ""
+msgstr "Connecté en tant qu'utilisateur"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -350,7 +350,7 @@ msgstr "Lignes de la commande"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Rem.(%)"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -385,7 +385,7 @@ msgstr "Configuration des Journaux utilisés par les Points de Vente."
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal:0
@@ -447,7 +447,7 @@ msgstr "Ristourne (%)"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Indiquer la position fiscale :"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_add_product
@@ -487,7 +487,7 @@ msgstr "Point de Vente"
 #. module: point_of_sale
 #: field:pos.order,salesman_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Vendeur"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -929,7 +929,7 @@ msgstr "Actions"
 #. module: point_of_sale
 #: help:pos.order,salesman_id:0
 msgid "This is the salesman actually making the order."
-msgstr ""
+msgstr "Indiquer le vendeur de cette vente"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -957,7 +957,7 @@ msgstr "Date d'Impression"
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "OPERATION N° :"
-msgstr ""
+msgstr "OPÉRATION N° :"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 981d20077d3..dcc2086eb26 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -31,11 +31,9 @@ import re
 import decimal_precision as dp
 
 class pos_config_journal(osv.osv):
-    
     """ Point of Sale journal configuration"""
-    
     _name = 'pos.config.journal'
-    _description = "Point of Sale journal configuration"
+    _description = "Journal Configuration"
     _columns = {
         'name': fields.char('Description', size=64),
         'code': fields.char('Code', size=64),
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index dace921596b..d2cc102a047 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -66,7 +66,7 @@
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
                                 <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
-                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>                             
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
                             </group>
                         </page>
 
@@ -156,12 +156,10 @@
                     <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
                     <filter icon="terp-sale" string="Running" domain="[('state','in',('payment','advance'))]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-partner" string="My Sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
-                    </field>
-                    <field name="date_order" string="Order date" />
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -172,12 +170,12 @@
                </search>
             </field>
         </record>
-        
+
         <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="2" />
-        
+
         <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
 
         <!--  POS Order view (date_payment)  -->
@@ -189,8 +187,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>	             
- 				           
+            <field name="context">{"search_default_user_id":uid}</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>
+
         </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
@@ -201,8 +200,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('state','!=', 'invoiced')]</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>	             
-		    	             
+            <field name="context">{"search_default_user_id":uid}</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>
+
         </record>
         <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
         <menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
@@ -213,7 +213,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=', 'paid')]</field>
- 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
+            <field name="context">{"search_default_user_id":uid}</field>
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree2">
             <field name="name">Point of Sale</field>
@@ -222,7 +223,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
- 			<field name="search_view_id" ref="view_pos_order_filter"/>	               
+            <field name="context">{"search_default_user_id":uid}</field>
+ 			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
@@ -231,7 +233,8 @@
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>            
+            <field name="context">{"search_default_user_id":uid}</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree_open">
             <field name="name">Opened Sales</field>
@@ -239,7 +242,8 @@
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>            
+            <field name="context">{"search_default_user_id":uid}</field>
+			<field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
 
         <record model="ir.ui.view" id="view_pos_order_line">
@@ -790,7 +794,7 @@
                     parent="menu_point_config_product"
                     action="action_product_output"
                     id="products_for_output_operations"/>
-            
+
         <menuitem name="Register Management" parent="menu_point_root"
             id="menu_point_config" sequence="3"/>
         <menuitem
@@ -798,7 +802,7 @@
             string="Refloat"
             action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="3" />
-            
+
         <menuitem
             name="Output Operations" parent="menu_point_config"
             string="Refloat"
@@ -921,7 +925,7 @@
 
         <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
                 id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
- 
+
         <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
                 id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
         <menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 599df9581ee..ac87e1cc8b9 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -28,7 +28,7 @@
 "access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_sale_user","pos.sale.user","model_pos_sale_user","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_sale_user","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user_today","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_sales_user_today_current_user","pos.sales.user.today.current_user","model_pos_sales_user_today_current_user","point_of_sale.group_pos_user",1,0,0,0
 "access_all_closed_cashbox_of_the_day","all.closed.cashbox.of.the.day","model_all_closed_cashbox_of_the_day","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_receipt","pos.receipt ","model_pos_receipt","point_of_sale.group_pos_user",1,0,0,0
@@ -36,3 +36,4 @@
 "access_pos_payment_report_date ","pos.payment.report.date ","model_pos_payment_report_date","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report","pos.payment.report","model_pos_payment_report","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index 427362cc459..a96a792c711 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -221,13 +221,14 @@
     
     
 - 
- I create partner delivery address.
+  I create partner delivery address.
 - 
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
+  I create product category.    
 - 
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
@@ -319,7 +320,7 @@
     property_account_income: account_account_receivable0
  
 -  
-  I create New Order with adding the details of Salesman and  "Product" as LG Viewty Smart Quantity as 10.
+  I create New Order by adding the details of Salesman and  "Product" as LG Viewty Smart Quantity as 10.
 -
 
   !record {model: pos.order, id: pos_order_pos0}:
@@ -341,13 +342,13 @@
     shop_id: sale.shop
     user_salesman_id: base.user_root
 - 
-  I have add discount 
+  I add discount. 
 - 
   !record {model: pos.discount, id: pos_discount_0}:
     discount: 5.0
     discount_notes: More then 5 product
 - 
-   Apply the discount 
+  I Apply the discount. 
 - 
   !python {model: pos.discount}: |
     self.apply_discount(cr, uid, [ref("pos_discount_0")], {"lang": "en_US", "active_model":
@@ -355,13 +356,13 @@
       ref("pos_order_pos0"), })
     
 - 
-  I Open the registered .
+  I open the register.
 - 
   !record {model: pos.open.statement, id: pos_open_statement_0}:
     {}
     
 - 
-  I Open the statement.
+  I open the statement.
 - 
   !python {model: pos.open.statement}: |
     self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
@@ -369,7 +370,7 @@
       False, "active_id": ref("point_of_sale.menu_open_statement"), })
      
 -
-  I click on  the wizard "Make Payment" 
+  I click on the "Make Payment" wizard.  
 - 
   !record {model: pos.make.payment, id: pos_make_payment_0}:
     amount: 1615.0
@@ -386,20 +387,20 @@
       "pos.order", "active_ids": [ref("point_of_sale.pos_order_pos0")], "tz":
       False, "active_id": ref("point_of_sale.pos_order_pos0"), })
 -
-  I have check the Statement lines are created automatically when payment are done.
+  I check the Statement lines are created automatically when payment is done.
 -
   !python {model: pos.order}: |
    order=self.browse(cr,uid,ref("pos_order_pos0"))
    assert(order.statement_ids!=[]), "Statement lines not created"    
                                             
 -
-  When i click on Return picking button , i get three option.
+  When I click on Return picking button , I get three option.
 -
   1. Cancel 2.Return Goods and Exchange 3.Return without Refund
 -
-  When i click on  Return Goods and Exchange .  
+  When I click on  Return Goods and Exchange.  
 -  
-  Then allows me to define the quantity of products, which will return to the stock. 
+  Then it allows me to define the quantity of products, which will return to the stock. 
 - 
   I click on Return Picking button.
 - 
@@ -415,15 +416,15 @@
     
     
 - 
-  Then allows me to define the quantity of products, which will return to the stock.
+  Then it allows me to define the quantity of products, which will return to the stock.
 -
-  I have select the  HP Pavilion Desktop PCs for exchange.   
+  I select the  HP Pavilion Desktop PCs for exchange.   
 - 
   !record {model: pos.add.product, id: pos_add_product_0}:
     product_id: product_product_hppaviliondesktoppcs0
     quantity: 5.0
 -    
-  I click on close on button.
+  I click on close button.
 - 
   !python {model: pos.add.product}: |
     self.close_action(cr, uid, [ref("pos_add_product_0")], {"lang": "en_US", "active_model":
@@ -441,7 +442,7 @@
     product_id: product_product_hppaviliondesktoppcs0
 
 - 
-   For payment  I click on  Make Payment. 
+  For payment, I click on  Make Payment. 
 - 
   !python {model: pos.make.payment}: |
     self.check(cr, uid, [ref("pos_make_payment_1")], {"lang": "en_US", "active_model":
@@ -454,19 +455,19 @@
   !record {model: pos.return, id: pos_return_0}:
    {}
 -
-  The quantity which are selected in Return lines wizard are refunded..
+  The quantity which is selected in Return lines wizard is refunded.
 - 
   !python {model: pos.return}: |
     self.create_returns2(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
       "pos.order", "active_ids": [ref("pos_order_pos0")], "tz":
       False, "active_id": ref("pos_order_pos0"), })
 - 
-  To Close order   I use the wizard "Sale Confirm".
+  To Close order, I use the wizard "Sale Confirm".
 - 
   !record {model: pos.confirm, id: pos_confirm_0}:
     {}
 - 
-  I have close this order.
+  I close this order.
 - 
   !python {model: pos.confirm}: |
     self.action_confirm(cr, uid, [ref("pos_confirm_0")], {"lang": "en_US", "active_model":
diff --git a/addons/process/process.py b/addons/process/process.py
index 94f3a46d779..0d68fb460be 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -296,7 +296,7 @@ process_process()
 
 class process_node(osv.osv):
     _name = 'process.node'
-    _description ='Process Nodes'
+    _description ='Process Node'
     _columns = {
         'name': fields.char('Name', size=30,required=True, translate=True),
         'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'),
@@ -342,7 +342,7 @@ process_node_condition()
 
 class process_transition(osv.osv):
     _name = 'process.transition'
-    _description ='Process Transitions'
+    _description ='Process Transition'
     _columns = {
         'name': fields.char('Name', size=32, required=True, translate=True),
         'source_node_id': fields.many2one('process.node', 'Source Node', required=True, ondelete='cascade'),
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index bfd987d6f3d..2c79d0e3a50 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -53,7 +53,7 @@ class price_type(osv.osv):
         return comp.currency_id.id
 
     _name = "product.price.type"
-    _description = "Price type"
+    _description = "Price Type"
     _columns = {
         "name" : fields.char("Price Name", size=32, required=True, translate=True, help="Name of this kind of price."),
         "active" : fields.boolean("Active"),
@@ -241,7 +241,7 @@ class product_pricelist(osv.osv):
                         price = currency_obj.compute(cr, uid,
                                 price_type.currency_id.id, res['currency_id'],
                                 product_obj.price_get(cr, uid, [prod_id],
-                                    price_type.field)[prod_id], round=False)
+                                    price_type.field)[prod_id], round=False, context=context)
 
                     if price:
                         price_limit = price
diff --git a/addons/product/product.py b/addons/product/product.py
index e8a226597e7..f8f96ff69de 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -280,7 +280,7 @@ class product_template(osv.osv):
             help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM.'),
         'uos_coeff': fields.float('UOM -> UOS Coeff', digits=(16,4),
             help='Coefficient to convert UOM to UOS\n'
-            ' uom = uos * coeff'),
+            ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
         'seller_delay': fields.function(_calc_seller_delay, method=True, type='integer', string='Supplier Lead Time', help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 300a2b0f546..ce2cc1ee632 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -22,11 +22,12 @@
             <field name="name">PCE</field>
             <field name="factor">1.0</field>
             <field name="factor_inv_data">1.0</field>
+            <field name="rounding">1.0</field>
         </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">KGM</field>
-            <field name="factor">1.0</field>
+            <field name="factor">1000.0</field>
             <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_hour" model="product.uom">
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 19761704e88..a2405f33b52 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -164,7 +164,7 @@
             <field name="categ_id" ref="product_category_10"/>
         </record>
         <record id="product_product_cpu3" model="product.product">
-            <field name="default_code">CPU2</field>
+            <field name="default_code">CPU3</field>
             <field name="list_price">150.0</field>
             <field name="standard_price">100.0</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -303,7 +303,7 @@
             <field name="categ_id" ref="product_category_10"/>
         </record>
         <record id="product_product_22" model="product.product">
-            <field name="default_code">CPU_GEN</field>
+            <field name="default_code">CPU_DEM</field>
             <field name="supply_method">produce</field>
             <field name="list_price">150.0</field>
             <field name="standard_price">100.0</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 360ffef25eb..9bfcb33b050 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -193,7 +193,7 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="7"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
diff --git a/addons/product_margin/security/ir.model.access.csv b/addons/product_margin/security/ir.model.access.csv
new file mode 100644
index 00000000000..51d88da9d81
--- /dev/null
+++ b/addons/product_margin/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_product_margin","product.margin","model_product_margin",,1,0,0,0
diff --git a/addons/profile_manufacturing/security/ir.model.access.csv b/addons/profile_manufacturing/security/ir.model.access.csv
index dc32d522e81..892aa4bce00 100644
--- a/addons/profile_manufacturing/security/ir.model.access.csv
+++ b/addons/profile_manufacturing/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_profile_manufacturing_wizard_install","profile manufacturing wizard install","model_profile_manufacturing_config_install_modules_wizard","base.group_system",1,1,1,1
+"access_profile_manufacturing_config_install_modules_wizard_all","profile_manufacturing_config_install_modules_wizard_all","model_profile_manufacturing_config_install_modules_wizard","base.group_system",1,1,1,1
diff --git a/addons/profile_tools/security/ir.model.access.csv b/addons/profile_tools/security/ir.model.access.csv
new file mode 100644
index 00000000000..dbe55929ecc
--- /dev/null
+++ b/addons/profile_tools/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_misc_tools_installer","misc_tools.installer","model_misc_tools_installer",,1,1,1,1
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 50591b5ccd0..27d4cb3fc9f 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 05:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-19 09:19+0000\n"
+"Last-Translator: Rytis Ūsalis <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-04-17 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -206,7 +206,7 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -216,7 +216,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
 msgid "Analysis"
-msgstr ""
+msgstr "Analizė"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -224,7 +224,7 @@ msgstr ""
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
-msgstr ""
+msgstr "Projektas"
 
 #. module: project
 #: view:project.task:0
diff --git a/addons/project/project.py b/addons/project/project.py
index f96740219e5..a6c703657d0 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -250,7 +250,8 @@ project()
 
 class task(osv.osv):
     _name = "project.task"
-    _description = "Tasks"
+    _description = "Task"
+    _log_create = True
     _date_name = "date_start"
 
     def _str_get(self, task, level=0, border='***', context={}):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cec9ed95c0c..8b65468c158 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -414,20 +414,19 @@
                         <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
+                        <field name="project_id" select="1" widget="selection">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Users" name="user_id" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
-                        <filter string="Stage" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Users" name="group_user_id" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Project" name="group_project_id" icon="terp-project" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="State" name="group_state" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
@@ -444,7 +443,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_project_id":context.get('project_id',False)}</field>
+            <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
 
         </record>
@@ -612,7 +611,6 @@
 	                   <field name="subject"/>
 	                   <field name="project_id" select="1" widget="selection"/>
 	                   <field name="user_id" select="1" widget="selection">
-	                       <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" default="1"/>
 	                   </field>
                    </group>
                    <newline/>
@@ -631,7 +629,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_project_message_tree"/>
-            <field name="context">{"search_default_project_id":context.get('project_id',False), "search_default_my_msg":1}</field>
+            <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_project_message_search"/>
        </record>
 
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index e099b4544aa..128bdb39378 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -30,17 +30,16 @@ class report_project_task_user(osv.osv):
         'name': fields.char('Task Summary', size=128, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year',size=64,required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'date_start': fields.datetime('Starting Date',readonly=True),
+        'user_id':fields.many2one('res.users', 'Assigned To', readonly=True),
+        'date_start': fields.date('Starting Date',readonly=True),
         'no_of_days': fields.integer('#Days', size=128, readonly=True),
         'description': fields.text('Description',readonly=True),
-        'date_end': fields.datetime('Ending Date',readonly=True),
+        'date_end': fields.date('Ending Date',readonly=True),
         'date_deadline': fields.date('Deadline',readonly=True),
         'project_id':fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
-#        'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
         'closing_days': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the task"),
 
@@ -102,7 +101,6 @@ class report_project_task_user(osv.osv):
                     t.state,
                     date_trunc('day',t.date_end),
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'),
-                    date_trunc('day',t.date_start),
                     t.company_id,
                     t.partner_id,
                     t.type,
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a4a072849b9..d4443e7ed5c 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -52,13 +52,13 @@
             <field name="arch" type="xml">
                 <search string="Tasks">
                 	<group>
-	                    <filter icon="terp-project" string="This Year"
+	                    <filter icon="terp-project" string="Last 365 Days"
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Tasks performed in this year"/>
-	                    <filter icon="terp-project" string="This Month"
+	                    	    help="Tasks performed in last 365 Days"/>
+	                    <filter icon="terp-project" string="Last 30 Days"
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    		help="Tasks performed in this month"/>
+	                    		help="Tasks performed in last 30 days"/>
 		                <filter icon="gtk-media-rewind"
 	                            string="    7 Days    "
 	                            separator="1"
@@ -77,6 +77,10 @@
 	                   			icon="terp-project"
 	                   			domain="[('state','=','pending')]"
 	                   			help = "Pending tasks"/>
+                      	<filter string="Done"
+                    			icon="terp-project"
+                    			name="done"
+                    			domain="[('state','=','done')]"/>
 	  					<separator orientation="vertical"/>
 	                    <field name="user_id" widget="selection">
 	                        <filter icon="terp-project"
@@ -88,7 +92,7 @@
 	                        		help="Non Assigned Tasks to users"
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
-	                    <field name="project_id">
+	                    <field name="project_id" widget="selection">
 	                        <filter icon="terp-project"
 	                        		string="My Task"
 	                        		help="My Tasks"
@@ -98,25 +102,21 @@
 	                        		help ="Non assigned tasks to projects"
 	                        		domain="[('project_id','=',False"/>
 	                    </field>
+	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
 	                <group expand="0" string="Extended options..." colspan="10" col="12">
-                      	<filter string="Done"
-                    			icon="terp-project"
-                    			name="done"
-                    			domain="[('state','=','done')]"/>
-                    	<filter string="Cancelled"
-                    			icon="terp-project"
-                    			domain="[('state','=','cancelled')]"/>
-                    	<separator orientation="vertical"/>
 	                    <field name="type" widget="selection"/>
-	                    <field name="priority"/>
-	                    <field name="partner_id" widget="selection"/>
 	                    <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <separator orientation="vertical"/>
 	                    <field name="date_deadline"/>
 	                    <newline/>
-	                    <field name="date_start"/>
+	                    <field name="priority"/>
+	                    <separator orientation="vertical"/>
 	                    <field name="date_end"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="partner_id" />
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="11">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index f31c6f0401f..0cbe980f2e6 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -17,3 +17,4 @@
 "access_project_vs_remaining_hours","project.vs.remaining.hours","model_project_vs_remaining_hours","project.group_project_user",1,1,1,1
 "access_task_by_days_vs_planned_hours","task.by.days.vs.planned.hour","model_task_by_days_vs_planned_hours","project.group_project_user",1,1,1,1
 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
+"access_close_task","close.task","model_close_task","project.group_project_manager",1,1,1,1
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index 27f868fbae5..abbd2e8dec7 100644
--- a/addons/project_gtd/i18n/fr.po
+++ b/addons/project_gtd/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 14:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-21 10:32+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -78,7 +78,7 @@ msgstr "Projet par défaut"
 #. module: project_gtd
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context4_id:0
@@ -110,12 +110,12 @@ msgstr "Feuilles de temps"
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "Getting Things Done - Module de Gestion du Temps"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
 msgid "Timebox Tasks"
-msgstr ""
+msgstr "Tâche de la Timebox"
 
 #. module: project_gtd
 #: wizard_view:project.gtd.timebox.fill,init:0
@@ -181,7 +181,7 @@ msgstr "Contexte 3"
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,process:0
 msgid "Add to Timebox"
-msgstr ""
+msgstr "Ajouter une Timebox"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context5_id:0
@@ -277,7 +277,7 @@ msgstr "Séquence"
 #. module: project_gtd
 #: field:project.gtd.timebox,child_ids:0
 msgid "Child Timeboxes"
-msgstr ""
+msgstr "Timeboxes enfant"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_allinbox
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index d45576cabb1..059c19e0f40 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -39,7 +39,7 @@ except ImportError:
 
 class project_gtd_context(osv.osv):
     _name = "project.gtd.context"
-    _description = "Contexts"
+    _description = "Context"
     _columns = {
         'name': fields.char('Context', size=64, required=True, select=1),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of contexts."),
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index b990142e1ea..513bae085bd 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -31,8 +31,8 @@
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
-        'crm',
         'project',
+        'hr_timesheet_sheet',
     ],
     'init_xml': [
         'project_issue_data.xml'
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2de1b9f6b59..f67986526cd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -36,7 +36,7 @@ class project_issue(osv.osv, crm.crm_case):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, id desc"
-    _inherit = 'mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     def case_open(self, cr, uid, ids, *args):
         """
@@ -110,6 +110,10 @@ class project_issue(osv.osv, crm.crm_case):
         return res
 
     _columns = {
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
+        'id': fields.integer('ID'),  
+        'name': fields.char('Name', size=128, required=True), 
+        'active': fields.boolean('Active', required=False), 
         'create_date': fields.datetime('Creation Date' , readonly=True), 
         'write_date': fields.datetime('Update Date' , readonly=True), 
         'date_deadline': fields.date('Deadline'), 
@@ -138,9 +142,6 @@ class project_issue(osv.osv, crm.crm_case):
         'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
  will receive a copy of the future" \
 " communication between partner and users by email"), 
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
-                            domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.phonecall')]"), 
         'date_open': fields.datetime('Opened', readonly=True),
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True),
@@ -164,13 +165,26 @@ class project_issue(osv.osv, crm.crm_case):
                                 method=True, multi='day_close', type="float", store=True),
         'assigned_to' : fields.many2one('res.users', 'Assigned to'),
     }
-
+    
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
            return user.context_project_id.id
        return False
 
+    _defaults = {
+        'active': lambda *a: 1, 
+        'user_id': crm.crm_case._get_default_user, 
+        'partner_id': crm.crm_case._get_default_partner, 
+        'partner_address_id': crm.crm_case._get_default_partner_address, 
+        'email_from': crm.crm_case. _get_default_email, 
+        'state': lambda *a: 'draft',
+        'section_id': crm.crm_case. _get_section, 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+        'project_id':_get_project,
+    }
+
     def convert_issue_task(self, cr, uid, ids, context=None):
         case_obj = self.pool.get('project.issue')
         data_obj = self.pool.get('ir.model.data')
@@ -249,9 +263,5 @@ class project_issue(osv.osv, crm.crm_case):
             return {'value':{}}
         return {'value':{}}
 
-    _defaults = {
-        'project_id':_get_project,
-    }
-
 project_issue()
 
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 7c7764a2e37..ed031672360 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -22,7 +22,7 @@
 		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
 		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
 	</record>
-	<record id="crm_case_log_takecorrectiveactions0" model="crm.case.log">
+	<record id="crm_case_log_takecorrectiveactions0" model="mailgate.message">
 		<field eval="time.strftime('%Y-%m-08')" name="date"/>
 		<field name="case_id" ref="crm_case_buginaccountsmodule0"/>
 		<field name="som" ref="base.som_normal"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 40366bc26bd..210ad4ee737 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -188,17 +188,12 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Subject"/>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
                             <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
                         </field>
-                        <field name="project_id" select="1" widget="selection" string="Project">
-                            <filter icon="terp-crm"
-                                domain="[('project_id','=',context.get('project_id',False))]"
-                                help="My Project"
-                                />
-                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="16">
@@ -292,12 +287,8 @@
                             <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
-                        <field name="project_id" select="1" widget="selection" string="Project">
-                            <filter icon="terp-crm"
-                                domain="[('project_id','=',context.get('project_id',False))]"
-                                help="My Project"
-                                />
-                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project"/>
+
                     </group>
                 </search>
             </field>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 16dc2eb6ae2..70a08e2c7b4 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -66,7 +66,7 @@ class project_issue_report(osv.osv):
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True),
-        'day': fields.char('Day', size=128, readonly=True), 
+        'day': fields.char('Day', size=128, readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'nbr': fields.integer('# of Issues', readonly=True),
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index a9f8f016dec..5729698392f 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -93,10 +93,7 @@
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
-
-                      	<field name="user_id"  select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Project Issue" help="My Project Issue Entries" domain="[('user_id','=',uid)]" />
-               			</field>
+                      	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
                    <group  expand="1" string="Extended options..." colspan="10" col="12">
@@ -182,7 +179,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
   			<field name="view_mode">graph,tree</field>
-  			<field name="context">{"search_default_This Month":1,"search_default_User":1,'group_by_no_leaf':1,'group_by':[]}</field>
+  			<field name="context">{"search_default_This Month":1,"search_default_User":1,"search_default_user_id":uid,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
         </record>
@@ -206,4 +203,4 @@
 
 
   </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a925aeeb7aa..ebcc62b7bc3 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -244,7 +244,6 @@ project_resource_allocation()
 
 class project(osv.osv):
     _inherit = "project.project"
-    _description = "Project"
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
@@ -254,7 +253,6 @@ project()
 
 class task(osv.osv):
     _inherit = "project.task"
-    _description = "Task"
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase'),
         'occupation_rate': fields.float('Occupation Rate', help='The occupation rate fields indicates how much of his time a user is working on a task. A 100% occupation rate means the user works full time on the tasks. The ending date of a task is computed like this: Starting Date + Duration / Occupation Rate.'),
@@ -368,4 +366,4 @@ class task(osv.osv):
         return super(task, self).write(cr, uid, ids, vals, context=context)
 
 task()
-# 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/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
new file mode 100644
index 00000000000..96782d5fc82
--- /dev/null
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_project_messages","project.messages","model_project_messages",,1,1,1,1
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 484b9a2e4f1..342ff9e3d91 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -32,7 +32,7 @@ When installed, this module will automatically create a new task
 for each procurement order line, when the corresponding product
 meets the following characteristics:
   * Type = Service
-  * Procurement method (Order fulfillment) = MTO (make to order)
+  * Procurement method (Order fulfilment) = MTO (make to order)
   * Supply/Procurement method = Produce
 
 The new task is created outside of any existing project, but
@@ -49,8 +49,11 @@ automatically created via sale orders.
     'website': 'http://www.openerp.com',
     'depends': ['project', 'mrp_procurement', 'sale', 'mrp_jit'],
     'init_xml': [],
-    'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml'],
+    'update_xml': ['project_mrp_workflow.xml', 
+                   #'process/project_mrp_process.xml',
+                   ],
     'demo_xml': [],
+    'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'active': False,
     'certificate': '0031976495453',
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
index 845d32815a9..350d6b006b7 100644
--- a/addons/project_mrp/mrp.py
+++ b/addons/project_mrp/mrp.py
@@ -29,27 +29,53 @@ class mrp_procurement(osv.osv):
     def action_produce_assign_service(self, cr, uid, ids, context={}):
         for procurement in self.browse(cr, uid, ids):
             sline = self.pool.get('sale.order.line')
-            sale_ids = sline.search(cr, uid, [('procurement_id','=',procurement.id)], context)
             content = ''
+            sale_order = self.pool.get('sale.order')
+            so_ref =  procurement.name.split(':')[0]
+            order_ids = sale_order.search(cr, uid, [('name','=',so_ref)], context)
+
+            if order_ids:
+                sale_ids = sale_order.read(cr, uid, order_ids[0],['order_line'],context=context)['order_line']
+            else:
+                so_ref =  procurement.origin.split(':')[0]
+                sale_ids = sline.search(cr, uid, [('procurement_id','=',procurement.id)], context)
             l = None
             project_id = None
+            analytic_account_id = False
+            partner_id = False
+            
             for line in sline.browse(cr, uid, sale_ids, context=context):
                 content += (line.notes or '')
                 l = line
+                partner_id = line.order_id.partner_id.id
                 if line.order_id.project_id:
+                    analytic_account_id = line.order_id.project_id.id
+                    partner_id = line.order_id.partner_id.id
                     content+="\n\n"+line.order_id.project_id.complete_name
+                    break
             
             # Creating a project for task.Project is created from Procurement.
-            proj_name = tools.ustr(procurement.name)
+            proj_name = tools.ustr(so_ref)
             proj_exist_id = self.pool.get('project.project').search(cr, uid, [('name','=',proj_name)], context=context)
             if  not proj_exist_id:
-                project_id = self.pool.get('project.project').create(cr, uid, {'name':proj_name})
+                project_id = self.pool.get('project.project').create(cr, uid, {'name':proj_name,'category_id':analytic_account_id, 'partner_id':partner_id})
             else:
                 project_id = proj_exist_id[0]
                 
             self.write(cr, uid, [procurement.id], {'state':'running'})
+            
+            name_task = ('','')
+            if procurement.product_id.type == 'service':
+                proc_name = procurement.name
+                if procurement.origin == proc_name:
+                    proc_name = procurement.product_id.name
+                    
+                name_task = (procurement.origin, proc_name or '')
+            else:
+                name_task = (procurement.product_id.name or procurement.origin, procurement.name or '')
+                
             task_id = self.pool.get('project.task').create(cr, uid, {
-                'name': '%s:%s' %(procurement.product_id.name or procurement.origin, procurement.name or ''),
+                'name': '%s:%s' % name_task,
                 'date_deadline': procurement.date_planned,
                 'planned_hours': procurement.product_qty,
                 'remaining_hours': procurement.product_qty,
diff --git a/addons/project_mrp/project_mrp_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index a4f038f4ad2..43217d69f83 100644
--- a/addons/project_mrp/project_mrp_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <record model="workflow.transition" id="mrp.trans_produce_service_make_done">
-        <field name="act_from" ref="mrp.act_produce_service"/>
+    <record model="workflow.transition" id="mrp_procurement.trans_produce_service_make_done">
+        <field name="act_from" ref="mrp_procurement.act_produce_service"/>
         <field name="act_to" ref="mrp_procurement.act_make_done"/>
         <field name="signal">subflow.done</field>
     </record>
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
new file mode 100644
index 00000000000..dda382a128a
--- /dev/null
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -0,0 +1,75 @@
+-
+  In order to test project_mrp module with OpenERP I want to create sale orders 
+  with product type 'service' so when procurement runs one task is created.
+-
+  I create record for a service type product.
+-
+  !record {model: product.product, id: product_product_partnerstraining0}:
+    categ_id: product.product_category_7
+    cost_method: standard
+    mes_type: fixed
+    name: Partners Training
+    procure_method: make_to_order
+    supply_method: produce
+    type: service
+    uom_id: product.uom_day
+    uom_po_id: product.uom_day
+    warranty: 0.0
+- 
+  I create a sale order for product Partners Training which has type 'Service'.
+- 
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-05-21'
+    invoice_quantity: order
+    name: SO006
+    order_policy: manual
+    partner_id: base.res_partner_asus
+    partner_invoice_id: base.res_partner_address_tang
+    partner_order_id: base.res_partner_address_tang
+    partner_shipping_id: base.res_partner_address_tang
+    order_line:
+      - state: draft
+        delay: 7.0
+        name: Partners Training
+        price_unit: 1.0
+        product_id: product_product_partnerstraining0
+        product_uom: product.uom_day
+        product_uom_qty: 5.0
+        th_weight: 0.0
+        type: make_to_order
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+    user_id: base.user_demo
+-
+  I confirm this sale order.
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+  I check the procurements.
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    orderline_obj = self.pool.get('sale.order.line')
+    line_ids = orderline_obj.search(cr, uid, [('order_id','=', ref('sale_order_so0'))])
+    orders = orderline_obj.browse(cr, uid, line_ids)
+    proc_ids = map(lambda x: x.procurement_id.id, orders)
+    assert proc_ids, _('No Procurements!')
+-
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[('state','=','confirmed')]"
+-
+  Now I check the tasks.
+-
+  I see that one task is created for my sale order.
+-
+  !python {model: project.task}: |
+    from tools.translate import _
+    order_obj = self.pool.get('sale.order')
+    order = order_obj.browse(cr, uid, ref('sale_order_so0')) 
+    task_id = self.search(cr, uid, [('project_id.name','=', order.name)]) 
+    assert task_id, _('No Task is created!')
+    
\ No newline at end of file
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index bfd2af5566c..09a105cfb53 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -184,7 +184,6 @@ report_account_analytic_planning_line()
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
     _inherit = 'account.analytic.account'
-    _description = 'Analytic Accounts'
     _columns = {
         'planning_ids': fields.one2many('report_account_analytic.planning.line', 'account_id', 'Plannings'),
     }
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 6302bb7b440..7dbf2195c16 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -112,7 +112,11 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
+<<<<<<< TREE
+                                                        <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
+=======
                                                         <button name="%(project.action_project_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
+>>>>>>> MERGE-SOURCE
                                                         <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
 
                                                     </group>
@@ -162,12 +166,11 @@
             <field name="arch" type="xml">
                 <search string="Planning by Account">
                     <group col="8" colspan="4">
-                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Plannings"/>
                         <filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="user_id" select="1"/>
+                        <field name="user_id" widget="selection" select="1"/>
                         <field name="state" select="1"/>
                     </group>
                 </search>
@@ -215,6 +218,7 @@
             <field name="res_model">report_account_analytic.planning</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account_analytic_planning_view_search"/>
         </record>
         <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
index 60c8279f16f..3300ac0eebe 100644
--- a/addons/project_retro_planning/project_retro_planning.py
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -26,7 +26,6 @@ from datetime import datetime
 
 class project_project(osv.osv):
     _inherit = 'project.project'
-    _description = 'project.project'
 
     def write(self, cr, uid, ids,vals, *args, **kwargs):
         if 'date' in vals and vals['date']:
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 3ab09a390cc..f332067b88f 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -28,7 +28,6 @@ from tools.translate import _
 
 class project_work(osv.osv):
     _inherit = "project.task.work"
-    _description = "Task Work"
 
     def get_user_related_details(self, cr, uid, user_id):
         res = {}
@@ -144,7 +143,6 @@ project_work()
 
 class task(osv.osv):
     _inherit = "project.task"
-    _description = "Tasks"
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         for task_obj in self.browse(cr, uid, ids, *args, **kwargs):
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index e44e399b292..7093582d7fc 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -74,15 +74,9 @@
             		<group col="10" colspan="4">
 	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
 	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
-	            		<separator orientation="vertical"/>
-	            		<filter string="Start Date" icon="terp-project" domain="[('date_start','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 		<filter string="End Date" icon="terp-project" domain="[('date_end','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 	   <filter string="Deadline Date" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
 	            		<separator orientation="vertical"/>
 	            		<field name="project_id" select="1"/>
-	                    <field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
-                		</field>
+	                    <field name="user_id" select="1" widget="selection"/>
                 		<newline/>
                 		<group expand="1" string="Extended options..." colspan="10" col="12">
                     		<filter icon="terp-project"
@@ -124,6 +118,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="domain">[]</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_report_task_search"/>
         </record>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
@@ -156,9 +151,7 @@
 	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
 	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
 	            		<separator orientation="vertical"/>
-	                    <field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" />
-                		</field>
+	                    <field name="user_id" select="1" widget="selection"/>
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
@@ -174,6 +167,7 @@
             <field name="res_model">report.timesheet.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
         </record>
         <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 42c3ea0d15c..69075f64e05 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -1,3 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_task_report","report.task.report","model_task_report","project.group_project_manager",1,0,0,0
 "access_report_timesheet_task_user","report.timesheet.task.user","model_report_timesheet_task_user","project.group_project_manager",1,0,0,0
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 553d0342f7a..46d7c3296b9 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -51,12 +51,12 @@
         'process/purchase_process.xml',
         'report/purchase_report_view.xml',
     ],
-    'demo_xml': ['purchase_demo.xml'],
     'test': [
              'test/purchase_from_order.yml',
              'test/purchase_from_manual.yml',
 #             'test/purchase_from_picking.yml',
     ],
+    'demo_xml': ['purchase_demo.xml','purchase_unit_test.xml'],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 448f4ccc63b..849e586335c 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -162,7 +162,7 @@ class purchase_order(osv.osv):
                 "In this case, it will remove the warehouse link and set the customer location."
         ),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}),
-        'location_id': fields.many2one('stock.location', 'Destination', required=True),
+        'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
         'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
@@ -210,7 +210,8 @@ class purchase_order(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
     }
     _name = "purchase.order"
-    _description = "Purchase order"
+    _description = "Purchase Order"
+    _log_create = True
     _order = "name desc"
 
     def unlink(self, cr, uid, ids, context=None):
@@ -414,6 +415,7 @@ class purchase_order(osv.osv):
                 'purchase_id': order.id,
                 'company_id': order.company_id.id,
             })
+            todo_moves = []
             for order_line in order.order_line:
                 if not order_line.product_id:
                     continue
@@ -437,8 +439,9 @@ class purchase_order(osv.osv):
                     })
                     if order_line.move_dest_id:
                         self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
-                    self.pool.get('stock.move').action_confirm(cr, uid, [move])
-                    self.pool.get('stock.move').force_assign(cr,uid, [move])
+                    todo_moves.append(move)    
+            self.pool.get('stock.move').action_confirm(cr, uid, todo_moves)
+            self.pool.get('stock.move').force_assign(cr, uid, todo_moves)
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
         return picking_id
@@ -516,6 +519,7 @@ class purchase_order(osv.osv):
                 'state': 'draft',
                 'order_line': {},
                 'notes': '%s' % (porder.notes or '',),
+                'fiscal_position': porder.fiscal_position and porder.fiscal_position.id or False,
                 })
             else:
                 #order_infos['name'] += ', %s' % porder.name
@@ -608,7 +612,7 @@ class purchase_order_line(osv.osv):
     }
     _table = 'purchase_order_line'
     _name = 'purchase.order.line'
-    _description = 'Purchase Order lines'
+    _description = 'Purchase Order Line'
     def copy_data(self, cr, uid, id, default=None,context={}):
         if not default:
             default = {}
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 890062a66b9..00678589999 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -8,7 +8,7 @@
             <field name="pricelist_id" ref="list0"/>
             <field name="partner_id" search="[]" model="res.partner"/>
             <field name="partner_address_id" search="[]" model="res.partner.address"/>
-            <field name="location_id" search="[]" model="stock.location"/>
+            <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record model="purchase.order.line" id="test_purchase_1_line_1">
             <field name="order_id" ref="test_purchase_1"/>
@@ -63,10 +63,10 @@
         <function model="account.invoice" name="pay_and_reconcile">
             <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_id.id]" />
             <value eval="1164" />
-            <value search="[('type', '=', 'cash')]" model="account.account"/>
+            <value eval="ref('account.cash')"/>
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
             <value eval="ref('account.bank_journal')" />
-            <value search="[('type', '=', 'cash')]" model="account.account"/>
+            <value eval="ref('account.cash')"/>
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
             <value eval="ref('account.bank_journal')" />
         </function>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a57749e8134..8f76d4b409b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -5,7 +5,7 @@
             groups="group_purchase_user"/>-->
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
             groups="group_purchase_user" sequence="7"/>
-       <menuitem id="menu_procurement_management" name="Procurement Management"
+       <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
 
      <!--supplier menu-->
@@ -157,12 +157,10 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
                     <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid" widget="selection">
-                        <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>
-                    </field>
+                    <field name="name" select="1" string="Reference"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="create_uid" select="1" widget="selection"/>
                 </group>
                 <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="10">
@@ -200,8 +198,9 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_draft': 1}</field>
+            <field name="context">{'search_default_draft': 1,'search_create_uid':uid}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
                 sequence="6"/>
@@ -211,7 +210,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1}</field>
+            <field name="context">{'search_default_approved': 1,'search_create_uid':uid}</field>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
 
@@ -323,11 +323,11 @@
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
          <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
-		
-		<!-- 
+
+		<!--
         	Procurements
         -->
-         
+
         <record id="view_procurement_form_inherit" model="ir.ui.view">
         	<field name="name">mrp.procurement.form.inherit</field>
         	<field name="model">mrp.procurement</field>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 76d018680d2..cf177319ea5 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -54,6 +54,12 @@ class purchase_report(osv.osv):
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'partner_address_id':fields.many2one('res.partner.address', 'Address Contact Name', readonly=True),
+        'dest_address_id':fields.many2one('res.partner.address', 'Dest. Address Contact Name',readonly=True),
+        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
+        'date_approve':fields.date('Date Approved', readonly=True),
+        'expected_date':fields.date('Expected Date', readonly=True),
+        'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'quantity': fields.float('# of Products', readonly=True),
@@ -76,6 +82,12 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'MM') as month,
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                     s.state,
+                    s.date_approve,
+                    date_trunc('day',s.minimum_planned_date) as expected_date,
+                    s.partner_address_id,
+                    s.dest_address_id,
+                    s.pricelist_id,
+                    s.validator,
                     s.warehouse_id as warehouse_id,
                     s.partner_id as partner_id,
                     s.fiscal_position,
@@ -97,6 +109,12 @@ class purchase_report(osv.osv):
                     s.create_uid,
                     s.partner_id,
                     s.location_id,
+                    s.date_approve,
+                    date_trunc('day',s.minimum_planned_date),
+                    s.partner_address_id,
+                    s.pricelist_id,
+                    s.validator,
+                    s.dest_address_id,
                     l.product_id,
                     s.date_order,
                     to_char(s.date_order, 'YYYY'),
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 93918160bd1..49caced7a6b 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -21,6 +21,8 @@
             <field name="arch" type="xml">
                 <tree string="Purchase Orders Statistics">
                 	<field name="date" invisible="1"/>
+                	<field name="date_approve" invisible="1"/>
+                	<field name="expected_date" invisible="1"/>
                 	<field name="user_id" invisible="1"/>
                 	<field name="partner_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
@@ -32,6 +34,10 @@
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="warehouse_id" invisible="1"/>
+                    <field name="partner_address_id" invisible="1"/>
+                    <field name="dest_address_id" invisible="1"/>
+                    <field name="pricelist_id" invisible="1"/>
+                    <field name="validator" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="location_id" invisible="1"/>
@@ -46,7 +52,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-            <group>
+            <group colspan="10" col="12">
             	<filter icon="terp-purchase" 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"/>
@@ -71,48 +77,60 @@
                 		domain="[('state','=','manual')]"/>
 
                 <separator orientation="vertical"/>
+                <field name="partner_id" string="Supplier"/>
+                <field name="product_id"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-purchase"
-                    		string="My Purchaes"
-                    		help = "My Purchaes"
-                    		domain="[('user_id','=',uid)]" />
                     <filter icon="terp-purchase"
                     		string="Purchase Non User"
                     		help="Purchase Non User"
                     		domain="[('user_id','=',False)]"/>
                 </field>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
+                    <field name="date_approve"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_address_id"/>
                     <field name="invoice_method"/>
                     <field name="warehouse_id" widget="selection"/>
-                    <field name="location_id" widget="selection"/>
+                    <field name="validator" widget="selection"/>
+
                     <newline/>
                     <filter icon="terp-purchase" string="Invoice Exception  " domain="[('state','=','invoice_except')]"/>
                     <filter icon="terp-purchase" string="Cancel" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
+                    <field name="expected_date"/>
+                    <separator orientation="vertical"/>
+                    <field name="dest_address_id"/>
                     <field name="fiscal_position" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="date"/>
+                    <field name="location_id" widget="selection"/>
+                    <field name="pricelist_id" widget="selection"/>
+
+ 					<newline/>
+					<field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
+                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
                     <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
-                    <filter string="Partner" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
                     <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 7d7b78d0cdb..9b0f8bc184e 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -1,11 +1,19 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_purchase_order","purchase.order","model_purchase_order","purchase.group_purchase_user",1,1,1,1
 "access_purchase_order_line","purchase.order.line","model_purchase_order_line","purchase.group_purchase_user",1,1,1,1
-"access_stock_location_purchase_user","stock.location purchase_user","stock.model_stock_location","purchase.group_purchase_user",1,0,0,0
-"access_stock_warehouse_purchase_user","stock.warehouse purchase_user","stock.model_stock_warehouse","purchase.group_purchase_user",1,0,0,0
-"access_stock_picking_purchase_user","stock.picking purchase_user","stock.model_stock_picking","purchase.group_purchase_user",1,1,1,1
-"access_stock_move_purchase_user","stock.move purchase_user","stock.model_stock_move","purchase.group_purchase_user",1,1,1,1
-"access_purchase_order_stock_worker","purchase.order stock_worker","model_purchase_order","stock.group_stock_user",1,0,0,0
-"access_purchase_order_line_stock_worker","purchase.order.line stock_worker","model_purchase_order_line","stock.group_stock_user",1,0,0,0
-"access_account_tax_purchase_user","account.tax purchase_user","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
+"access_stock_location_purchase_user","stock.location","stock.model_stock_location","purchase.group_purchase_user",1,0,0,0
+"access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","purchase.group_purchase_user",1,0,0,0
+"access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","purchase.group_purchase_user",1,1,1,1
+"access_stock_move_purchase_user","stock.move","stock.model_stock_move","purchase.group_purchase_user",1,1,1,1
+"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,0,0,0
+"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0
+"access_account_tax_purchase_user","account.tax","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
 "access_report_purchase_order","purchase.report","model_purchase_report","purchase.group_purchase_manager",1,0,0,0
+"access_purchase_order_group","purchase.order.group","model_purchase_order_group","purchase.group_purchase_user",1,1,1,1
+"access_purchase_order_manager","purchase.order","model_purchase_order","purchase.group_purchase_manager",1,1,1,1
+"access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","purchase.group_purchase_manager",1,1,1,1
+"access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","purchase.group_purchase_manager",1,0,0,0
+"access_stock_warehouse_purchase_user_manager","stock.warehouse","stock.model_stock_warehouse","purchase.group_purchase_manager",1,0,0,0
+"access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","purchase.group_purchase_manager",1,1,1,1
+"access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","purchase.group_purchase_manager",1,1,1,1
+"access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","purchase.group_purchase_manager",1,0,0,0
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index a6e25375bc1..845738165d2 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -25,7 +25,7 @@ class purchase_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manage your Purchase Requisition and regroup and  allow you to easily keep track and order all your purchase orders."),
+        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allow you to easily keep track and manage all your purchase orders."),
         }
 purchase_installer()
 
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index e7b1f09aa90..85c35b277c5 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -27,7 +27,7 @@ import time
 
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
-    _description="Purchase requisition"
+    _description="Purchase Requisition"
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
         'origin': fields.char('Origin', size=32),
@@ -93,25 +93,19 @@ class purchase_requisition_line(osv.osv):
         @param product_id: Changed product_id
         @return:  Dictionary of changed values
         """
-        value = {}
-        
+        value = {'product_uom_id': ''}
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
             value = {'product_uom_id': prod.uom_id.id}
-            if product_uom_id != prod.uom_id.id:
-                value = {'product_uom_id': prod.uom_id.id}            
         return {'value': value}
 
     _defaults = {
                  'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
                  }
-
 purchase_requisition_line()
 
-
 class purchase_order(osv.osv):
     _inherit = "purchase.order"
-    _description = "purchase order"
     _columns = {
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
     }
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 6b31d75e70e..72f11069fcf 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -120,13 +120,11 @@
                     <filter icon="terp-purchase" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
 					<filter icon="terp-purchase" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>                    
                     <separator orientation="vertical"/>
-                    <field name="name" string="Requisition Reference"/>
-                    <field name="purchase_ids"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Requisition "/>
-                    </field>
-                    <field name="exclusive"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="name" select="1" string="Requisition Reference"/>
+                    <field name="purchase_ids" select="1"/>
+                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="exclusive" select="1" />
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="10">
@@ -148,6 +146,7 @@
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
+		<field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
     </record>
 
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index ff3f10bc425..8983d238e0e 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -52,14 +52,12 @@
     picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.shop
-        
 - 
   I confirm the sale order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
-    
 - 
-  I launch he scheduler to compute all procurements, and planify all requisitions orders.
+  I launch he scheduler to compute all procurements, and specify all requisitions orders.
 - 
   !python {model: mrp.procurement.compute.all}: |
     proc_obj = self.pool.get('mrp.procurement')
@@ -71,10 +69,8 @@
   !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
     partner_address_id: base.res_partner_address_7
     partner_id: base.res_partner_4
-    
 - 
-  I create a new purchase order .
-  
+  I create a new purchase order.
 - 
   !python {model: purchase.requisition.partner}: |
     req_obj = self.pool.get('purchase.requisition')
@@ -84,16 +80,14 @@
       1, "active_ids": ids, "active_id": ids[0], })
     
 -
- I check that I have two purchase orders on the purchase tender  
-  
+ I check that I have two purchase orders on the purchase tender.  
 -
  !python {model: purchase.order}: |
     order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
     ids=len(order_ids)
     assert (ids==2), "Purchase order  hasn't Created"
 - 
- I set the purchase requisition as 'Not Exclusive'
- 
+ I set the purchase requisition as 'Not Exclusive'.
 -
  !python {model: purchase.requisition}: |
     ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
@@ -101,7 +95,6 @@
 -
   I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
   purchase order for Asustek includes 2 pieces.
-
 - 
   !python {model: purchase.order}: |
     line_obj=self.pool.get('purchase.order.line')  
@@ -118,7 +111,6 @@
     line_obj.write(cr, uid, order_line2, {'product_qty':3})  
 -
   I confirm and validate both purchase orders.
-  
 -
   !python {model: purchase.order}: |
    order_ids= self.search(cr, uid, [])
@@ -127,10 +119,8 @@
    for id in order_ids:    
       wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr)    
       wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr) 
-   
 -
   I check that the delivery order of the customer is in state 'Waiting Goods'.
-  
 -
   !python {model: stock.picking }: |
     picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','delivery')])
@@ -138,10 +128,8 @@
       pick=self.browse(cr,uid,picking_id[0])
       assert (pick.state) =='confirmed'," Order is  not confirm"
       assert(pick.move_lines[0].state=='wating'),'Order is  not wating"'
-
 -
   I receive the order of the supplier Asustek from the Incoming Products menu.
-  
 -
   !python {model: stock.picking }: |
    import time
@@ -165,7 +153,6 @@
      self.do_partial(cr, uid, picking_id,partial_datas)
 -
  I receive the order of the supplier DistriPC from the Incoming Shipments menu.
- 
 -   
   !python {model: stock.picking }: |
    import time
@@ -186,8 +173,7 @@
       } 
       self.do_partial(cr, uid, picking_id,partial_datas)
 -
-  Now, I can check that the delivery order of the customer is in the state Available.
-  
+  I check that the delivery order of the customer is in the state Available.
 -
   !python {model: stock.picking }: |
    picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','out')])
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index 42eb34ea725..e2cba67fca9 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -1,11 +1,9 @@
 -
   In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
   purchase flow and I will buy the required products at two different suppliers.
-  
 -
   I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
   with the generation of purchase requisitions.    
-  
 -
   !record {model: product.product, id: product_product_laptopacer1}:
     categ_id: product.product_category_3
@@ -23,10 +21,8 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit 
-    
 - 
   Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0002
-  
 - 
   !record {model: sale.order, id: sale_order_testtender1}:
     date_order: '2010-04-20'
@@ -53,7 +49,6 @@
   I confirm  sale order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1}
-
 - 
   I launch he scheduler to compute all procurements, and planify all requisitions orders.
 -  
@@ -70,14 +65,13 @@
     assert len(requisition_ids), "Purchase requisition  hasn't Created"
 -
   On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC .
+  the button 'New Request for Quotation'. This opens a window to ask me the supplier and I set DistriPC .
 - 
   I Create  purchase.requisition.partner .
 - 
   !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
     partner_address_id: base.res_partner_address_7
     partner_id: base.res_partner_4
-        
 - 
   I create a new purchase order for the supplier 'DistriPC'.
 - 
@@ -87,7 +81,6 @@
     self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
       'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
       1, "active_ids": ids, "active_id": ids[0], })
-    
 -
   I set the purchase tender as 'Exclusive'      
 - 
@@ -95,7 +88,7 @@
     ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
     self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
 -
-  I confirm and validate the RfQ of ASUStek.      
+  I confirm and validate the Request for Quotation of ASUStek.      
 -
  !python {model: purchase.order}: |
     partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
@@ -108,7 +101,7 @@
       wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr)
       wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr)  
 -
-  I check that RfQ of DistriPC is cancelled.
+  I check that Request for Quotation of DistriPC is cancelled.
 -        
   !python {model: purchase.order}: |
    partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 6c6349cddae..68cd5ccbe9b 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -12,9 +12,7 @@
                 <search string="Search Resource">
                    <group col='15' colspan='4'>
                        <field name="name"/>
-                       <field name="user_id" string="User" widget="selection">
-                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" default="1"/>
-                       </field>
+                       <field name="user_id" string="User" widget="selection"/>
                        <field name="resource_type"/>
                        <field name="company_id" widget="selection"/>
                    </group>
@@ -58,7 +56,7 @@
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resouce" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
                     </group>
                </search>
             </field>
@@ -191,6 +189,7 @@
             <field name="name">Resources</field>
             <field name="res_model">resource.resource</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_resource_resource_search"/>
         </record>
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 651945752a7..d43278381f5 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -65,6 +65,8 @@
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',
              'test/advance_invoice.yml',
+             'test/so_make_line_invoice.yml',
+             'test/so_make_invoice.yml',
              'test/sale_procurement.yml',
             ],
     'installable': True,
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 3d9f2727a80..c81d4b09f23 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.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-11-17 10:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-22 09:28+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-05-23 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -210,7 +210,7 @@ msgstr "Politique d'expédition"
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annuler"
 
 #. module: sale
 #: selection:sale.order,state:0
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 54f387c1bac..5a29059512f 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-17 14:08+0000\n"
+"PO-Revision-Date: 2010-05-21 08:21+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -222,7 +222,7 @@ msgstr "Wydawanie produktów"
 #. module: sale
 #: view:sale.order:0
 msgid "Reference"
-msgstr "Odnośnik"
+msgstr "Numer"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index 1c205b6c256..1b1256cee19 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -134,7 +134,7 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
@@ -144,10 +144,10 @@
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]] </para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]] [[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]][[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -155,7 +155,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
@@ -187,7 +187,8 @@
           <para style="terp_tblheader_General_Centre">Your Reference </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ o.state=='draft' and 'Quotation Date' or 'Date Ordered' ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ o.state=='draft' and removeParentNode('para') ]] Date Ordered</para>
+          <para style="terp_tblheader_General_Centre">[[ o.state &lt;&gt; 'draft' and removeParentNode('para') ]] Quotation Date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Our Salesman </para>
@@ -240,7 +241,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="208.0,99.0,43.0,21.0,59.0,43.0,65.0" style="Table5">
+      <blockTable colWidths="207.0,99.0,43.0,21.0,59.0,43.0,65.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -370,4 +371,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index d1081a4b21f..c8b616ced78 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -57,6 +57,12 @@ class sale_report(osv.osv):
             ('done', 'Done'),
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True),
+        'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
+        'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact Name', readonly=True),
+        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address Name', readonly=True),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'date_confirm': fields.date('Confirmation Date', readonly=True)
     }
     _order = 'date desc'
     def init(self, cr):
@@ -81,7 +87,13 @@ class sale_report(osv.osv):
                      sum(l.product_uom_qty*l.price_unit) as price_total,
                      (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
                      count(*) as nbr,
-                     s.state
+                     s.state,
+                     s.partner_invoice_id as partner_invoice_id,
+                     s.partner_order_id as partner_order_id,
+                     s.partner_shipping_id as partner_shipping_id,
+                     s.pricelist_id as pricelist_id,
+                     s.project_id as analytic_account_id,
+                     s.date_confirm as date_confirm
                      from
                  sale_order_line l
                  left join
@@ -97,7 +109,13 @@ class sale_report(osv.osv):
                      s.shop_id,
                      s.company_id,
                      s.fiscal_position,
-                     s.payment_term
+                     s.payment_term,
+                     s.partner_invoice_id,
+                     s.partner_order_id,
+                     s.partner_shipping_id,
+                     s.pricelist_id,
+                     s.project_id,
+                     s.date_confirm
             )
         """)
 sale_report()
@@ -167,10 +185,14 @@ class product_bought_by_sale_order(osv.osv):
     _name = "product.bought.by.sale.order"
     _description = "Product bought by sale order"
     _auto = False
-    _rec_name = 'partner'
+    _rec_name = 'month'
     _columns = {
         'total_products': fields.integer('Total Products', readonly=True),
-        'name': fields.char('Sale order', size=64, readonly=True)
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        '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),
+        'year': fields.char('Year', size=64, readonly=True)
     }
     _order = 'total_products desc'
     def init(self, cr):
@@ -179,8 +201,10 @@ class product_bought_by_sale_order(osv.osv):
             create or replace view product_bought_by_sale_order as (
                 select
                     min(s.id) as id,
-                    count(*) as total_products,
-                    s.name as name
+                    l.product_id as product_id,
+                    to_char(l.create_date, 'MM') as month,
+                    to_char(l.create_date, 'YYYY') as year,
+                    count(*) as total_products
                 from
                     sale_order_line l
                 left join
@@ -188,7 +212,7 @@ class product_bought_by_sale_order(osv.osv):
                 where
                     s.state='manual' or s.state='progress'
                 group by
-                    s.name
+                    l.product_id,  to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY') 
             )
         """)
 product_bought_by_sale_order()
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 72707f6e01d..fe88fa33555 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -24,6 +24,12 @@
                 <field name="state" invisible="1"/>
                 <field name="fiscal_position" invisible="1"/>
                 <field name="payment_term" invisible="1"/>
+                <field name="partner_invoice_id" invisible="1"/>
+                <field name="partner_order_id" invisible="1"/>
+                <field name="partner_shipping_id" invisible="1"/>
+                <field name="pricelist_id" invisible="1"/>
+                <field name="analytic_account_id" invisible="1"/>
+                <field name="date_confirm" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -72,10 +78,6 @@
 
 	                <separator orientation="vertical"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-sale"
-	                    		string="My Sales"
-	                    		help = "My Sales"
-	                    		domain="[('user_id','=',uid)]" />
 	                    <filter icon="terp-sale"
 	                    		string="sale Non User"
 	                    		help="sale Non User"
@@ -97,8 +99,16 @@
                     <filter icon="terp-sale" string="Done" domain="[('state','=','done')]"/>
                     <filter icon="terp-sale" string="Cancelled" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
+                    <field name="partner_invoice_id"/>
+                    <field name="partner_order_id"/>
+                    <field name="partner_shipping_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="pricelist_id" widget="selection"/>
+                    <field name="analytic_account_id"/>
+                    <newline/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="date"/>
+                    <field name="date_confirm"/>
                 </group>
                 <newline/>
                 <newline/>
@@ -112,9 +122,16 @@
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
                     <filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
                     <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
+                    <newline/>
+                    <filter string="Invoice Address Name" icon="terp-sale" context="{'group_by':'partner_invoice_id'}"/>
+                    <filter string="Ordering Contact Name" icon="terp-sale" context="{'group_by':'partner_order_id'}"/>
+                    <filter string="Shipping Address Name" icon="terp-sale" context="{'group_by':'partner_shipping_id'}"/>
                     <separator orientation="vertical"/>
 					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
                 </group>
             </search>
@@ -127,7 +144,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_order_product_search"/>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
@@ -205,7 +222,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Product bought by sale order">
-                <field name="name"/>
+                <field name="product_id"/>
+                 <field name="month"/>
+                 <field name="year"/>
                 <field name="total_products"/>
             </tree>
         </field>
@@ -217,8 +236,9 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Product bought by sale order" type="bar">
-                 <field name="name"/>
-                 <field name="total_products" operator="+"/>
+                 <field name="product_id" select="1"/>
+                 <field name="total_products" select="1"/>
+                 <field name="month" group = "True"/>
              </graph>
          </field>
     </record>
@@ -227,7 +247,8 @@
         <field name="name">Product bought by sale order</field>
         <field name="res_model">product.bought.by.sale.order</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain">[('year','=', time.strftime('%Y'))]</field>
         <field name="view_id" ref="view_product_bought_by_sale_order_tree"/>
     </record>
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 718f29f12d7..272ee0ecd70 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -52,6 +52,7 @@ def _incoterm_get(self, cr, uid, context=None):
 
 class sale_order(osv.osv):
     _name = "sale.order"
+    _log_create = True
     _description = "Sale Order"
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -106,17 +107,19 @@ class sale_order(osv.osv):
         for id in ids:
             res[id] = [0.0, 0.0]
         cr.execute('''SELECT
-                p.sale_id,sum(m.product_qty), m.state
+                p.sale_id,sum(m.product_qty), mp.state as mp_state
             FROM
                 stock_move m
             LEFT JOIN
                 stock_picking p on (p.id=m.picking_id)
+            LEFT JOIN
+                mrp_procurement mp on (mp.move_id=m.id)
             WHERE
-                p.sale_id = ANY(%s) GROUP BY m.state, p.sale_id''',(ids,))
-        for oid, nbr, state in cr.fetchall():
-            if state == 'cancel':
+                p.sale_id = ANY(%s) GROUP BY mp.state, p.sale_id''',(ids,))
+        for oid, nbr, mp_state in cr.fetchall():
+            if mp_state == 'cancel':
                 continue
-            if state == 'done':
+            if mp_state == 'done':
                 res[oid][0] += nbr or 0.0
                 res[oid][1] += nbr or 0.0
             else:
@@ -434,7 +437,7 @@ class sale_order(osv.osv):
             'currency_id': order.pricelist_id.currency_id.id,
             'comment': order.note,
             'payment_term': pay_term,
-            'fiscal_position': order.partner_id.property_account_position.id,
+            'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
             'date_invoice' : context.get('date_invoice',False),
             'company_id' : order.company_id.id,
         }
@@ -508,18 +511,14 @@ class sale_order(osv.osv):
     def action_invoice_end(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+            
         for order in self.browse(cr, uid, ids, context=context):
-            val = {'invoiced': True}
-            if order.state == 'invoice_except':
-                val['state'] = 'progress'
-
             for line in order.order_line:
-                towrite = []
                 if line.state == 'exception':
-                    towrite.append(line.id)
-                if towrite:
-                    self.pool.get('sale.order.line').write(cr, uid, towrite, {'state': 'confirmed'}, context=context)
-            self.write(cr, uid, [order.id], val)
+                    self.pool.get('sale.order.line').write(cr, uid, [line.id], {'state': 'confirmed'}, context=context)
+            
+            if order.state == 'invoice_except':
+                self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
 
         return True
 
@@ -553,16 +552,10 @@ class sale_order(osv.osv):
         return True
 
     def action_wait(self, cr, uid, ids, *args):
-        event_p = self.pool.get('res.partner.event.type').check(cr, uid, 'sale_open')
-        event_obj = self.pool.get('res.partner.event')
+        for (id,name) in self.name_get(cr, uid, ids):
+            message = _('Quotation ') + " '" + name + "' "+ _("converted to sale order.")
+            self.log(cr, uid, id, message)
         for o in self.browse(cr, uid, ids):
-            if event_p:
-                event_obj.create(cr, uid, {'name': 'Sale Order: '+ o.name,\
-                        'partner_id': o.partner_id.id,\
-                        'date': time.strftime('%Y-%m-%d %H:%M:%S'),\
-                        'user_id': (o.user_id and o.user_id.id) or uid,\
-                        'partner_type': 'customer', 'probability': 1.0,\
-                        'planned_revenue': o.amount_untaxed})
             if (o.order_policy == 'manual'):
                 self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')})
             else:
@@ -813,7 +806,7 @@ class sale_order_line(osv.osv):
         return res
 
     _name = 'sale.order.line'
-    _description = 'Sale Order line'
+    _description = 'Sale Order Line'
     _columns = {
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -1072,7 +1065,7 @@ class sale_order_line(osv.osv):
                         'product_uos':
                         [('category_id', '=', uos_category_id)]}
 
-        elif uos: # only happens if uom is False
+        elif uos and not uom: # only happens if uom is False
             result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id
             result['product_uom_qty'] = qty_uos / product_obj.uos_coeff
             result['th_weight'] = result['product_uom_qty'] * product_obj.weight
@@ -1117,7 +1110,7 @@ class sale_order_line(osv.osv):
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False):
         res = self.product_id_change(cursor, user, ids, pricelist, product,
-                qty=0, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
+                qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
                 partner_id=partner_id, lang=lang, update_tax=update_tax,
                 date_order=date_order)
         if 'product_uom' in res['value']:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ba90e82f820..5add715a0cc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -110,7 +110,7 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" widget="selection"/>
                             <field name="project_id"
                                 context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
                                 groups="base.group_extended"/>
@@ -130,7 +130,8 @@
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
                                                 />
                                             <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"
+                                                widget="selection"/>
                                             <field
                                                 name="product_packaging"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
@@ -159,8 +160,6 @@
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
-                                            <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
-                                            <field groups="product.group_uos" name="product_uos"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
 <!--                                            <separator colspan="4" string="Properties"/>-->
@@ -191,7 +190,7 @@
                             <group col="8" colspan="5">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" sum="Total amount"/>
+                                <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="13" colspan="4">
@@ -238,7 +237,7 @@
                         </page>
                         <page string="History" groups="base.group_extended">
                             <separator colspan="4" string="Related invoices"/>
-                            <field colspan="4" name="invoice_ids" nolabel="1"/>
+                            <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -256,18 +255,17 @@
                     <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
                     <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" />
-                    </field>
-                    <field name="date_order" string="Order date" />
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
                         <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
@@ -279,7 +277,7 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{'search_default_user_id':uid}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index e2f632bf711..48c00d8afba 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -63,11 +63,8 @@ class stock_picking(osv.osv):
                 user, picking)
 
     def _get_comment_invoice(self, cursor, user, picking):
-        if picking.sale_id and picking.sale_id.note:
-            if picking.note:
-                return picking.note + '\n' + picking.sale_id.note
-            else:
-                return picking.sale_id.note
+        if picking.note or (picking.sale_id and picking.sale_id.note):
+            return picking.note or picking.sale_id.note
         return super(stock_picking, self)._get_comment_invoice(cursor, user,
                 picking)
 
@@ -139,6 +136,10 @@ class stock_picking(osv.osv):
             sale_lines = picking.sale_id.order_line
             invoice_created = invoices[result[picking.id]]
             
+            for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context):
+                if not inv.fiscal_position:
+                    invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
+                    
             if picking.sale_id.client_order_ref:
                 inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
                 invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)
@@ -188,6 +189,19 @@ class stock_picking(osv.osv):
                         })
 
         return result
+    
+    def action_cancel(self, cr, uid, ids, context={}):
+        res = super(stock_picking, self).action_cancel(cr, uid, ids, context=context)
+        for pick in self.browse(cr, uid, ids, context):
+            call_ship_end = True
+            if pick.sale_id:
+                for picks in pick.sale_id.picking_ids:
+                    if picks.state not in ('done','cancel'):
+                        call_ship_end = False
+                        break
+                if call_ship_end:
+                    self.pool.get('sale.order').action_ship_end(cr, uid, [pick.sale_id.id], context)    
+        return res
 
 
 stock_picking()
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
index 5a73236f7bc..a5e78117674 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -3,6 +3,8 @@
   products with different supply method and procurement method.
 -
   I create two products.
+-
+  I create one product Table.
 -
   !record {model: product.product, id: product_product_table0}:
     categ_id: product.cat1
@@ -12,6 +14,8 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
+-
+  I create another product Wood.
 -
   !record {model: product.product, id: product_product_wood0}:
     categ_id: product.cat1
@@ -28,7 +32,6 @@
     company_id: base.main_company
     location_id: stock.stock_location_stock
     logic: max
-    name: OP/00002
     product_id: product_product_wood0
     product_max_qty: 15.0
     product_min_qty: 10.0
@@ -38,12 +41,11 @@
 -
   Now I make a sale order for table.
 - 
-  !record {model: sale.order, id: sale_order_so0}:
+  !record {model: sale.order, id: sale_order_so3}:
     amount_total: 5.0
     amount_untaxed: 5.0
     date_order: '2010-04-30'
     invoice_quantity: order
-    name: SO006
     order_line:
       - company_id: base.main_company
         delay: 7.0
@@ -66,7 +68,7 @@
 -
   I confirm the order.
 - 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
 -
   I check that one procurement is generated.
 -
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
index 4bbbbb74dc5..c030a80c64a 100644
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -211,7 +211,7 @@
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
 - 
-  I define LG Viewty Smart product template.
+  I define New Chocolate Slider Mobile template.
 - 
   !record {model: product.template, id: product_template_newchocolateslidermobile0}:
     categ_id: product_category_allproductssellable0
@@ -226,7 +226,7 @@
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
 - 
-  I define LG Viewty Smart product.
+  I define New Chocolate Slider Mobile.
 - 
   !record {model: product.product, id: product_product_newchocolateslidermobile0}:
     categ_id: product_category_allproductssellable0
diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml
new file mode 100644
index 00000000000..e34b11ffb2b
--- /dev/null
+++ b/addons/sale/test/so_make_invoice.yml
@@ -0,0 +1,341 @@
+-
+  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+  I am going to sell my Mobile products to the customer with name Cleartrail
+- 
+  I create View Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_view0}:
+    close_method: none
+    code: View
+    name: View
+    sign: 1
+- 
+  I create Income Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: Income
+    name: Income
+    sign: 1
+- 
+  I create Expense Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: Expense
+    name: Expense
+    sign: 1
+- 
+  I create Cash Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_cash0}:
+    close_method: balance
+    code: Cash
+    name: Cash
+    sign: 1
+- 
+  I create Minimal Chart Account.
+- 
+  !record {model: account.account, id: account_account_minimalchart0}:
+    code: '0'
+    company_id: base.main_company
+    currency_mode: current
+    name: Minimal Chart
+    parent_left: 1
+    parent_right: 12
+    type: view
+    user_type: account_account_type_view0
+- 
+  I create Payable Account.
+- 
+  !record {model: account.account, id: account_account_payable1}:
+    code: AP
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_id: account_account_minimalchart0
+    parent_left: 2
+    parent_right: 3
+    reconcile: true
+    type: payable
+    user_type: account_account_type_expense0
+- 
+  I create Receivable Account.
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: AR
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_id: account_account_minimalchart0
+    parent_left: 4
+    parent_right: 5
+    reconcile: true
+    type: receivable
+    user_type: account_account_type_income0
+- 
+  I create Cash Account.
+- 
+  !record {model: account.account, id: account_account_cash0}:
+    code: C
+    company_id: base.main_company
+    currency_mode: current
+    name: Cash
+    parent_id: account_account_minimalchart0
+    parent_left: 6
+    parent_right: 7
+    type: other
+    user_type: account_account_type_cash0
+- 
+  I create Purchases Account.
+- 
+  !record {model: account.account, id: account_account_purchases0}:
+    code: P
+    company_id: base.main_company
+    currency_mode: current
+    name: Purchases
+    parent_id: account_account_minimalchart0
+    parent_left: 8
+    parent_right: 9
+    type: other
+    user_type: account_account_type_expense0
+- 
+  I create Sales Account.
+- 
+  !record {model: account.account, id: account_account_sales0}:
+    code: S
+    company_id: base.main_company
+    currency_mode: current
+    name: Sales
+    parent_id: account_account_minimalchart0
+    parent_left: 10
+    parent_right: 11
+    type: other
+    user_type: account_account_type_income0
+- 
+  I create Purchase Journal.
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: PUJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_purchases0
+    default_debit_account_id: account_account_purchases0
+    name: Purchase Journal
+    sequence_id: account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_view
+- 
+  I create Sale Journal.
+- 
+  !record {model: account.journal, id: account_journal_salejournal0}:
+    code: SAJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_sales0
+    default_debit_account_id: account_account_sales0
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+- 
+  I create Bank Journal.
+- 
+  !record {model: account.journal, id: account_journal_bankjournal0}:
+    code: BNK
+    company_id: base.main_company
+    default_credit_account_id: account_account_cash0
+    default_debit_account_id: account_account_cash0
+    name: Bank Journal
+    sequence_id: account.sequence_journal
+    type: cash
+    view_id: account.account_journal_bank_view
+- 
+  I create ir.property for account payable.
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_payable
+    name: property_account_expense_categ
+    value_reference: account.account,5
+- 
+  I create ir.property for account receivable.
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_receivable
+    name: property_account_income_categ
+    value_reference: account.account,6
+- 
+  I create Partner category Customers.
+- 
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+-
+  I create Cleartrail Customer.
+- 
+  !record {model: res.partner, id: res_partner_cleartrail0}:
+    category_id:
+      - res_partner_category_customers0
+    name: Cleartrail
+- 
+  I create contact address for Cleartrail.
+- 
+  !record {model: res.partner.address, id: res_partner_address_1}:
+    partner_id: res_partner_cleartrail0
+    street: onam plaza, 14 B palasia A B Road
+    type: contact
+- 
+  I create invoice address for Cleartrail.
+- 
+  !record {model: res.partner.address, id: res_partner_address_2}:
+    partner_id: res_partner_cleartrail0
+    street: sarda house 24 B palasia, A B Road
+    type: invoice
+- 
+  I create delivery address for Cleartrail.
+- 
+  !record {model: res.partner.address, id: res_partner_address_3}:
+    partner_id: res_partner_cleartrail0
+    street: sangam house 15 B palasia, A B Road
+    type: delivery
+-
+  Customer Cleartrail has specific instrument requirement regarding the stockable products.
+- 
+  I define product category Mobile Products Sellable.
+- 
+  !record {model: product.category, id: product_category_allproductssellable0}:
+    name: Mobile Products Sellable
+- 
+  I define product category Mobile Services. 
+- 
+  !record {model: product.category, id: product_category_services0}:
+    name: Mobile Services
+- 
+  I define LG Viewty Smart product template.
+- 
+  !record {model: product.template, id: product_template_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    procure_method: make_to_order
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-    
+  I define LG Viewty Smart product.
+- 
+  !record {model: product.product, id: product_product_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  I define New Chocolate Slider Mobile template.
+- 
+  !record {model: product.template, id: product_template_newchocolateslidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200.0
+    mes_type: fixed
+    name: New Chocolate Slider Mobile
+    procure_method: make_to_order
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- 
+  I define New Chocolate Slider Mobile.
+- 
+  !record {model: product.product, id: product_product_newchocolateslidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200.0
+    mes_type: fixed
+    name: New Chocolate Slider Mobile
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 189.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 200.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- 
+  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy manual.
+-
+  !record {model: sale.order, id: sale_order_so4}:
+    date_order: '2010-05-12'
+    invoice_quantity: order
+    name: Test_SO004
+    order_line:
+      - name: New Chocolate Slider Mobile
+        price_unit: 200.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_newchocolateslidermobile0
+        product_uos_qty: 500.0
+        type: make_to_order
+      - name: LG Viewty Smart
+        price_unit: 170.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_lgviewtysmart0
+        product_uos_qty: 500.0
+        th_weight: 0.0
+        type: make_to_order      
+    order_policy: manual
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  I confirm the Sale Order.
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so4}
+-
+  I create an invoice on sale order.
+- 
+  !record {model: sale.make.invoice, id: sale_make_invoice_1}:
+    {}
+- 
+  Invoice is created for specific sale order.
+- 
+  !python {model: sale.make.invoice}: |
+    self.make_invoices(cr, uid, [ref("sale_make_invoice_1")], {"lang": 'en_US', "search_default_user_id":
+      1, "tz": False, "active_model": 'sale.order', "active_ids": [ref("sale_order_so4")], "active_id":
+      ref("sale_order_so4"), })
+-
+  I verify that invoice regarding sale order has been created.
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so4"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+
+    
\ No newline at end of file
diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml
new file mode 100644
index 00000000000..de5782c8517
--- /dev/null
+++ b/addons/sale/test/so_make_line_invoice.yml
@@ -0,0 +1,342 @@
+-
+  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+  I am going to sell my Mobile products to the customer with name Cleartrail
+- 
+  I create View Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_view0}:
+    close_method: none
+    code: View
+    name: View
+    sign: 1
+- 
+  I create Income Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: Income
+    name: Income
+    sign: 1
+- 
+  I create Expense Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: Expense
+    name: Expense
+    sign: 1
+- 
+  I create Cash Account Type.
+- 
+  !record {model: account.account.type, id: account_account_type_cash0}:
+    close_method: balance
+    code: Cash
+    name: Cash
+    sign: 1
+- 
+  I create Minimal Chart Account.
+- 
+  !record {model: account.account, id: account_account_minimalchart0}:
+    code: '0'
+    company_id: base.main_company
+    currency_mode: current
+    name: Minimal Chart
+    parent_left: 1
+    parent_right: 12
+    type: view
+    user_type: account_account_type_view0
+- 
+  I create Payable Account.
+- 
+  !record {model: account.account, id: account_account_payable1}:
+    code: AP
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_id: account_account_minimalchart0
+    parent_left: 2
+    parent_right: 3
+    reconcile: true
+    type: payable
+    user_type: account_account_type_expense0
+- 
+  I create Receivable Account.
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: AR
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_id: account_account_minimalchart0
+    parent_left: 4
+    parent_right: 5
+    reconcile: true
+    type: receivable
+    user_type: account_account_type_income0
+- 
+  I create Cash Account.
+- 
+  !record {model: account.account, id: account_account_cash0}:
+    code: C
+    company_id: base.main_company
+    currency_mode: current
+    name: Cash
+    parent_id: account_account_minimalchart0
+    parent_left: 6
+    parent_right: 7
+    type: other
+    user_type: account_account_type_cash0
+- 
+  I create Purchases Account.
+- 
+  !record {model: account.account, id: account_account_purchases0}:
+    code: P
+    company_id: base.main_company
+    currency_mode: current
+    name: Purchases
+    parent_id: account_account_minimalchart0
+    parent_left: 8
+    parent_right: 9
+    type: other
+    user_type: account_account_type_expense0
+- 
+  I create Sales Account.
+- 
+  !record {model: account.account, id: account_account_sales0}:
+    code: S
+    company_id: base.main_company
+    currency_mode: current
+    name: Sales
+    parent_id: account_account_minimalchart0
+    parent_left: 10
+    parent_right: 11
+    type: other
+    user_type: account_account_type_income0
+- 
+  I create Purchase Journal.
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: PUJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_purchases0
+    default_debit_account_id: account_account_purchases0
+    name: Purchase Journal
+    sequence_id: account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_view
+- 
+  I create Sale Journal.
+- 
+  !record {model: account.journal, id: account_journal_salejournal0}:
+    code: SAJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_sales0
+    default_debit_account_id: account_account_sales0
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+- 
+  I create Bank Journal.
+- 
+  !record {model: account.journal, id: account_journal_bankjournal0}:
+    code: BNK
+    company_id: base.main_company
+    default_credit_account_id: account_account_cash0
+    default_debit_account_id: account_account_cash0
+    name: Bank Journal
+    sequence_id: account.sequence_journal
+    type: cash
+    view_id: account.account_journal_bank_view
+- 
+  I create ir.property for account payable.
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_payable
+    name: property_account_expense_categ
+    value_reference: account.account,5
+- 
+  I create ir.property for account receivable.
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_receivable
+    name: property_account_income_categ
+    value_reference: account.account,6
+- 
+  I create Partner category Customers.
+- 
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+-
+  I create Cleartrail Customer.
+- 
+  !record {model: res.partner, id: res_partner_cleartrail0}:
+    category_id:
+      - res_partner_category_customers0
+    name: Cleartrail
+- 
+  I create contact address for Cleartrail.
+- 
+  !record {model: res.partner.address, id: res_partner_address_1}:
+    partner_id: res_partner_cleartrail0
+    street: onam plaza, 14 B palasia A B Road
+    type: contact
+- 
+  I create invoice address for Cleartrail.
+- 
+  !record {model: res.partner.address, id: res_partner_address_2}:
+    partner_id: res_partner_cleartrail0
+    street: sarda house 24 B palasia, A B Road
+    type: invoice
+- 
+  I create delivery address for Cleartrail.
+- 
+  !record {model: res.partner.address, id: res_partner_address_3}:
+    partner_id: res_partner_cleartrail0
+    street: sangam house 15 B palasia, A B Road
+    type: delivery
+-
+  Customer Cleartrail has specific instrument requirement regarding the stockable products.
+- 
+  I define product category Mobile Products Sellable.
+- 
+  !record {model: product.category, id: product_category_allproductssellable0}:
+    name: Mobile Products Sellable
+- 
+  I define product category Mobile Services. 
+- 
+  !record {model: product.category, id: product_category_services0}:
+    name: Mobile Services
+- 
+  I define LG Viewty Smart product template.
+- 
+  !record {model: product.template, id: product_template_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    procure_method: make_to_order
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-    
+  I define LG Viewty Smart product.
+- 
+  !record {model: product.product, id: product_product_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  I define New Chocolate Slider Mobile template.
+- 
+  !record {model: product.template, id: product_template_newchocolateslidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200.0
+    mes_type: fixed
+    name: New Chocolate Slider Mobile
+    procure_method: make_to_order
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- 
+  I define New Chocolate Slider Mobile.
+- 
+  !record {model: product.product, id: product_product_newchocolateslidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200.0
+    mes_type: fixed
+    name: New Chocolate Slider Mobile
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 189.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 200.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- 
+  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy manual.
+-
+  !record {model: sale.order, id: sale_order_so3}:
+    date_order: '2010-05-12'
+    invoice_quantity: order
+    name: Test_SO003
+    order_line:
+      - name: New Chocolate Slider Mobile
+        price_unit: 200.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_newchocolateslidermobile0
+        product_uos_qty: 500.0
+        type: make_to_order
+      - name: LG Viewty Smart
+        price_unit: 170.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_lgviewtysmart0
+        product_uos_qty: 500.0
+        th_weight: 0.0
+        type: make_to_order      
+    order_policy: manual
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  I confirm the Sale Order.
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
+-
+  I create an invoice on sale order line. 
+- 
+  !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_0}:
+    {}
+- 
+  invoice is created for specific sale order line.
+- 
+  !python {model: sale.order.line.make.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+    sol = so.order_line[0]    
+    self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_0")], {"lang":
+      'en_US', "active_model": "sale.order.line", "active_ids": [ref(sol.id)], "tz":
+      False, "active_id": ref(sol.id), })
+-
+  I verify that invoice regarding sale order line has been created.
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so3"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 4bf3074db54..195931ecb04 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -20,22 +20,12 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-import wizard
+from tools.translate import _
 import netsvc
-import ir
-import pooler
 
 class sale_order_line_make_invoice(osv.osv_memory):
     _name = "sale.order.line.make.invoice"
     _description = "Sale OrderLine Make_invoice"
-    _columns = {
-        'grouped': fields.boolean('Group the invoices'),
-    }
-    _default = {
-        'grouped' : lambda *a: False
-    }
-
     def make_invoices(self, cr, uid, ids, context):
         """ 
              To make invoices.
@@ -82,7 +72,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 'currency_id' : order.pricelist_id.currency_id.id,
                 'comment': order.note,
                 'payment_term': pay_term,
-                'fiscal_position': order.partner_id.property_account_position.id
+                'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
             }
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
             return inv_id
@@ -110,6 +100,8 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
                 sales_order_obj.write(cr,uid,[line.order_id.id],{'state' : 'progress'})
 
+        if not invoices:
+            raise osv.except_osv(_('Warning'),_('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
         for result in invoices.values():
             order = result[0][0].order_id
             il = map(lambda x: x[1], result)
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 90bdf2a6828..436fabc91fc 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -8,8 +8,6 @@
             <field name="arch" type="xml">
              <form string="Create invoices">
     			<separator colspan="4" string="Do you really want to create the invoices ?" />
-    			<field name="grouped" />
-             	<separator string="" colspan="6" />
               	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                	<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
              </form>
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index c5d7bbaceea..5ea01b1db6c 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -34,14 +34,19 @@ class sale_make_invoice(osv.osv_memory):
     _default = {
         'grouped' : lambda *a: False
     }
-
+    def view_init(self, cr, uid, fields_list, context=None):
+        record_id = context and context.get('active_id', False)     
+        order = self.pool.get('sale.order').browse(cr, uid, record_id)
+        if order.state=='draft':
+            raise osv.except_osv(_('Warning !'),'You can not create invoice when sale order is not confirmed.')
+        return False
     def make_invoices(self, cr, uid, ids, context={}):
         order_obj = self.pool.get('sale.order')
         newinv = []
         data=self.read(cr,uid,ids)[0]
         order_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data['grouped'],date_inv = data['invoice_date'])
+        wf_service = netsvc.LocalService("workflow")
         for id in context.get(('active_ids'),[]):
-            wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
             
         for o in order_obj.browse(cr, uid, context.get(('active_ids'),[]), context):
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 2d5320d1ff6..2861a046205 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -22,10 +22,6 @@ from osv import fields, osv
 from service import web_services
 from tools.translate import _
 import ir
-import netsvc
-import pooler
-
-
 
 class sale_advance_payment_inv(osv.osv_memory):
     _name = "sale.advance.payment.inv"
@@ -95,7 +91,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                     'currency_id' :sale.pricelist_id.currency_id.id,
                     'comment': '',
                     'payment_term':sale.payment_term.id,
-                    'fiscal_position': sale.partner_id.property_account_position.id
+                    'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id
                     }
                 
                 inv_id = inv_obj.create(cr, uid, inv)
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 613d8af7b7a..14c1a07e336 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -23,7 +23,6 @@ from osv import osv,fields
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
-    _description = 'Sale orders'
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 535dbd39a68..7a8cd419718 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -34,8 +34,7 @@
         <field name="inherit_id" ref="sale.view_sales_order_filter"/>
         <field name="arch" type="xml">
             <field name="date_order" position="after">
-            <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Section" groups="base.group_extended">
-
+            <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sale Team" groups="base.group_extended">
                     <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             groups="base.group_extended"
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 780634e62e4..1a1d2387da9 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -44,7 +44,7 @@ sale_fields = {
         'relation': 'res.partner',
         'help': 'Use this partner if there is no partner on the case'},
     'picking_policy': {'string': 'Picking Policy', 'type': 'selection',
-        'selection': [('direct','Direct Delivery'),('one','All at once')]},
+        'selection': [('direct', 'Partial Delivery'), ('one', 'Complete Delivery')]},
     'products': {'string': 'Products', 'type': 'many2many',
         'relation': 'product.product'},
     'analytic_account': {'string': 'Analytic Account', 'type': 'many2one',
@@ -116,14 +116,19 @@ class make_sale(wizard.interface):
 
             if data['form']['analytic_account']:
                 vals['project_id'] = data['form']['analytic_account']
+                
+            vals.update( sale_obj.onchange_partner_id(cr, uid, [], partner_id).get('value',{}) )
             new_id = sale_obj.create(cr, uid, vals)
-            for product_id in data['form']['products'][0][2]:
-                value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
-                        product_id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value']
-                value['product_id'] = product_id
-                value['order_id'] = new_id
-                value['tax_id'] = [(6,0,value['tax_id'])]
-                sale_line_obj.create(cr, uid, value)
+            if data['form']['products']:
+                for product_id in data['form']['products'][0][2]:
+                    value = {
+                    'price_unit': 0.0,
+                    'product_id': product_id,
+                    'order_id': new_id,
+                        }
+                    value.update( sale_line_obj.product_id_change(cr, uid, [], pricelist,product_id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value'] )
+                    value['tax_id'] = [(6,0,value['tax_id'])]
+                    sale_line_obj.create(cr, uid, value)
 
             case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
             new_ids.append(new_id)
@@ -161,7 +166,7 @@ class make_sale(wizard.interface):
         'init': {
             'actions': [_selectPartner],
             'result': {'type': 'form', 'arch': sale_form, 'fields': sale_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('order', 'Create Quote', 'gtk-go-forward')]}
+                'state' : [('end', 'Cancel', 'gtk-cancel'),('order', 'Create', 'gtk-apply')]}
         },
         'order': {
             'actions': [],
diff --git a/addons/sale_delivery_report/report/shipping.rml b/addons/sale_delivery_report/report/shipping.rml
index f0fd5fa282a..79a44933935 100644
--- a/addons/sale_delivery_report/report/shipping.rml
+++ b/addons/sale_delivery_report/report/shipping.rml
@@ -201,7 +201,7 @@
             <para style="terp_default_9">[[line.product_id.code ]] [[ line.product_id and line.product_id.name or '']]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ (line.prodlot_id and (line.prodlot_id.name + '/' + line.prodlot_id.ref)) or ' ' ]]</para>
+            <para style="terp_default_Centre_9">[[ (line.prodlot_id and (line.prodlot_id.name + (line.prodlot_id.ref and ('/' + line.prodlot_id.ref) or ''))) or ' ' ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty) ]]</para>
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 37e7e4846c1..f6b59668150 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -57,7 +57,6 @@
         <field name="arch" type="xml">
             <search string="Picking Journal">
                 <group col="8" colspan="4">
-                    <filter icon="terp-hr" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
                     <filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
@@ -73,6 +72,7 @@
         <field name="res_model">sale_journal.picking.journal</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_picking_journal_search"/>
     </record>
 
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index c041a934274..8b636241285 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -25,7 +25,7 @@ import time
 
 class sale_journal_invoice_type(osv.osv):
     _name = 'sale_journal.invoice.type'
-    _description = 'Invoice Types'
+    _description = 'Invoice Type'
     _columns = {
         'name': fields.char('Invoice Type', size=64, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the invoice type without removing it."),
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 23142c3fcaa..c1e415b8833 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -99,7 +99,6 @@
         <field name="arch" type="xml">
             <search string="Sales by Journal">
             	<group col="8" colspan="4">
-	            	<filter icon="terp-sale" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
 	               	<filter icon="terp-sale" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
 	               	<separator orientation="vertical"/>
 	                <field name="name"/>
@@ -115,6 +114,7 @@
         <field name="res_model">sale_journal.sale.journal</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_sale_journal_search"/>
     </record>
 
diff --git a/addons/scrum/i18n/fr.po b/addons/scrum/i18n/fr.po
index 5dd1943ab4a..9d1982fc341 100644
--- a/addons/scrum/i18n/fr.po
+++ b/addons/scrum/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 13:49+0000\n"
-"Last-Translator: nel <nel@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-22 09:49+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-05-23 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
@@ -29,7 +29,7 @@ msgstr "Nom du Rendez-vous"
 #. module: scrum
 #: model:process.transition,note:scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "Créer une tâche à partir du référentiel"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task4
@@ -46,17 +46,17 @@ msgstr "Mes Sprints Ouverts (Directeur de Produit)"
 #. module: scrum
 #: model:process.node,note:scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "Créer une tâche à partir des référentiels"
 
 #. module: scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action"
 
 #. module: scrum
 #: model:ir.module.module,shortdesc:scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "Scrum, méthode de développement agile"
 
 #. module: scrum
 #: field:scrum.project,progress_rate:0
@@ -69,6 +69,8 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Le temps restant total peut être réévalué périodiquement par le prescripteur "
+"de la tâche."
 
 #. module: scrum
 #: field:scrum.project,child_id:0
@@ -88,7 +90,7 @@ msgstr "Est-ce que l'estimation du Retard du Sprint est correcte ?"
 #. module: scrum
 #: field:scrum.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Membres du projet"
 
 #. module: scrum
 #: view:scrum.project:0
@@ -106,6 +108,8 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"L'entête est ajouté au début de l'email pour que le message d'avertissement "
+"soit envoyer au client lorsque la tâche est fermé."
 
 #. module: scrum
 #: field:scrum.task,priority:0
@@ -127,6 +131,8 @@ msgstr "Voir le Retard du Projet"
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
+"Membre du projet. Non utilisé dans aucun calcul, juste proposer à titre "
+"d'information"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
@@ -150,6 +156,8 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Temps estimé pour réaliser la tâche, habituellement fixé par le responsable "
+"du projet quand la tâche est à l'état brouillon"
 
 #. module: scrum
 #: field:scrum.project,notes:0
@@ -175,6 +183,8 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
+"Si vous cochez ce champs, le responsable du projet recevra une requête "
+"chaque fois qu'une tâche est completé par son équipe."
 
 #. module: scrum
 #: selection:scrum.project,state:0
@@ -190,7 +200,7 @@ msgstr "Nom de l'équipe"
 #. module: scrum
 #: field:scrum.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "En-tête de courrier"
 
 #. module: scrum
 #: field:scrum.project,sprint_size:0
@@ -205,7 +215,7 @@ msgstr "Date de fin"
 #. module: scrum
 #: help:scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Calculé en utilisant la somme du travail de tâche effectuée."
 
 #. module: scrum
 #: help:scrum.project,warn_customer:0
@@ -213,6 +223,8 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Si vous cochez la case, l'utilisateur verra un menu surgissant quand une "
+"tâche sera fermé proposant un message pour envoyer un mail au client."
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_task_open
@@ -239,7 +251,7 @@ msgstr "Date limite"
 #: field:scrum.project,partner_id:0
 #: field:scrum.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: scrum
 #: field:scrum.product.backlog,planned_hours:0
@@ -251,7 +263,7 @@ msgstr "Heures planifiés"
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Modèle"
 
 #. module: scrum
 #: field:scrum.product.backlog,priority:0
@@ -268,11 +280,12 @@ msgstr "État"
 #: help:scrum.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Pourcentage des tâches fermés en accord avec le total des tâches à faire."
 
 #. module: scrum
 #: help:scrum.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Description interne du projet"
 
 #. module: scrum
 #: field:scrum.sprint,meetings_id:0
@@ -282,7 +295,7 @@ msgstr "Scrum Journalier"
 #. module: scrum
 #: help:scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Calculer comme: Temps passé + Temps restant"
 
 #. module: scrum
 #: field:scrum.task,type:0
@@ -292,7 +305,7 @@ msgstr "Type"
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "Données Scrum"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
@@ -303,7 +316,7 @@ msgstr "Moyenne"
 #. module: scrum
 #: field:scrum.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Temps Total"
 
 #. module: scrum
 #: model:ir.ui.menu,name:scrum.next_id_67
@@ -356,7 +369,7 @@ msgstr "Voir les tâches du projet"
 #. module: scrum
 #: field:scrum.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Delais en heures"
 
 #. module: scrum
 #: field:scrum.project,contact_id:0
@@ -392,18 +405,18 @@ msgstr "Créer tâches"
 #. module: scrum
 #: field:scrum.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progression (%)"
 
 #. module: scrum
 #: help:scrum.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Calculer comme: Temps passé / Temps total"
 
 #. module: scrum
 #: field:scrum.project,scrum:0
 #: field:scrum.task,scrum:0
 msgid "Is Scrum"
-msgstr ""
+msgstr "Est Scrum"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
@@ -482,7 +495,7 @@ msgstr "Mes Tâches Ouvertes"
 #. module: scrum
 #: field:scrum.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Responsable du projet"
 
 #. module: scrum
 #: selection:scrum.project,state:0
@@ -511,13 +524,13 @@ msgstr "Sprints Ouverts"
 #. module: scrum
 #: field:scrum.project,effective_hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Temps écoulé"
 
 #. module: scrum
 #: field:scrum.project,complete_name:0
 #: field:scrum.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Nom du Projet"
 
 #. module: scrum
 #: field:scrum.project,product_owner_id:0
@@ -561,6 +574,9 @@ msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
 msgstr ""
+"Calculer comme: Temps total - Temps estimé. Cela donne la différence de "
+"temps estimé par le responsable projet et le temps réel pour fermer cette "
+"tâche."
 
 #. module: scrum
 #: field:scrum.task,timebox_id:0
@@ -576,7 +592,7 @@ msgstr "Sprints Brouillon"
 #. module: scrum
 #: field:scrum.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Temps de travail"
 
 #. module: scrum
 #: field:scrum.task,work_ids:0
@@ -591,7 +607,7 @@ msgstr "Voir les retards du sprint"
 #. module: scrum
 #: field:scrum.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Déléguer à"
 
 #. module: scrum
 #: field:scrum.task,date_close:0
@@ -611,7 +627,7 @@ msgstr "Retard Correct"
 #. module: scrum
 #: help:scrum.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
+msgstr "Total des heures passés de toutes les tâches reliés à ce projet"
 
 #. module: scrum
 #: help:scrum.task,project_id:0
@@ -619,16 +635,18 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Si vous avez [?] dans le nom du projet, cela signifie que vous n'avez pas de "
+"compte analytique lié à ce projet"
 
 #. module: scrum
 #: help:scrum.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
+msgstr "Somme des tâches planifiés de toutes les tâches relier à ce projet."
 
 #. module: scrum
 #: field:scrum.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Avertir le partenaire"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
@@ -648,6 +666,10 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Lier ce projet à un compte analytique si vous souhaitez une gestion "
+"financière sur les projets. Il vous active la gestion des projets avec les "
+"budgets, agenda, coût, analyse de revenu, feuilles de temps sur le projet, "
+"etc."
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
@@ -680,12 +702,12 @@ msgstr "Heures effectives"
 #. module: scrum
 #: field:scrum.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Avertir le responsable"
 
 #. module: scrum
 #: selection:scrum.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En cours"
 
 #. module: scrum
 #: field:scrum.sprint,review:0
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 379dc66a4fd..394ea4c4219 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -44,11 +44,9 @@
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
-                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
-                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
@@ -149,13 +147,7 @@
                                 domain="[('sprint_id','=',False)]"
                                 help="Backlogs Not Assigned To Sprints."/>
                         </field>
-                        <field name="user_id" widget="selection">
-                            <filter default="1"
-                                icon="terp-project"
-                                string="My Features"
-                                domain="[('user_id','=',uid)]"
-                                help="My Backlogs"/>
-                        </field>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
@@ -173,6 +165,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">scrum.product.backlog</field>
             <field name="view_type">form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
         </record>
         <menuitem
@@ -267,17 +260,13 @@
             <field name="arch" type="xml">
                 <search string="Sprints">
                     <group col="10" colspan="4">
-                        <filter default="1" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
+                        <filter name="filter_current" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
                         <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
                         <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
-                        <field name="scrum_master_id" widget="selection">
-                            <filter icon="gtk-execute" domain="[('scrum_master_id','=',uid)]"
-                                default="1"
-                                help="My Sprints"/>
-                        </field>
+                        <field name="scrum_master_id" widget="selection"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
@@ -298,7 +287,9 @@
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_filter_current': 1}</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
+            <field name="context">{"search_default_scrum_master_id":uid}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
diff --git a/addons/smtpclient/i18n/fr.po b/addons/smtpclient/i18n/fr.po
new file mode 100644
index 00000000000..ceed71ebce5
--- /dev/null
+++ b/addons/smtpclient/i18n/fr.po
@@ -0,0 +1,871 @@
+# 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-26 06:00+0000\n"
+"PO-Revision-Date: 2010-05-22 09:14+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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-05-23 03:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,bcc:0
+msgid "BCC to"
+msgstr "Copie cachée à"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr "__number__ pour la facture / Numéro de vente"
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr "Utiliser SSL?"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Start Server"
+msgstr "Démarrer le serveur"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr "Vérifier le serveur"
+
+#. module: smtpclient
+#: field:email.smtpclient,priority:0
+msgid "Server Priority"
+msgstr "Priorité du serveur"
+
+#. module: smtpclient
+#: help:email.sendcode,init,emailto:0
+msgid "Enter the address Email where you want to get the Verification Code"
+msgstr ""
+"Saisir l'adresse email à laquelle vous voulez envoyer le code de vérification"
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Other Mail Servers"
+msgstr "Autres serveurs de courrier"
+
+#. module: smtpclient
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de modèle invalide pour la définition de l'action"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,to:0
+msgid "Mail to"
+msgstr "Envoyer par email à"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr "Erreur de message!"
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr "Nom du serveur"
+
+#. module: smtpclient
+#: field:email.smtpclient,header_ids:0
+msgid "Default Headers"
+msgstr "Entêtes de courrier par défaut"
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr "Envoyer un email"
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr "Société"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Set to Draft"
+msgstr "Mettre en brouillon"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr "Serveur déjà vérifié!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr ""
+"Échec de vérification. Merci de vérifier le serveur de configuration!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr "Erreur du serveur SMTP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,auth_type:0
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr "Type de serveur"
+
+#. module: smtpclient
+#: field:email.smtpclient,from_email:0
+msgid "Email From"
+msgstr "Email de"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr "Information utilisateur"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr "Code d'enregistrement email du serveur SMTP OpenERP!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr "Statistiques du serveur"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr "Messages"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr "Vente"
+
+#. module: smtpclient
+#: field:email.headers,value:0
+msgid "Value"
+msgstr "Valeur"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr "Permission d'accès"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_headers
+msgid "Email Headers"
+msgstr "Entêtes de courrier"
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue:0
+msgid "Queue Option"
+msgstr "Option de file d'attente"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr ""
+"Merci de configurer les messages du serveur email [Vérification / Test]"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr "Échec de vérification. Code de vérification non valide!"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
+msgid "Email History"
+msgstr "Historique des emails"
+
+#. module: smtpclient
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr "Historique du serveur"
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Yahoo!!! Server"
+msgstr "Serveur Yahoo!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,test_email:0
+msgid "Test Message"
+msgstr "Message de test"
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr "ID du serveur"
+
+#. module: smtpclient
+#: help:email.smtpclient,delete_queue_period:0
+msgid "delete emails/contents from email queue after specified no of days"
+msgstr ""
+"effacer les emails/contenu placé en attente après le nombre de jours spécifié"
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr "Nombre total"
+
+#. module: smtpclient
+#: help:email.smtpclient,process_id:0
+msgid "Mail Transport Agent Process"
+msgstr "Processus d'agent de transport email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr "__user__ pour le nom d'utilisateur"
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr "Date de création"
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr "État du serveur"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,error:0
+msgid "Last Error"
+msgstr "Dernière erreur"
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr "Envoyer un code"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,name:0
+msgid "Subject"
+msgstr "Sujet"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr "Erreur de lecture!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr "Impossible de lire les paramètres du serveur"
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+msgid "Statistics"
+msgstr "Statistiques"
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr "Email de test"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr "Serveur SMTP"
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr "Adresses email"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
+msgid "Email Server History"
+msgstr "Historique du serveur email"
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Waiting"
+msgstr "En attente"
+
+#. module: smtpclient
+#: help:email.testemail,init,emailto:0
+msgid "Enter the address Email where you want to get the Test Email"
+msgstr ""
+"Saisir l'adresse email à laquelle vous voulez recevoir l'email de test"
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr "Non vérifié"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr "Email"
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Sent"
+msgstr "Envoyé"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr "Type d'adresse"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr "Permission"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Message with All Headers"
+msgstr "Message avec entêtes complètes"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Message Headers"
+msgstr "Entêtes de message"
+
+#. module: smtpclient
+#: field:ir.actions.server,report_id:0
+msgid "Report"
+msgstr "Rapport"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Other Information"
+msgstr "Autre information"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: smtpclient
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Paramètres non valides"
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue !"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,disclaimers:0
+msgid "Disclaimers"
+msgstr "Avertissement de responsabilité limitée"
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr "Serveur"
+
+#. module: smtpclient
+#: view:res.company:0
+msgid "SMTP Settings"
+msgstr "Paramètres SMTP"
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid ""
+"The message text that will be send along with the email which is send "
+"through this server"
+msgstr "Le message texte qui sera envoyé avec l'email envoyé par ce serveur"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr "Envoyer email de test"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
+msgid "Email Queue"
+msgstr "File d'attente email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr "Information sur le serveur"
+
+#. module: smtpclient
+#: help:email.verifycode,init,code:0
+msgid "Enter the verification code thay you get in your verification Email"
+msgstr ""
+"Saisir le code de vérification que vous avez reçu dans votre email de "
+"vérification"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr "Historique du client email"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Never Delete Message"
+msgstr "Ne jamais effacer le message"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr "Email de test OpenERP!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient.queue:0
+#: field:email.smtpclient.queue,serialized_message:0
+msgid "Message"
+msgstr "Message"
+
+#. module: smtpclient
+#: field:email.smtpclient,process_id:0
+msgid "MTA Process"
+msgstr "Processus MTA"
+
+#. module: smtpclient
+#: field:email.headers,server_id:0
+#: view:email.smtpclient:0
+#: field:email.smtpclient,server:0
+#: field:email.smtpclient.queue,server_id:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+msgid "SMTP Server"
+msgstr "Serveur SMTP"
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Google Server"
+msgstr "Serveur Google"
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr "Vérifié"
+
+#. module: smtpclient
+#: help:email.smtpclient,priority:0
+msgid ""
+"Priority between 0 to 10, will be used to define the MTA process priotiry"
+msgstr ""
+"Priorité de 0 à 10, utilisé pour définir les priorités des processus MTA"
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr "Port SMTP"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Email TO Address not Defined !"
+msgstr "Adresse d'envoi non définie!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error !"
+msgstr "Erreur de serveur SMTP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,auth:0
+msgid "Use Auth"
+msgstr "Utiliser l'authentification"
+
+#. module: smtpclient
+#: field:email.smtpclient,pstate:0
+msgid "Server Statue"
+msgstr "État du serveur"
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr "Nom d'utilisateur"
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr "Vérifiez le message"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
+msgid "Email Client"
+msgstr "Client email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Disclaimers Message"
+msgstr "Message sur la limitation de garantie"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr "__code__ pour le Code de Vérification"
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Queued"
+msgstr "File d'attente"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+#: field:email.smtpclient.queue,date_create:0
+msgid "Date"
+msgstr "Date"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,cc:0
+msgid "CC to"
+msgstr "En copie à"
+
+#. module: smtpclient
+#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
+msgid ""
+"Verification Message. This is the code\n"
+"__code__ \n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"Created by user __user__"
+msgstr ""
+"Message de vérification. Ceci est le code\n"
+"__code__ \n"
+"que vous devez saisir dans le serveur email OpenERP (assistant Vérification "
+"du Serveur).\n"
+"Créé par utilisateur __utilisateur__"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
+msgid "Message Queue"
+msgstr "File d'attente des messages"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr "Défaut"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete Content After"
+msgstr "Effacer le contenu après"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr "Vous n'avez aucune permission d'accès au serveur SMTP : %s "
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr "Actif"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
+msgid "Message Queus"
+msgstr "File d'attente des messages"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#: view:email.smtpclient.queue:0
+#: selection:email.smtpclient.queue,state:0
+#, python-format
+msgid "Error"
+msgstr "Erreur"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr "Erreur serveur !"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Clear All After"
+msgstr "Tout effacer après"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Please verify Email Server, without verification you can not send Email(s)."
+msgstr ""
+"Merci de vérifier votre serveur email, sans vérification vous ne pouvez pas "
+"envoyer d'email(s)."
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+msgid "History"
+msgstr "Historique"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,priority:0
+msgid "Message Priority"
+msgstr "Priorité du message"
+
+#. module: smtpclient
+#: field:ir.actions.server,file_ids:0
+msgid "Attachments"
+msgstr "Fichiers attachés"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr "__name__ pour le Nom du Client"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "General"
+msgstr "Général"
+
+#. module: smtpclient
+#: field:email.headers,key:0
+msgid "Header"
+msgstr "Entête"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Verification Message. This is the code\n"
+"\n"
+"__code__\n"
+"\n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"\n"
+"Created by user __user__"
+msgstr ""
+"Message de vérification. Voici le code\n"
+"\n"
+"__code__\n"
+"\n"
+"Vous devez le copier dans le serveur de couriel d'Open ERP (Assistant de "
+"vérification).\n"
+"\n"
+"Créer par l'utilisateur __user__"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr "Code de vérification"
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue_period:0
+msgid "Delete after"
+msgstr "Effacer après"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server is not Verified, Please Verify the Server !"
+msgstr "Le serveur n'est pas vérifié, merci de vérifier le serveur!"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr "ID de la ressource"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Data Error !"
+msgstr "Erreur de données SMTP !"
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+"caractères spéciaux !"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete when Email Sent"
+msgstr "Effacer une fois l'email envoyé"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr "Compte"
+
+#. module: smtpclient
+#: model:ir.module.module,description:smtpclient.module_meta_information
+msgid ""
+"Email Client module that provides:\n"
+"    Sending Email\n"
+"    Use Multiple Server\n"
+"    Multi Threading\n"
+"    Multi Attachment\n"
+"    "
+msgstr ""
+"Module de client email qui permet d' :\n"
+"    Envoyer des emails\n"
+"    Utiliser plusieurs serveurs\n"
+"    Utiliser plusieurs files d'envoi (multi-threading)\n"
+"    Envoyer plusieurs fichiers attachés\n"
+"    "
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr "Stock"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr "Description"
+
+#. module: smtpclient
+#: field:email.smtpclient,code:0
+#: wizard_field:email.verifycode,init,code:0
+msgid "Verification Code"
+msgstr "Code de vérifcation"
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Stop"
+msgstr "Arrêter"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,body:0
+msgid "Email Text"
+msgstr "Texte de l'email"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr "Livraison"
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Running"
+msgstr "En cours"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Last Error occured"
+msgstr "Dernière erreur apparu"
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr "En attente de vérification"
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr "Mot de passe"
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr "Utilisateurs authorisés"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#, python-format
+msgid "Verification Code Already Generated !"
+msgstr "Génération du code de vérification déjà effectuée!"
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: field:email.smtpclient,email:0
+#: wizard_field:email.testemail,init,emailto:0
+#: view:res.company:0
+#: field:res.company.address,email:0
+msgid "Email Address"
+msgstr "Adresse courriel"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr "Message de vérification"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Stop Server"
+msgstr "Arrêter le serveur"
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Email Servers"
+msgstr "Serveurs email"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr "Envoyer le code de vérification"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+msgid "Model"
+msgstr "Modèle"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+#: field:ir.actions.server,email_server:0
+msgid "Email Server"
+msgstr "Serveur de couriel"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr "Erreur de permission !"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr "res.company.address"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,state:0
+msgid "Message Status"
+msgstr "État du message"
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index a48c0569f95..a0eb329b4e2 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:47+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-05-18 13:12+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@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-04-17 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -115,13 +115,13 @@ msgstr "Import"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr "Productes rebuts"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "Productes entrants"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -268,7 +268,7 @@ msgstr "STOCK_GOTO_FIRST"
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 msgid "Internal Moves"
-msgstr "Moviments interns"
+msgstr "Albarans interns"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
@@ -1432,7 +1432,7 @@ msgstr "Data prevista"
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr "Productes sortints"
+msgstr "Albarans de sortida"
 
 #. module: stock
 #: selection:stock.location,icon:0
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 3673eeebe69..563a23a48e9 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-29 11:22+0000\n"
-"Last-Translator: Shay <Unknown>\n"
+"PO-Revision-Date: 2010-05-18 13:11+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -120,7 +121,7 @@ msgstr "Productos recibidos"
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "Productos entrantes"
+msgstr "Albaranes de entrada"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -267,7 +268,7 @@ msgstr "STOCK_GOTO_FIRST"
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 msgid "Internal Moves"
-msgstr "Movimientos internos"
+msgstr "Albaranes internos"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
@@ -1448,7 +1449,7 @@ msgstr "Fecha prevista"
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr "Productos salientes"
+msgstr "Albaranes de salida"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2287,8 +2288,8 @@ msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
 msgstr ""
-"Fecha fijada para el movimiento de productos o fecha real si el movimiento "
-"ha sido realizado"
+"Fecha programada para el movimiento de productos o fecha real si el "
+"movimiento ha sido realizado."
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 9d0c7b40248..26c85ca75c7 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-25 14:13+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-05-21 10:35+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -66,7 +66,7 @@ msgstr "Nom de modèle non valide dans la définition de l'action."
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 #: model:ir.ui.menu,name:stock.menu_stock_root
 msgid "Inventory Management"
-msgstr ""
+msgstr "Gestion des inventaires"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -86,7 +86,7 @@ msgstr "STOCK_MEDIA_FORWARD"
 #. module: stock
 #: rml:lot.location:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -300,7 +300,7 @@ msgstr "Commande(Origine)"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: stock
 #: view:stock.location:0
@@ -677,7 +677,7 @@ msgstr "Date d'envoi prévue"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "Adresse de livraison"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -744,7 +744,7 @@ msgstr "Depuis"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "weight"
-msgstr ""
+msgstr "poids"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -1391,7 +1391,7 @@ msgstr "État de la facturation"
 #. module: stock
 #: rml:lot.location:0
 msgid "Units"
-msgstr ""
+msgstr "Unités"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1641,7 +1641,7 @@ msgstr "Incoterms"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1703,7 +1703,7 @@ msgstr "Magasin"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Done"
-msgstr "Terminer"
+msgstr "Terminé"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
@@ -2275,6 +2275,8 @@ msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
 msgstr ""
+"Date prévisionnelle pour le mouvement du produit ou la date réelle si le "
+"mouvement est terminé."
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 942cb5d0730..a4406384e8e 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-26 17:56+0000\n"
+"PO-Revision-Date: 2010-05-21 08:22+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -126,7 +126,7 @@ msgstr "Przyjmowanie produktów"
 #: field:stock.picking,name:0
 #: field:stock.tracking,serial:0
 msgid "Reference"
-msgstr "Odnośnik"
+msgstr "Numer"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,group:0
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index da1dd27ff14..3e7fe147c73 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -22,6 +22,7 @@
 from osv import osv, fields
 from tools.translate import _
 import tools
+from tools.sql import drop_view_if_exists
 
 #
 # Check if it works with UoM ???
@@ -38,7 +39,7 @@ class stock_report_prodlots(osv.osv):
     }
     
     def init(self, cr):
-        tools.drop_view_if_exists(cr, 'stock_report_prodlots')
+        drop_view_if_exists(cr, 'stock_report_prodlots')
         cr.execute("""
             create or replace view stock_report_prodlots as (
                 select max(id) as id,
@@ -94,7 +95,7 @@ class stock_report_tracklots(osv.osv):
     }
     
     def init(self, cr):
-        tools.drop_view_if_exists(cr, 'stock_report_tracklots')
+        drop_view_if_exists(cr, 'stock_report_prodlots')
         cr.execute("""
            create or replace view stock_report_tracklots as (
                 
@@ -149,7 +150,7 @@ class report_stock_lines_date(osv.osv):
         'date': fields.datetime('Latest Inventory Date'),
     }
     def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_stock_lines_date')
+        drop_view_if_exists(cr, 'stock_report_prodlots')
         cr.execute("""
             create or replace view report_stock_lines_date as (
                 select
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
index 7f4ac801399..b6e2a3d3373 100644
--- a/addons/stock/report/report_stock_picking.py
+++ b/addons/stock/report/report_stock_picking.py
@@ -30,17 +30,30 @@ class report_stock_picking(osv.osv):
         '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),
         'day': fields.char('Day', size=128, readonly=True),
-        'reference': fields.char('Reference', size=64, select=True),
         'nbr': fields.integer('# of Lines', readonly=True),
         'nbp': fields.integer('# of Picking', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_qty': fields.float('# of Products', readonly=True),
+        'product_uos_qty': fields.float('# of Products', readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'date': fields.date('Date', readonly=True),
         'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of  Avg Days to deliver"),
-        'origin': fields.char('Origin', size=64),
         'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
         'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'invoice_state': fields.selection([
+            ("invoiced", "Invoiced"),
+            ("2binvoiced", "To Be Invoiced"),
+            ("none", "Not from Picking")], "Invoice Status",readonly=True),
+        'min_date': fields.date('Expected Date',help="Expected date for Picking. Default it takes current date"),
+        'order_date': fields.date('Order Date', help="Date of Order"),
+        'date_done': fields.date('Date Done', help="Date of completion"),
+        'location_id': fields.many2one('stock.location', 'Source Location', help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', help="Location where the system will stock the finished products."),
+        'max_date': fields.date('Max.Expected Date'),
+        'product_uos': fields.many2one('product.uom', 'Product UOS'),
+        'product_uom': fields.many2one('product.uom', 'Product UOM'),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_picking')
@@ -48,6 +61,10 @@ class report_stock_picking(osv.osv):
             create or replace view report_stock_picking as (
                 select
                     min(sm.id) as id,
+                    date_trunc('day',sp.min_date) as min_date,
+                    date_trunc('day',sp.date) as order_date,
+                    date_trunc('day',sp.date_done) as date_done,
+                    date_trunc('day',sp.max_date) as max_date,
                     to_char(sp.create_date, 'YYYY') as year,
                     to_char(sp.create_date, 'MM') as month,
                     to_char(sp.create_date, 'YYYY-MM-DD') as day,
@@ -56,19 +73,37 @@ class report_stock_picking(osv.osv):
                     count(sm.id) as nbr,
                     count(distinct sp.id) as nbp,
                     sum(sm.product_qty) as product_qty,
+                    sum(sm.product_uos_qty) as product_uos_qty,
+                    sm.product_id as product_id,
+                    sm.location_dest_id as location_dest_id,
+                    sm.location_id as location_id,
                     sp.type,
-                    sp.name as reference,
-                    sp.origin,
+                    sm.product_uos,
+                    sm.product_uom,
+                    sp.invoice_state,
+                    sp.company_id as company_id,
                     avg(extract('epoch' from (sp.date_done-sp.create_date)))/(3600*24) as  avg_days_to_deliver,
                     sp.state
                 from stock_move as sm
                 left join stock_picking as sp ON (sm.picking_id=sp.id)
                 group by sp.type,
-                     sp.create_date,
-                     sp.address_id,
-                     sp.name,
-                     sp.origin,
-                     sp.state
+                         sp.create_date,
+                         sp.address_id,
+                         sm.product_id,
+                         to_char(sp.create_date, 'YYYY'),
+                         sm.location_dest_id,
+                         sm.location_id,
+                         to_char(sp.create_date, 'MM'),
+                         to_char(sp.create_date, 'YYYY-MM-DD'),
+                         sm.product_uos,
+                         sm.product_uom,
+                         date_trunc('day',sp.min_date),
+                         date_trunc('day',sp.date),
+                         date_trunc('day',sp.date_done),
+                         date_trunc('day',sp.max_date),
+                         sp.invoice_state,
+                         sp.company_id,
+                         sp.state
 
             )""")
 report_stock_picking()
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index d4116313a7e..62d1b06fd19 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -15,15 +15,20 @@
                		<field name="month" invisible="1"/>
                		<field name="day" invisible="1"/>
                		<field name="date" invisible="1"/>
-					<field name="reference" invisible="1"/>
+					<field name="company_id" invisible="1"/>
 					<field name="partner_id" invisible="1"/>
-					<field name="origin" invisible="1"/>
+					<field name="product_id" invisible="1"/>
+					<field name="min_date" invisible="1"/>
+					<field name="order_date" invisible="1"/>
+					<field name="date_done" invisible="1"/>
+					<field name="max_date" invisible="1"/>
 					<field name="type" invisible="1"/>
+					<field name="invoice_state" invisible="1"/>
 					<field name="state" invisible="1"/>
 					<field name="product_qty" sum="# of Products" />
 					<field name="nbp" sum="# of Pickings" />
 					<field name="nbr" sum="# of Lines" />
-			        <field name="avg_days_to_deliver" sum='Avg Days to Deliver'/>
+			        <field name="avg_days_to_deliver" avg='Avg Days to Deliver'/>
 				</tree>
             </field>
         </record>
@@ -49,29 +54,43 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter icon="terp-stock" string="This Year"
+                   		<filter icon="terp-stock" string="Last 365 Days"
 	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Picking in this year"/>
-	                	<filter icon="terp-stock" string="This Month"
+	                    	    help="Picking in last 365 days"/>
+	                	<filter icon="terp-stock" string="Last 30 Days"
 	                			name="month"
 	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                			help="Picking in this month"/>
+	                			help="Picking in last 30 days"/>
                         <separator orientation="vertical"/>
                         <filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
                         <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
 						<separator orientation="vertical"/>
 						<field name="partner_id"/>
-						<field name="reference" />
-						<field name="origin" />
-						<field name="type" groups="base.group_extended"/>
+						<field name="company_id" groups="base.group_extended" widget="selection"/>
                    </group>
+                   <newline/>
+                	<group expand="0" string="Extended options..." colspan="10" col="12">
+                		<field name="type"/>
+                		<separator orientation="vertical"/>
+                		<field name="min_date"/>
+                		<separator orientation="vertical"/>
+                		<field name="max_date"/>
+	                    <newline/>
+	                    <field name="invoice_state"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="order_date"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="date_done"/>
+                	</group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="5">
                         <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
                     	<separator orientation="vertical"/>
-                    	<filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
-                    	<filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
+                    	<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                    	<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                    	<filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
                     	<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
                     	<filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 91941341ccf..ca36c8460a7 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -37,7 +37,6 @@
 "access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0
 "access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,0,0,0
 "access_stock_delivery","stock.delivery","model_stock_delivery","stock.group_stock_user",1,0,0,0
-
 "access_stock_traceability_upstream","stock.traceability.upstream","model_stock_traceability_upstream","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_downstream","stock.traceability.downstream","model_stock_traceability_downstream","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_lot_upstream","stock.traceability.lot.upstream","model_stock_traceability_lot_upstream","stock.group_stock_user",1,0,0,0
@@ -45,4 +44,5 @@
 "access_stock_partial_picking",stock.partial.picking","model_stock_partial_picking","stock.group_stock_user",1,0,0,0
 "access_stock_partial_move","stock.partial.move","model_stock_partial_move","stock.group_stock_user",1,0,0,0
 "access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
-"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
\ No newline at end of file
+"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
+"access_action_traceability","action.traceability","model_action_traceability","stock.group_stock_user",1,0,0,0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 17ad742fb7f..27930c8a3e7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -351,20 +351,18 @@ class stock_tracking(osv.osv):
     _name = "stock.tracking"
     _description = "Stock Tracking Lots"
     
-    def get_create_tracking_lot(self, cr, uid, ids, context):
-        tracking_id = context.get('tracking_id', False)
-        tracking_id_list = self.search(cr, uid, [('name', '=', tracking_id)],
+    def get_create_tracking_lot(self, cr, uid, ids, tracking_lot):
+        tracking_lot_list = self.search(cr, uid, [('name', '=', tracking_lot)],
                                             limit=1)
-        if tracking_id_list:
-            tracking_id = tracking_id_list[0]
-        tracking_obj = self.browse(cr, uid, tracking_id)
+        if tracking_lot_list:
+            tracking_lot = tracking_lot_list[0]
+        tracking_obj = self.browse(cr, uid, tracking_lot)
         if not tracking_obj:
             tracking_lot_vals = {
-                'name': tracking_id
+                'name': tracking_lot
                 }
-            tracking_id = self.create(cr, uid, tracking_lot_vals,
-                    context=context)
-        return tracking_id
+            tracking_lot = self.create(cr, uid, tracking_lot_vals)
+        return tracking_lot
     def checksum(sscc):
         salt = '31' * 8 + '3'
         sum = 0
@@ -473,7 +471,15 @@ class stock_picking(osv.osv):
     def create(self, cr, user, vals, context=None):
         if ('name' not in vals) or (vals.get('name')=='/'):
             vals['name'] = self.pool.get('ir.sequence').get(cr, user, 'stock.picking')
-
+        type_list = {
+            'out':_('Packing List'),
+            'in':_('Reception'),
+            'internal': _('Internal picking'),
+            'delivery': _('Delivery order')
+        }
+        if not vals.get('auto_picking', False):
+            message = type_list.get(vals.get('type',_('Picking'))) + " '" + vals['name'] + "' "+ _("created.")
+            self.log(cr, user, id, message)
         return super(stock_picking, self).create(cr, user, vals, context)
 
     _columns = {
@@ -546,7 +552,7 @@ class stock_picking(osv.osv):
     def action_confirm(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'confirmed'})
         todo = []
-        for picking in self.browse(cr, uid, ids):
+        for picking in self.browse(cr, uid, ids, context=context):
             for r in picking.move_lines:
                 if r.state == 'draft':
                     todo.append(r.id)
@@ -613,7 +619,16 @@ class stock_picking(osv.osv):
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
 
-    def action_assign_wkf(self, cr, uid, ids):
+    def action_assign_wkf(self, cr, uid, ids, context=None):
+        for pick in self.browse(cr, uid, ids, context=context):
+            type_list = {
+                'out':'Packing List',
+                'in':'Reception',
+                'internal': 'Internal picking',
+                'delivery': 'Delivery order'
+            }
+            message = type_list.get(pick.type, _('Document')) + " '" + pick.name + "' "+ _("is ready to be processed.")
+            self.log(cr, uid, id, message)
         self.write(cr, uid, ids, {'state': 'assigned'})
         return True
 
@@ -875,15 +890,23 @@ class stock_picking(osv.osv):
         return True
 
     def unlink(self, cr, uid, ids, context=None):
+        move_obj = self.pool.get('stock.move')
+        if not context:
+            context = {}
+            
         for pick in self.browse(cr, uid, ids, context=context):
             if pick.state in ['done','cancel']:
                 raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state !')%(pick.state,))
-            elif pick.state in ['confirmed','assigned']:
+            elif pick.state in ['confirmed','assigned', 'draft']:
                 ids2 = [move.id for move in pick.move_lines]
-                context.update({'call_unlink':True})
-                self.pool.get('stock.move').action_cancel(cr, uid, ids2, context)
-            else:
-                continue
+                ctx = context.copy()
+                ctx.update({'call_unlink':True})
+                if pick.state != 'draft':
+                    #Cancelling the move in order to affect Virtual stock of product
+                    move_obj.action_cancel(cr, uid, ids2, ctx)
+                #Removing the move
+                move_obj.unlink(cr, uid, ids2, ctx)
+                    
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
     def do_partial(self, cr, uid, ids, partial_datas, context={}):
@@ -1159,6 +1182,7 @@ class stock_move(osv.osv):
         return (res and res[0]) or False
     _name = "stock.move"
     _description = "Stock Move"
+    _log_create = False
 
     def name_get(self, cr, uid, ids, context={}):
         res = []
@@ -1283,6 +1307,11 @@ class stock_move(osv.osv):
     def create(self, cr, user, vals, context=None):
         if vals.get('move_stock_return_history',False):
             vals['move_stock_return_history'] = []
+        # Check that the stock.move is in draft state at creation to force
+        # passing through button_confirm
+        if vals.get('state','draft') not in ('draft','done','waiting'):
+            logger = netsvc.Logger()
+            logger.notifyChannel("code", netsvc.LOG_WARNING, "All new stock.move must be in state draft at the creation !")
         return super(stock_move, self).create(cr, user, vals, context)
 
     def _auto_init(self, cursor, context):
@@ -1619,15 +1648,15 @@ class stock_move(osv.osv):
                         'line_id': lines,
                         'ref': ref,
                     })
-        tracking_id = False                    
+        tracking_lot = False                    
         if context:
-            tracking_id = context.get('tracking_id', False)
-            if tracking_id:
+            tracking_lot = context.get('tracking_lot', False)
+            if tracking_lot:
                 rec_id = context and context.get('active_id', False)
                 tracking = self.pool.get('stock.tracking')
-                tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
+                tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)        
                  
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_id or False})
+        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_lot or False})
         picking_obj = self.pool.get('stock.picking')
         for pick in picking_obj.browse(cr, uid, picking_ids):
             if all(move.state == 'done' for move in pick.move_lines):
@@ -1639,6 +1668,8 @@ class stock_move(osv.osv):
         return True
 
     def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}        
         for move in self.browse(cr, uid, ids, context=context):
             if move.state != 'draft':
                 raise osv.except_osv(_('UserError'),
@@ -1769,7 +1800,7 @@ class stock_move(osv.osv):
 
         @ return: Consumed lines
         '''
-        if not context:
+        if context is None:
             context = {}
 
         if quantity <= 0:
@@ -1845,7 +1876,7 @@ class stock_move(osv.osv):
         partner_id = partial_datas.get('partner_id', False)
         address_id = partial_datas.get('address_id', False)
         delivery_date = partial_datas.get('delivery_date', False)
-        tracking_id = context.get('tracking_id', False)
+        tracking_lot = context.get('tracking_lot', False)
         
         new_moves = []
 
@@ -1864,7 +1895,7 @@ class stock_move(osv.osv):
             if move.product_qty == product_qty:
                 self.write(cr, uid, move.id,
                 {
-                    'tracking_id': tracking_id
+                    'tracking_id': tracking_lot
                 })
                 complete.append(move)
             elif move.product_qty > product_qty:
@@ -1910,7 +1941,7 @@ class stock_move(osv.osv):
                         'state': 'assigned',
                         'move_dest_id': False,
                         'price_unit': move.price_unit,
-                        'tracking_id': tracking_id,
+                        'tracking_id': tracking_lot,
                     })
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, move.id,
@@ -1925,7 +1956,7 @@ class stock_move(osv.osv):
                     {
                         'product_qty': move.product_qty,
                         'product_uos_qty': move.product_qty,
-                        'tracking_id': tracking_id
+                        'tracking_id': tracking_lot
                     })
             complete.append(move)
 
@@ -2050,7 +2081,7 @@ stock_inventory()
 
 class stock_inventory_line(osv.osv):
     _name = "stock.inventory.line"
-    _description = "Inventory line"
+    _description = "Inventory Line"
     _columns = {
         'inventory_id': fields.many2one('stock.inventory', 'Inventory', ondelete='cascade', select=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True),
@@ -2086,9 +2117,9 @@ class stock_warehouse(osv.osv):
 #       'partner_id': fields.many2one('res.partner', 'Owner'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1),
         'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'),
-        'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True),
-        'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True),
-        'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True),
+        'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage','<>','view')]),
+        'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','<>','view')]),
+        'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]),
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 054c56ea507..5cb543b748e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -69,7 +69,7 @@
             <field name="model">stock.inventory</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Lot Inventory" colors="grey:state in ('done', 'cancel')">
+                <tree string="Lot Inventory" colors="grey:state in ('cancel')">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="state"/>
@@ -192,9 +192,9 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree colors="grey:not active" string="Tracking Number">
-                    <field name="name" select="1"/>
-                    <field name="serial" select="1"/>
-                    <field name="date" select="1"/>
+                    <field name="name" />
+                    <field name="serial" />
+                    <field name="date" />
                 </tree>
             </field>
         </record>
@@ -307,18 +307,18 @@
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Moves">
-                    <field name="product_id" select="1"/>
-                    <field name="product_qty" select="1"/>
-                    <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
+                <tree colors="grey:state in ('cancel')" string="Moves">
+                    <field name="product_id" />
+                    <field name="product_qty" />
+                    <field name="product_uom"  string="UOM"/>
+                    <field name="prodlot_id"  groups="base.group_extended"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
-                    <field name="location_id" select="1"/>
-                    <field name="location_dest_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_planned" select="1" string="Date"/>
-                    <field name="date_expected" select="1" string="Date Expected"/>
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="date"/>
+                    <field name="date_planned" string="Date"/>
+                    <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -330,18 +330,18 @@
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Moves">
-                    <field name="product_id" select="1"/>
-                    <field name="product_qty" select="1"/>
-                    <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
+                <tree colors="grey:state in ('cancel')" string="Moves">
+                    <field name="product_id" />
+                    <field name="product_qty" />
+                    <field name="product_uom"  string="UOM"/>
+                    <field name="prodlot_id"  groups="base.group_extended"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
-                    <field name="location_id" select="1"/>
-                    <field name="location_dest_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_planned" select="1" string="Date"/>
- 					<field name="date_expected" select="1" string="Date Expected"/>                    
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="date" />
+                    <field name="date_planned" string="Date"/>
+ 					<field name="date_expected" string="Date Expected"/>                    
                     <field name="state"/>
                 </tree>
             </field>
@@ -457,7 +457,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal';black:usage not in ('view','internal')">
+                <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal'">
                     <field name="complete_name"/>
                     <field name="usage"/>
                     <field name="stock_real" invisible="'product_id' not in context"/>
@@ -582,7 +582,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
@@ -615,7 +615,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -625,7 +625,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="date_expected" select="1" string="Date Expected"/>
+                                    <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                         name="%(stock.track_line)d"
@@ -644,7 +644,7 @@
                                             <separator colspan="4" string="Move Information"/>
                                             <field name="location_id" domain="[('usage','=','internal')]"/>
                                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)" select="1"/>
                                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -652,9 +652,9 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
- 											<field name="date_expected" select="1" string="Date Expected"/>                                            
+ 											<field name="date_expected" string="Date Expected"/>                                            
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
@@ -666,7 +666,7 @@
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
-                                            <group>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
@@ -736,7 +736,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
 		    		<field name="address_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
@@ -767,7 +767,7 @@
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -777,7 +777,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
- 									<field name="date_expected" select="1" string="Date Expected"/>                                    
+ 									<field name="date_expected" string="Date Expected"/>                                    
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -796,7 +796,7 @@
                                             <separator colspan="4" string="Move Information"/>
                                             <field name="location_id" domain="[('usage','=','internal')]"/>
                                             <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -805,7 +805,7 @@
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
  											<field name="date_expected"  string="Date Expected"/>                                            
-                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
@@ -813,7 +813,7 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
-                                            <group>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
@@ -915,7 +915,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
@@ -947,7 +947,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -976,7 +976,7 @@
                                             <separator colspan="4" string="Move Information"/>
                                             <field name="location_id" domain="[('usage','=','internal')]"/>
                                             <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
                                             <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -985,7 +985,7 @@
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
  											<field name="date_expected"  string="Date Expected"/>                                            
-                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
@@ -995,7 +995,7 @@
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
-                                            <group>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
@@ -1094,7 +1094,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                <tree colors="blue:state in ('draft');grey:state in ('done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
@@ -1129,7 +1129,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
-                                <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" string="Product Unit of Measure"/>
@@ -1152,7 +1152,7 @@
                                             <separator colspan="4" string="Move Information"/>
                                             <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
                                             <field domain="[('usage','=','internal')]" name="location_dest_id" />
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1162,7 +1162,7 @@
  											<field name="date_expected" groups="base.group_extended" string="Date Expected"/>                                            
                                             <newline/>
                                             <newline/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <newline/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -1174,7 +1174,7 @@
                                             <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
-                                            <group>
+                                            <group colspan="2">
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
@@ -1312,7 +1312,7 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('done', 'cancel');black:state not in ('done', 'cancel');red:date_planned > current_date" string="Moves">
+                <tree colors="grey:state in ('cancel');red:date_planned > current_date" string="Moves">
                     <field name="name" string="Move Name"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1343,7 +1343,7 @@
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
                                 <field name="name"/>
-                                <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                                <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)"/>
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" string="Unit Of Measure" widget="selection"/>
                                 <field name="product_uos" groups="base.group_extended" />
@@ -1439,7 +1439,7 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves">
+                <tree colors="grey:state in ('cancel')" string="Moves">
                     <field name="picking_id" string="Reference"/>
                     <field name="origin" string="Latest Procurement"/>
                     <field name="partner_id" string="Supplier"/>
@@ -1470,7 +1470,7 @@
                             <separator colspan="4" string="Move Information"/>
                             <field name="location_id"/>
                             <field name="location_dest_id"/>
-                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                             <field name="product_uom"/>
                             <field name="product_uos"/>
@@ -1528,7 +1528,7 @@
                     </group>
                     <newline/>
                     <group col='8' colspan='14' expand="1" string="Tracking Lots">
-                       <field name="tracking_id" context="{'tracking_id': self}" />
+                       <field name="tracking_id" context="{'tracking_lot': self}" />
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 6a9bf3ff9f3..38ecddffb91 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -288,6 +288,7 @@
   In Order to test the picking I create picking with move lines.
 - 
   !record {model: stock.picking, id: stock_picking_0}:
+    name: test_picking
     address_id: res_partner_address_0
     company_id: base.main_company
     date: '2010-05-11 15:18:52'
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 22e48631f8b..d2b671e9571 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -41,7 +41,7 @@ class stock_invoice_onshipping(osv.osv_memory):
             'invoice_date': fields.date('Invoiced date'),
             }
 
-    def _get_type(self, cr, uid, context):
+    def _get_type(self, cr, uid, context=None):
         """ 
              To get invoice type
             
@@ -53,10 +53,12 @@ class stock_invoice_onshipping(osv.osv_memory):
              
              @return: invoice type
         
-        """                
+        """
+        if context is None:
+            context = {}     
         picking_obj = self.pool.get('stock.picking')
         usage = 'customer'
-        pick = picking_obj.browse(cr, uid, context['active_id'])
+        pick = picking_obj.browse(cr, uid, context['active_id'], context=context)
         if pick.invoice_state == 'invoiced':
             raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
         if pick.invoice_state == 'none':
@@ -112,7 +114,7 @@ class stock_invoice_onshipping(osv.osv_memory):
                   context=context)
             invoice_ids = res.values()
             if not invoice_ids:
-                raise  osv.except_osv(_('Error'), _('Invoice is not created'))
+                raise osv.except_osv(_('Error'), _('Invoice is not created'))
 
             if type == 'out_invoice':
                 xml_id = 'action_invoice_tree1'
@@ -124,12 +126,12 @@ class stock_invoice_onshipping(osv.osv_memory):
                 xml_id = 'action_invoice_tree4'
 
             result = mod_obj._get_id(cr, uid, 'account', xml_id)
-            id = mod_obj.read(cr, uid, result, ['res_id'])
-            result = act_obj.read(cr, uid, id['res_id'])
+            id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+            result = act_obj.read(cr, uid, id['res_id'], context=context)
             result['res_id'] = invoice_ids
+            result['context'] = context
             return result
 
 stock_invoice_onshipping()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index dc4e6d465db..4a5206d1ef0 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -187,11 +187,11 @@ class stock_partial_move(osv.osv_memory):
 
     def do_partial(self, cr, uid, ids, context):    
         rec_id = context and context.get('active_id', False)
-        tracking_id = context.get('tracking_id', False)
-        if tracking_id:
+        tracking_lot = context.get('tracking_lot', False)
+        if tracking_lot:
             tracking = self.pool.get('stock.tracking')
-            tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
-            context ['tracking_id'] = tracking_id 
+            tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)        
+            context ['tracking_lot'] = tracking_lot 
         move_obj = self.pool.get('stock.move')    
         move_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)
diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py
index 0092656f83d..c1354e21578 100644
--- a/addons/stock/wizard/stock_split_move.py
+++ b/addons/stock/wizard/stock_split_move.py
@@ -38,7 +38,7 @@ class stock_split_move_line(osv.osv_memory):
         res = super(stock_split_move_line, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
-        pick = pick_obj.browse(cr, uid, record_id)
+        pick = pick_obj.browse(cr, uid, record_id, context=context)
         for m in [line for line in pick.move_lines]:
             res['move%s'%(m.id)] = m.product_qty
         return res
@@ -57,7 +57,7 @@ class stock_split_move_line(osv.osv_memory):
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             try:
-                pick = pick_obj.browse(cr, uid, record_id)
+                pick = pick_obj.browse(cr, uid, record_id, context=context)
                 for m in [line for line in pick.move_lines]:
                     if 'move%s' % m.id not in self._columns:
                         self._columns['move%s' % m.id] = fields.float(string=m.product_id.name)
@@ -79,7 +79,7 @@ class stock_split_move_line(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False
         assert record_id,'Active ID not found'
         pick_obj = self.pool.get('stock.picking')
-        pick = pick_obj.browse(cr, uid, record_id)
+        pick = pick_obj.browse(cr, uid, record_id, context=context)
         arch_lst = ['<?xml version="1.0"?>', '<form string="Split lines">', '<label string="Indicate here the quantity of the new line. A quantity of zero will not split the line." colspan="4"/>']
         for m in [line for line in pick.move_lines]:
             quantity = m.product_qty
@@ -106,10 +106,10 @@ class stock_split_move_line(osv.osv_memory):
         move_obj = self.pool.get('stock.move')
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
-        pick = pick_obj.browse(cr, uid, record_id)
+        pick = pick_obj.browse(cr, uid, record_id, context=context)
         data = self.read(cr, uid, ids[0])
         move_ids = [m.id for m in [line for line in pick.move_lines]]
-        for move in move_obj.browse(cr, uid, move_ids):
+        for move in move_obj.browse(cr, uid, move_ids, context=context):
             quantity = data['move%s' % move.id]
             if 0 < quantity < move.product_qty:
                 new_qty = move.product_qty - quantity
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index 3467771b8bb..a7092e8621f 100644
--- a/addons/stock_invoice_directly/i18n/fr.po
+++ b/addons/stock_invoice_directly/i18n/fr.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\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 14:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-21 10:33+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Facture la livraison directement"
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index fa0bec2f5b1..3bdc14bce82 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -161,6 +161,7 @@ class stock_sale_forecast_createlines(osv.osv_memory):
     def create_forecast(self,cr, uid, ids, context={}):
         product_obj = self.pool.get('product.product')
         forecast_obj=self.pool.get('stock.sale.forecast')
+        mod_obj =self.pool.get('ir.model.data')
         for f in self.browse(cr, uid, ids, context):
             prod_categ_obj=self.pool.get('product.category')
             template_obj=self.pool.get('product.template')
@@ -212,11 +213,14 @@ class stock_sale_forecast_createlines(osv.osv_memory):
                         'product_uom_categ' : p.uom_id.category_id.id,
                         'product_uos_categ' : prod_uos_categ,
                      })
+        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_sale_forecast_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         return {
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.sale.forecast',
-                'type': 'ir.actions.act_window',                
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id'],                
             }
 stock_sale_forecast_createlines()
 
@@ -488,7 +492,7 @@ class stock_planning_createlines(osv.osv_memory):
     def create_planning(self,cr, uid, ids, context={}):
         product_obj = self.pool.get('product.product')
         planning_obj=self.pool.get('stock.planning')
-
+        mod_obj =self.pool.get('ir.model.data')
         for f in self.browse(cr, uid, ids, context=context):
             if f.forecasted_products:
                 cr.execute("SELECT product_id \
@@ -562,11 +566,14 @@ class stock_planning_createlines(osv.osv_memory):
                         'stock_supply_location': stock_supply_location,
 
                     })
+        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_planning_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         return {
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.planning',
-                'type': 'ir.actions.act_window',                
+                'type': 'ir.actions.act_window', 
+                'search_view_id': id['res_id'],               
             }
 stock_planning_createlines()
 
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 5a504e56322..dfca96b0163 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-        <menuitem id="menu_stock_period_main" 
-                  name="Stock and Sales Periods" 
+        <menuitem id="menu_stock_period_main"
+                  name="Stock and Sales Periods"
                   parent="base.menu_base_config"/>
 
 <!-- Creating periods section -->
@@ -15,16 +15,16 @@
                 <form string="Stock and Sales Periods">
                     <separator colspan="4" string="Create periods for Stock and Sales Planning"/>
                     <field name="date_start"/>
-                    <field name="date_stop"/>                             
-                    <separator colspan="4" string=""/>        
+                    <field name="date_stop"/>
+                    <separator colspan="4" string=""/>
                     <group col="3" colspan="4">
                         <button name="create_period" string="Create Daily Periods" type="object"/>
                         <button name="create_period_weekly" string="Create Weekly Periods" type="object"/>
                         <button name="create_period_monthly" string="Create Monthly Periods" type="object"/>
-                    </group> 
+                    </group>
                 </form>
             </field>
-        </record>      
+        </record>
 
         <record id="action_stock_period_createlines_form" model="ir.actions.act_window">
             <field name="name">Stock and Sales Planning Periods</field>
@@ -35,9 +35,9 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_stock_period_creatlines" 
-                  name="Create Stock and Sales Periods" 
-                  parent="menu_stock_period_main" 
+        <menuitem id="menu_stock_period_creatlines"
+                  name="Create Stock and Sales Periods"
+                  parent="menu_stock_period_main"
                   action="action_stock_period_createlines_form"
                   sequence = "5"/>
 
@@ -56,7 +56,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_stock_period_tree" model="ir.ui.view">
             <field name="name">stock.period.tree</field>
             <field name="model">stock.period</field>
@@ -78,7 +78,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        
+
         <menuitem
             id="menu_stock_period"
             parent="menu_stock_period_main"
@@ -107,10 +107,10 @@
                     <group colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" name="create_forecast" string="Create Forecasts" type="object" />
-                    </group>         
+                    </group>
                 </form>
             </field>
-        </record>      
+        </record>
 
         <record id="action_stock_sale_forecast_createlines_form" model="ir.actions.act_window">
             <field name="name">Create Stock and Sales Forecasts</field>
@@ -120,9 +120,9 @@
             <field name="view_id" ref="view_stock_sale_forecast_createlines_form"/>
             <field name="target">new</field>
         </record>
-        
+
         <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" parent="base.menu_base_partner"/>
-        
+
         <menuitem id="menu_stock_sale_forecast_createlines" name="Create Stock and Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
 
         <record id="view_stock_sale_forecast_form" model="ir.ui.view">
@@ -133,19 +133,19 @@
                 <form string="Stock and Sales Forecast">
                     <group colspan = "4" col = "4">
 		        <group colspan = "2" col="2" >
-                            <field name="company_id"  
-                                        groups="base.group_multi_company" 
-                                        widget="selection" 
+                            <field name="company_id" select="1"
+                                        groups="base.group_multi_company"
+                                        widget="selection"
                                         on_change="onchange_company(company_id)"/>
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="period_id" />
                             <field name="product_id" on_change="product_id_change(product_id)" />
 			    <field name="product_uom_categ"  invisible = "True"/>
 			    <field name="product_uos_categ"  invisible = "True"/>
-                            <field name="product_uom"  
+                            <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom, product_qty, active_uom)"/>
-                            <field name="active_uom" invisible = "True" />  
+                            <field name="active_uom" invisible = "True" />
 		         </group>
 		         <group colspan = "2" col="2" >
                             <field name="user_id"/>
@@ -156,7 +156,7 @@
 		        </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
-                    <group colspan = "4" col = "5"> 
+                    <group colspan = "4" col = "5">
                         <label string = " "/>
                         <label string = "Per User :"/>
                         <label string = "Per Department :"/>
@@ -166,7 +166,7 @@
                         <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
                         <field name="analyzed_dept_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
                         <field name="analyzed_warehouse_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
-                        <group colspan = "1" col = "2"> 
+                        <group colspan = "1" col = "2">
                             <field name = "analyze_company"/>
                         </group>
                         <field name = "analyzed_period1_id" nolabel = "1"  />
@@ -194,14 +194,14 @@
                         <field name = "analyzed_period5_per_dept" nolabel = "1" />
                         <field name = "analyzed_period5_per_warehouse" nolabel = "1" />
                         <field name = "analyzed_period5_per_company" nolabel = "1" />
-                        <button name="calculate_sales_history" icon="gtk-execute" 
+                        <button name="calculate_sales_history" icon="gtk-execute"
                                 string="Calculate Sales History" type="object" colspan = "1" states="draft" />
                     </group>
 
                 </form>
             </field>
         </record>
-        
+
         <record id="view_stock_sale_forecast_tree" model="ir.ui.view">
              <field name="name">stock.sale.forecast.tree</field>
             <field name="model">stock.sale.forecast</field>
@@ -217,7 +217,7 @@
                 </tree>
             </field>
         </record>
-        
+
        <record id="view_stock_sale_forecast_graph" model="ir.ui.view">
              <field name="name">stock.sale.forecast.graph</field>
             <field name="model">stock.sale.forecast</field>
@@ -240,32 +240,31 @@
                 <search string="Search Stock and Sales Forecast">
                  <group col='10' colspan='4'>
                     <filter icon="terp-purchase" string="Validated" domain="[('state','=','validated')]" separator="1"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
-                    <field name="product_id" widget="selection"/>
-                    <field name="create_uid" widget="selection">
-                        <filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Forecasts"/>
-                    </field>
+                    <field name="company_id" select="1" widget="selection"/>
+                    <field name="warehouse_id" select="1" widget="selection"/>
+                    <field name="period_id" select="1" widget="selection"/>
+                    <field name="product_id" select="1" widget="selection"/>
+                    <field name="create_uid" select="1" widget="selection"/>
                 </group>
               </search>
             </field>
         </record>
 
-        
+
         <record id="action_view_stock_sale_forecast_form" model="ir.actions.act_window">
             <field name="name">Stock and Sales Forecast</field>
             <field name="res_model">stock.sale.forecast</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_create_uid":uid}</field>
             <field name="search_view_id" ref="view_stock_sale_forecast_filter"/>
         </record>
-        
-        <menuitem id="menu_stock_sale_forecast_all" 
-                  name="Stock and Sales Forecasts" 
-                  parent="menu_stock_sale_forecast" 
+
+        <menuitem id="menu_stock_sale_forecast_all"
+                  name="Stock and Sales Forecasts"
+                  parent="menu_stock_sale_forecast"
                   action="action_view_stock_sale_forecast_form"/>
-        
+
 <!-- Create Planning section -->
 
         <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root"/>
@@ -275,7 +274,7 @@
             <field name="model">stock.planning.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Planning">                            
+                <form string="Stock Planning">
 		    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="period_id2" widget="selection"/>
@@ -290,10 +289,10 @@
                     <group colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-ok" name="create_planning" string="Create Stock Planning" type="object"/>
-                    </group>         
+                    </group>
                 </form>
             </field>
-        </record>      
+        </record>
 
         <record id="action_stock_planning_createlines_form" model="ir.actions.act_window">
             <field name="name">Create Stock Planning Lines</field>
@@ -305,7 +304,7 @@
         </record>
 
         <menuitem
-            id="menu_stock_planning_createlines" 
+            id="menu_stock_planning_createlines"
             parent="menu_stock_planning_main"
             action="action_stock_planning_createlines_form" sequence = "5"/>
 
@@ -322,14 +321,14 @@
                         <group colspan ="3" col="2">
                             <separator colspan ="2" string = "General Info"/>
 
-                            <field name="company_id" widget= "selection" 
+                            <field name="company_id" select = "1" widget= "selection"
                                          on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
                             <field name="period_id" />
                             <field name="product_id" on_change="product_id_change(product_id)"  />
 			    <field name="product_uom_categ"  invisible = "True"/>
 			    <field name="product_uos_categ"  invisible = "True"/>
-                            <field name="product_uom"  
+                            <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom)"/>
 <!--                            <field name="state"/>    -->
@@ -353,7 +352,7 @@
                             <field name="incoming"/>
                             <field name="incoming_left"/>
                             <button name="calculate_planning" string="Calculate Planning" type="object" colspan="2"/>
-                            <field name="stock_only"/> 
+                            <field name="stock_only"/>
                         </group>
                         <group colspan ="2" col="2">
                             <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
@@ -362,13 +361,13 @@
                             <separator colspan ="2" string = "Calculated Period Simulation"/>
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
-                            <field name="stock_simulation"/> 
+                            <field name="stock_simulation"/>
                             <button name="procure_incomming_left" string="Procure Incoming Left" type="object" colspan="2"/>
-                            <field name="procure_to_stock"/> 
+                            <field name="procure_to_stock"/>
                             <separator colspan ="2" string = "Internal Supply"/>
 			    <button name="internal_supply" string="Supply from Another Warehouse" type="object" colspan="2"/>
-                            <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/> 
-                            <field name="stock_supply_location"/> 
+                            <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                            <field name="stock_supply_location"/>
                         </group>
                     </group>
                     <separator colspan ="4" string = "Requisition history"/>
@@ -424,9 +423,9 @@
         </record>
 
         <menuitem
-            id="menu_stock_planning" 
+            id="menu_stock_planning"
             parent="menu_stock_planning_main"
             action="action_view_stock_planning_form"/>
-        
+
 </data>
 </openerp>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index e9899156326..b05bf099d09 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -29,7 +29,7 @@ from tools.translate import _
 
 class subscription_document(osv.osv):
     _name = "subscription.document"
-    _description = "Subscription document"
+    _description = "Subscription Document"
     _columns = {
         'name': fields.char('Name', size=60, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the subscription document without removing it."),
@@ -49,7 +49,7 @@ subscription_document()
 
 class subscription_document_fields(osv.osv):
     _name = "subscription.document.fields"
-    _description = "Subscription document fields"
+    _description = "Subscription Document Fields"
     _rec_name = 'field'
     _columns = {
         'field': fields.many2one('ir.model.fields', 'Field', domain="[('model_id', '=', parent.model)]", required=True),
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 466283702c6..0aec93f1c90 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,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/>.
 #
 ##############################################################################
 
@@ -49,7 +49,7 @@ class res_partner(osv.osv):
          'picking_warn' : lambda *a: 'no-message',
          'invoice_warn' : lambda *a: 'no-message',
     }
-    
+
 res_partner()
 
 
@@ -73,11 +73,11 @@ class sale_order(osv.osv):
             }
 
         result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
-        
+
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
-            
+
         return {'value': result.get('value',{}), 'warning':warning}
 sale_order()
 
@@ -101,21 +101,20 @@ class purchase_order(osv.osv):
                 'message': message
                 }
         result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)
-        
+
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
-            
+
         return {'value': result.get('value',{}), 'warning':warning}
-    
+
 purchase_order()
 
 
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False):
-        
+            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
         if not partner_id:
             return {'value': {
             'address_contact_id': False ,
@@ -131,7 +130,7 @@ class account_invoice(osv.osv):
         if partner.invoice_warn != 'no-message':
             if partner.invoice_warn == 'block':
                 raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.invoice_warn_msg)
-            
+
             title = _("Warning for %s") % partner.name
             message = partner.invoice_warn_msg
             warning = {
@@ -139,19 +138,19 @@ class account_invoice(osv.osv):
                 'message': message
                 }
         result =  super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False)
-        
+            date_invoice=False, payment_term=False, partner_bank=False)
+
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
-        
+
         return {'value': result.get('value',{}), 'warning':warning}
-    
+
 account_invoice()
 
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
-    
+
     def onchange_partner_in(self, cr, uid, context, partner_id=None):
         if not partner_id:
             return {}
@@ -172,9 +171,9 @@ class stock_picking(osv.osv):
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
-        
+
         return {'value': result.get('value',{}), 'warning':warning}
-    
+
 stock_picking()
 
 class product_product(osv.osv):
@@ -185,12 +184,12 @@ class product_product(osv.osv):
          'purchase_line_warn' : fields.selection(WARNING_MESSAGE,'Purchase Order Line', help=WARNING_HELP),
          'purchase_line_warn_msg' : fields.text('Message for Purchase Order Line'),
      }
-    
+
     _defaults = {
          'sale_line_warn' : lambda *a: 'no-message',
          'purchase_line_warn' : lambda *a: 'no-message',
     }
-    
+
 product_product()
 
 class sale_order_line(osv.osv):
@@ -204,11 +203,11 @@ class sale_order_line(osv.osv):
             return {'value': {'th_weight' : 0, 'product_packaging': False,
                 'product_uos_qty': qty}, 'domain': {'product_uom': [],
                    'product_uos': []}}
-        product_obj = self.pool.get('product.product') 
+        product_obj = self.pool.get('product.product')
         product_info = product_obj.browse(cr, uid, product)
         title = False
         message = False
-        
+
         if product_info.sale_line_warn != 'no-message':
             if product_info.sale_line_warn == 'block':
                 raise osv.except_osv(_('Alert for %s !') % (product_info.name), product_info.sale_line_warn_msg)
@@ -216,7 +215,7 @@ class sale_order_line(osv.osv):
             message = product_info.sale_line_warn_msg
             warning['title'] = title
             warning['message'] = message
-            
+
         result =  super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
             lang, update_tax, date_order, packaging, fiscal_position, flag)
@@ -227,9 +226,9 @@ class sale_order_line(osv.osv):
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
-        
+
         return {'value': result.get('value',{}), 'warning':warning}
-    
+
 sale_order_line()
 
 class purchase_order_line(osv.osv):
@@ -239,11 +238,11 @@ class purchase_order_line(osv.osv):
         warning = {}
         if not product:
             return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}
-        product_obj = self.pool.get('product.product') 
+        product_obj = self.pool.get('product.product')
         product_info = product_obj.browse(cr, uid, product)
         title = False
         message = False
-        
+
         if product_info.purchase_line_warn != 'no-message':
             if product_info.purchase_line_warn == 'block':
                 raise osv.except_osv(_('Alert for %s !') % (product_info.name), product_info.purchase_line_warn_msg)
@@ -251,16 +250,16 @@ class purchase_order_line(osv.osv):
             message = product_info.purchase_line_warn_msg
             warning['title'] = title
             warning['message'] = message
-            
+
         result =  super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order, fiscal_position)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
-        
+
         return {'value': result.get('value',{}), 'warning':warning}
-    
+
 purchase_order_line()
 
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 4675cea75f9..93f0df72361 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -155,12 +155,12 @@
             <field name="arch" type="xml">
                 <search string="Wiki">
                     <group col='8' colspan='4'>
-                        <filter icon="gtk-execute" string="My" domain="[('create_uid','=',uid)]" help="My Pages"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="group_id" select="1"/>
                         <field name="text_area" select="1"/>
                         <field name="review" select="1"/>
+                        <field name="create_uid" widget="selection" select="1"/>
                     </group>
                 </search>
             </field>
@@ -174,7 +174,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wiki_tree"/>
-            <field name="context">{'section':'1'}</field>
+            <field name="context">{'section':'1','search_default_create_uid':uid}</field>
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>