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..9b1497b563f 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:
@@ -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_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..6c5be231657 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -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..68344247171 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,7 +14,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: account
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/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/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index de97bfcb798..e9336cd1393 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -44,12 +44,7 @@
 	         		<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="user_id" widget="selection"/>
 	                <field name="partner_id"/>
                 </group>
                 <newline/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 5a833e454fb..33d3442ddbb 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -79,10 +79,6 @@
                 <field name="product_id"/>
                 <field name="user_id" widget="selection">
 
-                    <filter icon="terp-account"
-                    		string="My Invoices"
-                    		help = "My Invoices"
-                    		domain="[('user_id','=',uid)]" />
                     <filter icon="terp-account"
                     		string="Invoices Non Users"
                     		help="Invoices Non Users"
@@ -141,7 +137,7 @@
         <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>
 
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..9b4d7b21560
--- /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-20 05:23+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_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/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/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5546a0e345e..c53bf131002 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1618,15 +1618,14 @@ class ir_model(osv.osv):
         @param context: A standard dictionary for contextual values 
         """
 
-        if isinstance(ids, (str, int, long)):
-            ids = [ids]
+        new_ids = isinstance(ids, (str, int, long)) and [ids] or ids
 
-        data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
+        data = super(ir_model, self).read(cr, uid, new_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()
 
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 9b4cc656acc..0aaf0b5c0c4 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,10 +209,10 @@ 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', \
+        'address_id': fields.many2one('res.partner.address', 'Address', domain=[('partner_id', '=', name)], \
                         help='Address which is linked to the Partner'),
         'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
         'function_id': fields.many2one('res.partner.function','Partner Function', \
@@ -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..e4c04634f12
--- /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-20 05:23+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_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_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_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/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0b970da2bca..fe0eb82c52a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -32,7 +32,7 @@ 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']
 
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index d4d182a2dc5..ce29a2056d5 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -8,6 +8,7 @@
         <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>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index aaca747e594..886492a9470 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -48,7 +48,8 @@
                          string="Convert"
                          help="Convert to Opportunity"
                          icon="gtk-index"   
-                         type="object"/>
+                         type="object"
+                         attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
                         widget="selection" />
@@ -102,18 +103,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 +126,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" />
@@ -197,7 +198,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 +291,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 +300,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 +311,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..3b68173d8bc 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -41,7 +41,7 @@ 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"]
 
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3f8e1bd1fde..064f55676af 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>
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 6712ffe23ce..0a781007ce0 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -260,25 +260,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"
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..eb9e8b97bd7 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -29,6 +29,7 @@
           <field name="domain">[('type','=','opportunity')]</field>
           <field name="context">{'search_default_current':1}</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..2bc711c2a5c 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -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,7 +211,8 @@
         <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"/>
@@ -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" />
@@ -290,10 +291,6 @@
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
-                        domain="[('user_id','=',uid)]"
-                        help="My Opportunities" default="1"
-                    />
                     <filter icon="terp-partner"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
@@ -303,7 +300,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">
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 6244ba1807a..49d1cefbbd1 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -29,7 +29,7 @@ class crm_phonecall(osv.osv, crm_case):
     """ Phonecall Cases """
 
     _name = "crm.phonecall"
-    _description = "Phonecall Cases"
+    _description = "Phonecall"
     _order = "id desc"
     _inherit = 'mailgate.thread'
 
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 916cd5f64f3..6fc757f2842 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -20,6 +20,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..1eb1226ea13 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -18,7 +18,6 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
-                        <newline/>
                         <field name="resource_calendar_id" select="2"/>
                     </group>
                     <notebook colspan="4">
@@ -39,8 +38,8 @@
                             </group>
                             <separator string="Members List" colspan="4"/>
                             <field name="member_ids" nolabel="1" colspan="4"/>
-                            <separator string="Note" colspan="4"/>
-                            <field name="note" select="1" colspan="4" nolabel="1"/>
+                        </page><page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -435,9 +434,6 @@
             <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'))]"
@@ -465,6 +461,7 @@
             <field name="res_model">mailgate.thread</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_tree-view"/>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
 
@@ -522,10 +519,6 @@
         <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"/>
@@ -545,6 +538,7 @@
             <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="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="crm_case_history_search"/>
         </record>
 
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_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_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_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_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 700ff046a0e..9225cbca66b 100644
--- a/addons/delivery/test/delivery_test.yml
+++ b/addons/delivery/test/delivery_test.yml
@@ -3,11 +3,10 @@
   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.
 - 
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_thepost0}:
     address:
@@ -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,10 +31,8 @@
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
     warranty: 0.0
-    
 -    
-
-  I create the Delivery Method
+  I create the Delivery Method.
 - 
   !record {model: delivery.carrier, id: delivery_carrier_theopenerpexperss0}:
     name: The OpenERP Experss
@@ -45,7 +40,7 @@
     product_id: product_product_deliverybypost0
 - 
   I create a delivery grid record and define the region for which the tariffs in the grid will be applicable.
-  Then set the condition for which this rule is applicable
+  Then set the condition for which this rule is applicable.
 - 
   !record {model: delivery.grid, id: delivery_grid_weight0}:
     carrier_id: delivery_carrier_theopenerpexperss0
@@ -74,9 +69,8 @@
         
     name: Weight
     sequence: 1
-    
 -
-  To check the Delivery based on order quantities , I have created sale order and picking_policy is direct
+  To check the Delivery based on order quantities , I have created sale order and picking_policy is direct .
 - 
   !record {model: sale.order, id: sale_order_so0}:
     date_order: '2010-05-11'
@@ -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,25 +135,21 @@
     partner_shipping_id: base.res_partner_address_7        
     pricelist_id: product.list0        
     order_policy: picking
-    
-    
 - 
   I confirm the sale order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_test_complete0}
 - 
-  Creating a stock.invoice.onshipping record
+  I Create stock.invoice.onshipping 
 - 
   !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
     journal_id: account.sales_journal
     type: out_invoice
 - 
-  Create a Invoice form picking.
+  I Create  Invoice form picking.
 - 
   !python {model: stock.invoice.onshipping}: |
     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_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/event/event.py b/addons/event/event.py
index ffdeb84d15d..6c214694887 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -218,11 +218,13 @@ 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:
@@ -231,11 +233,13 @@ class event_registration(osv.osv):
                 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:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index cb13b0662a8..9a49a79c1d0 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -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>
 
@@ -271,7 +271,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 +291,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/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_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/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_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_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index c376df3e4d7..6e7e6beb218 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -74,10 +74,6 @@
 	                   		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"
@@ -133,7 +129,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_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 18ea7d58d45..c05e7817236 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -65,12 +65,7 @@
 		                    	help="Leaves of this month"/>
 		                <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="user_id" widget="selection"/>
 	                </group>
 	                <newline/>
 	                <group expand="1" string="Group By..." colspan="10" col="12">
@@ -93,6 +88,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_user_id":uid}</field>
             <field name="view_id" ref="view_hr_available_holidays_report_search"/>
 
         </record>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 4af9bdb8f51..382a5704585 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -61,12 +61,7 @@
 
                 <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="user_id" widget="selection"/>
                 <field name="date"/>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
@@ -86,7 +81,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_employee': 1, "search_default_user_id":uid}</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..5875f813dfe 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -55,7 +55,7 @@ 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'
 
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_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 8e0c3f0845a..6d3eee8fe68 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -72,7 +72,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 +84,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"
@@ -136,7 +132,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..86995aab44c 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,7 +96,7 @@
             <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"/>
@@ -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_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 976b2a6f8ea..8358df4cc9e 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -68,10 +68,6 @@
 	                    		domain="[('state','=','done')]"/>
 	                    <separator orientation="vertical"/>
 	  					<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"
@@ -111,7 +107,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/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/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/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..90b7d9f07ab 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -36,6 +36,7 @@
     'init_xml': [],
     'update_xml': [
         'marketing_campaign_view.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..0beab1bf38d 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -33,7 +33,7 @@ _intervalTypes = {
 
 class marketing_campaign(osv.osv): #{{{
     _name = "marketing.campaign"
-    _description = "Marketing Campaigns"
+    _description = "Marketing Campaign"
     
     _columns = {
         'name': fields.char('Name', size=64, required=True),
@@ -47,10 +47,10 @@ 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'),                                       
         
     }
 
@@ -58,7 +58,7 @@ 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,17 +67,16 @@ 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'),
+        'sync_mode': fields.selection([('create', 'Create'),
                                       ('write', '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'),
     }
@@ -86,7 +85,7 @@ 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,7 +95,7 @@ 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')],
@@ -111,11 +110,13 @@ 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:
@@ -129,12 +130,12 @@ class marketing_campaign_activity(osv.osv): #{{{
             return act_ids
         return super(marketing_campaign_activity, self).search(cr, uid, args, 
                                            offset, limit, order, context, count)
-
+    
 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 +147,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,8 +173,8 @@ 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')
         }
 
     def process_chain(self, cr, uid, workitem_id, context={}):
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index eefffcf7ff1..abee5a1c124 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,59 @@
         <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>
+            	<field name="state" nolabel = "1" colspan="4" readonly="True"/>
+          	</form>
         </field>
     </record>
 
@@ -74,34 +75,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 +130,22 @@
         <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"/>
+                	<field name="date_done"/>
+                	<separator string="Synchronization" colspan="4" />
+               		<field name="sync_last_date"/>
+               		<field name="sync_mode"/>
+            	</group>
                 <separator string="Status" colspan="4" />
-                <field name="state" nolabel = "1" colspan="4"/>
+                <field name="state" nolabel = "1" colspan="4" readonly="1"/>
             </form>
         </field>
     </record>
@@ -162,7 +163,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 +194,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 +212,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 +230,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 +252,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 +287,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 +306,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/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..6ed57efa1ad
--- /dev/null
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -0,0 +1,98 @@
+# -*- 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'),
+#        'case_id': fields.many2one('crm.lead', 'Opportunity', readonly=True),
+#       'count' : fields.integer('Count', readonly=True),
+        'total_cost': fields.function(_total_cost, string='Cost', method=True, 
+                                                                type="float"),
+        'revenue': fields.float('Revenue',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..8cf0aa9ab46
--- /dev/null
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -0,0 +1,67 @@
+<?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="month"/>
+		        <field name="year"/>
+				<field name="date"/>
+		    	<field name="campaign_id"/>
+		    	<field name="activity_id"/>
+		        <field name="segment_id"/>
+		        <field name="partner_id"/>
+		        <field name="country_id" />
+		        <!--field name="case_id"/-->
+		        <!--field name="count"/-->
+		        <field name="total_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"/>
+					<!--field name="case_id"/-->
+                </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_group_campaign': 1, 'search_default_group_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/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_workflow.xml b/addons/mrp/mrp_workflow.xml
index 791c376ef92..6f7ef00b3d2 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -122,41 +122,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/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/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..5ab36dd4cb8 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -48,16 +48,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 +155,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 +172,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..d866d70cb6a 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 _
 
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/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/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 eaafc9c8b2a..a96a792c711 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -4,7 +4,7 @@
 -
  I  configure all details for the customer,Salesman  and  Product ,Account.
 - 
-  Creating an account.account.type record
+   I create View Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
@@ -14,7 +14,7 @@
     
     
 - 
-  Creating an account.account.type record
+   I create Income Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
@@ -24,7 +24,7 @@
     
     
 - 
-  Creating an account.account.type record
+   I create Expense Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
@@ -34,7 +34,7 @@
     
     
 - 
-  Creating an account.account.type record
+   I create Cash Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
@@ -44,7 +44,7 @@
     
     
 - 
-  Creating an account.account record
+  I create Minimal Chart Account.
 - 
   !record {model: account.account, id: account_account_minimalchart0}:
     code: '0'
@@ -56,7 +56,7 @@
     type: view
     user_type: account_account_type_view0
 - 
-  Creating an account.account record
+   I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable1}:
     code: AP
@@ -72,7 +72,7 @@
     
     
 - 
-  Creating an account.account record
+   I create Receivable Account.
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
@@ -88,7 +88,7 @@
     
     
 - 
-  Creating an account.account record
+  I create Cash Account.
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
@@ -103,7 +103,7 @@
     
     
 - 
-  Creating an account.account record
+  I create Purchases Account.
 - 
   !record {model: account.account, id: account_account_purchases0}:
     code: P
@@ -116,7 +116,7 @@
     type: other
     user_type: account_account_type_expense0
 - 
-  Creating an account.account record
+   I create Sales Account.
 - 
   !record {model: account.account, id: account_account_sales0}:
     code: S
@@ -130,7 +130,7 @@
     user_type: account_account_type_income0
 
 - 
-  Creating an account.journal record
+  I create Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: PUJ
@@ -144,7 +144,7 @@
     
     
 - 
-  Creating an account.journal record
+   I create Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejournal0}:
     code: SAJ
@@ -158,7 +158,7 @@
     
     
 - 
-  Creating an account.journal record
+   I create Bank Journal.
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
@@ -172,7 +172,7 @@
     
     
 - 
-  Creating a ir.property record
+  I create property for account payable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
@@ -182,7 +182,7 @@
     
     
 - 
-  Creating a ir.property record
+   I create property for account receivable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
@@ -190,12 +190,12 @@
     name: property_account_income_categ
     value_reference: account.account,6
 - 
-  Creating a res.partner.category record
+  I create Partner category Customers.
 - 
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
-  Creating an res.partner record
+  I create partner
 - 
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
@@ -204,7 +204,7 @@
     
     
 - 
-  Creating an res.partner.address record
+ I create partner address.
 - 
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
@@ -213,7 +213,7 @@
     
     
 - 
-  Creating an res.partner.address record
+  I create partner  invoice address.
 - 
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
@@ -221,21 +221,19 @@
     
     
 - 
-  Creating an res.partner.address record
+  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
 -
-  Customer Cleartrail has specific instrument requirements regarding the stockable products
-- 
-  Creating an product.category record
+  I create product category.    
 - 
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
 -
-  Creating a res.partner record
+   I create partner.
 - 
   !record {model: res.partner, id: res_partner_microlinktechnologies0}:
     address:
@@ -246,23 +244,20 @@
     supplier: true        
     
 -
-  Creating a res.partner.address record
+  I create partner address .
 - 
   !record {model: res.partner.address, id: res_partner_address_0}:
     country_id: base.in
     partner_id: res_partner_microlinktechnologies0
     street: Ash House, Ash Road
     title: Ms.
-    
-                   
-    
 - 
-  Creating an product.category record
+  I create product category .
 - 
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
 - 
-  Creating an product.template record
+  I create product template .
 - 
   !record {model: product.template, id: product_template_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -278,7 +273,7 @@
     uom_po_id: product.product_uom_unit
     
 -    
-  Creating an product.product record
+  I create product  LG Viewty Smart.
 - 
   !record {model: product.product, id: product_product_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -296,13 +291,15 @@
     supply_method: produce
     type: product
     uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit    
+    uom_po_id: product.product_uom_unit
+-  
+  I create product category .        
 -
   !record {model: product.category, id: product_category_computer0}:
     name: Computer
 
 - 
-  Creating a product.product record
+  I create product  HP Pavilion Desktop PCs
 - 
   !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
     categ_id: product_category_computer0
@@ -321,9 +318,11 @@
     uom_po_id: product.product_uom_unit
     property_account_expense: account_account_payable1
     property_account_income: account_account_receivable0
-- 
-  Creating a pos.order record
-- 
+ 
+-  
+  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}:
     company_id: base.main_company
     date_order: '2010-05-13 15:02:48'
@@ -343,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":
@@ -357,13 +356,13 @@
       ref("pos_order_pos0"), })
     
 - 
-  Creating a pos.open.statement record
+  I open the register.
 - 
   !record {model: pos.open.statement, id: pos_open_statement_0}:
     {}
     
 - 
-  Performing an osv_memory action open_statement on module pos.open.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":
@@ -371,7 +370,7 @@
       False, "active_id": ref("point_of_sale.menu_open_statement"), })
      
 -
- Creating a pos.make.payment record
+  I click on the "Make Payment" wizard.  
 - 
   !record {model: pos.make.payment, id: pos_make_payment_0}:
     amount: 1615.0
@@ -381,34 +380,34 @@
     product_id: product_product_hppaviliondesktoppcs0
     
 - 
-   For payment  I click on  Make Payment. 
+  I make the payment.
 - 
   !python {model: pos.make.payment}: |
     self.check(cr, uid, [ref("pos_make_payment_0")], {"lang": "en_US", "active_model":
       "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. 
 - 
-  Creating a pos.return record
+  I click on Return Picking button.
 - 
   !record {model: pos.return, id: pos_return_0}:
    {}
 - 
-  Performing an osv_memory action create_returns on module pos.return
+  I Return the product.
 - 
   !python {model: pos.return}: |
     self.create_returns(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
@@ -417,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":
@@ -433,7 +432,7 @@
       })
        
 -    
-  Creating a pos.make.payment record
+  I create payment.
 - 
   !record {model: pos.make.payment, id: pos_make_payment_1}:
     amount: 680.0
@@ -443,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":
@@ -451,27 +450,24 @@
       False, "active_id": ref("pos_order_pos0"), })    
 
 - 
-  Creating a pos.return record
+  To check the Return without Refund . I click button "Return without Refund ".
 - 
   !record {model: pos.return, id: pos_return_0}:
    {}
-- 
-  To check the Return without Refund . I click button "Return without Refund ".
 -
-  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"), })
 - 
-  Creating a pos.confirm record
+  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..ef7919356fa 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -414,11 +414,10 @@
                         <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>
@@ -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_view.xml b/addons/project/report/project_report_view.xml
index a4a072849b9..9cca4f556e4 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -79,17 +79,13 @@
 	                   			help = "Pending tasks"/>
 	  					<separator orientation="vertical"/>
 	                    <field name="user_id" widget="selection">
-	                        <filter icon="terp-project"
-	                        		string="My Task"
-	                        		help = "My tasks"
-	                        		domain="[('user_id','=',uid)]" />
 	                        <filter icon="terp-project"
 	                        		string="Non Assigned Tasks to users"
 	                        		help="Non Assigned Tasks to users"
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
-	                    <field name="project_id">
-	                        <filter icon="terp-project"
+	                    <field name="project_id" widget="selection">
+	                    	<filter icon="terp-project"
 	                        		string="My Task"
 	                        		help="My Tasks"
 	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
@@ -143,7 +139,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_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 action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
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/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/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_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..ee5a94208aa 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,7 +49,9 @@ 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': [],
     'installable': True,
     'active': False,
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_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..0ebbcd8e519 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -162,12 +162,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 +214,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..ce5a86b13a7 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -80,9 +80,7 @@
                  	   <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 +122,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 +155,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 +171,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_view.xml b/addons/purchase/report/purchase_report_view.xml
index 93918160bd1..6f923c0440e 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -72,10 +72,6 @@
 
                 <separator orientation="vertical"/>
                 <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"
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 da2c3f41cca..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'),
+        '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..77234889391 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),
@@ -111,7 +111,6 @@ 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 96488f4eb72..72f11069fcf 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -67,16 +67,28 @@
 						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
 	                </group>                        
                     </page>
-                    <page string="Notes">
+                    <page string="Quotations">
+						<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
+							<tree string="Purchase Order">
+			                    <field name="name" string="Reference"/>
+			                    <field name="date_order" string="Order Date"/>
+			                    <field name="partner_id"/>
+			                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+			                    <field name="location_id"/>
+			                    <field name="minimum_planned_date"/>
+			                    <field name="origin"/>
+			                    <field name="state"/>	
+			                    </tree>	
+                     	</field>
+						<separator colspan="4" string=""/>
+                     	<group col="8" colspan="4">
+                     	 <label colspan="6"  string=""/>
+						<button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
+                    	</group>
+                   </page>
+					<page string="Notes">
                         <field name="description" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Quotations">
-                     	<group col="8" colspan="4">
-                    	<button name="%(action_purchase_requisition_partner)d" string="New RfQr" type="action" />
-                    	 <label colspan="6"  string=""/>
-                    	  </group>
-                    	<field name="purchase_ids" nolabel="1" colspan="4"/>
-                   </page>
                 </notebook>
             </form>
         </field>
@@ -108,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">
@@ -136,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 6a8d52ed201..8983d238e0e 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -27,7 +27,7 @@
     weight_net: 0.0
     list_price: 100.0    
 - 
-  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001
+  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001.
 - 
   !record {model: sale.order, id: sale_order_testtender0}:
     date_order: '2010-05-10'
@@ -52,32 +52,25 @@
     picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.shop
-        
 - 
-  Performing a workflow action order_confirm on module sale.order
+  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')
     proc_obj._procure_confirm(cr,uid)
 -
   On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  
-- 
-  Creating a purchase.requisition.partner record
-  
+  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC . 
 - 
   !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
     partner_address_id: base.res_partner_address_7
     partner_id: base.res_partner_4
-    
 - 
-  Performing an osv_memory action create_order on module purchase.requisition.partner
-  
+  I create a new purchase order.
 - 
   !python {model: purchase.requisition.partner}: |
     req_obj = self.pool.get('purchase.requisition')
@@ -87,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')])
@@ -104,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')  
@@ -120,8 +110,7 @@
     line_obj.write(cr, uid, order_line1, {'product_qty':2})
     line_obj.write(cr, uid, order_line2, {'product_qty':3})  
 -
-  I confirm and validate both purchase orders
-  
+  I confirm and validate both purchase orders.
 -
   !python {model: purchase.order}: |
    order_ids= self.search(cr, uid, [])
@@ -130,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'
-  
+  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')])
@@ -141,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
-  
+  I receive the order of the supplier Asustek from the Incoming Products menu.
 -
   !python {model: stock.picking }: |
    import time
@@ -167,8 +152,7 @@
       } 
      self.do_partial(cr, uid, picking_id,partial_datas)
 -
- I receive the order of the supplier DistriPC from the Incoming Shipments menu
- 
+ I receive the order of the supplier DistriPC from the Incoming Shipments menu.
 -   
   !python {model: stock.picking }: |
    import time
@@ -189,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 030b80b2260..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'
@@ -50,19 +46,18 @@
     pricelist_id: product.list0
     shop_id: sale.shop    
 - 
-  Performing a workflow action order_confirm on module sale.order
+  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
+  I launch he scheduler to compute all procurements, and planify all requisitions orders.
 -  
   !python {model: mrp.procurement.compute.all}: |
     proc_obj = self.pool.get('mrp.procurement')
     proc_obj._procure_confirm(cr,uid)
 -
   I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
-  5 Laptop ACER, and a purchase order on the default supplier for this product
+  5 Laptop ACER, and a purchase order on the default supplier for this product.
 -    
  !python {model: purchase.requisition}: |
     requisition_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
@@ -70,16 +65,15 @@
     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 .
 - 
-  Creating a purchase.requisition.partner record
+  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
-        
 - 
-  Performing an osv_memory action create_order on module purchase.requisition.partner
+  I create a new purchase order for the supplier 'DistriPC'.
 - 
   !python {model: purchase.requisition.partner}: |
     req_obj = self.pool.get('purchase.requisition')
@@ -87,15 +81,14 @@
     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'      
 - 
- !python {model: purchase.requisition}: |
+  !python {model: purchase.requisition}: |
     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/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index abac95bba16..c7a38cf64e1 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -9,6 +9,7 @@
               	<form string="Purchase Requisition">
               		 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               		 <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
+              		  <separator string="" colspan="4" />
 		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="create_order" string="Create Orders" type="object"/>
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 eb97152280b..651945752a7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -47,6 +47,7 @@
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
+        'wizard/sale_make_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
         'company_view.xml',
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 54f387c1bac..2016f908fe8 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.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: sale
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_view.xml b/addons/sale/report/sale_report_view.xml
index 72707f6e01d..fdfb1b5d2c9 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -72,10 +72,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"
@@ -127,7 +123,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"/>
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..c9d26baec9f 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -28,7 +28,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 +37,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 +64,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/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 07c5ceea83d..ba6fd677a3c 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -19,8 +19,9 @@
 #
 ##############################################################################
 
-#remaining make_invoice
+import sale_make_invoice
 import sale_line_invoice
 import sale_make_invoice_advance
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/make_invoice.py b/addons/sale/wizard/make_invoice.py
deleted file mode 100644
index 7b190c3b2d6..00000000000
--- a/addons/sale/wizard/make_invoice.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- 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 wizard
-import netsvc
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />
-    <field name="grouped" />
-    <field name="invoice_date" />    
-</form>
-"""
-
-invoice_fields = {
-    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda x,y,z: False},
-    'invoice_date': {'string': 'Invoiced date', 'type':'date' }
-}
-
-ack_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator string="Invoices created" />
-</form>"""
-
-ack_fields = {}
-
-def _makeInvoices(self, cr, uid, data, context):
-    pool_obj = pooler.get_pool(cr.dbname)
-    mod_obj = pool_obj.get('ir.model.data') 
-    order_obj = pool_obj.get('sale.order')
-    newinv = []
-
-    order_obj.action_invoice_create(cr, uid, data['ids'], data['form']['grouped'], date_inv = data['form']['invoice_date'])
-    for id in data['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, data['ids'], context):
-        for i in o.invoice_ids:
-            newinv.append(i.id)
-    act_obj = pool_obj.get('ir.actions.act_window')
-    xml_id='action_invoice_tree5'
-    result = mod_obj._get_id(cr, uid, 'account', xml_id)
-    id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
-    result = act_obj.read(cr, uid, id)
-    result['domain'] ="[('id','in', ["+','.join(map(str,newinv))+"])]"
-    return result
-    #return {
-    #    'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
-    #    'name': 'Invoices',
-    #    'view_type': 'form',
-    #    'view_mode': 'tree,form',
-    #    'res_model': 'account.invoice',
-    #    'view_id': False,
-    #    'context': "{'type':'out_refund'}",
-    #    'type': 'ir.actions.act_window'
-    #}
-    #return {}
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices') ]}
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type': 'state', 'state': 'end'}
-        },
-    }
-make_invoice("sale.order.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 4bf3074db54..15405f07874 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -20,22 +20,11 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-import wizard
-import netsvc
-import ir
-import pooler
+from tools.translate import _
 
 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 +71,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 +99,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
new file mode 100644
index 00000000000..5ea01b1db6c
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -0,0 +1,74 @@
+##############################################################################
+#
+#    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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import ir
+import netsvc
+
+class sale_make_invoice(osv.osv_memory):
+    _name = "sale.make.invoice"
+    _description = "Sale Make Invoice"
+    _columns = {
+        'grouped': fields.boolean('Group the invoices'),
+        'invoice_date':fields.date('Invoice Date'),
+    }
+    _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.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
+            
+        for o in order_obj.browse(cr, uid, context.get(('active_ids'),[]), context):
+            for i in o.invoice_ids:
+                newinv.append(i.id)
+        
+        mod_obj =self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        
+        id = mod_obj.read(cr, uid, result, ['res_id'])                
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'context': "{'type':'out_refund'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['id']                
+        }
+
+sale_make_invoice()        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
new file mode 100644
index 00000000000..ade720be1f4
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_order_make_invoice" model="ir.ui.view">
+            <field name="name">Create invoices</field>
+            <field name="model">sale.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Create invoices">
+				<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<field name="grouped" />
+    			<field name="invoice_date"/>
+             	<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>
+            </field>
+		</record>
+
+        <act_window name="Make Invoices"		    
+		    res_model="sale.make.invoice"
+		    src_model="sale.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_sale_order_make_invoice"/>		
+
+    </data>
+</openerp>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 6c9ca17b836..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
-import wizard
-
 
 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/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/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/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_move.py b/addons/stock/report/report_stock_move.py
index 11d855e63d9..8d905a4c4d7 100755
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -44,7 +44,7 @@ class report_stock_move(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
-
+        'day_diff':fields.integer('Expected Performance',readonly=True),
     }
     
     def init(self, cr):
@@ -56,6 +56,7 @@ class report_stock_move(osv.osv):
                     to_char(date_trunc('day',m.date_planned), 'YYYY') as year,
                     to_char(date_trunc('day',m.date_planned), 'MM') as month,
                     to_char(date_trunc('day',m.date_planned), 'YYYY-MM-DD') as day,
+                    (date(m.date_planned)-date(m.date_expected)) as day_diff,
                     m.address_id as partner_id,
                     m.location_id as location_id,
                     m.location_dest_id as location_dest_id,
@@ -69,6 +70,6 @@ class report_stock_move(osv.osv):
                     m.product_id=pp.id and pp.product_tmpl_id=pt.id
                group by 
                     m.id, m.product_id,m.address_id, m.location_id, m.location_dest_id,
-                    m.date_planned, m.state, m.product_uom,pt.standard_price     )      
+                    m.date_planned, m.state, m.product_uom,pt.standard_price,m.date_expected     )      
         """)
 report_stock_move()
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 8a72f5182d8..3a7b233504a 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -8,6 +8,7 @@
         <field name="arch" type="xml">
             <tree string="Stock Orders Statistics">
                 <field name="date_planned"/>
+                <field name="day_diff"/>
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
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 e96e86c5f09..f4fad43086c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -473,7 +473,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 +554,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 +621,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 +892,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 +1184,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 = []
@@ -1191,7 +1217,7 @@ class stock_move(osv.osv):
 
         'date': fields.datetime('Created Date'),
         'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
-
+        'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
         'product_qty': fields.float('Quantity', required=True),
@@ -1269,7 +1295,8 @@ class stock_move(osv.osv):
         'scraped' : lambda *a: False,
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c)
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),
+        'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),        
     }
 
     def copy(self, cr, uid, id, default=None, context={}):
@@ -1282,6 +1309,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):
@@ -1638,6 +1670,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'),
@@ -1768,7 +1802,7 @@ class stock_move(osv.osv):
 
         @ return: Consumed lines
         '''
-        if not context:
+        if context is None:
             context = {}
 
         if quantity <= 0:
@@ -2049,7 +2083,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),
@@ -2085,9 +2119,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 33b62bf768e..13ee27bd6c0 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"/>
@@ -307,7 +307,7 @@
             <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">
+                <tree colors="grey:state in ('cancel')" string="Moves">
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
@@ -318,6 +318,7 @@
                     <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="state"/>
                 </tree>
             </field>
@@ -329,7 +330,7 @@
             <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">
+                <tree colors="grey:state in ('cancel')" string="Moves">
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
@@ -340,6 +341,7 @@
                     <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="state"/>
                 </tree>
             </field>
@@ -455,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"/>
@@ -580,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"/>
@@ -613,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)"/>
@@ -623,6 +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="state"/>
                                     <button
                                         name="%(stock.track_line)d"
@@ -641,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)"/>
@@ -649,8 +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="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)]"
@@ -662,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"/>
@@ -732,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"/>
@@ -763,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)"/>
@@ -773,6 +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="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -791,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)"/>
@@ -799,7 +804,8 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
+ 											<field name="date_expected"  string="Date Expected"/>                                            
+                                            <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)]"
@@ -807,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"/>
@@ -909,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"/>
@@ -941,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)"/>
@@ -951,6 +957,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
+ 									<field name="date_expected" string="Date Expected"/>                                    
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -969,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)"/>
@@ -977,7 +984,8 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                            <field groups="base.group_extended" name="product_packaging"/>
+ 											<field name="date_expected"  string="Date Expected"/>                                            
+                                            <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)]"
@@ -987,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"/>
@@ -1086,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"/>
@@ -1121,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"/>
@@ -1144,16 +1152,17 @@
                                             <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)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field colspan="4" invisible="1" name="name" />
                                             <field groups="base.group_extended" name="date_planned"/>
+ 											<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}"
@@ -1165,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=""/>
@@ -1303,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)"/>
@@ -1314,6 +1323,7 @@
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
+					<field name="date_expected"/>              
                     <field name="state"/>
                 </tree>
             </field>
@@ -1333,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" />
@@ -1352,6 +1362,7 @@
                                 <separator string="Dates &amp; Priority" colspan="2" />
                                 <field name="date"/>
                                 <field name="date_planned"/>
+								<field name="date_expected"/>                                
                                 <field name="priority"/>
                             </group>
 
@@ -1428,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"/>
@@ -1437,6 +1448,7 @@
                     <field name="product_uom" string="Uint Of Measure"/>
                     <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
+                    <field name="date_expected"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
@@ -1458,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"/>
@@ -1466,6 +1478,7 @@
                             <field name="date"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="date_planned"/>
+                            <field name="date_expected"/>
                             <field name="priority"/>
                             <field name="address_id" context="{'contact_display':'partner'}"/>
                             <newline/>
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 0922c2f975e..6a9bf3ff9f3 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -4,7 +4,7 @@
   create physical inventory ,fill inventory lines from location,split inventory line into production lot
      
 - 
-  Creating a account.account.type record
+  I create Asset Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_asset0}:
     close_method: balance
@@ -12,18 +12,8 @@
     name: Asset
     sign: 1
     
-    
 - 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_liability0}:
-    close_method: balance
-    code: liability
-    name: Liability
-    sign: 1    
-    
-- 
-  Creating a account.account.type record
+   I create Income Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
@@ -33,7 +23,7 @@
     
     
 - 
-  Creating a account.account.type record
+  I create Expense Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
@@ -41,7 +31,7 @@
     name: Expense
     sign: 1    
 - 
-  Creating a account.account.type record
+  I create Cash Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
@@ -51,7 +41,7 @@
     
     
 - 
-  Creating a account.account.type record
+  I create Receivable Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_receivable0}:
     close_method: balance
@@ -60,7 +50,7 @@
     sign: 1
 -
  
-  Creating a account.account record
+  I create Receivable Account .
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: '40000'
@@ -72,7 +62,7 @@
     type: receivable
     user_type: account_account_type_receivable0
 - 
-  Creating a account.account record
+  I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable0}:
     code: '440000'
@@ -84,7 +74,7 @@
     type: payable
     user_type: account_account_type_expense0    
 - 
-  Creating a account.journal record
+  I create Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: pur
@@ -95,18 +85,18 @@
     view_id: account.account_journal_bank_view
     
 - 
-  Creating a account.journal record
+  I create Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejouran0}:
     code: sal
     company_id: base.main_company
-    name: Sale Jouran
+    name: Sale Journal
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
     
 - 
-  Creating a account.account record
+  I create Expense Account.
 - 
   !record {model: account.account, id: account_account_expenseaccount0}:
     code: Expe
@@ -118,7 +108,7 @@
     type: consolidation
     user_type: account_account_type_asset0
 - 
-  Creating a account.account record
+  I create Product Sale Account.
 - 
   !record {model: account.account, id: account_account_productsale0}:
     code: '001'
@@ -130,7 +120,7 @@
     
     
 - 
-  Creating a account.account record
+  I create Product Purchase Account.
 - 
   !record {model: account.account, id: account_account_productpurchase0}:
     code: '0002'
@@ -141,7 +131,7 @@
     user_type: account_account_type_expense0
         
 - 
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_shawtrust0}:
     address:
@@ -152,7 +142,7 @@
     property_account_payable: account_account_payable0
     property_account_receivable: account_account_receivable0
 -    
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_diasorinltd0}:
     address:
@@ -163,7 +153,7 @@
     
         
 -
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_microlinktechnologies0}:
     address:
@@ -174,7 +164,7 @@
     supplier: true        
     
 -
-  Creating a res.partner.address record
+  I create partner address.
 - 
   !record {model: res.partner.address, id: res_partner_address_0}:
     country_id: base.in
@@ -184,13 +174,13 @@
     
                
 -     
-  Creating a product.category record
+  I create  product.category .
 - 
   !record {model: product.category, id: product_category_computer0}:
     name: Computer
 
 - 
-  Creating a product.product record
+   I create  product HP Pavilion Desktop PCs .
 - 
   !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
     categ_id: stock.product_category_computer0
@@ -211,7 +201,7 @@
     property_account_income: account_account_productsale0    
     
 - 
-  Creating a product.product record
+  I create  product HP CD writers.
 - 
   !record {model: product.product, id: product_product_hpcdwriters0}:
     categ_id: stock.product_category_computer0
@@ -259,7 +249,7 @@
   !python {model: stock.inventory}: |
    self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')])
 - 
-  Creating a stock.fill.inventory record
+  I create stock.fill.inventory .
 - 
   !record {model: stock.fill.inventory, id: stock_fill_inventory_0}:
     location_id: stock.stock_location_stock
@@ -273,7 +263,7 @@
       [ref("stock_inventory_physicalinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0"), })
 
 - 
-  Creating a stock.move.split record.
+  I create stock.move.split record.
 - 
   !record {model: stock.move.split, id: stock_move_split_0}:
     line_ids:
@@ -283,7 +273,7 @@
     
     
 - 
-  Split into production line.
+  I Split into production line.
 - 
   !python {model: stock.move.split}: |
     move_obj=self.pool.get('stock.move')
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_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_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>