diff --git a/addons/account/account.py b/addons/account/account.py
index c2e6f3d1221..fbbbfd64537 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -31,7 +31,7 @@ import decimal_precision as dp
 from tools.translate import _
 from tools.float_utils import float_round
 from openerp import SUPERUSER_ID
-
+import tools
 
 _logger = logging.getLogger(__name__)
 
@@ -227,7 +227,7 @@ class account_account(osv.osv):
         while pos < len(args):
 
             if args[pos][0] == 'code' and args[pos][1] in ('like', 'ilike') and args[pos][2]:
-                args[pos] = ('code', '=like', str(args[pos][2].replace('%', ''))+'%')
+                args[pos] = ('code', '=like', tools.ustr(args[pos][2].replace('%', ''))+'%')
             if args[pos][0] == 'journal_id':
                 if not args[pos][2]:
                     del args[pos]
@@ -682,7 +682,7 @@ class account_journal_view(osv.osv):
     _name = "account.journal.view"
     _description = "Journal View"
     _columns = {
-        'name': fields.char('Journal View', size=64, required=True),
+        'name': fields.char('Journal View', size=64, required=True, translate=True),
         'columns_id': fields.one2many('account.journal.column', 'view_id', 'Columns')
     }
     _order = "name"
@@ -1908,7 +1908,7 @@ class account_tax(osv.osv):
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'description': fields.char('Tax Code',size=32),
+        'description': fields.char('Tax Code'),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
@@ -2518,7 +2518,7 @@ class account_account_template(osv.osv):
         'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'note': fields.text('Note'),
-        'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade'),
+        'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'),
         'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'),
         'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
@@ -2536,20 +2536,6 @@ class account_account_template(osv.osv):
         (_check_recursion, 'Error!\nYou cannot create recursive account templates.', ['parent_id']),
     ]
 
-    def create(self, cr, uid, vals, context=None):
-        if 'parent_id' in vals:
-            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
-            if parent and parent[0]['type'] != 'view':
-                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
-        return super(account_account_template, self).create(cr, uid, vals, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        if 'parent_id' in vals:
-            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
-            if parent and parent[0]['type'] != 'view':
-                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
-        return super(account_account_template, self).write(cr, uid, ids, vals, context=context)
-
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
@@ -2828,7 +2814,7 @@ class account_tax_template(osv.osv):
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
-        'description': fields.char('Internal Name', size=32),
+        'description': fields.char('Internal Name'),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
     }
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 9889eadf387..b4fc2388a68 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -457,6 +457,8 @@ class account_bank_statement(osv.osv):
         return res and res[0] or 0.0
 
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
+        if not journal_id:
+            return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
         journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context)
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index aff38d71cfe..a1c53eff4b1 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -508,8 +508,10 @@ class account_invoice(osv.osv):
         if journal_id:
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
             currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
+            company_id = journal.company_id.id
             result = {'value': {
                     'currency_id': currency_id,
+                    'company_id': company_id,
                     }
                 }
         return result
@@ -1371,7 +1373,10 @@ class account_invoice_line(osv.osv):
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
 
-    def _default_account_id(self, cr, uid, ids, context=None):
+    def _default_account_id(self, cr, uid, context=None):
+        # XXX this gets the default account for the user's company,
+        # it should get the default account for the invoice's company
+        # however, the invoice's company does not reach this point
         prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
         return prop and prop.id or False
 
@@ -1401,7 +1406,7 @@ class account_invoice_line(osv.osv):
             context = {}
         company_id = company_id if company_id != None else context.get('company_id',False)
         context = dict(context)
-        context.update({'company_id': company_id})
+        context.update({'company_id': company_id, 'force_company': company_id})
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
@@ -1556,16 +1561,19 @@ class account_invoice_line(osv.osv):
     def onchange_account_id(self, cr, uid, ids, product_id, partner_id, inv_type, fposition_id, account_id):
         if not account_id:
             return {}
-        taxes = self.pool.get('account.account').browse(cr, uid, account_id).tax_ids
+        unique_tax_ids = []
         fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
-        tax_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-
-        product_change_result = self.product_id_change(cr, uid, ids, product_id, False, type=inv_type,
-                                                       partner_id=partner_id, fposition_id=fposition_id)
-        unique_tax_ids = set(tax_ids)
-        if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
-            unique_tax_ids |= set(product_change_result['value']['invoice_line_tax_id'])
-        return {'value':{'invoice_line_tax_id': list(unique_tax_ids)}}
+        account = self.pool.get('account.account').browse(cr, uid, account_id)
+        if not product_id:
+            taxes = account.tax_ids
+            unique_tax_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
+        else:
+            product_change_result = self.product_id_change(cr, uid, ids, product_id, False, type=inv_type,
+                partner_id=partner_id, fposition_id=fposition_id,
+                company_id=account.company_id.id)
+            if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
+                unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
+        return {'value':{'invoice_line_tax_id': unique_tax_ids}}
 
 account_invoice_line()
 
@@ -1650,14 +1658,13 @@ class account_invoice_tax(osv.osv):
 
         for line in inv.invoice_line:
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
-                tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit'])
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']
                 val['amount'] = tax['amount']
                 val['manual'] = False
                 val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
+                val['base'] = cur_obj.round(cr, uid, cur, tax['price_unit'] * line['quantity'])
 
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1c4d83106ca..4a587eee6fe 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -278,6 +278,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
@@ -299,8 +300,8 @@
                         <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
                         <button name="invoice_open" states="proforma2" string="Validate"/>
                         <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                        <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
-                        <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                        <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid'/>
+                        <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
                         <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                         <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
@@ -437,6 +438,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 5ddbbee74f2..bb1ace992ca 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -562,6 +562,7 @@ class account_move_line(osv.osv):
         'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
         'credit': 0.0,
         'debit': 0.0,
+        'amount_currency': 0.0,
         'account_id': lambda self, cr, uid, c: c.get('account_id', False),
         'period_id': lambda self, cr, uid, c: c.get('period_id', False),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
@@ -1193,12 +1194,12 @@ class account_move_line(osv.osv):
         jour_period_obj = self.pool.get('account.journal.period')
         cr.execute('SELECT state FROM account_journal_period WHERE journal_id = %s AND period_id = %s', (journal_id, period_id))
         result = cr.fetchall()
+        journal = journal_obj.browse(cr, uid, journal_id, context=context)
+        period = period_obj.browse(cr, uid, period_id, context=context)
         for (state,) in result:
             if state == 'done':
-                raise osv.except_osv(_('Error!'), _('You cannot add/modify entries in a closed journal.'))
+                raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name)))                
         if not result:
-            journal = journal_obj.browse(cr, uid, journal_id, context=context)
-            period = period_obj.browse(cr, uid, period_id, context=context)
             jour_period_obj.create(cr, uid, {
                 'name': (journal.code or journal.name)+':'+(period.name or ''),
                 'journal_id': journal.id,
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2c204fdf707..1fbda80a0fe 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1305,16 +1305,6 @@
     Account.Entry Edition
     -->
 
-        <record id="account_move_graph" model="ir.ui.view">
-            <field name="name">account.move.graph</field>
-            <field name="model">account.move</field>
-            <field name="arch" type="xml">
-                <graph string="Account Statistics" type="bar">
-                    <field name="period_id"/>
-                    <field name="amount" operator="+"/>
-                </graph>
-            </field>
-         </record>
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
@@ -1338,8 +1328,8 @@
             <field name="arch" type="xml">
                 <form string="Account Entry" version="7.0">
                 <header>
-                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
-                    <button name="button_cancel" states="posted" string="Cancel" type="object"/>
+                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
+                    <button name="button_cancel" states="posted" string="Cancel" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Journal Entries" >
@@ -1488,7 +1478,7 @@
             <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
             <field name="help" type="html">
@@ -2037,7 +2027,7 @@
            src_model="account.journal"/>
 
         <act_window
-            context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+            context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
             id="act_account_partner_account_move_all"
             name="Receivables &amp; Payables"
@@ -2073,7 +2063,7 @@
             id="account_template_folder"
             name="Templates"
             parent="menu_finance_accounting"
-            groups="base.group_multi_company"/>
+            groups="account.group_account_manager"/>
         <menuitem
             id="account_template_taxes"
             name="Taxes"
diff --git a/addons/account/partner.py b/addons/account/partner.py
index f2b9f79bb8a..a9b2b99588d 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -44,17 +44,17 @@ class account_fiscal_position(osv.osv):
             return []
         if not fposition_id:
             return map(lambda x: x.id, taxes)
-        result = []
+        result = set()
         for t in taxes:
             ok = False
             for tax in fposition_id.tax_ids:
                 if tax.tax_src_id.id == t.id:
                     if tax.tax_dest_id:
-                        result.append(tax.tax_dest_id.id)
+                        result.add(tax.tax_dest_id.id)
                     ok=True
             if not ok:
-                result.append(t.id)
-        return result
+                result.add(t.id)
+        return list(result)
 
     def map_account(self, cr, uid, fposition_id, account_id, context=None):
         if not fposition_id:
@@ -77,6 +77,12 @@ class account_fiscal_position_tax(osv.osv):
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
 
+    _sql_constraints = [
+        ('tax_src_dest_uniq',
+         'unique (position_id,tax_src_id,tax_dest_id)',
+         'A tax fiscal position could be defined only once time on same taxes.')
+    ]
+
 account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
@@ -89,6 +95,12 @@ class account_fiscal_position_account(osv.osv):
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
 
+    _sql_constraints = [
+        ('account_src_dest_uniq',
+         'unique (position_id,account_src_id,account_dest_id)',
+         'An account fiscal position could be defined only once time on same accounts.')
+    ]
+
 account_fiscal_position_account()
 
 class res_partner(osv.osv):
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 7ac1efd4f9f..4bee2002ffd 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -92,34 +92,7 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <field name="bank_ids">
-                        <form string="Bank account" version="7.0">
-                            <group col="4">
-                                <field name="state"/>
-                                <field name="acc_number"/>
-                            </group>
-                            <group>
-                                <group name="owner" string="Bank Account Owner">
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="owner_name"/>
-                                    <label for="street" string="Address"/>
-                                    <div>
-                                        <field name="street" placeholder="Street..."/>
-                                        <div>
-                                            <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
-                                        </div>
-                                        <field name="state_id" placeholder="State" options='{"no_open": true}'/>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
-                                    </div>
-                                </group>
-                                <group name="bank" string="Information About the Bank">
-                                    <field name="bank" on_change="onchange_bank_id(bank)"/>
-                                    <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
-                                </group>
-                            </group>
-                        </form>
+                    <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
                         <tree string="Bank Details">
                             <field name="sequence" invisible="1"/>
                             <field name="acc_number"/>
@@ -141,7 +114,7 @@
             context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             src_model="res.partner"
             view_type="form"
-            view_mode="tree,form,graph,calendar"/>
+            view_mode="tree,form,calendar"/>
 
     </data>
 </openerp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index da1a11b9cb6..70db95425b1 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -73,7 +73,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph,form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
@@ -114,9 +114,6 @@
             </field>
         </record>
 
-        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
-            name="Analytic" parent="account.menu_finance_generic_reporting"
-            sequence="4"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
@@ -351,15 +348,6 @@
         # Reporting
         #
 
-        <record id="action_account_analytic_journal_tree" model="ir.actions.act_window">
-            <field name="name">Print Analytic Journals</field>
-            <field name="res_model">account.analytic.journal</field>
-            <field name="view_type">tree</field>
-            <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
-        </record>
-        <menuitem groups="analytic.group_analytic_accounting"
-            action="action_account_analytic_journal_tree"
-            id="account_analytic_journal_print" parent="account.next_id_40"/>
 
         <record id="view_account_journal_1" model="ir.ui.view">
             <field name="name">account.journal.form.1</field>
@@ -372,16 +360,5 @@
             </field>
         </record>
 
-     <record id="analytic_accounts_graph" model="ir.ui.view">
-            <field name="name">analytic.accounts.graph</field>
-            <field name="model">account.analytic.account</field>
-            <field name="arch" type="xml">
-                <graph string="Analytic Account Statistics" type="bar">
-                    <field name="complete_name"/>
-                    <field name="balance" operator="+"/>
-                </graph>
-            </field>
-     </record>
-
     </data>
 </openerp>
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index 9a2eee020b1..8148a016927 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -29,6 +29,7 @@ class account_analytic_journal_report(osv.osv_memory):
     _columns = {
         'date1': fields.date('Start of period', required=True),
         'date2': fields.date('End of period', required=True),
+        'analytic_account_journal_id': fields.many2many('account.analytic.journal', 'account_analytic_journal_name', 'journal_line_id', 'journal_print_id', 'Analytic Journals', required=True),
     }
 
     _defaults = {
@@ -40,8 +41,15 @@ class account_analytic_journal_report(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]
+        ids_list = []
+        if context.get('active_id',False):
+            ids_list.append(context.get('active_id',False))
+        else:
+            record = self.browse(cr,uid,ids[0],context=context)
+            for analytic_record in record.analytic_account_journal_id:
+                ids_list.append(analytic_record.id)
         datas = {
-             'ids': context.get('active_ids',[]),
+             'ids': ids_list,
              'model': 'account.analytic.journal',
              'form': data
                  }
@@ -50,6 +58,14 @@ class account_analytic_journal_report(osv.osv_memory):
             'report_name': 'account.analytic.journal',
             'datas': datas,
             }
+        
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
+        if 'analytic_account_journal_id' in fields:
+            res.update({'analytic_account_journal_id': context.get('active_ids',[])})
+        return res
 
 account_analytic_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index e4c4cd314db..b0cb0293270 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -7,15 +7,16 @@
             <field name="model">account.analytic.journal.report</field>
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4">
                         <field name="date1"/>
                         <field name="date2"/>
+                        <field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1"/>
                     </group>
+                    <footer>
+                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -38,6 +39,13 @@
             <field name="key">action</field>
             <field name="model">account.analytic.journal</field>
         </record>
+        
+        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
+            name="Analytic" parent="account.menu_finance_generic_reporting"
+            sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="account.action_account_analytic_journal"
+            id="account_analytic_journal_print" parent="account.next_id_40"/>
 
     </data>
 </openerp>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 442b51466f8..4b90e0c8ad5 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -16,7 +16,7 @@
     </record>
 
     <record id="group_account_manager" model="res.groups">
-        <field name="name">Manager</field>
+        <field name="name">Financial Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index b7d278b8849..38a22baa9f1 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -32,11 +32,11 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation Date', help='This date will be used as the invoice date for credit note and period will be chosen accordingly!'),
+       'date': fields.date('Date', help='This date will be used as the invoice date for credit note and period will be chosen accordingly!'),
        'period': fields.many2one('account.period', 'Force period'),
        'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the credit note that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
-       'description': fields.char('Description', size=128, required=True),
-       'filter_refund': fields.selection([('refund', 'Create a draft refund'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
+       'description': fields.char('Reason', size=128, required=True),
+       'filter_refund': fields.selection([('refund', 'Create a draft credit note'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
     }
 
     def _get_journal(self, cr, uid, context=None):
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 78a9b085bf1..3945a6f57e6 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -7,19 +7,40 @@
             <field name="model">account.invoice.refund</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
-                    <separator string="Credit Note Options"/>
-                    <group col="4">
-                         <field name="description"/>
-                         <field name="journal_id" widget='selection'/>
-                         <field name="date"/>
-                         <field name="period"/>
-                         <field name="filter_refund"/>
+                    <group>
+                         <group colspan="2">
+                             <label for="filter_refund"/>
+                             <div>
+                                 <field name="filter_refund" class="oe_inline"/>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','refund')]}" class="oe_grey">
+                                    You will be able to edit and validate this
+                                    credit note directly or keep it draft,
+                                    waiting for the document to be issued by
+                                    your supplier/customer.
+                                 </p>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','cancel')]}" class="oe_grey">
+                                    Use this option if you want to cancel an invoice you should not
+                                    have issued. The credit note will be created, validated and reconciled
+                                    with the invoice. You will not be able to modify the credit note.
+                                 </p>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','modify')]}" class="oe_grey">
+                                    Use this option if you want to cancel an invoice and create a new
+                                    one. The credit note will be created, validated and reconciled
+                                    with the current invoice. A new, draft, invoice will be created 
+                                    so that you can edit it.
+                                 </p>
+                             </div>
+                         </group>
+                         <group>
+                             <field name="description"/>
+                             <field name="journal_id" widget='selection'/>
+                         </group><group>
+                             <field name="date"/>
+                             <field name="period"/>
+                         </group>
                     </group>
-                    <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
-                    <label string="Credit Note: Creates the credit note, ready for editing."/>
-                    <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
                     <footer>
-                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
+                        <button string='Create Credit Note' name="invoice_refund" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
@@ -28,7 +49,7 @@
         </record>
 
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
-            <field name="name">Refund</field>
+            <field name="name">Refund Invoice</field>
             <field name="res_model">account.invoice.refund</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 9fa521c09f7..f3d25b1c8db 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -23,6 +23,7 @@ import time
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class account_move_line_reconcile(osv.osv_memory):
     """
@@ -32,9 +33,9 @@ class account_move_line_reconcile(osv.osv_memory):
     _description = 'Account move line reconcile'
     _columns = {
         'trans_nbr': fields.integer('# of Transaction', readonly=True),
-        'credit': fields.float('Credit amount', readonly=True),
-        'debit': fields.float('Debit amount', readonly=True),
-        'writeoff': fields.float('Write-Off amount', readonly=True),
+        'credit': fields.float('Credit amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'debit': fields.float('Debit amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'writeoff': fields.float('Write-Off amount', readonly=True, digits_compute=dp.get_precision('Account')),
     }
 
     def default_get(self, cr, uid, fields, context=None):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index ffbe48f0b19..d56b6ee4760 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -48,7 +48,7 @@
             <field name="name">Contracts to Renew</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
             <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
@@ -72,7 +72,7 @@
             <field name="name">Contracts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{'default_type':'contract', 'search_default_open':1, 'search_default_pending':1}</field>
             <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index b6828062a85..e6861d0db67 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -350,7 +350,7 @@ class account_asset_depreciation_line(osv.osv):
         'amount': fields.float('Depreciation Amount', required=True),
         'remaining_value': fields.float('Amount to Depreciate', required=True),
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
-        'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
+        'depreciation_date': fields.date('Depreciation Date', select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
     }
@@ -368,7 +368,7 @@ class account_asset_depreciation_line(osv.osv):
         for line in self.browse(cr, uid, ids, context=context):
             if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):
                 can_close = True
-            depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')
+            depreciation_date = time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
             current_currency = line.asset_id.currency_id.id
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index 700832881c4..4b38834bdc3 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -57,6 +57,7 @@ class account_invoice_line(osv.osv):
                     'partner_id': line.invoice_id.partner_id.id,
                     'company_id': line.invoice_id.company_id.id,
                     'currency_id': line.invoice_id.currency_id.id,
+                    'purchase_date' : line.invoice_id.date_invoice,
                 }
                 changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
                 vals.update(changed_vals['value'])
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 000967a555c..583e5534613 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -50,7 +50,7 @@ class asset_asset_report(osv.osv):
                 select 
                     min(dl.id) as id,
                     dl.name as name,
-                    to_date(dl.depreciation_date, 'YYYY-MM-DD') as depreciation_date,
+                    dl.depreciation_date as depreciation_date,
                     a.purchase_date as purchase_date,
                     (CASE WHEN (select min(d.id) from account_asset_depreciation_line as d
                                 left join account_asset_asset as ac ON (ac.id=d.asset_id)
@@ -77,7 +77,7 @@ class asset_asset_report(osv.osv):
                 from account_asset_depreciation_line dl
                     left join account_asset_asset a on (dl.asset_id=a.id)
                 group by 
-                    dl.amount,dl.asset_id,to_date(dl.depreciation_date, 'YYYY-MM-DD'),dl.name,
+                    dl.amount,dl.asset_id,dl.depreciation_date,dl.name,
                     a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,
                     a.purchase_value, a.id, a.salvage_value
         )""")
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index 30b2778817c..1c076426752 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -76,7 +76,7 @@
           <field name="ref" readonly="1"/>
           <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
           <field name="type" on_change="onchange_type(partner_id, type)"/>
-          <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+          <field name="account_id" domain="[('journal_id','=',journal_id)]"/>
           <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
           <field name="amount" readonly="1" sum="Total Amount"/>
           <field name="globalisation_id" string="Glob. Id"/>
@@ -100,7 +100,7 @@
               <field name="ref" readonly="0"/>
               <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               <field name="type" on_change="onchange_type(partner_id, type)"/>
-              <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+              <field domain="[('journal_id', '=', journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
               <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
               <field name="amount"/>
               <field name="globalisation_id"/>
diff --git a/addons/account_coda/i18n/en_AU.po b/addons/account_coda/i18n/en_AU.po
index 05ee43ee631..319220741c5 100644
--- a/addons/account_coda/i18n/en_AU.po
+++ b/addons/account_coda/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-27 04:36+0000\n"
-"X-Generator: Launchpad (build 16033)\n"
+"X-Launchpad-Export-Date: 2012-09-28 04:39+0000\n"
+"X-Generator: Launchpad (build 16043)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 713784798fc..455475b0ae5 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -88,7 +88,7 @@ class payment_order_create(osv.osv_memory):
                     'partner_id': line.partner_id and line.partner_id.id or False,
                     'communication': line.ref or '/',
                     'date': date_to_pay,
-                    'currency': line.invoice and line.invoice.currency_id.id or False,
+                    'currency': (line.invoice and line.invoice.currency_id.id) or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -120,4 +120,4 @@ class payment_order_create(osv.osv_memory):
 
 payment_order_create()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c74ca5f833a..30358f701ef 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -32,11 +32,11 @@ class res_company(osv.osv):
     _columns = {
         'income_currency_exchange_account_id': fields.many2one(
             'account.account',
-            string="Income Currency Rate",
+            string="Gain Exchange Rate Account",
             domain="[('type', '=', 'other')]",),
         'expense_currency_exchange_account_id': fields.many2one(
             'account.account',
-            string="Expense Currency Rate",
+            string="Loss Exchange Rate Account",
             domain="[('type', '=', 'other')]",),
     }
 
@@ -782,9 +782,16 @@ class account_voucher(osv.osv):
             vals[key].update(res[key])
         return vals
 
+    def button_proforma_voucher(self, cr, uid, ids, context=None):
+        context = context or {}
+        wf_service = netsvc.LocalService("workflow")
+        for vid in ids:
+            wf_service.trg_validate(uid, 'account.voucher', vid, 'proforma_voucher', cr)
+        return {'type': 'ir.actions.act_window_close'}
+
     def proforma_voucher(self, cr, uid, ids, context=None):
         self.action_move_line_create(cr, uid, ids, context=context)
-        return {'type': 'ir.actions.act_window_close'}
+        return True
 
     def action_cancel_draft(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
@@ -950,11 +957,11 @@ class account_voucher(osv.osv):
         if amount_residual > 0:
             account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
             if not account_id:
-                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Income Currency Rate' on the company, then create accounting entry for currency rate difference."))
+                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Expense Currency Rate' on the company, then create accounting entry for currency rate difference."))
         else:
             account_id = line.voucher_id.company_id.income_currency_exchange_account_id
             if not account_id:
-                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Expense Currency Rate' on the company, then create accounting entry for currency rate difference."))
+                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Income Currency Rate' on the company, then create accounting entry for currency rate difference."))
         # Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
         # the receivable/payable account may have a secondary currency, which render this field mandatory
         account_currency_id = company_currency <> current_currency and current_currency or False
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 5e26c366778..697d2affcf0 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -108,6 +108,7 @@
                     </notebook>
                   </sheet>
                   <div class="oe_chatter">
+                      <field name="message_is_follower" invisible="1"/>
                       <field name="message_ids" widget="mail_thread"/>
                       <field name="message_follower_ids" widget="mail_followers"/>
                   </div>
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 14b725cbeca..91ba438756e 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -27,11 +27,12 @@ class invoice(osv.osv):
 
     def invoice_pay_customer(self, cr, uid, ids, context=None):
         if not ids: return []
+        mod,modid = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_dialog_form')
         inv = self.browse(cr, uid, ids[0], context=context)
         return {
             'name':_("Pay Invoice"),
             'view_mode': 'form',
-            'view_id': False,
+            'view_id': modid,
             'view_type': 'form',
             'res_model': 'account.voucher',
             'type': 'ir.actions.act_window',
@@ -41,13 +42,13 @@ class invoice(osv.osv):
             'context': {
                 'default_partner_id': inv.partner_id.id,
                 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
-                'default_name':inv.name,
+                'default_number':inv.name,
                 'close_after_process': True,
-                'invoice_type':inv.type,
-                'invoice_id':inv.id,
+                'invoice_type': inv.type,
+                'invoice_id': inv.id,
                 'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment',
                 'type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
-                }
+            }
         }
 
 invoice()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 65bcdad8a9b..8e86e44942a 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -243,6 +243,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
@@ -284,6 +285,111 @@
         <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
 
+        <record model="ir.ui.view" id="view_vendor_receipt_dialog_form">
+            <field name="name">account.voucher.receipt.dialog.form</field>
+            <field name="model">account.voucher</field>
+            <field name="priority">30</field>
+            <field name="arch" type="xml">
+                <form string="Payment" version="7.0">
+                    <group>
+                        <group>
+                            <field name="state" invisible="1"/>
+                            <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <label for="amount" string="Paid Amount"/>
+                            <div>
+                                <field name="amount" class="oe_inline"
+                                    invisible="context.get('line_type', False)"
+                                    on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                            <field name="journal_id"
+                                domain="[('type','in',['bank', 'cash'])]"
+                                invisible="context.get('line_type', False)"
+                                widget="selection"
+                                on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
+                                string="Payment Method"/>
+                        </group>
+                        <group>
+                            <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                            <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="e.g. 003/10"/>
+                            <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="e.g. Invoice SAJ/0042"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+
+                            <field name="account_id"
+                                widget="selection"
+                                invisible="True"/>
+                            <field name="pre_line" invisible="1"/>
+                            <field name="type" invisible="True"/>
+                        </group>
+                    </group>
+                    <notebook invisible="1">
+                        <page string="Payment Information" groups="base.group_user">
+                        	<label for="line_cr_ids"/>
+                            <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
+                                <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"
+                                        groups="account.group_account_user"/>
+                                    <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
+                                </tree>
+                            </field>
+                            <label for="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
+                            <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"/>
+                                    <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
+                                </tree>
+                            </field>
+                            <group col="3">
+                                <group>
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                    <field name="is_multi_currency" invisible="1"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                    <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                                </group>
+                                <group>
+                                    <field name="writeoff_amount"/>
+                                    <field name="payment_option" required="1"/>
+                                    <field name="writeoff_acc_id"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                           domain="[('type','=','other')]"/>
+                                    <field name="comment"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                    <field name="analytic_id"
+                                           groups="analytic.group_analytic_accounting"/>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
+                    <footer>
+                        <button name="button_proforma_voucher" string="Pay" class="oe_highlight" type="object"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+
         <record model="ir.ui.view" id="view_vendor_receipt_form">
             <field name="name">account.voucher.receipt.form</field>
             <field name="model">account.voucher</field>
@@ -297,7 +403,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
-                    <h1><field name="number"/></h1>
+                    <h1 attrs="{'invisible': [('number','=',False)]}"><field name="number"/></h1>
                     <group>
                         <group>
                             <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
@@ -329,7 +435,6 @@
                             <field name="type" invisible="True"/>
                         </group>
                     </group>
-
                     <notebook>
                         <page string="Payment Information" groups="base.group_user">
                         	<label for="line_cr_ids"/>
@@ -414,6 +519,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5bcecfa268e..d3449cf6027 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -146,6 +146,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
@@ -301,6 +302,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 51f5428002f..bed588015ad 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -53,6 +53,7 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 3dff7c1cb00..332808d8a18 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -442,11 +442,13 @@ class audittrail_objects_proxy(object_proxy):
 
             # if at least one modification has been found
             for model_id, resource_id in lines:
+                name = pool.get(model.model).name_get(cr, uid, [resource_id])[0][1]
                 vals = {
                     'method': method,
                     'object_id': model_id,
                     'user_id': uid,
                     'res_id': resource_id,
+                    'name': name,
                 }
                 if (model_id, resource_id) not in old_values and method not in ('copy', 'read'):
                     # the resource was not existing so we are forcing the method to 'create'
@@ -484,7 +486,7 @@ class audittrail_objects_proxy(object_proxy):
                     if len(rule['user_id']) == 0 or uid in rule['user_id']:
                         if rule.get('log_'+method,0):
                             return True
-                        elif method not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink', 'write', 'create'):
+                        elif method not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink', 'write', 'create', 'read_group', 'import_data'):
                             if rule['log_action']:
                                 return True
 
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index 47fc41c3645..c2c0ac557bf 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -180,8 +180,8 @@ class CompanyLDAP(osv.osv):
         """
         
         user_id = False
-        login = tools.ustr(login)
-        cr.execute("SELECT id, active FROM res_users WHERE login=%s", (login,))
+        login = tools.ustr(login.lower())
+        cr.execute("SELECT id, active FROM res_users WHERE lower(login)=%s", (login,))
         res = cr.fetchone()
         if res:
             if res[1]:
diff --git a/addons/auth_ldap/users_ldap_view.xml b/addons/auth_ldap/users_ldap_view.xml
index c4fc7cebbbe..47c15badd7c 100644
--- a/addons/auth_ldap/users_ldap_view.xml
+++ b/addons/auth_ldap/users_ldap_view.xml
@@ -14,7 +14,7 @@
                                     <field name="ldap_server"/>
                                     <field name="ldap_server_port"/>
                                     <field name="ldap_binddn"/>
-                                    <field name="ldap_password"/>
+                                    <field name="ldap_password" password="True"/>
                                     <field name="ldap_base"/>
                                     <field name="ldap_filter"/>
                                     <field name="create_user"/>
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 7555621945d..5b8c41787d4 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -971,8 +971,8 @@ class calendar_event(osv.osv):
             event = datas['id']
             if datas.get('interval', 0) < 0:
                 raise osv.except_osv(_('Warning!'), _('Interval cannot be negative.'))
-            if datas.get('count', 0) < 0:
-                raise osv.except_osv(_('Warning!'), _('Count cannot be negative.'))
+            if datas.get('count', 0) <= 0:
+                raise osv.except_osv(_('Warning!'), _('Count cannot be negative or 0.'))
             if datas['recurrency']:
                 result[event] = self.compute_rule_string(datas)
             else:
@@ -1113,6 +1113,16 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             'user_id': lambda self, cr, uid, ctx: uid,
             'organizer': default_organizer,
     }
+    
+    def _check_closing_date(self, cr, uid, ids, context=None):
+        for event in self.browse(cr, uid, ids, context=context):
+            if event.date_deadline < event.date:
+                return False
+        return True
+
+    _constraints = [
+        (_check_closing_date, 'Error ! End date cannot be set before start date.', ['date_deadline']),
+    ]
 
     def get_recurrent_ids(self, cr, uid, select, domain, limit=100, context=None):
         """Gives virtual event ids for recurring events based on value of Recurrence Rule
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 2da18447820..8373d32ab0d 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -182,13 +182,14 @@
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
                                     string="Uncertain" type="object"
+                                    icon="terp-crm"
                                     />
                                 <button name="do_accept" string="Accept"
                                     states="needs-action,tentative,declined"
-                                    type="object" />
+                                    type="object" icon="gtk-apply"/>
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
-                                    type="object" />
+                                    type="object" icon="gtk-cancel"/>
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <header>
@@ -222,6 +223,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 2a7996655a2..dd36aa19041 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -36,7 +36,7 @@ It manages key tasks such as communication, identification, prioritization, assi
 
 OpenERP ensures that all cases are successfully tracked by users, customers and suppliers. It can automatically send reminders, escalate the request, trigger specific methods and many other actions based on your own enterprise rules.
 
-The greatest thing about this system is that users don't need to do anything special. The CRM module has an email gateway for the synchronization interface between mails and OpenERP. That way, users can just send emails to the request tracker. 
+The greatest thing about this system is that users don't need to do anything special. The CRM module has an email gateway for the synchronization interface between mails and OpenERP. That way, users can just send emails to the request tracker.
 
 OpenERP will take care of thanking them for their message, automatically routing it to the appropriate staff and make sure all future correspondence gets to the right place.
 
@@ -99,7 +99,7 @@ Dashboard for CRM will include:
 
         'res_partner_view.xml',
         'board_crm_view.xml',
-        
+
         'res_config_view.xml',
 
     ],
@@ -115,9 +115,10 @@ Dashboard for CRM will include:
         'test/process/cancel_lead.yml',
         'test/process/action_rule.yml',
         'test/process/segmentation.yml',
+        'test/process/phonecalls.yml',
         'test/ui/crm_demo.yml',
         'test/ui/duplicate_lead.yml',
-        'test/ui/delete_lead.yml'
+        'test/ui/delete_lead.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 330bbb1fc9b..cca195a1539 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -102,6 +102,7 @@ class crm_case_section(osv.osv):
     """ Model for sales teams. """
     _name = "crm.case.section"
     _inherits = {'mail.alias': 'alias_id'}
+    _inherit = "mail.thread"
     _description = "Sales Teams"
     _order = "complete_name"
 
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 551e4e93fb8..dde3e63cc4a 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
+
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
-    <record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
-        <field name="name">Meetings</field>
-        <field name="resource">ir.ui.menu</field>
-        <field name="user_id" ref="base.user_demo"/>
-        <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
-    </record>
+        <record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
+            <field name="name">Meetings</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
+        </record>
 
-    <record model="crm.case.section" id="crm_case_section_1">
+        <record model="crm.case.section" id="crm_case_section_1">
             <field name="name">Sales Marketing Department</field>
             <field name="code">SMD</field>
-            <field name="parent_id" ref="crm.section_sales_department"></field>
-    </record>
+            <field name="parent_id" ref="crm.section_sales_department"/>
+        </record>
 
-    <record model="crm.case.section" id="crm_case_section_2">
+        <record model="crm.case.section" id="crm_case_section_2">
             <field name="name">Support Department</field>
             <field name="code">SPD</field>
-            <field name="parent_id" ref="crm.section_sales_department"></field>
-    </record>
+            <field name="parent_id" ref="crm.section_sales_department"/>
+        </record>
 
-    <record model="crm.case.section" id="crm_case_section_3">
+        <record model="crm.case.section" id="crm_case_section_3">
             <field name="name">Direct Marketing</field>
             <field name="code">DM</field>
-            <field name="parent_id" ref="crm.section_sales_department"></field>
-    </record>
+            <field name="parent_id" ref="crm.section_sales_department"/>
+        </record>
 
-    <record model="crm.case.section" id="crm_case_section_4">
+        <record model="crm.case.section" id="crm_case_section_4">
             <field name="name">Online Support</field>
             <field name="code">OS</field>
-            <field name="parent_id" ref="crm.crm_case_section_2"></field>
-    </record>
+            <field name="parent_id" ref="crm.crm_case_section_2"/>
+        </record>
 
-    <record model="crm.segmentation" id="crm_segmentation0">
-        <field name="name">OpenERP partners</field>
-        <field name="exclusif">True</field>
-        <field name="categ_id" ref="base.res_partner_category_2"/>
-    </record>
+        <record model="crm.segmentation" id="crm_segmentation0">
+            <field name="name">OpenERP partners</field>
+            <field name="exclusif">True</field>
+            <field name="categ_id" ref="base.res_partner_category_2"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index d8b7fb58e49..d668ea710c1 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -277,6 +277,10 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(crm_lead, self).create(cr, uid, vals, context)
+        section_id = self.browse(cr, uid, obj_id, context=context).section_id
+        if section_id:
+            followers = [follow.id for follow in section_id.message_follower_ids]
+            self.message_subscribe(cr, uid, [obj_id], followers, context=context)
         self.create_send_note(cr, uid, [obj_id], context=context)
         return obj_id
 
@@ -294,7 +298,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
-                'partner_name' : partner.name, 
+                'partner_name' : partner.name,
                 'street' : partner.street,
                 'street2' : partner.street2,
                 'city' : partner.city,
@@ -491,7 +495,8 @@ class crm_lead(base_stage, format_address, osv.osv):
             title = "%s : %s" % (merge_message, opportunity.name)
             details.append(self._mail_body(cr, uid, opportunity, fields, title=title, context=context))
 
-        subject = subject[0] + ", ".join(subject[1:])
+        # Chatter message's subject
+        subject = subject[0] + ": " + ", ".join(subject[1:])
         details = "\n\n".join(details)
         return self.message_post(cr, uid, [opportunity_id], body=details, subject=subject, context=context)
 
@@ -560,19 +565,18 @@ class crm_lead(base_stage, format_address, osv.osv):
 
         data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
 
-        # merge data into first opportunity
-        self.write(cr, uid, [first_opportunity.id], data, context=context)
-
-        #copy message and attachements into the first opportunity
+        # Merge messages and attachements into the first opportunity
         self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
         self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)
 
-        #Notification about loss of information
+        # Merge notifications about loss of information
         self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
-        #delete tail opportunities
+        # Write merged data into first opportunity
+        self.write(cr, uid, [first_opportunity.id], data, context=context)
+        # Delete tail opportunities
         self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
 
-        #open first opportunity
+        # Open first opportunity
         self.case_open(cr, uid, [first_opportunity.id])
         return first_opportunity.id
 
@@ -581,13 +585,16 @@ class crm_lead(base_stage, format_address, osv.osv):
         contact_id = False
         if customer:
             contact_id = self.pool.get('res.partner').address_get(cr, uid, [customer.id])['default']
+
         if not section_id:
             section_id = lead.section_id and lead.section_id.id or False
+
         if section_id:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1), ('section_ids','=', section_id)])
         else:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
         stage_id = stage_ids and stage_ids[0] or False
+
         return {
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
@@ -604,7 +611,6 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
         partner = self.pool.get('res.partner')
-        mail_message = self.pool.get('mail.message')
         customer = False
         if partner_id:
             customer = partner.browse(cr, uid, partner_id, context=context)
@@ -790,7 +796,12 @@ class crm_lead(base_stage, format_address, osv.osv):
             stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
             if stage.on_change:
                 vals['probability'] = stage.probability
-        return super(crm_lead,self).write(cr, uid, ids, vals, context)
+        if vals.get('section_id'):
+            section_id = self.pool.get('crm.case.section').browse(cr, uid, vals.get('section_id'), context=context)
+            if section_id:
+                vals.setdefault('message_follower_ids', [])
+                vals['message_follower_ids'] += [(4, follower.id) for follower in section_id.message_follower_ids]
+        return super(crm_lead,self).write(cr, uid, ids, vals, context) 
 
     # ----------------------------------------
     # Mail Gateway
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index b3c00256b06..7849125282e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-        <!-- 
-            Demo Leads
-            -->
 
+        <!--  Demo Leads -->
         <record id="crm_case_1" model="crm.lead">
             <field name="type">lead</field>
             <field name="name">Plan to Attend a Training</field>
@@ -26,9 +24,9 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
-I am Jason from Le Club SARL,
-I am intertested to attend Training organized in your company,
-Can you send details,</field>
+I am Jason from Le Club SARL.
+I am intertested to attend a training organized in your company.
+Can you send me the details ?</field>
             <field eval="1" name="active"/>
         </record>
 
@@ -110,7 +108,8 @@ Can you send details,</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field name="description">Hi, Can you send a quotation for 20 Computers with speakers? 
+            <field name="description">Hi,
+Can you send me a quotation for 20 computers with speakers?
 Regards,
 Carrie Helle,
 Purchase Manager
@@ -215,8 +214,9 @@ Contact: +1 813 494 5005</field>
             <field name="section_id" ref="crm_case_section_3"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field name="description">hi,
-I want to know specification and cost of laptops of your company.
+            <field name="description">Hi,
+I would like to know more about specification and cost of laptops of your company.
+
 Thanks,
 Andrew</field>
             <field eval="1" name="active"/>
@@ -260,25 +260,20 @@ Andrew</field>
             <field eval="1" name="active"/>
         </record>
 
-
-        <!--        Call Function to Cancel the leads (set as Dead) -->
+        <!-- Call Function to Cancel the leads (set as Dead) -->
         <function model="crm.lead" name="case_cancel"
             eval="[ ref('crm_case_12'), ref('crm_case_7'),
                     ref('crm_case_3'), ref('crm_case_8')],
                   {'install_mode': True}"
         />
-        <!--        Call Function to set the leads as Unread -->
+
+        <!-- Call Function to set the leads as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_1'), ref('crm_case_2'),
                     ref('crm_case_5'), ref('crm_case_11')], {}"
         />
 
-
-        <!-- 
-            Demo Opportunities
-            -->
-
-
+        <!-- Demo Opportunities -->
         <record id="crm_case_13" model="crm.lead">
             <field name="type">opportunity</field>
             <field name="name">Plan to buy 60 keyboards and mouses</field>
@@ -563,9 +558,9 @@ Andrew</field>
             <field name="body">Dear Customer,
 Thanks for showing interest in our products.
 We have attached the catalogue,
-We would like to know your interests, Let us know if we can call you for more details.
+We would like to know your interests, so let us know when we can call you for more details.
 
-Thanks</field>
+Regards</field>
             <field name="parent_id" ref="message_email0"/>
             <field name="author_id" ref="base.partner_root"/>
         </record>
@@ -600,9 +595,9 @@ Thanks</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_1"/>
             <field name="body">Hello,
-I am Jason from Le Club SARL,
-I am intertested to attend Training organized in your company,
-Can you send details,</field>
+I am Jason from Le Club SARL.
+I am intertested to attend a training organized in your company.
+Can you send me the details ?</field>
             <field name="type">email</field>
         </record>
         <record id="message_email_13" model="mail.message">
@@ -613,7 +608,7 @@ Can you send details,</field>
             <field name="type">comment</field>
         </record>
 
-        <!--        Call Function to set the opportunities as Unread -->
+        <!-- Call Function to set the opportunities as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_15'), ref('crm_case_16'),
                     ref('crm_case_23'), ref('crm_case_19')], {}"
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 04758f4ffe0..208d92a6684 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -14,12 +14,13 @@
           <p class="oe_view_nocontent_create">
             Click to create an unqualified lead. 
           </p><p>
-            A lead is usually the first step in your sales cycle. It can be
-            a contact with a new prospect, a company you target, a contact form
-            filled in your website, etc.
+            Use leads if you need a qualification step before creating an
+            opportunity or a customer. It can be a business card you received,
+            a contact form filled in your website, or a file of unqualified
+            prospects you import, etc.
           </p><p>
             Once qualified, the lead can be converted into a business
-            opportunity and a new customer in your address book.
+            opportunity and/or a new customer in your address book.
           </p>
         </field>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f91a8756598..f0311f8fce5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -223,6 +223,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
@@ -525,6 +526,7 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index cbfb74a8e04..f441c29a7e6 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-    <!-- 
-        ((((((((((( Demo Cases ))))))))))) 
-    -->
+
+        <!--  Demo Cases  -->
         <record id="crm_phonecall_1" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
             <field name="partner_id" ref="base.res_partner_11"/>
@@ -47,7 +46,7 @@
             <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="name">Wanted information about pricing of Laptops</field>
+            <field name="name">Wanted information about pricing of laptops</field>
             <field name="state">done</field>
             <field name="partner_phone">(077) 582-4035</field>
             <field name="partner_mobile">(077) 341-3591</field>
@@ -79,6 +78,7 @@
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="8.56" name="duration"/>
-        </record>    
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index ba8c4768c09..c359aa461e7 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -6,8 +6,8 @@
         id="crm_case_categ_phone_create_partner"
         name="Schedule a Call"
         res_model="crm.phonecall"
-        view_mode="calendar,tree,form"
-        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
+        view_mode="tree,form,calendar"
+        context="{'search_default_partner_id': active_id, 'default_duration': 1.0, 'default_partner_id': active_id}"
         groups="base.group_sale_salesman"
         />
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 8c1e1c9ec76..b8bc6b3a13e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -146,10 +146,10 @@
                         <field name="priority"/>
                         <field name="opportunity_id"/>
                     </group>
-
                     <field name="description" placeholder="Description..."/>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index df2177a51fe..1da78e50843 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -115,6 +115,10 @@
                             <field name="note"/>
                         </page>
                     </notebook>
+                    <div class="oe_chatter">
+                        <field name="message_ids" widget="mail_thread"/>
+                        <field name="message_follower_ids" widget="mail_followers" help="Followers of this salesteam follow automatically all opportunities related to this salesteam."/>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 55cc0c95b2c..e43534476fd 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -26,12 +26,16 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     def _opportunity_meeting_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for partner in self.browse(cr, uid, ids, context):
-            res[partner.id] = {
-                'opportunity_count': len(partner.opportunity_ids),
-                'meeting_count': len(partner.meeting_ids),
-            }
+        res = dict(map(lambda x: (x,{'opportunity_count': 0, 'meeting_count': 0}), ids))
+        # the user may not have access rights for opportunities or meetings
+        try:
+            for partner in self.browse(cr, uid, ids, context):
+                res[partner.id] = {
+                    'opportunity_count': len(partner.opportunity_ids),
+                    'meeting_count': len(partner.meeting_ids),
+                }
+        except:
+            pass
         return res
 
     _columns = {
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index eae78de70a0..84a0bd4cf49 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -54,7 +54,7 @@
             <field name="src_model">res.partner</field>
             <field name="res_model">crm.meeting</field>
             <field name="view_mode">calendar,tree,form,gantt</field>
-            <field name="context">{'search_default_partner_ids': active_id}</field>
+            <field name="context">{'default_partner_ids': [active_id]}</field>
         </record>
 
         <!-- open opportunities related to given partner -->
diff --git a/addons/crm/test/process/action_rule.yml b/addons/crm/test/process/action_rule.yml
index 9c869009906..f76e6c250bc 100644
--- a/addons/crm/test/process/action_rule.yml
+++ b/addons/crm/test/process/action_rule.yml
@@ -7,14 +7,14 @@
     new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': model_ids[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_1'), 'act_user_id': ref('base.user_demo') })
     self._check(cr, uid)
 -
-  I create new lead to check record rule.
+  I create a new lead to check the record rule.
 -
   !record {model: crm.lead, id: crm_lead_test_rules_id}:
     name: 'Test lead rules'
     partner_id: base.res_partner_1
 -
-  I check record rule is apply and responsible is changed.
+  I check if the record rule is applied and the responsible is changed.
 -
   !python {model: crm.lead}: |
     lead_user = self.browse(cr, uid, ref('crm_lead_test_rules_id'))
-    assert lead_user.user_id.id == ref('base.user_demo'), "Responsible of lead is not changed." 
+    assert lead_user.user_id.id == ref('base.user_demo'), "Responsible of lead is not changed."
diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index 31c159c3fdf..edaf844952a 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -10,7 +10,7 @@
     lead = self.browse(cr, uid, ref('crm_case_1'))
     assert lead.stage_id.id == ref('crm.stage_lead7'), "Stage should be 'Dead' and is %s." % (lead.stage_id.name)
     assert lead.state == 'cancel', "Opportunity is not in 'cancel' state."
-    assert lead.probability == 0.0, 'Opportunity probability is wrong and should be 0.0.'
+    assert lead.probability == 0.0, 'Opportunity is probably wrong and should be 0.0.'
 -
   I reset cancelled lead into unqualified lead.
 -
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index ec11528d15a..2137616ae3e 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -1,7 +1,7 @@
 -
-  Customer interested in our product. so he send request by email to get more details.
+  Customer interested in our product, so he sends request by email to get more details.
 -
-  Mail script will be fetched him request from mail server. so I process that mail after read EML file 
+  Mail script will fetch his request from mail server. Then I process that mail after read EML file.
 -
   !python {model: mail.thread}: |
     import addons
@@ -15,27 +15,27 @@
     lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     assert lead_ids and len(lead_ids), "Lead is not created after getting request"
     lead = self.browse(cr, uid, lead_ids[0], context=context)
-    assert not lead.partner_id, "Customer should be a new"
+    assert not lead.partner_id, "Customer should be a new one"
     assert lead.name == "Fournir votre devis avec le meilleur prix.", "Subject does not match"
 -
-  I reply him request with welcome message. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
+  I reply his request with welcome message. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
   !python {model: mail.mail}: |
     lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
-    id = self.create(cr, uid, {'body': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
+    id = self.create(cr, uid, {'body': "Merci de votre intérêt pour notre produit, nous vous contacterons bientôt. Bien à vous", 'email_from': 'sales@mycompany.com'}, context=context)
     try:
         self.send_mail(cr, uid, [id], context=context)
     except:
         pass
 -
-  Now, I convert him into customer and put into regular customer list.
+  Now, I convert him into customer and put him into regular customer list.
 -
   !python {model: crm.lead}: |
     lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     self.convert_partner(cr, uid, lead_ids, context=context)
 -
-  I convert one phonecall request as a customer and put into regular customer list. 
+  I convert one phonecall request to a customer and put him into regular customer list.
 -
   !python {model: crm.phonecall2partner}: |
     context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_4")], 'active_id': ref("crm.crm_phonecall_4")})
@@ -48,5 +48,5 @@
     partner_id = self.search(cr, uid, [('phonecall_ids', '=', ref('crm.crm_phonecall_4'))])
     assert partner_id, "Customer is not found in regular customer list."
     data = self.browse(cr, uid, partner_id, context=context)[0]
-    assert data.user_id.id == ref("base.user_root"), "User not assign properly"
-    assert data.name == "Wanted information about pricing of Laptops", "Bad partner name"
+    assert data.user_id.id == ref("base.user_root"), "User not assigned properly"
+    assert data.name == "Wanted information about pricing of laptops", "Bad partner name"
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index ed552421cf0..eadb46f0f55 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -1,17 +1,17 @@
 -
-  In order to test convert customer lead into opportunity, 
+  In order to test convert customer lead into opportunity,
 -
   I open customer lead.
 -
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_case_4")])
-- 
-  I check lead state is "Open". 
+-
+  I check lead state is "Open".
 -
   !assert {model: crm.lead, id: crm.crm_case_4, string: Lead in open state}:
      - state == "open"
 -
-  I create partner from lead. 
+  I create partner from lead.
 -
   !record {model: crm.lead2partner, id: crm_lead2partner_id1, context: '{"active_model": "crm.lead", "active_ids": [ref("crm_case_4")]}'}:
 -
@@ -24,7 +24,7 @@
   !python {model: crm.lead}: |
     self.convert_opportunity(cr, uid ,[ref("crm_case_4")], ref("base.res_partner_2"))
 -
-  I check details of converted opportunity. 
+  I check details of converted opportunity.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_4'))
@@ -37,15 +37,15 @@
   !python {model: crm.opportunity2phonecall}: |
     import time
     context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_4')]})
-    call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                'name': "Bonjour M. Jean, Comment êtes-vous? J'ai obtenu votre demande. peut-on parler au sujet de ce pour quelques minutes?"}, context=context)
+    call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'name': "Bonjour M. Jean, Comment allez-vous? J'ai bien reçu votre demande, pourrions-nous en parler quelques minutes?"}, context=context)
     self.action_schedule(cr, uid, [call_id], context=context)
 -
   I check that phonecall is scheduled for that opportunity.
 -
   !python {model: crm.phonecall}: |
     ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_4'))])
-    assert len(ids), 'phonecall is not scheduled'
+    assert len(ids), 'Phonecall is not scheduled'
 -
   Now I schedule meeting with customer.
 -
@@ -55,7 +55,7 @@
   After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.lead}: |
-    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='ces détails envoyés par le client sur ​​le FAX pour la qualité')
+    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -
@@ -73,7 +73,7 @@
   I convert mass lead into opportunity customer.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_11")}) 
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_11")})
     id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
@@ -111,7 +111,7 @@
   I confirm review needs meeting.
 -
   !python {model: crm.meeting}: |
-    context.update({'active_model': 'crm.meeting'}) 
+    context.update({'active_model': 'crm.meeting'})
     self.case_open(cr, uid, [ref('base_calendar.crm_meeting_4')])
 -
   I invite a user for meeting.
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 6d13278eded..155cd68274f 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -1,19 +1,19 @@
 -
-  I make direct opportunity for customer.
+  I make an opportunity from customer.
 -
   !python {model: crm.partner2opportunity}: |
     context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_9")]})
-    res_id = self.create(cr, uid, {'name': "enquête pour l'achat de services"}, context=context)
+    res_id = self.create(cr, uid, {'name': "Enquête pour l'achat de services"}, context=context)
     self.make_opportunity(cr, uid, [res_id], context=context)
 -
-  I make another opportunity from phonecall for same customer.
+  I make another opportunity from a phone call with the same customer.
 -
   !python {model: crm.phonecall2opportunity}: |
     context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_6")]})
-    res_id = self.create(cr, uid, {'name': "Quoi de prix de votre autre service?", 'partner_id': ref("base.res_partner_9")}, context=context)
+    res_id = self.create(cr, uid, {'name': "À propos du prix de votre autre service", 'partner_id': ref("base.res_partner_9")}, context=context)
     self.make_opportunity(cr, uid, [res_id], context=context)
 -
-  Now I merge all opportunities of customer.
+  Now I merge these opportunities.
 -
   !python {model: crm.lead}: |
     opportunity_ids = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
@@ -24,7 +24,7 @@
   !python {model: crm.merge.opportunity}: |
     self.action_merge(cr, uid, [ref("opportunity_merge_id")], context=context)
 -
-  I check for merged opportunities for customer. 
+  I check for merged opportunities for customer.
 -
   !python {model: crm.lead}: |
     merge_id = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
@@ -32,55 +32,3 @@
     merge_data = self.browse(cr, uid, merge_id)[0]
     assert merge_data.type == 'opportunity', 'Merged opportunity type not change!'
     assert merge_data.partner_id.id == ref("base.res_partner_9"), 'Partner missmatch!'
--
-  Now I schedule another phonecall to customer after merged.
--
-  !python {model: crm.phonecall2phonecall}: |
-    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_6")], 'active_id': ref("crm.crm_phonecall_6")})
-    res_id = self.create(cr, uid, {'name': "vos chances sont fusionnés en un seul"}, context=context)
-    self.action_schedule(cr, uid, [res_id], context=context)
-- 
-  I schedule meeting on this phonecall.
--
-  !python {model: crm.phonecall}: |
-    self.action_make_meeting(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I set phone call to not held.
--
-  !python {model: crm.phonecall}: |
-    self.case_pending(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Not Held' state. 
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call held.}:
-    - state == "pending"
--
-  I cancelled the phone call. 
--
-  !python {model: crm.phonecall}: |
-    self.case_cancel(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Cancelled' state.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not cancelled.}:
-    - state == "cancel"
--
-  I reset the phone call. 
--
-  !python {model: crm.phonecall}: |
-    self.case_reset(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is reset or not.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not reset.}:
-    - state == "open"
--
-  I set phone call to held (done).
--
-  !python {model: crm.phonecall}: |
-    self.case_close(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Held' state.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not held.}:
-    - state == "done"
diff --git a/addons/crm/test/process/phonecalls.yml b/addons/crm/test/process/phonecalls.yml
new file mode 100644
index 00000000000..51a933f3223
--- /dev/null
+++ b/addons/crm/test/process/phonecalls.yml
@@ -0,0 +1,52 @@
+-
+  I schedule a phone call with a customer.
+-
+  !python {model: crm.phonecall2phonecall}: |
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_6")], 'active_id': ref("crm.crm_phonecall_6")})
+    res_id = self.create(cr, uid, {'name': "Proposition de réduction"}, context=context)
+    self.action_schedule(cr, uid, [res_id], context=context)
+-
+  I schedule a meeting based on this phone call.
+-
+  !python {model: crm.phonecall}: |
+    self.action_make_meeting(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I set the phone call to not held.
+-
+  !python {model: crm.phonecall}: |
+    self.case_pending(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is in 'Not Held' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call held.}:
+    - state == "pending"
+-
+  I cancel the phone call.
+-
+  !python {model: crm.phonecall}: |
+    self.case_cancel(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is in 'Cancelled' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not cancelled.}:
+    - state == "cancel"
+-
+  I reset the phone call.
+-
+  !python {model: crm.phonecall}: |
+    self.case_reset(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is reset.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not reset.}:
+    - state == "open"
+-
+  I set phone call to held (done).
+-
+  !python {model: crm.phonecall}: |
+    self.case_close(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is in 'Held' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not held.}:
+    - state == "done"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 44ce73c23fe..2473a83206c 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -34,15 +34,17 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                                     ('create', 'Create a new customer'), \
                                     ('nothing', 'Do not link to a customer')], \
                                     'Related Customer', required=True),
-        'name': fields.selection([('convert', 'Convert to Opportunities'), ('merge', 'Merge with existing Opportunities')], 'Conversion Action', required=True),
+        'name': fields.selection([('convert', 'Convert to opportunity'), \
+                                  ('merge', 'Merge with existing opportunities')], \
+                                  'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]),
     }
 
     def default_get(self, cr, uid, fields, context=None):
         """
-            Default get for name, opportunity_ids
-            if there is an exisitng  partner link to the lead, find all existing opportunity link with this partnet to merge
-            all information together
+        Default get for name, opportunity_ids.
+        If there is an exisitng partner link to the lead, find all existing
+        opportunities links with this partner to merge all information together
         """
         lead_obj = self.pool.get('crm.lead')
 
@@ -62,12 +64,13 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         ids = []
         if partner_id:
+            # Search for opportunities that have the same partner and that arent done or cancelled
             ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
             if ids:
                 opportunities.append(ids[0])
         if not partner_id:
             if email:
-                # Find email of existing opportunity matches the email_from of the lead
+                # Find email of existing opportunity matching the email_from of the lead
                 cr.execute("""select id from crm_lead where type='opportunity' and
                                 substring(email_from from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
                 ids = map(lambda x:x[0], cr.fetchall())
@@ -83,12 +86,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         if 'opportunity_ids' in fields:
             res.update({'opportunity_ids': opportunities})
 
-
         return res
 
     def view_init(self, cr, uid, fields, context=None):
         """
-        This function checks for precondition before wizard executes
+        Check some preconditions before the wizard executes.
         """
         if context is None:
             context = {}
@@ -110,7 +112,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             partner_id = partner_ids_map.get(lead_id, False)
             # FIXME: cannot pass user_ids as the salesman allocation only works in batch
             res = lead.convert_opportunity(cr, uid, [lead_id], partner_id, [], team_id, context=context)
-        # FIXME: must perform salesman allocation in batch separately here  
+        # FIXME: must perform salesman allocation in batch separately here
         user_ids = vals.get('user_ids', False)
         if user_ids:
             lead.allocate_salesman(cr, uid, lead_ids, user_ids, team_id=team_id, context=context)
@@ -136,9 +138,10 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
     def action_apply(self, cr, uid, ids, context=None):
         """
-        This converts lead to opportunity and opens Opportunity view
+        Convert lead to opportunity or merge lead and opportunity and open
+        the freshly created opportunity view.
         """
-        if not context:
+        if context is None:
             context = {}
         lead = self.pool.get('crm.lead')
         lead_ids = context.get('active_ids', [])
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index ef8acf95b58..3390ad8f547 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -7,15 +7,9 @@
             <field name="model">crm.lead2opportunity.partner</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <group>
-                        <field name="action" class="oe_inline"/>
-                        <field name="partner_id" 
-                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
-                            class="oe_inline"/>
-                    </group>
                     <group>
                         <field name="name" class="oe_inline"/>
-                        <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
+                        <field name="opportunity_ids" attrs="{'invisible': [('name', '!=', 'merge')]}">
                             <tree>
                                 <field name="name"/>
                                 <field name="partner_id"/>
@@ -24,6 +18,12 @@
                             </tree>
                         </field>
                     </group>
+                    <group attrs="{'invisible': [('name', '!=', 'convert')]}">
+                        <field name="action" class="oe_inline"/>
+                        <field name="partner_id"
+                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
+                            class="oe_inline"/>
+                    </group>
                     <footer>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
                         or
@@ -38,23 +38,28 @@
             <field name="model">crm.lead2opportunity.partner.mass</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <group string="Conversion Options">
-                        <field name="action"/>
-                        <field name="partner_id" attrs="{'invisible':[('action','!=','exist')],'required': [('action', '=', 'exist')]}"/>
-                        <field name="name"/>
+                    <separator string="Conversion Options"/>
+                    <group>
+                        <field name="name" class="oe_inline"/>
                     </group>
-                    <group string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}">
-                    <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
-                        <tree>
-                            <field name="name" />
-                            <field name="partner_id" />
-                            <field name="user_id" />
-                            <field name="section_id" />
-                        </tree>
-                    </field>
+                    <group attrs="{'invisible': [('name', '!=', 'convert')]}">
+                        <field name="action" class="oe_inline"/>
+                        <field name="partner_id"
+                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
+                            class="oe_inline"/>
                     </group>
-                    
-                    <group string="Assign opportunities to">
+                    <group string="Select Opportunities" attrs="{'invisible': [('name', '!=', 'merge')]}">
+                        <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
+                            <tree>
+                                <field name="name" />
+                                <field name="partner_id" />
+                                <field name="user_id" />
+                                <field name="section_id" />
+                            </tree>
+                        </field>
+                    </group>
+
+                    <group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
                         <field name="section_id" />
                         <field name="user_ids" colspan="4">
                             <tree>
@@ -62,14 +67,14 @@
                             </tree>
                         </field>
                     </group>
-                    
+
                     <footer>
                         <button name="mass_convert" string="Convert to Opportunities" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>                            
+                    </footer>
                 </form>
-              </field>
+            </field>
         </record>
 
         <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
@@ -83,10 +88,11 @@
 
         <act_window id="action_crm_send_mass_convert"
             multi="True"
-            key2="client_action_multi" name="Convert opportunities"
+            key2="client_action_multi" name="Convert to opportunities"
             res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
             view_id="view_crm_lead2opportunity_partner_mass"/>
+
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 381bb9871ea..edfefb5e5bc 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -27,6 +27,8 @@ class crm_merge_opportunity(osv.osv_memory):
     _description = 'Merge two Opportunities'
 
     def action_merge(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         lead = self.pool.get('crm.lead')
         record = self.browse(cr, uid, ids[0], context=context)
         opportunities = record.opportunity_ids
@@ -38,7 +40,7 @@ class crm_merge_opportunity(osv.osv_memory):
         return lead.redirect_opportunity_view(cr, uid, merge_id, context=context)
 
     _columns = {
-        'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
+        'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'),
     }
 
     def default_get(self, cr, uid, fields, context=None):
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 3a0b11c4255..4b035200737 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -3,13 +3,12 @@
     <data>
 
         <!-- Merge Opportunities  -->
-
         <record model="ir.ui.view" id="merge_opportunity_form">
             <field name="name">crm.merge.opportunity.form</field>
             <field name="model">crm.merge.opportunity</field>
             <field name="arch" type="xml">
-                <form string="Merge Opportunities" version="7.0">
-                    <separator string="Select Opportunities"/>
+                <form string="Merge Leads/Opportunities" version="7.0">
+                    <separator string="Select Leads/Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
                             <field name="name"/>
@@ -19,7 +18,7 @@
                         </tree>
                     </field>
                     <footer>
-                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
+                        <button name="action_merge" type="object" string="Merge" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
@@ -27,10 +26,9 @@
             </field>
         </record>
 
-        <!--  Merge Opportunities action -->
-
+        <!--  Merge leads/opportunities action -->
         <record model="ir.actions.act_window" id="merge_opportunity_act">
-            <field name="name">Merge Opportunities</field>
+            <field name="name">Merge leads/opportunities</field>
             <field name="res_model">crm.merge.opportunity</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -40,7 +38,7 @@
 
         <act_window id="action_merge_opportunities"
             multi="True"
-            key2="client_action_multi" name="Merge Opportunities"
+            key2="client_action_multi" name="Merge leads/opportunities"
             res_model="crm.merge.opportunity" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"/>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 820fb38e58a..b319339bcfd 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -181,6 +181,7 @@
                     </group>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
@@ -241,7 +242,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_claim" string="Claim">
+                    <group name="grp_claim" string="Claims">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 5399c9880ca..d2be33e4584 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -61,10 +61,6 @@
                                         on_change="onchange_partner_id(partner_id, email_from)"
                                         />
                                     <field name="email_from"/>
-                                    <button name="remind_partner"
-                                        states="open,pending"
-                                        string="Send Reminder" type="object"
-                                        icon="gtk-go-forward" />
                                 </group>
                                 <group string="Categorization">
                                     <field name="priority"/>
@@ -99,6 +95,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 1e894b456c0..dacbca0b3c6 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -124,7 +124,7 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <notebook position="inside">
-                <page string="Profiling">
+                <page string="Profiling" groups="base.group_user">
                   <button string="Use a questionnaire"
                       name="%(action_open_questionnaire)d" type="action" colspan="1"
                       icon="gtk-justify-fill" />
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index 24fd7009c6a..71149a912ee 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_crm_profiling_answer_salesman,crm_profiling.answer.salesman,model_crm_profiling_answer,base.group_sale_salesman,1,1,1,0
 access_crm_profiling_answer_manager,crm_profiling.answer.manager,model_crm_profiling_answer,base.group_sale_manager,1,1,1,1
+access_crm_profiling_answer_user,crm_profiling.answer.user,model_crm_profiling_answer,base.group_user,1,0,0,0
 access_crm_profiling_question_salesman,crm_profiling.question.salesman,model_crm_profiling_question,base.group_sale_salesman,1,1,1,0
 access_crm_profiling_question_manager,crm_profiling.question.manager,model_crm_profiling_question,base.group_sale_manager,1,1,1,1
 access_crm_profiling_questionnarie_salesman,crm_profiling.questionnarie.salesman,model_crm_profiling_questionnaire,base.group_sale_salesman,1,1,1,0
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index deb59983ef2..4ac1ab12573 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -90,7 +90,7 @@
         </record>
 
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
-            <field name="name">Delivery Method</field>
+            <field name="name">Delivery Methods</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
@@ -230,6 +230,10 @@
                     <field name="carrier_tracking_ref"/>
                     <field name="number_of_packages"/>
                 </field>
+                <field name="company_id" position="before">
+                    <field name="weight"/>
+                    <field name="weight_net" groups="base.group_no_one"/>
+               </field>
             </field>
         </record>
 
@@ -307,13 +311,26 @@
         <record id="view_delivery_order_inherit_stock" model="ir.ui.view">
             <field name="name">stock.picking.out.form</field>
             <field name="model">stock.picking.out</field>
-            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/header//button[@string='Create Invoice/Refund']" position="after">
-                    <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
+                <xpath expr="/form/header//button[@name='action_process']" position="after">
+                    <button name="%(report_shipping)d" string="Print Delivery Order" states="confirmed,assigned" type="action"/>
+                    <button name="%(report_shipping)d" string="Print Delivery Order" states="done" type="action" class="oe_highlight"/>
                 </xpath>
             </field>
         </record>
-
+        
+        <record id="view_picking_withcarrier_in_form" model="ir.ui.view">
+            <field name="name">delivery.stock.picking_withcarrier.in.form.view</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+              <field name="company_id" position="before">
+                    <field name="weight"/>
+                    <field name="weight_net" groups="base.group_no_one"/>
+               </field>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index f4d133e967a..c3ce236dc2e 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -202,5 +202,30 @@ class stock_picking_out(osv.osv):
         'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
         'number_of_packages': fields.integer('Number of Packages'),
         }
+stock_picking_out()
+
+class stock_picking_in(osv.osv):
+    _inherit = 'stock.picking.in'
+
+    def _cal_weight(self, cr, uid, ids, name, args, context=None):
+        return self.pool.get('stock.picking')._cal_weight(cr, uid, ids, name, args, context=context)
+
+    def _get_picking_line(self, cr, uid, ids, context=None):
+        return self.pool.get('stock.picking')._get_picking_line(cr, uid, ids, context=context)
+
+    _columns = {
+        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+                store={
+                'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
+                'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
+                }),
+        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+                store={
+                'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
+                'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
+                }),
+        }
+stock_picking_in()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 3dc14054b40..e3354efff0c 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -57,6 +57,7 @@ ATTENTION:
     ],
     'demo': [ 'document_demo.xml','board_document_demo.xml'],
     'test': ['test/document_test2.yml'],
+    'js': ['static/src/js/document.js'],
     'installable': True,
     'auto_install': False,
     'images': ['images/1_directories.jpeg','images/2_storage_media.jpeg','images/3_directories_structure.jpeg'],
diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js
new file mode 100644
index 00000000000..2dde2696c81
--- /dev/null
+++ b/addons/document/static/src/js/document.js
@@ -0,0 +1,10 @@
+openerp.document = function (instance) {
+    _t = instance.web._t;
+    instance.web.Sidebar.include({
+        init : function(){
+            this._super.apply(this, arguments);
+            this.sections.splice(1, 0, { 'name' : 'files', 'label' : _t('Attachment(s)'), });
+            this.items['files'] = [];
+        }
+    });
+};
\ No newline at end of file
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index b1120bc6511..8260424d653 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -39,7 +39,7 @@ class document_ftp_browse(osv.osv_memory):
             data_pool = self.pool.get('ir.model.data')
             aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
             aid = data_pool.browse(cr, uid, aid, context=context).res_id
-            ftp_url = self.pool.get('ir.actions.url').browse(cr, uid, aid, context=context)
+            ftp_url = self.pool.get('ir.actions.act_url').browse(cr, uid, aid, context=context)
             url = ftp_url.url and ftp_url.url.split('ftp://') or []
             if url:
                 url = url[1]
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 5da2ddf11e8..d0679973c5a 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -44,7 +44,7 @@ class document_ftp_configuration(osv.osv_memory):
         # Update the action for FTP browse.
         aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
         aid = data_pool.browse(cr, uid, aid, context=context).res_id
-        self.pool.get('ir.actions.url').write(cr, uid, [aid], 
+        self.pool.get('ir.actions.act_url').write(cr, uid, [aid], 
                 {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/' + cr.dbname+'/'})
 
 document_ftp_configuration()
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 36fb80c51af..9e05fba986e 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record model="ir.actions.url" id="action_document_browse">
+    <record model="ir.actions.act_url" id="action_document_browse">
         <field name="name">Browse Files</field>
         <field name="url">ftp://localhost:8021/</field>
     </record>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index fd396053d5d..f786592d06c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
-        <act_window
-            id="act_event_list_register_event"
-            name="Registration"
-            res_model="event.registration"
-            src_model="event.event"
-            view_mode="calendar,tree,form,graph"
-            context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
-            view_type="form"/>
+        
+        <record id="act_event_list_register_event" model="ir.actions.act_window">
+            <field name="res_model">event.registration</field>
+            <field name="view_type">form</field>
+            <field name="name">Registrations</field>
+            <field name="view_mode">calendar,tree,form,graph</field>
+            <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
+        </record>
 
         <!-- Top menu item -->
         <menuitem name="Events"
@@ -197,6 +196,7 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
@@ -247,12 +247,12 @@
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette">
                         <a type="open" class="oe_module_icon">
-                           <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
-                           <div class="oe_event_month_year">
-                             <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
-                             <t t-esc="record.date_begin.raw_value.getFullYear()"/>
-                           </div>
-                           <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
+                            <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
+                            <div class="oe_event_month_year">
+                                <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
+                                <t t-esc="record.date_begin.raw_value.getFullYear()"/>
+                            </div>
+                            <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
                         </a>
                         <div class="oe_module_desc">
                             <h4><a type="open"><field name="name"/></a></h4>
@@ -272,10 +272,10 @@
                             </p>
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
-                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
-                                  <span >Subscribe</span>
-                                  </button>
+                                <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
+                                <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
+                                    <span >Subscribe</span>
+                                </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
@@ -479,6 +479,7 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 8e5ff480c2c..c3e8073a7ae 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -16,7 +16,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_event" string="Event">
+                    <group name="grp_event" string="Events">
                         <field name="event_ids" colspan="4" nolabel="1">
                             <tree string="Events">
                                 <field name="name" string="Event"/>
@@ -24,7 +24,7 @@
                             </tree>
                         </field>
                     </group>
-                    <group name="grp_registration" string="Registration">
+                    <group name="grp_registration" string="Registrations">
                         <field name="event_registration_ids" colspan="4" nolabel="1">
                             <tree string="Events Registration">
                                 <field name="event_begin_date" string="Date"/>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index f46bc5fff96..2cc749a1a40 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record model="ir.module.category" id="module_category_event_management">
-            <field name="name">Event</field>
+            <field name="name">Events</field>
             <field name="description">Helps you manage your Events.</field>
             <field name="sequence">3</field>
         </record>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 70a05c6bd0e..e0023697594 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -195,7 +195,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                                                              strip_attachments=(not server.attach),
                                                              context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", False)})
                             imap_server.store(num, '+FLAGS', '\\Seen')
                             cr.commit()
                         count += 1
@@ -220,7 +220,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                                                              strip_attachments=(not server.attach),
                                                              context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", False)})
                         pop_server.dele(num)
                         cr.commit()
                     _logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name)
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5d4c2ae9d45..6253205eb7e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -205,25 +205,6 @@
             </field>
         </record>
 
-        <record id="open_view_employee_list_my_kanban" model="ir.actions.act_window.view">
-            <field name="sequence" eval="0"/>
-            <field name="view_mode">kanban</field>
-            <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record>
-        <record id="open_view_employee_list_my_tree2" model="ir.actions.act_window.view">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_employee_tree"/>
-            <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record>
-
-        <record id="open_view_employee_list_my_form2" model="ir.actions.act_window.view">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_employee_form"/>
-            <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record>
-
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
         <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
@@ -350,10 +331,8 @@
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_highlight"/>
-                            <button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_highlight"/>
-                        </span>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_highlight" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
@@ -374,14 +353,14 @@
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="Description">
-                                <label for="description"/>
-                                <field name="description"/>
-                                <label for="requirements"/>
-                                <field name="requirements"/>
-                            </page>
-                        </notebook>
+                        <div>
+                            <label for="description"/>
+                            <field name="description"/>
+                        </div>
+                        <div>
+                            <label for="requirements"/>
+                            <field name="requirements"/>
+                        </div>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 7507665c96d..f370b26139d 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -69,7 +69,7 @@
                                 <field name="module_hr_timesheet_sheet" class="oe_inline"/>
                                 <label for="module_hr_timesheet_sheet"/>
                             </div>
-                            <div>
+                            <div name="hr_attendance">
                                 <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
                                 <label for="module_hr_attendance"/>
                             </div>
diff --git a/addons/hr_attendance/__init__.py b/addons/hr_attendance/__init__.py
index dadb043e016..feb32e22792 100644
--- a/addons/hr_attendance/__init__.py
+++ b/addons/hr_attendance/__init__.py
@@ -22,5 +22,6 @@
 import hr_attendance
 import wizard
 import report
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index f47b0900fb6..631880ec73b 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -35,14 +35,14 @@ actions(Sign in/Sign out) performed by them.
     'images': ['images/hr_attendances.jpeg'],
     'depends': ['hr'],
     'data': [
+        'security/ir_rule.xml',
         'security/ir.model.access.csv',
         'hr_attendance_view.xml',
         'hr_attendance_report.xml',
-        'security/ir.model.access.csv',
-        'security/ir_rule.xml',
         'wizard/hr_attendance_bymonth_view.xml',
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
+        'res_config_view.xml',
     ],
     'demo': ['hr_attendance_demo.xml'],
     'test': [
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 8fdd2928fe6..a2ee3650a2f 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -126,9 +126,18 @@ class hr_employee(osv.osv):
                 result[id] = res[0]
         return result
 
+    def _attendance_access(self, cr, uid, ids, name, args, context=None):
+        # this function field use to hide attendance button to singin/singout from menu
+        group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_hr_attendance')
+        visible = False
+        if uid in [user.id for user in group.users]:
+            visible = True
+        return dict([(x, visible) for x in ids])
+
     _columns = {
        'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
        'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'),
+       'attendance_access': fields.function(_attendance_access, type='boolean'),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c686b4c1ff0..c38ee45b510 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -76,9 +76,9 @@
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="5" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_attendance"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20" groups="base.group_hr_attendance"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -114,9 +114,8 @@
         </record>
 
         <menuitem
-            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
-            groups="base.group_no_one"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_no_one"/>
+            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" groups="base.group_hr_attendance" name="Attendance"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_hr_attendance"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
@@ -124,8 +123,8 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-                    <label for="state"/>
-                    <div>
+                    <label for="state" groups="base.group_hr_attendance"/>
+                    <div groups="base.group_hr_attendance">
                         <field name="state" class="oe_inline"/> - 
                         <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
                         <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py
new file mode 100644
index 00000000000..0da2d183409
--- /dev/null
+++ b/addons/hr_attendance/res_config.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class hr_attendance_config_settings(osv.osv_memory):
+    _inherit = 'hr.config.settings'
+
+    _columns = {
+        'group_hr_attendance': fields.boolean('Track attendances',
+            implied_group='base.group_hr_attendance',
+            help="Allocates attendance group to all users."),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/res_config_view.xml b/addons/hr_attendance/res_config_view.xml
new file mode 100644
index 00000000000..252672ad86d
--- /dev/null
+++ b/addons/hr_attendance/res_config_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="hr_attendace_group" model="ir.ui.view">
+            <field name="name">hr.config.settings.inherit</field>
+            <field name="model">hr.config.settings</field>
+            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//div[@name='hr_attendance']" position="after">
+                    <div>
+                        <field name="group_hr_attendance" class="oe_inline"/>
+                        <label for="group_hr_attendance"/>
+                    </div>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index b934dc16f5a..e08af0644bc 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="True">
 
+        <record id="base.group_hr_attendance" model="res.groups">
+            <field name="name">Attendances</field>
+            <field name="category_id" ref="base.module_category_hidden"/>
+        </record>
+
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
index 1b5e271b4ba..d92e7534786 100644
--- a/addons/hr_attendance/static/src/js/attendance.js
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -57,9 +57,12 @@ openerp.hr_attendance = function (instance) {
             var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [
                 ['user_id', '=', self.session.uid]
             ]);
-            return employee.read_slice(['id', 'name', 'state', 'last_sign']).pipe(function (res) {
-                if (_.isEmpty(res))
+            return employee.read_slice(['id', 'name', 'state', 'last_sign', 'attendance_access']).pipe(function (res) {
+                if (_.isEmpty(res) )
                     return;
+                if (res[0].attendance_access == false){
+                    return;
+                }
                 self.$el.show();
                 self.employee = res[0];
                 self.last_sign = instance.web.str_to_datetime(self.employee.last_sign);
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 6566f303d36..0659d661420 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -5,13 +5,13 @@
         
 <!-- Contracts Button on Employee Form -->
 
-        <act_window
-        context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-        id="act_hr_employee_2_hr_contract"
-        name="Contracts"
-        res_model="hr.contract"
-        src_model="hr.employee"
-        groups="base.group_hr_manager"/>
+        <record id="act_hr_employee_2_hr_contract" model="ir.actions.act_window">
+            <field name="res_model">hr.contract</field>
+            <field name="view_type">form</field>
+            <field name="name">Contracts</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+        </record>
         
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3508dc36d49..d0da22c5681 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -141,6 +141,7 @@ hr_employee()
 
 class hr_evaluation(osv.osv):
     _name = "hr_evaluation.evaluation"
+    _inherit = "mail.thread"
     _description = "Employee Appraisal"
     _rec_name = 'employee_id'
     _columns = {
@@ -242,8 +243,10 @@ class hr_evaluation(osv.osv):
     def button_final_validation(self, cr, uid, ids, context=None):
         request_obj = self.pool.get('hr.evaluation.interview')
         self.write(cr, uid, ids, {'state':'progress'}, context=context)
-        for id in self.browse(cr, uid, ids, context=context):
-            if len(id.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', id.id),('state', 'in', ['done','cancel'])], context=context)):
+        for evaluation in self.browse(cr, uid, ids, context=context):
+            if evaluation.employee_id and evaluation.employee_id.parent_id and evaluation.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [evaluation.id], user_ids=[evaluation.employee_id.parent_id.user_id.id], context=context)
+            if len(evaluation.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', evaluation.id),('state', 'in', ['done','cancel'])], context=context)):
                 raise osv.except_osv(_('Warning!'),_("You cannot change state, because some appraisal(s) are in waiting answer or draft state."))
         return True
 
@@ -263,6 +266,10 @@ class hr_evaluation(osv.osv):
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('employee_id'):
+            employee_id = self.pool.get('hr.employee').browse(cr, uid, vals.get('employee_id'), context=context)
+            if employee_id.parent_id and employee_id.parent_id.user_id:
+                vals['message_follower_ids'] = [(4, employee_id.parent_id.user_id.partner_id.id)]
         if 'date' in vals:
             new_vals = {'date_deadline': vals.get('date')}
             obj_hr_eval_iterview = self.pool.get('hr.evaluation.interview')
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 29d68d7a12c..fb9d287ea77 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -58,6 +58,16 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+        
+      <!-- Appraisal Interviews Action -->
+      
+        <record id="act_hr_employee_2_hr__evaluation_interview" model="ir.actions.act_window">
+            <field name="res_model">hr.evaluation.interview</field>
+            <field name="view_type">form</field>
+            <field name="name">Interviews</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}</field>
+        </record>
 
         <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="25"/>
         <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
@@ -134,6 +144,9 @@
                     <field name="evaluation_date"/>
                 </group>
             </xpath>
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
+            </xpath>
             </field>
         </record>
 
@@ -165,7 +178,7 @@
                         <field nolabel="1" name="survey_request_ids">
                             <form string="Interview Appraisal" version="7.0">
                                 <div class="oe_right oe_button_box">
-                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                                     <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                                 </div>
                                 <group>
@@ -196,6 +209,10 @@
                         <field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
                     </group>
               </sheet>
+	          <div class="oe_chatter">
+	              <field name="message_ids" widget="mail_thread"/>
+	              <field name="message_follower_ids" widget="mail_followers"/>
+	          </div>
               </form>
             </field>
         </record>
@@ -316,7 +333,7 @@
                     <field name="user_id" string="Interviewer"/>
                     <field name="user_to_review_id"/>
                     <field name="response" readonly="1" invisible="True"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
                     <field name="state"/>
@@ -408,13 +425,5 @@
                     'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
                     'default_subject': 'Reminder to fill up Survey'}"/>
 
-      <!-- Appraisal Interviews Button on Employee Form -->
-      <act_window
-        context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
-        id="act_hr_employee_2_hr__evaluation_interview"
-        name="Appraisal Interviews"
-        res_model="hr.evaluation.interview"
-        src_model="hr.employee"/>
-
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 83f986e59cc..91dc44fed61 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -118,6 +118,9 @@ class hr_expense_expense(osv.osv):
         return {'value': {'department_id': department_id, 'company_id': company_id}}
 
     def expense_confirm(self, cr, uid, ids, *args):
+        for expense in self.browse(cr, uid, ids):
+            if expense.employee_id and expense.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
         self.write(cr, uid, ids, {
             'state':'confirm',
             'date_confirm': time.strftime('%Y-%m-%d')
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index d9efa612c0b..f35547927fa 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -139,6 +139,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
@@ -195,12 +196,10 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-            <field name="purchase_ok" position="before">
-                <div>
+                <field name="purchase_ok" position="before">
                     <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
                     <label for="hr_expense_ok"/>
-                </div>
-            </field>
+                </field>
             </field>
         </record>
 
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 759170224bd..76d4e42818a 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -303,7 +303,7 @@ class hr_holidays(osv.osv):
         self.check_holidays(cr, uid, ids, context=context)
         for record in self.browse(cr, uid, ids, context=context):
             if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
-                self.message_subscribe(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
+                self.message_subscribe_users(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 347e2b17ca5..0a2054b14d2 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -121,6 +121,7 @@
                     </group>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
@@ -158,6 +159,7 @@
                     <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 08dacc9a951..b56b49d3d99 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -317,7 +317,10 @@ class hr_payslip(osv.osv):
             'company_id': company_id,
             'period_id': False,
             'basic_before_leaves': 0.0,
-            'basic_amount': 0.0
+            'basic_amount': 0.0,
+            'number': '',
+            'payslip_run_id': False,
+            'paid': False,
         })
         return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
 
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ef3c0ea2e9f..c87d36de591 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -234,7 +234,7 @@
                         </h2>
                     </div>
                     <group col="4">
-                        <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)" context="{'default_employee_id': employee_id}"/>
+                        <field name="contract_id" domain="[('employee_id','=',employee_id),('date_start','&lt;=',date_to),'|',('date_end','&gt;=',date_from),('date_end','=',False)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)" context="{'default_employee_id': employee_id}"/>
                         <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="name"/>
@@ -369,14 +369,16 @@
             <field name="view_id" ref="view_hr_payslip_tree"/>
             <field name="search_view_id" ref="view_hr_payslip_filter"/>
         </record>
-        <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/>
-        <act_window name="Payslips"
-                    context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-                    res_model="hr.payslip"
-                    src_model="hr.employee"
-                    view_id ="view_hr_payslip_tree"
-                    id="act_hr_employee_payslip_list"
-                    groups="base.group_hr_manager"/>
+
+        <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/>        
+
+        <record id="act_hr_employee_payslip_list" model="ir.actions.act_window">
+            <field name="res_model">hr.payslip</field>
+            <field name="name">Payslips</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+        </record>
 
         <!-- Employee View -->
         <record id="payroll_hr_employee_view_form" model="ir.ui.view">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 08e5f31a2d2..32c26573e8c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -183,6 +183,7 @@
                 <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
             <div class="oe_chatter">
+                <field name="message_is_follower" invisible="1"/>
                 <field name="message_ids" widget="mail_thread"/>
                 <field name="message_follower_ids" widget="mail_followers"/>
             </div>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 086e63e542b..2d0b85faf70 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -8,5 +8,5 @@ access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,
 access_crm_meeting_hruser,crm.meeting.hruser,base_calendar.model_crm_meeting,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
-access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,0,0,0
+access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,1,1,0
 access_hr_applicant_category_manager,hr.applicant_category,model_hr_applicant_category,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 43b677d7978..c81cda8493b 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -116,10 +116,12 @@
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to your timesheets.
+                Click to record your timesheets.
               </p><p>
-                Through this menu you can register and follow your workings
-                hours by project every day.
+                You can register and track your workings hours by project every
+                day. Every time spent on a project will become a cost in the
+                analytic accounting and can be re-invoiced to customers if
+                required.
               </p>
             </field>
         </record>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index d5f89098a69..069a5a9c170 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,8 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_hr_analytic_timesheet,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_hr_user,1,1,1,1
-access_hr_analytic_timesheet_employee,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,0
+access_hr_analytic_timesheet_employee,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,1
 access_hr_account_analytic_line,account.account.analytic.line,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
-access_hr_account_analytic_line_employee,account.account.analytic.line employee,account.model_account_analytic_line,base.group_user,1,1,1,0
+access_hr_account_analytic_line_employee,account.account.analytic.line employee,account.model_account_analytic_line,base.group_user,1,1,1,1
 access_account_analytic_journal,account.account.analytic.journal,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
 access_product_product_user,product.product user,product.model_product_product,base.group_hr_user,1,1,1,1
 access_product_template_hr_timesheet,product.template.hr.timesheet,product.model_product_template,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index 6b6dd9f6e52..7af9603ebd8 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -31,7 +31,7 @@ class report_timesheet_line(osv.osv):
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'date': fields.date('Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         'cost': fields.float('Cost', readonly=True),
         'product_id': fields.many2one('product.product', 'Product',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
@@ -83,7 +83,7 @@ class report_timesheet_user(osv.osv):
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         'cost': fields.float('Cost', 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),
@@ -117,7 +117,7 @@ class report_timesheet_account(osv.osv):
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', 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),
 
@@ -151,7 +151,7 @@ class report_timesheet_account_date(osv.osv):
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', 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),
     }
@@ -185,7 +185,7 @@ class report_timesheet_invoice(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Project', readonly=True),
         'manager_id':fields.many2one('res.users', 'Manager', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         'amount_invoice': fields.float('To invoice', readonly=True)
     }
     _rec_name = 'user_id'
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 2d4b0debde8..6d6fe2f3776 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
@@ -347,18 +347,11 @@
         src_model="res.users"/>
 
         <act_window
-            context="{'search_default_account_id': [active_id],'default_account_id': [active_id]}"
-            id="act_account_analytic_account_2_report_timehsheet_account"
-            name="Timesheets"
-            res_model="hr.analytic.timesheet"
-            src_model="account.analytic.account"/>
-
-        <act_window
-        context="{'search_default_manager_id': [active_id]}"
-        id="act_res_users_2_report_timesheet_invoice"
-        name="Costs to invoice"
-        res_model="report_timesheet.invoice"
-        src_model="res.users"/>
+            context="{'search_default_manager_id': [active_id]}"
+            id="act_res_users_2_report_timesheet_invoice"
+            name="Costs to invoice"
+            res_model="report_timesheet.invoice"
+            src_model="res.users"/>
 
 
     </data>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 76314e1986a..0014ac685b2 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -79,17 +79,24 @@ class account_analytic_line(osv.osv):
             curr_invoice = {
                 'name': time.strftime('%d/%m/%Y')+' - '+account.name,
                 'partner_id': account.partner_id.id,
+                'company_id': account.company_id.id,
                 'payment_term': partner.property_payment_term.id or False,
                 'account_id': partner.property_account_receivable.id,
                 'currency_id': account.pricelist_id.currency_id.id,
                 'date_due': date_due,
                 'fiscal_position': account.partner_id.property_account_position.id
             }
-            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context)
-            invoices.append(last_invoice)
-
+            
             context2 = context.copy()
             context2['lang'] = partner.lang
+            # set company_id in context, so the correct default journal will be selected 
+            context2['force_company'] = curr_invoice['company_id']
+            # set force_company in context so the correct product properties are selected (eg. income account) 
+            context2['company_id'] = curr_invoice['company_id']
+            
+            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
+            invoices.append(last_invoice)
+
             cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id, name " \
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
@@ -115,11 +122,11 @@ class account_analytic_line(osv.osv):
                 else:
                     price = 0.0
 
+                general_account = product.product_tmpl_id.property_account_income or product.categ_id.property_account_income_categ
+                if not general_account:
+                    raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
                 taxes = product.taxes_id
                 tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
-                account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
-                if not account_id:
-                    raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
                 curr_line = {
                     'price_unit': price,
                     'quantity': qty,
@@ -130,7 +137,7 @@ class account_analytic_line(osv.osv):
                     'product_id': product_id,
                     'invoice_line_tax_id': [(6,0,tax)],
                     'uos_id': uom,
-                    'account_id': account_id,
+                    'account_id': general_account.id,
                     'account_analytic_id': account.id,
                 }
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index fcdbfda0667..13c11cf72c7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -103,6 +103,7 @@ class one2many_mod(fields.one2many):
 
 class hr_timesheet_sheet(osv.osv):
     _name = "hr_timesheet_sheet.sheet"
+    _inherit = "mail.thread"
     _table = 'hr_timesheet_sheet_sheet'
     _order = "id desc"
     _description="Timesheet"
@@ -265,6 +266,8 @@ class hr_timesheet_sheet(osv.osv):
 
     def button_confirm(self, cr, uid, ids, context=None):
         for sheet in self.browse(cr, uid, ids, context=context):
+            if sheet.employee_id and sheet.employee_id.parent_id and sheet.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [sheet.id], user_ids=[sheet.employee_id.parent_id.user_id.id], context=context)
             self.check_employee_attendance_state(cr, uid, sheet.id, context=context)
             di = sheet.user_id.company_id.timesheet_max_difference
             if (abs(sheet.total_difference) < di) or not di:
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6c92e28564e..9a7416464af 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -64,9 +64,9 @@
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                         <group>
-                            <field name="total_attendance" widget="float_time"/>
+                            <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                             <field name="total_timesheet" widget="float_time"/>
-                            <field name="total_difference" widget="float_time"/>
+                            <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
                             <field name="user_id" invisible="1"/>
                         </group>
                     </group>
@@ -84,7 +84,7 @@
                                 </div>
                             </group>
                             <group colspan="4" col="3">
-                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
+                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance">
                                     <tree string="Attendances" editable="bottom">
                                         <field name="name"/>
                                         <field name="action"/>
@@ -92,14 +92,14 @@
                                     </tree>
                                 </field>
                                 <group>
-                                    <div align="right" groups="base.group_hr_manager">
-                                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In"/>
-                                        <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out"/>
+                                    <div align="right" groups="base.group_hr_manager,base.group_hr_attendance">
+                                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" groups="base.group_hr_attendance"/>
+                                        <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" groups="base.group_hr_attendance"/>
                                     </div>
                                 </group>
                             </group>
                             <group col="4">
-                                <field name="state_attendance"/>
+                                <field name="state_attendance" groups="base.group_hr_attendance"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
@@ -134,14 +134,18 @@
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time"/>
+                                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                                     <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time"/>
+                                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
                                 </tree>
                             </field>
                         </page>
                     </notebook>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -318,9 +322,9 @@
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="department_id"/>
-                    <field name="total_attendance" widget="float_time"/>
+                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time"/>
-                    <field name="total_difference" widget="float_time"/>
+                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -332,18 +336,23 @@
             <field name="arch" type="xml">
                 <tree colors="blue:total_difference&lt;0.1;red:total_difference&gt;=0.1" string="Period">
                     <field name="name"/>
-                    <field name="total_attendance" widget="float_time" sum="Total Attendances"/>
+                    <field name="total_attendance" widget="float_time" sum="Total Attendances" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time" sum="Total Timesheet"/>
-                    <field name="total_difference" widget="float_time" sum="Total Difference"/>
+                    <field name="total_difference" widget="float_time" sum="Total Difference" groups="base.group_hr_attendance"/>
                 </tree>
             </field>
         </record>
 
   <!-- Timesheet Button on Employee Form -->
-  <act_window
-           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
            
+    <record id="act_hr_employee_2_hr_timesheet" model="ir.actions.act_window">
+        <field name="res_model">hr_timesheet_sheet.sheet</field>
+        <field name="view_type">form</field>
+        <field name="name">Timesheets</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+    </record>
+         
       <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index 49b18f75e4b..1fdcac9f7c6 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -43,7 +43,7 @@ class hr_timesheet_report(osv.osv):
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
         'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
-        'quantity': fields.float('Quantity',readonly=True),
+        'quantity': fields.float('Time',readonly=True),
     }
 
     def init(self, cr):
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index 38e19d708d4..3db7ff8feb2 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -52,7 +52,7 @@ class timesheet_report(osv.osv):
             ('draft','Draft'),
             ('confirm','Confirmed'),
             ('done','Done')], 'Status', readonly=True),
-        'quantity': fields.float('#Quantity',readonly=True),
+        'quantity': fields.float('Time',readonly=True),
         'cost': fields.float('#Cost',readonly=True),
         }
 
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index eab3d03ceea..1b7cc5446b8 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -77,6 +77,7 @@
                     <field name="description"/>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
index 158aff29bf3..d44bd8e26ec 100644
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -10,6 +10,9 @@
                     <group>
                         <field name='name'/>
                     </group>
+                    <footer>
+                        <button string="Close" class="oe_highlight" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
index d231c186321..f8fc8991975 100644
--- a/addons/import_google/wizard/import_google.py
+++ b/addons/import_google/wizard/import_google.py
@@ -27,6 +27,7 @@ from dateutil import *
 from pytz import timezone
 from datetime import datetime
 import time
+import base64
 from osv import *
 from tools.translate import _
 
@@ -282,7 +283,7 @@ class google_import(import_framework):
             self.contact = self.gd_client.GetContactsFeed()
         while self.contact:
             for entry in self.contact.entry:
-                data = {}
+                data = {}                
                 data['id'] = entry.id.text
                 name = tools.ustr(entry.title.text)
                 if name == "None":
@@ -290,6 +291,8 @@ class google_import(import_framework):
                 data['name'] = name or _('Unknown')
                 emails = ','.join(email.address for email in entry.email)
                 data['email'] = emails
+                if self.gd_client.GetPhoto(entry):
+                    data['image'] = base64.encodestring(self.gd_client.GetPhoto(entry))
                 if table == 'Contact':
                     data.update({'customer': str(self.context.get('customer')),
                                  'supplier': str(self.context.get('supplier'))})
@@ -322,6 +325,12 @@ class google_import(import_framework):
                 'name': value('company', fallback='name'),
                 'customer': 'customer',
                 'supplier': 'supplier',
+                'city': 'city',
+                'phone': 'phone',
+                'mobile': 'mobile',
+                'email': 'email',
+                'image': 'image',
+                'fax': 'fax',
                 'child_ids/id': ref(self.TABLE_ADDRESS, 'id'),
                 }
             }
diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py
index 2132d141e29..5ce1d160f3e 100644
--- a/addons/import_google/wizard/import_google_data.py
+++ b/addons/import_google/wizard/import_google_data.py
@@ -104,7 +104,7 @@ class synchronize_google(osv.osv_memory):
     _columns = {
         'customer': fields.boolean('Customer', help="Check this box to set newly created partner as Customer."),
         'supplier': fields.boolean('Supplier', help="Check this box to set newly created partner as Supplier."),
-        'group_name': fields.selection(_get_group, "Group Name",help="Choose which group to import, By default it takes all."),
+        'group_name': fields.selection(_get_group, "Group Name", help="Choose which group to import, By default it takes all."),
         'calendar_name': fields.selection(_get_calendars, "Calendar Name"),
      }
 
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index f8e110e6a5d..e11b5aa2d08 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <group colspan="4" col="4" width="430">
-                       <field name="group_name" colspan="4"/>
+                       <field name="group_name" colspan="4" required="1"/>
                        <newline/>
                        <group colspan="4" col="4">
                             <separator string="Partner Status for this Group:" colspan="4"/>
@@ -32,7 +32,7 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <group colspan="4" col="4" width="320">
-                       <field name="calendar_name" />
+                       <field name="calendar_name" required="1"/>
                     </group>
                     <footer>
                         <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index fad6ca53f92..d15b300597e 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -70,7 +70,7 @@ class partner_vat(osv.osv_memory):
                       FROM account_move_line l
                       LEFT JOIN res_partner p ON l.partner_id = p.id
                       LEFT JOIN account_tax_code c ON l.tax_code_id = c.id
-                      WHERE c.code IN ('01','02','03','45','49')
+                      WHERE c.code IN ('00','01','02','03','45','49')
                       AND l.partner_id IN %s
                       AND l.period_id IN %s
                       GROUP BY l.partner_id, p.name, p.vat) AS sub1
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index 7b80e3697ee..306207c612d 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -36,8 +36,9 @@ class WizardMultiChartsAccounts(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         """Override of code in order to be able to link journal with account in XML"""
         res = super(WizardMultiChartsAccounts, self).execute(cr, uid, ids, context)
-        path = addons.get_module_resource(os.path.join('l10n_ch','sterchi_chart','account_journal_rel.xml'))
+        path = addons.get_module_resource('l10n_ch','sterchi_chart','account_journal_rel.xml')
         tools.convert_xml_import(cr, 'l10n_ch', path, idref=None, mode='init', noupdate=True, report=None)
+        res.update({'type': 'ir.actions.act_window_close'})
         return res
 
 WizardMultiChartsAccounts()
diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py
index 9dd0caddf38..79dcb1a6834 100644
--- a/addons/l10n_ch/bank.py
+++ b/addons/l10n_ch/bank.py
@@ -48,7 +48,7 @@ class ResPartnerBank(osv.osv):
         'dta_code': fields.char('DTA code', size=5),
         'print_bank': fields.boolean('Print Bank on BVR'),
         'print_account': fields.boolean('Print Account Number on BVR'),
-        'acc_number': fields.char('Account/IBAN Number', size=64),
+        'acc_number': fields.char('Account Number', size=64),
         'my_bank': fields.boolean('Use my account to print BVR ?', help="Check to print BVR invoices"),
     }
 
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index da1badd7fe8..017f9bd1f9b 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -28,34 +28,6 @@
                 </field>
             </field>
         </record>
-        
-        <!-- res.partner.bank in res partner form-->
-        <!-- Partner -> Bank Details -->
-        
-        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_add_groups">
-            <field name="name">res.partner_bank.form.hide.f2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="account.view_partner_property_form"/>
-            <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <newline/>
-                    <separator colspan="4" string="Account Infos"/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                        <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
-                        <field name="dta_code"/>
-                        <newline/>
-                    </group>
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <field name="bank" />
-                </field>
-            </field>
-        </record>
-
 
         <!-- res.partner.bank base form-->
         <!-- Sales -> Configuration -> Address Book -> Bank accounts -->
@@ -66,35 +38,21 @@
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <newline/>
-                    
-                    <separator colspan="4" string="Account Infos"/>
-                        <newline/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                            <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
-                            <field name="dta_code"/>
-                        <newline/>
+                <xpath expr="//field[@name='acc_number']" position="attributes">
+                    <attribute name="attrs">{'required': [('state','not in',['bvpost','bvrpost'])]}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='acc_number']" position="after">
+                    <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])], 'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}"/>
+                    <field name="dta_code" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}"/>
+                    <field name="my_bank"  attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" />
+                </xpath>
+                <xpath expr="//group[@name='bank']" position="after">
+                    <group string="BVR print options" attrs="{'invisible': [('my_bank', '!=', True)]}" >
+                        <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
+                        <field name="print_bank"/>
+                        <field name="print_account"/>
                     </group>
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <newline/>
-                    <group attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" colspan="4">
-                        <field name="my_bank"  attrs="{'invisible': [('company_id', '=', False)]}" />
-                        <group string="BVR print options" colspan="4"  attrs="{'invisible': [('my_bank', '!=', True)]}" >
-                            <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
-                            <field name="print_bank"/>
-                            <field name="print_account"/>
-                            <newline/>
-                        </group>
-                    </group>
-                    <newline/>
-                    <field name="bank" />
-                </field>
+                </xpath>
             </field>
         </record>        
 
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index f38f95750cf..45f5edb33d9 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -277,7 +277,7 @@
             <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
             <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a1"/>
+            <field name="parent_id" ref="a20"/>
         </record>
         
       <!--  <record model="account.account.template" id="290">
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 1648fb6b171..6cc213c8d2f 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -36,7 +36,6 @@ Seddik au cours du troisième trimestre 2010.""",
     'website': 'http://www.kazacube.com',
     'depends' : ['base', 'account'],
     'data' : [
-        'security/compta_security.xml',
         'security/ir.model.access.csv',
         'account_type.xml',
         'account_pcg_morocco.xml',
diff --git a/addons/l10n_ma/security/compta_security.xml b/addons/l10n_ma/security/compta_security.xml
deleted file mode 100644
index 8d511ae7154..00000000000
--- a/addons/l10n_ma/security/compta_security.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
-
-    <record id="group_expert_comptable" model="res.groups">
-        <field name="name">Finance / Expert Comptable </field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-</data>
-</openerp>
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index 4c9fe63308b..48cf78f382b 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -3955,11 +3955,13 @@
             <field name="code">4a</field>
             <field name="parent_id" ref="btw_code_vanuit_buitenland"/>
             <field name="name">Leveringen uit landen buiten de EU (invoer) (BTW)</field>
+            <field name="sign" eval="-1" />
         </record>
         <record id="btw_code_4b" model="account.tax.code.template">
             <field name="code">4b</field>
             <field name="parent_id" ref="btw_code_vanuit_buitenland"/>
             <field name="name">Verwerving van goederen uit landen binnen de EU (BTW)</field>
+            <field name="sign" eval="-1" />
         </record>
 <!-- 5. Voorbelasting, kleineondernemersregeling, schatting en eindtotaal -->
         <record id="btw_code_voorbelasting" model="account.tax.code.template">
@@ -4100,6 +4102,7 @@
             <field name="property_account_payable" ref="a_pay"/>          <!-- crediteuren -->
             <field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen -->
             <field name="property_account_income_categ" ref="a_sale"/>    <!-- verkoop rekening -->
+            <field name="property_reserve_and_surplus_account" ref="a_9999"/>
         </record>
 
 <!-- BTW  Template
@@ -4325,7 +4328,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_6_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU laag(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_6"/>
                             <field name="account_collected_id" ref="vat_payable6"/>
@@ -4337,7 +4340,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_6_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU laag(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_6"/>
                             <field name="account_collected_id" ref="vat_refund6"/>
@@ -4360,7 +4363,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_19_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU hoog(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_19"/>
                             <field name="account_collected_id" ref="vat_payable19"/>
@@ -4372,7 +4375,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_19_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU hoog(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_19"/>
                             <field name="account_collected_id" ref="vat_refund19"/>
@@ -4395,7 +4398,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_overig_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU overig(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_overig"/>
                             <field name="account_collected_id" ref="vat_payable19"/>
@@ -4407,7 +4410,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_overig_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU overig(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_overig"/>
                             <field name="account_collected_id" ref="vat_refund19"/>
@@ -4458,7 +4461,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E1_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU laag(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E1"/>
                             <field name="account_collected_id" ref="vat_payable6"/>
@@ -4470,7 +4473,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E1_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU laag(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E1"/>
                             <field name="account_collected_id" ref="vat_refund6"/>
@@ -4493,7 +4496,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E2_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU hoog(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E2"/>
                             <field name="account_collected_id" ref="vat_payable19"/>
@@ -4505,7 +4508,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E2_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU hoog(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E2"/>
                             <field name="account_collected_id" ref="vat_refund19"/>
@@ -4528,7 +4531,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E_overig_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU overig(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E_overig"/>
                             <field name="account_collected_id" ref="vat_payable19"/>
@@ -4540,7 +4543,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E_overig_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU overig(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E_overig"/>
                             <field name="account_collected_id" ref="vat_refund19"/>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 8421dd74f9b..91d6a959241 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -33,7 +33,7 @@
         <act_window id="action_lunch_order_cancel_values"
             key2="client_action_multi" name="Cancel Order"
             res_model="lunch.order.cancel" src_model="lunch.order"
-            view_mode="form" target="new" view_type="form"/>
+            view_mode="form" target="new" view_type="form" multi="True"/>
         
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index dadde4ed089..022d17acea3 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -34,7 +34,7 @@
         <act_window id="action_lunch_order_confirm_values"
             key2="client_action_multi" name="Confirm Order"
             res_model="lunch.order.confirm" src_model="lunch.order"
-            view_mode="form" target="new" view_type="form"/>
+            view_mode="form" target="new" view_type="form" multi="True"/>
 
     </data>
 </openerp>
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index b8f6c21ecf5..23417850f2a 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from osv import osv
 from osv import fields
 import tools
@@ -91,7 +92,7 @@ class mail_notification(osv.Model):
             :param browse_record message: mail.message to notify
         """
         notify_pids = []
-        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+        for partner in self.pool.get('res.partner').browse(cr, SUPERUSER_ID, partner_ids, context=context):
             # Do not send an email to the writer
             if partner.user_ids and partner.user_ids[0].id == uid:
                 continue
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index 25b85bb7b22..707ece6a180 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from osv import osv
 from osv import fields
-from tools.translate import _
+
 
 class ir_ui_menu(osv.osv):
     """ Override of ir.ui.menu class. When adding mail_thread module, each
@@ -38,13 +39,14 @@ class ir_ui_menu(osv.osv):
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         """ Override to take off menu entries (mail.group) the user is not
-            following. """
+            following. Access are done using SUPERUSER_ID to avoid access
+            rights issues for an internal back-end algorithm. """
         ids = super(ir_ui_menu, self).search(cr, uid, args, offset=0, limit=None, order=order, context=context, count=False)
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         follower_obj = self.pool.get('mail.followers')
         for menu in self.browse(cr, uid, ids, context=context):
             if menu.mail_group_id:
-                sub_ids = follower_obj.search(cr, uid, [
+                sub_ids = follower_obj.search(cr, SUPERUSER_ID, [
                     ('partner_id', '=', partner_id), ('res_model', '=', 'mail.group'),
                     ('res_id', '=', menu.mail_group_id.id)
                     ], context=context)
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index a551a549b06..94b9f8f9b0b 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -81,6 +81,7 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
                         <field name="message_follower_ids" widget="mail_followers"/>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 6bbfa9bc30e..e9a569a8192 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -19,13 +19,12 @@
 #
 ##############################################################################
 
-# import ast
 import base64
 import logging
 import tools
 
-from osv import osv
-from osv import fields
+from openerp import SUPERUSER_ID
+from osv import osv, fields
 from tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -134,7 +133,8 @@ class mail_mail(osv.Model):
         :return: True
         """
         if mail.auto_delete:
-            mail.unlink()
+            # done with SUPERUSER_ID to avoid giving large unlink access rights
+            self.unlink(cr, SUPERUSER_ID, [mail.id], context=context)
         return True
 
     def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1d5d85e36e0..7d9c7b3085f 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -24,8 +24,9 @@ import openerp
 import tools
 
 from email.header import decode_header
+from openerp import SUPERUSER_ID
 from operator import itemgetter
-from osv import osv, fields
+from osv import osv, orm, fields
 from tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -62,14 +63,14 @@ class mail_message(osv.Model):
                 continue
             try:
                 result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
-            except openerp.exceptions.AccessDenied, e:
+            except (orm.except_orm, osv.except_osv):
                 pass
         return result
 
     def _get_unread(self, cr, uid, ids, name, arg, context=None):
         """ Compute if the message is unread by the current user. """
         res = dict((id, {'unread': False}) for id in ids)
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [
             ('partner_id', 'in', [partner_id]),
@@ -87,7 +88,7 @@ class mail_message(osv.Model):
             read_cond = '(read = false or read is null)'
         else:
             read_cond = 'read = true'
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         cr.execute("SELECT message_id FROM mail_notification "\
                         "WHERE partner_id = %%s AND %s" % read_cond,
                     (partner_id,))
@@ -140,7 +141,8 @@ class mail_message(osv.Model):
         return []
 
     def _get_default_author(self, cr, uid, context=None):
-        return self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        # remove context to avoid possible hack in browse with superadmin using context keys that could trigger a specific behavior
+        return self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=None).partner_id.id
 
     _defaults = {
         'type': 'email',
@@ -154,16 +156,17 @@ class mail_message(osv.Model):
     #------------------------------------------------------
 
     def vote_toggle(self, cr, uid, ids, user_ids=None, context=None):
-        ''' Toggles voting '''
+        ''' Toggles voting. Done as SUPERUSER_ID because of write access on
+            mail.message not always granted. '''
         if not user_ids:
             user_ids = [uid]
         for message in self.read(cr, uid, ids, ['vote_user_ids'], context=context):
             for user_id in user_ids:
                 has_voted = user_id in message.get('vote_user_ids')
                 if not has_voted:
-                    self.write(cr, uid, message.get('id'), {'vote_user_ids': [(4, user_id)]}, context=context)
+                    self.write(cr, SUPERUSER_ID, message.get('id'), {'vote_user_ids': [(4, user_id)]}, context=context)
                 else:
-                    self.write(cr, uid, message.get('id'), {'vote_user_ids': [(3, user_id)]}, context=context)
+                    self.write(cr, SUPERUSER_ID, message.get('id'), {'vote_user_ids': [(3, user_id)]}, context=context)
         return True
 
     #------------------------------------------------------
@@ -171,17 +174,31 @@ class mail_message(osv.Model):
     #------------------------------------------------------
 
     def _message_dict_get(self, cr, uid, msg, context=None):
-        """ Return a dict representation of the message browse record. """
+        """ Return a dict representation of the message browse record. A read
+            is performed to because of access rights issues (reading many2one
+            fields allow to have the foreign record name without having
+            to check external access rights).
+        """
         has_voted = False
-        vote_ids = self.pool.get('res.users').name_get(cr, uid, [user.id for user in msg.vote_user_ids], context=context)
+        vote_ids = self.pool.get('res.users').name_get(cr, SUPERUSER_ID, [user.id for user in msg.vote_user_ids], context=context)
         for vote in vote_ids:
             if vote[0] == uid:
                 has_voted = True
                 break
-        attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
-        author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
-        author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
-        partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
+        try:
+            attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
+        except (orm.except_orm, osv.except_osv):
+            attachment_ids = []
+        try:
+            author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
+            is_author = uid in msg.author_id.user_ids
+        except (orm.except_orm, osv.except_osv):
+            author_id = False
+            is_author = False
+        try:
+            partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
+        except (orm.except_orm, osv.except_osv):
+            partner_ids = []
         return {
             'id': msg.id,
             'type': msg.type,
@@ -193,7 +210,7 @@ class mail_message(osv.Model):
             'subject': msg.subject,
             'date': msg.date,
             'author_id': author_id,
-            'author_user_id': author_user_id,
+            'is_author': is_author,
             'partner_ids': partner_ids,
             'child_ids': [],
             'vote_user_ids': vote_ids,
@@ -246,7 +263,7 @@ class mail_message(osv.Model):
         limit = limit or self._message_read_limit
         context = context or {}
         if not ids:
-            ids = self.search(cr, uid, domain, context=context, limit=limit)
+            ids = self.search(cr, SUPERUSER_ID, domain, context=context, limit=limit)
         messages = self.browse(cr, uid, ids, context=context)
 
         result = []
@@ -294,41 +311,99 @@ class mail_message(osv.Model):
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
     def check_access_rule(self, cr, uid, ids, operation, context=None):
-        """ mail.message access rule check
-            - message received (a notification exists) -> ok
-            - check rules of related document if exists
-            - fallback on normal mail.message check """
+        """ Access rules of mail.message:
+            - read: if
+                - notification exist (I receive pushed message) OR
+                - author_id = pid (I am the author) OR
+                - I can read the related document if res_model, res_id
+                - Otherwise: raise
+            - create: if
+                - I am in the document message_follower_ids OR
+                - I can write on the related document if res_model, res_id
+                - Otherwise: raise
+            - write: if
+                - I can write on the related document if res_model, res_id
+                - Otherwise: raise
+            - unlink: if
+                - I can write on the related document if res_model, res_id
+                - Otherwise: raise
+        """
+        if uid == SUPERUSER_ID:
+            return
         if isinstance(ids, (int, long)):
             ids = [ids]
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
 
-        # check messages for which you have a notification
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
-        not_obj = self.pool.get('mail.notification')
-        not_ids = not_obj.search(cr, uid, [
-            ('partner_id', '=', partner_id),
-            ('message_id', 'in', ids),
-        ], context=context)
-        notified_ids = [notification.message_id.id for notification in not_obj.browse(cr, uid, not_ids, context=context)
-            if notification.message_id.id in ids]
-
-        # check messages linked to an existing document
+        # Read mail_message.ids to have their values
         model_record_ids = {}
-        document_ids = []
-        cr.execute('SELECT DISTINCT id, model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
-        for id, rmod, rid in cr.fetchall():
-            if not (rmod and rid):
-                continue
-            document_ids.append(id)
-            model_record_ids.setdefault(rmod, set()).add(rid)
+        message_values = dict.fromkeys(ids)
+        cr.execute('SELECT DISTINCT id, model, res_id, author_id FROM "%s" WHERE id = ANY (%%s)' % self._table, (ids,))
+        for id, rmod, rid, author_id in cr.fetchall():
+            message_values[id] = {'res_model': rmod, 'res_id': rid, 'author_id': author_id}
+            if rmod:
+                model_record_ids.setdefault(rmod, set()).add(rid)
+
+        # Read: Check for received notifications -> could become an ir.rule, but not till we do not have a many2one variable field
+        if operation == 'read':
+            not_obj = self.pool.get('mail.notification')
+            not_ids = not_obj.search(cr, SUPERUSER_ID, [
+                ('partner_id', '=', partner_id),
+                ('message_id', 'in', ids),
+            ], context=context)
+            notified_ids = [notification.message_id.id for notification in not_obj.browse(cr, SUPERUSER_ID, not_ids, context=context)]
+        else:
+            notified_ids = []
+        # Read: Check messages you are author -> could become an ir.rule, but not till we do not have a many2one variable field
+        if operation == 'read':
+            author_ids = [mid for mid, message in message_values.iteritems()
+                if message.get('author_id') and message.get('author_id') == partner_id]
+        else:
+            author_ids = []
+
+        # Create: Check message_follower_ids
+        if operation == 'create':
+            doc_follower_ids = []
+            for model, mids in model_record_ids.items():
+                fol_obj = self.pool.get('mail.followers')
+                fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
+                    ('res_model', '=', model),
+                    ('res_id', 'in', list(mids)),
+                    ('partner_id', '=', partner_id),
+                    ], context=context)
+                fol_mids = [follower.res_id for follower in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)]
+                doc_follower_ids += [mid for mid, message in message_values.iteritems()
+                    if message.get('res_model') == model and message.get('res_id') in fol_mids]
+        else:
+            doc_follower_ids = []
+
+        # Calculate remaining ids, and related model/res_ids
+        model_record_ids = {}
+        other_ids = set(ids).difference(set(notified_ids), set(author_ids), set(doc_follower_ids))
+        for id in other_ids:
+            if message_values[id]['res_model']:
+                model_record_ids.setdefault(message_values[id]['res_model'], set()).add(message_values[id]['res_id'])
+
+        # CRUD: Access rights related to the document
+        document_related_ids = []
         for model, mids in model_record_ids.items():
             model_obj = self.pool.get(model)
             mids = model_obj.exists(cr, uid, mids)
-            model_obj.check_access_rights(cr, uid, operation)
-            model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+            if operation in ['create', 'write', 'unlink']:
+                model_obj.check_access_rights(cr, uid, 'write')
+                model_obj.check_access_rule(cr, uid, mids, 'write', context=context)
+            else:
+                model_obj.check_access_rights(cr, uid, operation)
+                model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+            document_related_ids += [mid for mid, message in message_values.iteritems()
+                if message.get('res_model') == model and message.get('res_id') in mids]
 
-        # fall back on classic operation for other ids
-        other_ids = set(ids).difference(set(notified_ids), set(document_ids))
-        super(mail_message, self).check_access_rule(cr, uid, other_ids, operation, context=None)
+        # Calculate remaining ids: if not void, raise an error
+        other_ids = set(ids).difference(set(notified_ids), set(author_ids), set(doc_follower_ids), set(document_related_ids))
+        if not other_ids:
+            return
+        raise orm.except_orm(_('Access Denied'),
+                            _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
+                            (self._description, operation))
 
     def create(self, cr, uid, values, context=None):
         if not values.get('message_id') and values.get('res_id') and values.get('model'):
@@ -337,6 +412,13 @@ class mail_message(osv.Model):
         self.notify(cr, uid, newid, context=context)
         return newid
 
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        """ Override to explicitely call check_access_rule, that is not called
+            by the ORM. It instead directly fetches ir.rules and apply them. """
+        res = super(mail_message, self).read(cr, uid, ids, fields=fields, context=context, load=load)
+        self.check_access_rule(cr, uid, ids, 'read', context=context)
+        return res
+
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete attachments that are directly attached to the message (should only happen
         # for mail.messages that act as parent for a standalone mail.mail record).
@@ -360,12 +442,14 @@ class mail_message(osv.Model):
             partners_to_notify |= set(partner.id for partner in message.partner_ids)
         # add all followers and set add them in partner_ids
         if message.model and message.res_id:
-            record = self.pool.get(message.model).browse(cr, uid, message.res_id, context=context)
+            record = self.pool.get(message.model).browse(cr, SUPERUSER_ID, message.res_id, context=context)
             extra_notified = set(partner.id for partner in record.message_follower_ids)
             missing_notified = extra_notified - partners_to_notify
             if missing_notified:
-                message.write({'partner_ids': [(4, p_id) for p_id in missing_notified]})
+                self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, p_id) for p_id in missing_notified]}, context=context)
             partners_to_notify |= extra_notified
+        # # remove uid from partners
+        self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(3, uid)]}, context=context)
         self.pool.get('mail.notification').notify(cr, uid, list(partners_to_notify), newid, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 914937a34f3..8e7129e8165 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -76,13 +76,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_message_search"/>
         </record>
-
-        <act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]"
-            context="{'default_partner_id': active_id}"
-            id="act_res_partner_emails" name="Emails"
-            res_model="mail.message"
-            src_model="res.partner"
-            view_id="view_message_tree"/>
         
         <!-- Add menu entry in Settings/Email -->
         <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/>
@@ -95,7 +88,7 @@
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
-            <field name="name">My Feeds</field>
+            <field name="name">My Posts</field>
             <field name="tag">mail.wall</field>
             <field name="params" eval="&quot;{'domain': [('author_id.user_ids', 'in', [uid])],
                 'context': {'default_model': 'res.users', 'default_res_id': uid} }&quot;"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index abee20a35f8..c671dd55ec4 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -30,6 +30,7 @@ import xmlrpclib
 
 from email.message import Message
 from mail_message import decode
+from openerp import SUPERUSER_ID
 from osv import osv, fields
 from tools.safe_eval import safe_eval as eval
 
@@ -118,26 +119,27 @@ class mail_thread(osv.AbstractModel):
 
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
         res = dict((id, dict(message_unread=False, message_summary='')) for id in ids)
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
 
+        # search for unread messages, by reading directly mail.notification, as SUPERUSER
         notif_obj = self.pool.get('mail.notification')
-        notif_ids = notif_obj.search(cr, uid, [
+        notif_ids = notif_obj.search(cr, SUPERUSER_ID, [
             ('partner_id.user_ids', 'in', [uid]),
             ('message_id.res_id', 'in', ids),
             ('message_id.model', '=', self._name),
             ('read', '=', False)
         ], context=context)
-        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+        for notif in notif_obj.browse(cr, SUPERUSER_ID, notif_ids, context=context):
             res[notif.message_id.res_id]['message_unread'] = True
 
-        for thread in self.browse(cr, uid, ids, context=context):
-            cls = res[thread.id]['message_unread'] and ' class="oe_kanban_mail_new"' or ''
-            res[thread.id]['message_summary'] = "<span%s><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (cls, len(thread.message_comment_ids), len(thread.message_follower_ids))
-            res[thread.id]['message_is_follower'] = user.partner_id.id in [follower.id for follower in thread.message_follower_ids]
+        for thread in self.read(cr, uid, ids, ['message_follower_ids', 'message_comment_ids', 'message_ids'], context=context):
+            cls = res[thread['id']]['message_unread'] and ' class="oe_kanban_mail_new"' or ''
+            res[thread['id']]['message_summary'] = "<span%s><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (cls, len(thread['message_comment_ids']), len(thread['message_follower_ids']))
+            res[thread['id']]['message_is_follower'] = partner_id in thread['message_follower_ids']
         return res
 
     def _search_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
-        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         res = {}
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [
@@ -196,6 +198,13 @@ class mail_thread(osv.AbstractModel):
         fol_obj.unlink(cr, uid, fol_ids, context=context)
         return super(mail_thread, self).unlink(cr, uid, ids, context=context)
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default['message_ids'] = []
+        default['message_comment_ids'] = []
+        default['message_follower_ids'] = []
+        return super(mail_thread, self).copy(cr, uid, id, default=default, context=context)
+
     #------------------------------------------------------
     # mail.message wrappers and tools
     #------------------------------------------------------
@@ -620,7 +629,7 @@ class mail_thread(osv.AbstractModel):
         """ Wrapper on message_subscribe, using users. If user_ids is not
             provided, subscribe uid instead. """
         if not user_ids: user_ids = [uid]
-        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        partner_ids = [user['partner_id'][0] for user in self.pool.get('res.users').read(cr, uid, user_ids, ['partner_id'], context=context)]
         return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
@@ -631,7 +640,7 @@ class mail_thread(osv.AbstractModel):
         """ Wrapper on message_subscribe, using users. If user_ids is not
             provided, unsubscribe uid instead. """
         if not user_ids: user_ids = [uid]
-        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        partner_ids = [user['partner_id'][0] for user in self.pool.get('res.users').read(cr, uid, user_ids, ['partner_id'], context=context)]
         return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 2a8430926d5..5c051fc89b3 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,6 +9,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
                         <field name="message_follower_ids" widget="mail_followers"/>
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 2ec74086a34..26048e7a40c 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,13 +1,14 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_global,mail.mail,model_mail_mail,base.group_system,1,1,1,1
-access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
+access_mail_message_all,mail.message.all,model_mail_message,,1,0,1,0
 access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1
-access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
-access_mail_followers_all,mail.followers.all,model_mail_followers,,1,1,1,1
-access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1,1,1
-access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
+access_mail_mail_all,mail.mail.all,model_mail_mail,,0,0,1,0
+access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1,1
+access_mail_followers_all,mail.followers.all,model_mail_followers,,0,0,0,0
+access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
+access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0
+access_mail_notification_aystem,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
+access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0
+access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
+access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
 access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
-access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
-access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
-access_mail_mail_manager,mail.mail,model_mail_mail,group_mail_manager,1,1,1,1
 access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index a12314e6f25..b503565bd11 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -2,20 +2,6 @@
 <openerp>
     <data>
 
-        <!-- CATEGORY -->
-        <record model="ir.module.category" id="module_category_social">
-            <field name="name">Social and Sharing Tools</field>
-            <field name="parent_id" ref="base.module_category_tools"/>
-            <field name="sequence">26</field>
-        </record>
-
-        <!-- GROUPS -->
-        <record id="group_mail_manager" model="res.groups">
-            <field name="name">Mail manager</field>
-            <field name="comment"></field>
-            <field name="category_id" ref="module_category_social"/>
-        </record>
-
         <!-- RULES -->
         <record id="group_rule_public_and_joined" model="ir.rule">
             <field name="name">Mail.group: access only public and joined groups</field>
@@ -24,5 +10,18 @@
             <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [x.id for x in user.groups_id])]</field>
         </record>
 
+        <!--
+        This rule can not be uncommented, because we have a more wide method in mail.message. When we implement a many2one_variable field, we will be able to uncomment this.
+
+        <record id="mail_message_read_partner_or_author" model="ir.rule">
+            <field name="name">mail.message: read if notified or author</field>
+            <field name="model_id" ref="model_mail_message"/>
+            <field name="domain_force">['|', ('partner_ids', 'in', user.partner_id.id), ('author_id', '=', user.partner_id.id)]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+        -->
+
     </data>
 </openerp>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 717d0439486..e69eaadbcdb 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -124,6 +124,14 @@
 }
 
 
+/* ------------------------------------------------------------ */
+/* Followers
+/* ------------------------------------------------------------ */
+
+.openerp div.oe_mail_recthread_aside h4 {
+    display: inline-block;
+}
+
 /* ------------------------------------------------------------ */
 /* Thread
 /* ------------------------------------------------------------ */
@@ -224,7 +232,7 @@
     clear: both; 
 }
 
-.openerp .oe_mail_msg_content a {
+.openerp .oe_chatter a {
     cursor: pointer;
 }
 
@@ -258,30 +266,6 @@
     display: none;
 }
 
-/*--------------------------------------------------------------*/
-/* mail.vote
-/*--------------------------------------------------------------*/
-
-.openerp .oe_mail_msg_content button.oe_mail_msg_vote {
-    height:21px;
-    width: 30px;
-    padding: 1px;
-    background: #8A89BA;
-    margin-top: -4px;
-}
-
-.openerp .oe_mail_msg_content button.oe_mail_msg_vote_true {
-    background:#DC5F59;
-}
-
-.openerp .oe_mail_msg_content button.oe_mail_msg_vote span {
-    color: white;
-}
-
-.openerp .oe_mail_msg_content span.oe_mail_vote_count{
-    color: #807FB4;
-}
-
 
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view & OpenERP hacks
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 57c777441e7..196c54c8296 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -56,11 +56,6 @@ openerp.mail = function(session) {
             return session.origin + '/web/binary/saveas?session_id=' + session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id=' + attachment['id'];
         },
 
-        /** Check if the current user is the message author */
-        is_author: function (widget, message_user_id) {
-            return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
-        },
-
         /** Replaces some expressions
          * - :name - shortcut to an image
          */
@@ -301,6 +296,7 @@ openerp.mail = function(session) {
             // TDE TODO: check for deferred, not sure it is correct
             this._super.apply(this, arguments);
             this.bind_events();
+            this.display_user_avatar();
             // fetch and display message, using message_ids if set
             var display_done = $.when(this.message_fetch(true, [], {})).then(this.proxy('do_customize_display'));
             // add message composition form view
@@ -313,7 +309,6 @@ openerp.mail = function(session) {
         /** Customize the display
          * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
-            this.display_user_avatar();
             if (this.options.show_header_compose) {
                 this.$el.find('div.oe_mail_thread_action').eq(0).show();
             }
@@ -349,7 +344,8 @@ openerp.mail = function(session) {
             // event: click on 'Reply by email' in msg side menu
             this.$el.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
                 if (! self.compose_message_widget) return true;
-                var msg_id = event.srcElement.dataset.msg_id;
+                evt = event.target || event.srcElement;
+                var msg_id = evt.dataset.msg_id;
                 if (! msg_id) return false;
                 self.compose_message_widget.refresh({
                     'default_composition_mode': 'reply',
@@ -370,9 +366,10 @@ openerp.mail = function(session) {
 
         on_message_read: function (event) {
             //TDE: TODO
-            var msg_id = event.srcElement.dataset.id;
+            evt = event.target || event.srcElement;
+            var msg_id = evt.dataset.id;
             if (! msg_id) return false;
-            $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+            $(evt).parents('li.oe_mail_thread_msg').eq(0).remove();
             return this.ds_notification.call('set_message_read', [parseInt(msg_id)]);
         },
 
@@ -489,8 +486,7 @@ openerp.mail = function(session) {
          * - record.date: formatting according to the user timezone
          * - record.timerelative: relative time givein by timeago lib
          * - record.avatar: image url
-         * - record.attachment_ids[].url: url of each attachment
-         * - record.is_author: is the current user the author of the record */
+         * - record.attachment_ids[].url: url of each attachment */
         display_record: function (record) {
             // formatting and additional fields
             record.date = session.web.format_value(record.date, {type:"datetime"});
@@ -504,7 +500,6 @@ openerp.mail = function(session) {
                 var attach = record.attachment_ids[l];
                 attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
             }
-            record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
             // add to internal storage
             this.records[record.id] = record;
             // render, add the expand feature
@@ -647,12 +642,15 @@ openerp.mail = function(session) {
             // update domain
             var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
             // create and render Thread widget
+            var show_header_compose = this.view.is_action_enabled('edit') ||
+                (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
             this.$el.find('div.oe_mail_recthread_main').empty();
             var thread = new mail.Thread(self, domain, this.options.context,
                 {   'thread_level': this.options.thread_level,
-                    'use_composer': true,
+                    'show_header_compose': show_header_compose,
+                    'use_composer': show_header_compose,
                     'show_dd_delete': true,
-                    'show_reply_by_email': true });
+                    'show_reply_by_email': show_header_compose });
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
         },
     });
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index cf33bd64640..743c4704330 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -26,6 +26,8 @@ openerp_mail_followers = function(session, mail) {
             this._super.apply(this, arguments);
             this.options.image = this.node.attrs.image || 'image_small';
             this.options.title = this.node.attrs.title || 'Followers';
+            this.options.context = this.node.attrs.context;
+            this.options.comment = this.node.attrs.help || false;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
         },
@@ -43,8 +45,8 @@ openerp_mail_followers = function(session, mail) {
         },
 
         reinit: function() {
-            this.$el.find('button.oe_mail_button_follow').hide();
-            this.$el.find('button.oe_mail_button_unfollow').hide();
+            this.message_is_follower == undefined;
+            this.display_buttons();
         },
 
         bind_events: function() {
@@ -53,7 +55,7 @@ openerp_mail_followers = function(session, mail) {
                 .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
                 .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.$el.on('click', 'button.oe_mail_button_follow', function () { self.do_follow(); });
-            this.$el.on('click', 'button.oe_mail_button_invite', function(event) {
+            this.$el.on('click', 'a.oe_mail_invite', function(event) {
                 action = {
                     type: 'ir.actions.act_window',
                     res_model: 'mail.wizard.invite',
@@ -72,41 +74,65 @@ openerp_mail_followers = function(session, mail) {
 
         read_value: function() {
             var self = this;
-            return this.ds_model.read_ids([this.view.datarecord.id], ['message_follower_ids']).pipe(function (results) {
-                return results[0].message_follower_ids;
-            }).pipe(this.proxy('set_value'));
+            return this.ds_model.read_ids([this.view.datarecord.id], ['message_is_follower', 'message_follower_ids']).then(function (results) {
+                self.set_value(results[0].message_follower_ids, results[0].message_is_follower);
+            });
         },
 
-        set_value: function(value_) {
+        set_value: function(value_, message_is_follower) {
             this.reinit();
             if (! this.view.datarecord.id ||
                 session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$el.find('div.oe_mail_recthread_aside').hide();
+                this.$('div.oe_mail_recthread_aside').hide();
                 return;
             }
-            return this.fetch_followers(value_  || this.get_value());
+            return this.fetch_followers(value_  || this.get_value(), message_is_follower);
         },
 
-        fetch_followers: function (value_) {
-            return this.ds_follow.call('read', [value_, ['name', 'user_ids']]).pipe(this.proxy('display_followers'));
+        fetch_followers: function (value_, message_is_follower) {
+            this.value = value_;
+            this.message_is_follower = message_is_follower || (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
+            return this.ds_follow.call('read', [value_, ['name', 'user_ids']]).pipe(this.proxy('display_followers'), this.proxy('display_generic'));
+        },
+
+
+        /* Display generic info about follower, for people not having access to res_partner */
+        display_generic: function (error, event) {
+            event.preventDefault();
+            var node_user_list = this.$('ul.oe_mail_followers_display').empty();
+            // format content: Followers (You and 0 other) // Followers (3)
+            var content = this.options.title;
+            if (this.message_is_follower) {
+                content += ' (You and ' + (this.value.length-1) + ' other)';
+            }
+            else {
+                content += ' (' + this.value.length + ')'
+            }
+            this.$('div.oe_mail_recthread_followers h4').html(content);
+            this.display_buttons();
+            return $.when();
         },
 
         /** Display the followers, evaluate is_follower directly */
         display_followers: function (records) {
             var self = this;
-            this.message_is_follower = _.indexOf(_.flatten(_.pluck(records, 'user_ids')), this.session.uid) != -1;
-            var node_user_list = this.$el.find('ul.oe_mail_followers_display').empty();
-            this.$el.find('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
+            var node_user_list = this.$('ul.oe_mail_followers_display').empty();
+            this.$('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
             _(records).each(function (record) {
                 record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(node_user_list);
             });
-            if (this.message_is_follower) {
-                this.$el.find('button.oe_mail_button_follow').hide();
-                this.$el.find('button.oe_mail_button_unfollow').show(); }
-            else {
-                this.$el.find('button.oe_mail_button_follow').show();
-                this.$el.find('button.oe_mail_button_unfollow').hide(); }
+            this.display_buttons();
+        },
+
+        display_buttons: function () {
+            this.$('button.oe_mail_button_follow').hide();
+            this.$('button.oe_mail_button_unfollow').hide();
+            this.$('span.oe_mail_invite_wrapper').hide();
+            if (! this.view.is_action_enabled('edit')) return;
+            this.$('span.oe_mail_invite_wrapper').show();
+            if (this.message_is_follower) { this.$('button.oe_mail_button_unfollow').show(); }
+            else if (this.message_is_follower == false) { this.$('button.oe_mail_button_follow').show(); }
         },
 
         do_follow: function () {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e3586e723e4..c54bd4dbb2d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -140,7 +140,7 @@
                         <li t-if="options.show_record_name and record.record_name and record.subject and options.thread_level > 0">
                             <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
                         </li>
-                        <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
+                        <li t-if="record.author_id"><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                         <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                         <t t-call="mail.thread.message.vote"/>
                         <li t-if="options.show_reply"><a class="oe_mail_msg_reply">Reply</a></li>
@@ -185,7 +185,7 @@
         <t t-if='record.vote_user_ids.length > 0'>
              <span class="oe_left oe_mail_vote_count"><t t-esc="record.vote_user_ids.length"/> votes</span>
         </t>
-        <button t-attf-class="oe_mail_msg_vote oe_mail_msg_vote_#{record.has_voted}" t-attf-data-msg_id="{record.id}">
+        <button t-attf-class="oe_mail_msg_vote oe_tag" t-attf-data-msg_id="{record.id}">
             <t t-if="! record.has_voted"><span>+1</span></t>
             <t t-if="record.has_voted"><span>-1</span></t>
         </button>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 32ce34d48d1..203a7bce789 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -7,13 +7,17 @@
         -->
     <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
         <div class="oe_mail_recthread_actions">
-            <button type="button" class="oe_mail_button_invite">Invite</button>
             <button type="button" class="oe_mail_button_follow">Follow</button>
             <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
         </div>
+        <div class="oe_grey">
+            <t t-if="widget.options.comment">
+                <h5><t t-raw="widget.options.comment"/></h5>
+            </t>
+        </div>
         <div class="oe_mail_recthread_followers">
             <t t-if="widget.options.title">
-                <h4><t t-raw="widget.options.title"/></h4>
+                <h4><t t-raw="widget.options.title"/></h4><span class="oe_mail_invite_wrapper"> · <a class="oe_mail_invite" >Invite partners</a></span>
             </t>
             <ul class="oe_mail_followers_display"></ul>
         </div>
diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index d63c5634cc3..2d48fa233c4 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -18,10 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from . import test_mail
+from . import test_mail, test_mail_access_rights
 
 checks = [
     test_mail,
+    test_mail_access_rights,
 ]
 
-# 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/mail/tests/test_mail_access_rights.py b/addons/mail/tests/test_mail_access_rights.py
new file mode 100644
index 00000000000..104d7f28ffe
--- /dev/null
+++ b/addons/mail/tests/test_mail_access_rights.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests import test_mail
+from osv.orm import except_orm
+
+
+class test_mail_access_rights(test_mail.TestMailMockups):
+
+    def setUp(self):
+        super(test_mail_access_rights, self).setUp()
+        cr, uid = self.cr, self.uid
+        self.mail_group = self.registry('mail.group')
+        self.mail_message = self.registry('mail.message')
+        self.mail_notification = self.registry('mail.notification')
+        self.res_users = self.registry('res.users')
+        self.res_groups = self.registry('res.groups')
+        self.res_partner = self.registry('res.partner')
+
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+
+        # Find Employee group
+        group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        self.group_employee_id = group_employee_ref and group_employee_ref[1] or False
+
+        # Create Bert (without groups) and Raoul( employee)
+        self.user_bert_id = self.res_users.create(cr, uid, {'name': 'Bert Tartopoils', 'login': 'bert', 'groups_id': [(6, 0, [])]})
+        self.user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul', 'groups_id': [(6, 0, [self.group_employee_id])]})
+        self.user_bert = self.res_users.browse(cr, uid, self.user_bert_id)
+        self.partner_bert_id = self.user_bert.partner_id.id
+        self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
+        self.partner_raoul_id = self.user_raoul.partner_id.id
+
+    def test_00_mail_message_read_access_rights(self):
+        """ Test basic mail_message read access rights. """
+        cr, uid = self.cr, self.uid
+        partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
+        user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+
+        # Prepare groups: Pigs (employee), Jobs (public)
+        self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
+        self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
+
+        # ----------------------------------------
+        # CASE1: Bert, basic mail.message read access
+        # ----------------------------------------
+
+        # Do: create a new mail.message
+        message_id = self.mail_message.create(cr, uid, {'body': 'My Body'})
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, user_bert_id, message_id)
+        # Do: message is pushed to Bert
+        notif_id = self.mail_notification.create(cr, uid, {'message_id': message_id, 'partner_id': partner_bert_id})
+        # Test: Bert reads the message, ok because notification pushed
+        self.mail_message.read(cr, user_bert_id, message_id)
+        # Do: remove notification
+        self.mail_notification.unlink(cr, uid, notif_id)
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, self.user_bert_id, message_id)
+        # Do: Bert is now the author
+        self.mail_message.write(cr, uid, [message_id], {'author_id': partner_bert_id})
+        # Test: Bert reads the message, ok because Bert is the author
+        self.mail_message.read(cr, user_bert_id, message_id)
+        # Do: Bert is not the author anymore
+        self.mail_message.write(cr, uid, [message_id], {'author_id': partner_raoul_id})
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, user_bert_id, message_id)
+        # Do: message is attached to a document Bert can read, Jobs
+        self.mail_message.write(cr, uid, [message_id], {'model': 'mail.group', 'res_id': self.group_jobs_id})
+        # Test: Bert reads the message, ok because linked to a doc he is allowed to read
+        self.mail_message.read(cr, user_bert_id, message_id)
+        # Do: message is attached to a document Bert cannot read, Pigs
+        self.mail_message.write(cr, uid, [message_id], {'model': 'mail.group', 'res_id': self.group_pigs_id})
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, user_bert_id, message_id)
+
+    def test_05_mail_message_search_access_rights(self):
+        """ Test mail_message search override about access rights. """
+        self.assertTrue(1 == 1, 'Test not implemented, do not replace by return True')
+
+    def test_10_mail_flow_access_rights(self):
+        """ Test a Chatter-looks alike flow. """
+        cr, uid = self.cr, self.uid
+        partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
+        user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+
+        # Prepare groups: Pigs (employee), Jobs (public)
+        self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
+        self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
+
+        # ----------------------------------------
+        # CASE1: Bert, without groups
+        # ----------------------------------------
+        # Do: Bert creates a group, should crash because perm_create only for employees
+        self.assertRaises(except_orm,
+                          self.mail_group.create,
+                          cr, user_bert_id, {'name': 'Bert\'s Group'})
+        # Do: Bert reads Jobs basic fields, ok because public = read access on the group
+        self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['name', 'description'])
+        # Do: Bert browse Pigs, ok (no direct browse of partners)
+        self.mail_group.browse(cr, user_bert_id, self.group_jobs_id)
+        # Do: Bert reads Jobs messages, ok because read access on the group => read access on its messages
+        jobs_message_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_ids'])['message_ids']
+        self.mail_message.read(cr, user_bert_id, jobs_message_ids)
+        # Do: Bert reads Jobs followers, ko because partner are accessible to employees or partner manager
+        jobs_followers_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_follower_ids'])['message_follower_ids']
+        self.assertRaises(except_orm,
+                          self.res_partner.read,
+                          cr, user_bert_id, jobs_followers_ids)
+        # Do: Bert comments Jobs, ko because no write access on the group and not in the followers
+        self.assertRaises(except_orm,
+                          self.mail_group.message_post,
+                          cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
+        # Do: add Bert to jobs followers
+        self.mail_group.message_subscribe(cr, uid, [self.group_jobs_id], [partner_bert_id])
+        # Do: Bert comments Jobs, ok because he is now in the followers
+        self.mail_group.message_post(cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
+
+        # Do: Bert reads Pigs, should crash because mail.group security=groups only for employee group
+        self.assertRaises(except_orm,
+                          self.mail_group.read,
+                          cr, user_bert_id, self.group_pigs_id)
+
+        # ----------------------------------------
+        # CASE1: Raoul, employee
+        # ----------------------------------------
+        # Do: Bert read Pigs, ok because public
+        self.mail_group.read(cr, user_raoul_id, self.group_pigs_id)
+        # Do: Bert read Jobs, ok because group_public_id = employee
+        self.mail_group.read(cr, user_raoul_id, self.group_jobs_id)
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 19b9536c432..189bd8285f2 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -5,21 +5,36 @@
     <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
 
     <!-- Marketing Campaign -->
-    <act_window name="All Segments"
-        res_model="marketing.campaign.segment"
-        src_model="marketing.campaign"
-        view_type="form"
-        view_mode="tree,form"
-        id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
+    
+    <record id="act_marketing_campaing_segment_opened" model="ir.actions.act_window">
+        <field name="res_model">marketing.campaign.segment</field>
+        <field name="view_type">form</field>
+        <field name="name">Segments</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
+    
+    <!-- Campaign Follow-ups -->
+        
+    <record id="act_marketing_campaing_followup" model="ir.actions.act_window">
+        <field name="res_model">marketing.campaign.workitem</field>
+        <field name="view_type">form</field>
+        <field name="name">Workitems</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
+    
+    <!-- Campaign Statistics -->
+    
+    <record id="act_marketing_campaing_stat" model="ir.actions.act_window" >
+        <field name="res_model">campaign.analysis</field>
+        <field name="view_type">form</field>
+        <field name="name">Campaign Follow-up</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
 
     <!-- Campaign Followups -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_followup"
-        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
 
     <record model="ir.ui.view" id="view_marketing_campaign_form">
         <field name="name">marketing.campaign.form</field>
@@ -35,12 +50,15 @@
             </header>
             <sheet string="Campaign">
                 <div class="oe_right oe_button_box" name="button_box">
-                        <button type="action"
+                    <button type="action"
+                        name="%(act_marketing_campaing_stat)d"
+                        string="Campaign Statistics"/>
+                    <button type="action"
+                        name="%(act_marketing_campaing_segment_opened)d"
+                        string="Segments"/>  
+                    <button type="action"
                         name="%(act_marketing_campaing_followup)d"
                         string="Follow-Up"/>
-                        <button type="action"
-                        name="%(act_marketing_campaing_segment_opened)d"
-                        string="Segments"/>
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
@@ -422,29 +440,5 @@
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/>
 
-    <act_window name="All Segments"
-        res_model="marketing.campaign.segment"
-        src_model="marketing.campaign"
-        view_type="form"
-        view_mode="tree,form"
-        id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
-
-    <!-- Campaign Follow-ups -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_followup"
-        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
-
-    <!-- Campaign Statistics -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_stat"
-        name="Campaign Statistics" res_model="campaign.analysis"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
-
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
index 98ac53b7b29..8ae1ab8645a 100644
--- a/addons/marketing_campaign/res_partner.py
+++ b/addons/marketing_campaign/res_partner.py
@@ -29,7 +29,13 @@ class res_partner(osv.osv):
                                         'partner_id', 'Workitems',
                                         readonly=True),
     }
-
+    
+    def copy(self, cr, uid, id, default={}, context=None):
+        default.update({
+            'workitem_ids': [],
+        })
+        return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
+    
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 5b959625086..63c65ccd97f 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -12,7 +12,7 @@
                    <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_campaign" string="Campaign">
+                    <group name="grp_campaign" string="Campaigns">
                         <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
                 </xpath>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 2a006814629..87af723f2f9 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -338,7 +338,7 @@ class Partner(osv.osv):
                     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
                     _membership_date, multi = 'membeship_start',
-                    string = 'Start Membership Date', type = 'date',
+                    string = 'Membership Start Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@ class Partner(osv.osv):
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date,
-                    string = 'Stop Membership Date', type='date', multi='membership_stop',
+                    string = 'Membership End Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 94ee4bdb3b2..00a5790b67e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -106,6 +106,7 @@ class mrp_routing_workcenter(osv.osv):
     """
     _name = 'mrp.routing.workcenter'
     _description = 'Work Center Usage'
+    _order = 'sequence'
     _columns = {
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
         'name': fields.char('Name', size=64, required=True),
@@ -226,6 +227,7 @@ class mrp_bom(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c),
     }
     _order = "sequence"
+    _parent_name = "bom_id"
     _sql_constraints = [
         ('bom_qty_zero', 'CHECK (product_qty>0)',  'All product quantities must be greater than 0.\n' \
             'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
@@ -461,7 +463,8 @@ class mrp_production(osv.osv):
         'date_start': fields.datetime('Start Date', select=True, readonly=True),
         'date_finished': fields.datetime('End Date', select=True, readonly=True),
 
-        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
+        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]},
+            help="Bill of Materials allow you to define the list of required raw materials to make a finished product."),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]},
             help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
         'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
@@ -670,7 +673,7 @@ class mrp_production(osv.osv):
 
         for (production_id,name) in self.name_get(cr, uid, ids):
             production = self.browse(cr, uid, production_id)
-            if production.move_prod_id:
+            if production.move_prod_id and production.move_prod_id.location_id.id != production.location_dest_id.id:
                 move_obj.write(cr, uid, [production.move_prod_id.id],
                         {'location_id': production.location_dest_id.id})
             self.action_ready_send_note(cr, uid, [production_id], context)
@@ -828,7 +831,8 @@ class mrp_production(osv.osv):
                         'ref': wc.code,
                         'product_id': wc.product_id.id,
                         'unit_amount': wc_line.hour,
-                        'product_uom_id': wc.product_id.uom_id.id
+                        'product_uom_id': wc.product_id.id and wc.product_id.uom_id.id or False
+                        
                     } )
             if wc.costs_journal_id and wc.costs_general_account_id:
                 value = wc_line.cycle * wc.costs_cycle
@@ -844,7 +848,8 @@ class mrp_production(osv.osv):
                         'ref': wc.code,
                         'product_id': wc.product_id.id,
                         'unit_amount': wc_line.cycle,
-                        'product_uom_id': wc.product_id.uom_id.id
+                        'product_uom_id': wc.product_id.id and wc.product_id.uom_id.id or False
+                        
                     } )
         return amount
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d05893cf778..a198d736bbc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -13,7 +13,7 @@
             parent="base.menu_mrp_root"
             sequence="1"/>
 
-        <menuitem name="Master Data"
+        <menuitem name="Products"
             id="menu_mrp_bom"
             parent="base.menu_mrp_root"
             sequence="5"/>
@@ -409,8 +409,9 @@
                         </page>
                     </notebook>
                     <div class="oe_chatter">
-                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_is_follower" invisible="1"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                        <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
                 </form>
             </field>
@@ -513,7 +514,15 @@
               </p>
             </field>
         </record>
-
+        
+        <record id="product_supply_method_produce" model="ir.actions.act_window">
+            <field name="name">Products</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{'search_default_filter_supply_method_produce' : 1}</field>
+            <field name="search_view_id" ref="product.product_search_form_view"/>
+        </record>
         <!-- BOM menus -->
 
         <menuitem
@@ -521,6 +530,10 @@
             id="menu_mrp_bom_form_action"
             parent="menu_mrp_bom"
             sequence="10"/>
+       <menuitem name="Products" 
+            id="menu_mrp_product_form" 
+            action="product_supply_method_produce"
+            parent="menu_mrp_bom"/>
         <menuitem
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
@@ -532,9 +545,7 @@
             <field name="name">Bill of Materials Structure</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
-            <field name="domain">[('id','in',active_ids)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_mode">tree</field>
+            <field name="domain">[('bom_id', '=',active_ids)]</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
@@ -644,7 +655,7 @@
                             <field name="date_planned"/>
                         </group>
                         <group>
-                            <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
+                            <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)" required="1"/>
                             <field name="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
                             <field name="user_id"/>
                             <field name="origin"/>
@@ -663,7 +674,7 @@
                                             <field name="product_id"/>
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                            <field name="prodlot_id" groups="stock.group_production_lot"/>
+                                            <field name="prodlot_id" groups="stock.group_production_lot" context="{'product_id': product_id}"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
                                                 string="Consume Products" type="action"
@@ -787,6 +798,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 834f3000472..0bcce6063f1 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -107,6 +107,7 @@
                 </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 55cbe49c75b..976961693c6 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -189,6 +189,7 @@
                 </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 431cf0d54b4..21d71064901 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -27,7 +27,8 @@
             view_mode="form"
             target="new"        
             key2="client_action_multi"    
-            id="act_mrp_repair_invoice"/>        
+            id="act_mrp_repair_invoice"
+            multi="True"/>        
         
     </data>
 </openerp>    
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 62b007aab6e..d5af65f8763 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -117,8 +117,11 @@
             <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
           </header>
           <field name="memo" widget="html"/><!-- editor_width="100%%" editor_height="60%%" -->
-          <field name="message_follower_ids" widget="mail_followers"/>
-          <field class="oe_chatter" name="message_ids" widget="mail_thread"/>
+          <div class="oe_chatter">
+            <field name="message_is_follower" invisible="1"/>
+            <field name="message_ids" widget="mail_thread"/>
+            <field name="message_follower_ids" widget="mail_followers"/>
+          </div>
         </form>
       </field>
     </record>
diff --git a/addons/note/security/res.groups.csv b/addons/note/security/res.groups.csv
index 88d7b2cd667..b54b1b02393 100644
--- a/addons/note/security/res.groups.csv
+++ b/addons/note/security/res.groups.csv
@@ -1,2 +1,2 @@
-id,name,implied_ids/id
-group_note_fancy,Memo / Fancy mode,
+id,name,implied_ids/id,category_id/id
+group_note_fancy,Notes / Fancy mode,,base.module_category_hidden
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index a980552a854..90a570bc1d5 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -5,6 +5,7 @@
         <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
             <field name="name">Company's news</field>
+            <field name="public">public</field>
         </record>
 
         <record id="action_news" model="ir.actions.act_window">
@@ -17,6 +18,7 @@
         <!-- Mail group for the company's jobs -->
         <record id="company_jobs" model="mail.group">
             <field name="name">Company's jobs</field>
+            <field name="public">public</field>
         </record>
 
         <record id="action_jobs" model="ir.actions.act_window">
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index a8727b99556..e8d0fb4159b 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -9,7 +9,9 @@
             <field name="password">portal</field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
-            <field name="partner_id" eval="ref('base.res_partner_1')"/>
+            <field name="supplier" eval="False"/>
+            <field name="customer" eval="True"/>
+            <field name="email">demo@portal.wrong.address</field>
         </record>
 
         <!-- Add the demo user to the portal (and therefore to the portal member group) -->
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index 2d7a17e0016..1c4ee5964bd 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,8 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message,mail.message,mail.model_mail_message,group_portal,1,0,1,1
-access_mail_message_all,mail.message.all,mail.model_mail_message,group_portal,1,0,0,0
-access_mail_thread,mail.thread,mail.model_mail_thread,group_portal,1,0,0,0
-access_mail_followers,mail.followers,mail.model_mail_followers,group_portal,1,0,1,1
-access_mail_notification,mail.notification,mail.model_mail_notification,group_portal,1,0,1,0
-access_mail_group,mail.group,mail.model_mail_group,group_portal,1,0,0,0
-access_mail_alias,mail.alias,mail.model_mail_alias,group_portal,1,0,0,0
+access_mail_message_portal,mail.message.portal,mail.model_mail_message,group_portal,1,0,1,1
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 5e992fa06ea..653a05d40aa 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -21,15 +21,18 @@
 
 from openerp.addons.mail.tests import test_mail
 from openerp.tools import append_content_to_html
+from osv.orm import except_orm
 
 
 class test_portal(test_mail.TestMailMockups):
 
     def setUp(self):
         super(test_portal, self).setUp()
+        cr, uid = self.cr, self.uid
         self.ir_model = self.registry('ir.model')
         self.mail_group = self.registry('mail.group')
         self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
@@ -37,7 +40,42 @@ class test_portal(test_mail.TestMailMockups):
         self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
 
-    def test_00_mail_invite(self):
+        # Find Portal group
+        group_portal_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')
+        self.group_portal_id = group_portal_ref and group_portal_ref[1] or False
+
+        # Create Chell (portal user)
+        self.user_chell_id = self.res_users.create(cr, uid, {'name': 'Chell Gladys', 'login': 'chell', 'groups_id': [(6, 0, [self.group_portal_id])]})
+        self.user_chell = self.res_users.browse(cr, uid, self.user_chell_id)
+        self.partner_chell_id = self.user_chell.partner_id.id
+
+    def test_00_access_rights(self):
+        """ Test basic mail_message and mail_group access rights for portal users. """
+        cr, uid = self.cr, self.uid
+        partner_chell_id = self.partner_chell_id
+        user_chell_id = self.user_chell_id
+
+        # Prepare group: Pigs (portal)
+        self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
+        self.mail_group.write(cr, uid, [self.group_pigs_id], {'name': 'Jobs', 'public': 'groups', 'group_public_id': self.group_portal_id})
+
+        # ----------------------------------------
+        # CASE1: Chell will use the Chatter
+        # ----------------------------------------
+
+        # Do: Chell reads Pigs messages, ok because restricted to portal group
+        message_ids = self.mail_group.read(cr, user_chell_id, self.group_pigs_id, ['message_ids'])['message_ids']
+        self.mail_message.read(cr, user_chell_id, message_ids)
+        # Do: Chell posts a message on Pigs, crash because can not write on group or is not in the followers
+        self.assertRaises(except_orm,
+                          self.mail_group.message_post,
+                          cr, user_chell_id, self.group_pigs_id, body='Message')
+        # Do: Chell is added to Pigs followers
+        self.mail_group.message_subscribe(cr, uid, [self.group_pigs_id], [partner_chell_id])
+        # Test: Chell posts a message on Pigs, ok because in the followers
+        self.mail_group.message_post(cr, user_chell_id, self.group_pigs_id, body='Message')
+
+    def test_50_mail_invite(self):
         cr, uid = self.cr, self.uid
         user_admin = self.res_users.browse(cr, uid, uid)
         self.mail_invite = self.registry('mail.wizard.invite')
diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index 9fc47c4cfb0..a88c8ce7835 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Claims</field>
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 036993e1720..b671ced2275 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -40,32 +40,51 @@ class crm_contact_us(osv.TransientModel):
         r = self.pool.get('res.company').search(cr, uid, [], context=context)
         return r
 
-    def _get_current_user_email(self, cr, uid, context=None):
+    def _get_user_name(self, cr, uid, context=None):
         """
-        If the user is logged in (i.e. not anonymous), get the user's email to
-        pre-fill the email_from field.
+        If the user is logged in (i.e. not anonymous), get the user's name to
+        pre-fill the partner_name field.
+        Same goes for the other _get_user_attr methods.
 
-        @return current user's email if the user isn't "anonymous", None otherwise
+        @return current user's name if the user isn't "anonymous", None otherwise
         """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        user = self.pool.get('res.users').read(cr, uid, uid, ['login'], context)
 
-        if (user.login != 'anonymous'):
-            return user.email
+        if (user['login'] != 'anonymous'):
+            return self.pool.get('res.users').name_get(cr, uid, uid, context)[0][1]
+        else:
+            return None
+
+    def _get_user_email(self, cr, uid, context=None):
+        user = self.pool.get('res.users').read(cr, uid, uid, ['login', 'email'], context)
+
+        if (user['login'] != 'anonymous' and user['email']):
+            return user['email']
+        else:
+            return None
+
+    def _get_user_phone(self, cr, uid, context=None):
+        user = self.pool.get('res.users').read(cr, uid, uid, ['login', 'phone'], context)
+
+        if (user['login'] != 'anonymous' and user['phone']):
+            return user['phone']
         else:
             return None
 
     _defaults = {
-        'email_from' : _get_current_user_email,
-        'company_ids' : _get_companies,
+        'partner_name': _get_user_name,
+        'email_from': _get_user_email,
+        'phone': _get_user_phone,
+        'company_ids': _get_companies,
     }
 
     def create(self, cr, uid, values, context=None):
         """
-        Since they potentially sensitive, we don't want any user to be able to
-        read datas generated through this module.  That's why we'll write those
-        information in the crm.lead table and leave blank entries in the
-        portal_crm.crm_contact_us table.  This is why the create() method is
-        overwritten.
+        Since they are potentially sensitive, we don't want any user to be able
+        to read datas generated through this module.  That's why we'll write
+        those information directly in the crm.lead table and leave blank
+        entries in the portal_crm.crm_contact_us table.
+        This is why the create() method is overwritten.
         """
         crm_lead = self.pool.get('crm.lead')
 
@@ -88,11 +107,20 @@ class crm_contact_us(osv.TransientModel):
 
     def submit(self, cr, uid, ids, context=None):
         """ When the form is submitted, redirect the user to a "Thanks" message """
-        return {'type': 'ir.actions.act_window',
-                'view_mode': 'form',
-                'view_type': 'form',
-                'res_model': self._name,
-                'res_id': ids[0],
-                'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
-                'target': 'inline'
-               }
+        return {
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'view_type': 'form',
+            'res_model': self._name,
+            'res_id': ids[0],
+            'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
+            'target': 'inline',
+        }
+
+    def _needaction_domain_get(self, cr, uid, context=None):
+        """
+        This model doesn't need the needactions mechanism inherited from
+        crm_lead, so simply override the method to return an empty domain
+        and, therefore, 0 needactions.
+        """
+        return False
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
index 7418b08bb4b..fc652f4bcd1 100644
--- a/addons/portal_event/security/ir.model.access.csv
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event,event,event.model_event_event,portal.group_portal,1,0,0,0
-access_registration,registration,event.model_event_registration,portal.group_portal,1,0,0,0
+access_registration,registration,event.model_event_registration,portal.group_portal,1,1,1,1
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 74b2372c147..8f17808345b 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -12,7 +12,7 @@
         <record id="portal_registration_rule" model="ir.rule">
             <field name="name">Portal Personal Registrations</field>
             <field ref="event.model_event_registration" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
+            <field name="domain_force">[('user_id','=',user.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index b9d37cec099..316fb1b4a15 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_task_rule" model="ir.rule">
             <field name="name">Portal Personal Task</field>
             <field ref="project.model_project_task" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index 358b5e6a0ad..d58e160051b 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_issue_rule" model="ir.rule">
             <field name="name">Portal Personal Issues</field>
             <field ref="project_issue.model_project_issue" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index 2f161a73281..d27317d0305 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -5,43 +5,43 @@
         <!-- Sale Portal Access Rules -->
         <record id="portal_sale_order_user_rule" model="ir.rule">
             <field name="name">Portal Personal Quotations/Sales Orders</field>
-            <field ref="sale.model_sale_order" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders</field>
             <field name="model_id" ref="stock.model_stock_picking"/>
-            <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders Out</field>
-            <field ref="stock.model_stock_picking_out" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
+            <field name="model_id" ref="stock.model_stock_picking_out"/>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_account_invoice_user_rule" model="ir.rule">
             <field name="name">Portal Personal Account Invoices</field>
-            <field ref="account.model_account_invoice" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_personal_payment" model="ir.rule">
             <field name="name">Portal Personal Payments</field>
-            <field ref="account_voucher.model_account_voucher" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
+            <field name="model_id" ref="account_voucher.model_account_voucher"/>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_personal_contact" model="ir.rule">
             <field name="name">Portal Personal Contacts</field>
-            <field ref="base.model_res_partner" name="model_id"/>
-            <field name="domain_force">[('id','child_of',user.partner_id.id)]</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index d544181a6e8..9d064c0e649 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -30,9 +30,9 @@ class company(osv.osv):
             "today and today+range are skipped for future computation."),
     }
     _defaults = {
-        'schedule_range': 80.0,
+        'schedule_range': 730.0,
     }
 
 company()
 
-# 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/procurement/procurement.py b/addons/procurement/procurement.py
index 842f9ec27fa..c9b09761ed0 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -97,9 +97,9 @@ class procurement_order(osv.osv):
         'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
         'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
-        'close_move': fields.boolean('Close Move at end', required=True),
+        'close_move': fields.boolean('Close Move at end'),
         'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
             readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
             " a make to order method."),
 
@@ -333,8 +333,8 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Insufficient Data!'),
-                    _('Quantity in procurement order(s) must be greater than 0.'))
+                raise osv.except_osv(_('Data Insufficient !'),
+                    _('Please check the quantity in procurement order(s) for the product "%s", it should not be 0 or less!' % procurement.product_id.name))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
                     source = procurement.location_id.id
@@ -423,24 +423,26 @@ class procurement_order(osv.osv):
         """
         return 0
 
+    # XXX action_cancel() should accept a context argument
     def action_cancel(self, cr, uid, ids):
-        """ Cancels procurement and writes move state to Assigned.
+        """Cancel Procurements and either cancel or assign the related Stock Moves, depending on the procurement configuration.
+        
         @return: True
         """
-        todo = []
-        todo2 = []
+        to_assign = []
+        to_cancel = []
         move_obj = self.pool.get('stock.move')
         for proc in self.browse(cr, uid, ids):
             if proc.close_move and proc.move_id:
                 if proc.move_id.state not in ('done', 'cancel'):
-                    todo2.append(proc.move_id.id)
+                    to_cancel.append(proc.move_id.id)
             else:
                 if proc.move_id and proc.move_id.state == 'waiting':
-                    todo.append(proc.move_id.id)
-        if len(todo2):
-            move_obj.action_cancel(cr, uid, todo2)
-        if len(todo):
-            move_obj.write(cr, uid, todo, {'state': 'assigned'})
+                    to_assign.append(proc.move_id.id)
+        if len(to_cancel):
+            move_obj.action_cancel(cr, uid, to_cancel)
+        if len(to_assign):
+            move_obj.write(cr, uid, to_assign, {'state': 'assigned'})
         self.write(cr, uid, ids, {'state': 'cancel'})
         self.cancel_send_note(cr, uid, ids, context=None)
         wf_service = netsvc.LocalService("workflow")
@@ -548,6 +550,19 @@ class stock_warehouse_orderpoint(osv.osv):
             result[orderpoint.id] = procurement_ids
         return result
 
+    def _check_product_uom(self, cr, uid, ids, context=None):
+        '''
+        Check if the UoM has the same category as the product standard UoM
+        '''
+        if not context:
+            context = {}
+            
+        for rule in self.browse(cr, uid, ids, context=context):
+            if rule.product_id.uom_id.category_id.id != rule.product_uom.category_id.id:
+                return False
+            
+        return True
+
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the orderpoint without removing it."),
@@ -580,6 +595,9 @@ class stock_warehouse_orderpoint(osv.osv):
     _sql_constraints = [
         ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', 'Qty Multiple must be greater than zero.'),
     ]
+    _constraints = [
+        (_check_product_uom, 'You have to select a product unit of measure in the same category than the default unit of measure of the product', ['product_id', 'product_uom']),
+    ]
 
     def default_get(self, cr, uid, fields, context=None):
         res = super(stock_warehouse_orderpoint, self).default_get(cr, uid, fields, context)
@@ -610,9 +628,10 @@ class stock_warehouse_orderpoint(osv.osv):
         """
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            d = {'product_uom': [('category_id', '=', prod.uom_id.category_id.id)]}
             v = {'product_uom': prod.uom_id.id}
-            return {'value': v}
-        return {}
+            return {'value': v, 'domain': d}
+        return {'domain': {'product_uom': []}}
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index bf73b383216..34715f19e11 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -103,6 +103,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index f189b854fe5..3bc6e6d6814 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -203,7 +203,7 @@ class product_pricelist(osv.osv):
 
                 if partner:
                     partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
-                    partner_args = (partner, product_id)
+                    partner_args = (partner, tmpl_id)
                 else:
                     partner_where = 'base <> -2 '
                     partner_args = ()
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..8ffa4732c13 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -203,6 +203,7 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index 09cf5ce61fd..81b99b8ac0a 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -35,7 +35,7 @@ To this end, a new check box named 'Visible Discount' is added to the pricelist
     If the check box is unchecked, we will have on Sale Order and Invoice lines:
     Unit price=225, Discount=0,00, Net price=225.
     """,
-    'depends': ['sale'],
+    'depends': ["sale","purchase"],
     'demo': [],
     'data': ['product_visible_discount_view.xml'],
     'auto_install': False,
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index f543f48834e..f8c8bc84ba9 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-28 12:50+0000\n"
+"PO-Revision-Date: 2012-09-29 14:57+0000\n"
 "Last-Translator: Erwin <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: 2012-09-21 04:42+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-09-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16049)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1326,7 +1326,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
-msgstr ""
+msgstr "Delegeren"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
diff --git a/addons/project/project.py b/addons/project/project.py
index 3572fd094b3..0d92d71a45f 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -509,6 +509,8 @@ def Project():
                           model_name=vals.get('alias_model', 'project.task'),
                           context=context)
             vals['alias_id'] = alias_id
+        if vals.get('partner_id', False):
+            vals['type'] = 'contract'
         project_id = super(project, self).create(cr, uid, vals, context)
         mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)
         self.create_send_note(cr, uid, [project_id], context=context)
@@ -690,7 +692,6 @@ class task(base_stage, osv.osv):
         if not default.get('remaining_hours', False):
             default['remaining_hours'] = float(self.read(cr, uid, id, ['planned_hours'])['planned_hours'])
         default['active'] = True
-        default['stage_id'] = False
         if not default.get('name', False):
             default['name'] = self.browse(cr, uid, id, context=context).name or ''
             if not context.get('copy',False):
@@ -768,7 +769,7 @@ class task(base_stage, osv.osv):
             }),
         'user_id': fields.many2one('res.users', 'Assigned to'),
         'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
-        'partner_id': fields.many2one('res.partner', 'Contact'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
         'manager_id': fields.related('project_id', 'analytic_account_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
         'company_id': fields.many2one('res.company', 'Company'),
@@ -1100,6 +1101,10 @@ class task(base_stage, osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         task_id = super(task, self).create(cr, uid, vals, context=context)
+        project_id = self.browse(cr, uid, task_id, context=context).project_id
+        if project_id:
+            followers = [follower.id for follower in project_id.message_follower_ids]
+            self.message_subscribe(cr, uid, [task_id], followers, context=context)
         self._store_history(cr, uid, [task_id], context=context)
         self.create_send_note(cr, uid, [task_id], context=context)
         return task_id
@@ -1109,6 +1114,9 @@ class task(base_stage, osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
+        if vals.get('project_id'):
+            project_id = self.pool.get('project.project').browse(cr, uid, vals.get('project_id'), context=context)
+            vals['message_follower_ids'] = [(4, follower.id) for follower in project_id.message_follower_ids]
         if vals and not 'kanban_state' in vals and 'stage_id' in vals:
             new_stage = vals.get('stage_id')
             vals_reset_kstate = dict(vals, kanban_state='normal')
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 83d3414f74e..e302199a65c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -10,15 +10,14 @@
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-
-        <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="kanban,tree,form,calendar,graph"
-            view_type="form"/>
+        
+        <record id="act_project_project_2_project_task_all" model="ir.actions.act_window">
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="name">Tasks</field>
+            <field name="view_mode">kanban,tree,form,calendar,graph</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
 
         <!-- Project Read/Unread actions -->
         <record id="actions_server_project_unread" model="ir.actions.server">
@@ -93,12 +92,12 @@
                     </div>
                     <group>
                         <group>
+                            <field name="privacy_visibility"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
                         </group>
                         <group>
-                            <field name="privacy_visibility"/>
-                            <field name="analytic_account_id" readonly="1" required="0"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                            <field name="analytic_account_id" readonly="1" required="0" attrs="{'invisible': [('analytic_account_id','=',False)]}"/>
                         </group>
                     </group>
                     <notebook>
@@ -122,14 +121,14 @@
                             </field>
                         </page>
                         <page string="Other Info">
-                            <group string="Email Interface" colspan="2">
-                                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <field name="alias_id" invisible="1" required="0"/>
-                                    <label for="alias_name" class="oe_edit_only "/>
-                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
-                                </div>
-                            </group>
                             <group>
+                                <group string="Email Interface" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <div>
+                                        <field name="alias_id" invisible="1" required="0"/>
+                                        <label for="alias_name" class="oe_edit_only "/>
+                                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                                    </div>
+                                </group>
                                 <group string="Administration" groups="project.group_time_work_estimation_tasks">
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="effective_hours" widget="float_time"/>
@@ -137,8 +136,7 @@
                                 </group>
                                 <group string="Miscellaneous" name="misc">
                                     <field name="date"/>
-                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                                    <field name="priority"/>
+                                    <field name="priority" groups="base.group_no_one"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
 
                                     <field name="currency_id" groups="base.group_multi_currency" required="1"/>
@@ -152,8 +150,9 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues."/>
                 </div>
                 </form>
             </field>
@@ -207,15 +206,6 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="kanban,tree,form,calendar,graph"
-            view_type="form"/>
-
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
@@ -250,7 +240,7 @@
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <span>
+                                        <span groups="project.group_time_work_estimation_tasks">
                                             <span class="oe_e">R</span>
                                             <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
                                         </span>
@@ -478,6 +468,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
+                        <field name="message_is_follower" invisible="1"/>
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>
@@ -529,7 +520,7 @@
                             <div class="oe_kanban_content">
                                 <div><b><field name="name"/></b></div>
                                 <div>
-                                    <field name="project_id"/>
+                                    <field name="project_id"/><br/>
                                     <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
                                     <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
                                     <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
@@ -723,7 +714,7 @@
         </record>
 
         <record id="ir_project_task_open" model="ir.values">
-            <field eval=" 'tree_but_open'" name="key2"/>
+            <field eval="'tree_but_open'" name="key2"/>
             <field eval="'project.project'" name="model"/>
             <field name="name">View project's tasks</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
@@ -767,7 +758,7 @@
             <field name="model">project.task.type</field>
             <field name="arch" type="xml">
                 <tree string="Task Stage">
-                    <field name="sequence"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="state"/>
                 </tree>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f39be0c09d5..981ab0693d4 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -364,6 +364,10 @@ class project_issue(base_stage, osv.osv):
         logged_fields = ['stage_id', 'state', 'message_ids']
         if any([field in vals for field in logged_fields]):
             vals['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
+        if vals.get('project_id'):
+            project_id = self.pool.get('project.project').browse(cr, uid, vals.get('project_id'), context=context)
+            vals['message_follower_ids'] = [(4, follower.id) for follower in project_id.message_follower_ids]
+
         return super(project_issue, self).write(cr, uid, ids, vals, context)
 
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
@@ -381,6 +385,10 @@ class project_issue(base_stage, osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(project_issue, self).create(cr, uid, vals, context=context)
+        project_id = self.browse(cr, uid, obj_id, context=context).project_id
+        if project_id:
+            followers = [follower.id for follower in project_id.message_follower_ids]
+            self.message_subscribe(cr, uid, [obj_id], followers, context=context)
         self.create_send_note(cr, uid, [obj_id], context=context)
         return obj_id
 
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 0a4eee3067b..9759d15dabb 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -31,7 +31,7 @@
         </record>
 
         <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
-            <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+            <field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/>
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 8d54520261f..e41495590d7 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -161,6 +161,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
@@ -340,13 +341,13 @@
             </field>
         </record>
 
-        <act_window id="act_project_project_2_project_issue_all"
-            name="Issues"
-            src_model="project.project"
-            res_model="project.issue"
-            view_type="form"
-            view_mode="kanban,tree,form,calendar,graph"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+        <record id="act_project_project_2_project_issue_all" model="ir.actions.act_window">
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="name">Issues</field>
+            <field name="view_mode">kanban,tree,form,calendar,graph</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
 
         <!-- Project -->
         <record id="view_project_form_inherited" model="ir.ui.view">
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 5b88d5209c8..b19238200e5 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -292,7 +292,7 @@ account_analytic_account()
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
-        'phase_id': fields.many2one('project.phase', 'Project Phase'),
+        'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"),
     }
 project_task()
 
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 55a91b36f08..69fe335c1b0 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -83,13 +83,14 @@
 
 
         <!-- Project Phase -->
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+
+        <record id="act_project_phases" model="ir.actions.act_window">
+            <field name="res_model">project.phase</field>
+            <field name="view_type">form</field>
+            <field name="name">Phases</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
 
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
@@ -101,7 +102,7 @@
                        <label for="use_phases"/>
                 </xpath>
                 <xpath expr="//div[@name='buttons']" position='inside'>
-                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d"
+                        <button name="%(act_project_phases)d"
                                 string="Phases" type="action"
                                 attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
@@ -123,6 +124,14 @@
                 </xpath>
             </field>
         </record>
+        
+        <record id="project_phase_task_list" model="ir.actions.act_window">
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="name">Tasks</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}</field>
+        </record>
 
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
@@ -138,6 +147,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
+                    <button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
@@ -336,14 +346,6 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
-            id="project_phase_task_list"
-            name="Related Tasks"
-            res_model="project.task"
-            src_model="project.phase"
-            view_mode="tree,form"/>
-
         <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index f9f6fb6a279..1c347c8ae02 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -37,8 +37,10 @@ class procurement_order(osv.osv):
         """ Checks if task is done or not.
         @return: True or False.
         """
-        return all(proc.product_id.type != 'service' or (proc.task_id and proc.task_id.state in ('done', 'cancelled')) \
-                    for proc in self.browse(cr, uid, ids, context=context))
+        for p in self.browse(cr, uid, ids, context=context):
+            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')):
+                return False
+        return True
 
     def check_produce_service(self, cr, uid, procurement, context=None):    
         return True
@@ -81,7 +83,7 @@ class procurement_order(osv.osv):
                 'project_id':  project and project.id or False,
                 'company_id': procurement.company_id.id,
             },context=context)
-            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running'}, context=context)
+            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running', 'message':'from project: task created.'}, context=context)
         self.running_send_note(cr, uid, ids, context=None)
         return task_id
 
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 1e50848201c..488c780b988 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -46,23 +46,27 @@ class project_project(osv.osv):
     def open_timesheets(self, cr, uid, ids, context=None):
         """ open Timesheets view """
         project = self.browse(cr, uid, ids[0], context)
-        try:
-            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
-        except ValueError:
-            journal_id = False
         view_context = {
             'search_default_account_id': [project.analytic_account_id.id],
             'default_account_id': project.analytic_account_id.id,
-            'default_journal_id': journal_id,
         }
+        help = _("""<p class="oe_view_nocontent_create">Record your timesheets for the project '%s'.</p>""")
+        try:
+            if project.to_invoice and project.partner_id:
+                help+= _("""<p>Timesheets on this project may be invoiced to %s, according to the terms defined in the contract.</p>""" ) % (project.partner_id.name,)
+        except:
+            # if the user do not have access rights on the partner
+            pass
+
         return {
             'type': 'ir.actions.act_window',
-            'name': _('Bill Tasks Works'),
-            'res_model': 'account.analytic.line',
+            'name': _('Timesheets'),
+            'res_model': 'hr.analytic.timesheet',
             'view_type': 'form',
             'view_mode': 'tree,form',
             'context': view_context,
             'nodestroy': True,
+            'help': help
         }
 project_project()
 
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 66104ee0d8c..c7d6ab15ab4 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -97,7 +97,7 @@
         <menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
             id="menu_hr_timesheet_sign_in"
             parent="hr_attendance.menu_hr_attendance"
-            sequence="5" />
+            sequence="5" groups="base.group_hr_attendance" />
 
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 2edcf5ec0d8..6649ebfea9d 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -26,9 +26,13 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     def _purchase_order_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = len(partner.purchase_order_ids)
+        res = dict(map(lambda x: (x,0), ids))
+        # this user may not have access to user rights
+        try:
+            for partner in self.browse(cr, uid, ids, context=context):
+                res[partner.id] = len(partner.purchase_order_ids)
+        except:
+            pass
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index da1f841ba9e..7b03861759a 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -20,12 +20,14 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="context">{'search_default_partner_id': active_id}</field>
             <field name="groups_id" eval="[(4, ref('purchase.group_purchase_user'))]"/>
-            <field name="help">
-                This supplier has no RFQ or Purchase Order. Click here to create a new RFQ.
-                &lt;p&gt;
-                The "Quotation" is the first step of the Purchases flow. Manage your purchases from quotation to invoice.
-                &lt;p&gt;
-                You will be able to buy products (manage receptions) as well as services (create projects).
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    This supplier has no purchase order. Click to create a new RfQ.
+                </p><p>
+                    The request for quotation is the first step of the purchases flow. Once
+                    converted into a purchase order, you will be able to control the reception
+                    of the products and the supplier invoice.
+                </p>
             </field>
         </record>
 
@@ -53,12 +55,15 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'search_default_partner_id': active_id, 'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
-            <field name="help">
-                Click here to create Supplier invoice.
-                &lt;p&gt;
-                You can control the invoice from your supplier according to what you purchased or received.
-                &lt;p&gt;
-                OpenERP can also generate draft invoices automatically from purchase orders or receipts.
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to record a supplier invoice.
+                </p><p>
+                    Supplier invoices can be pre-generated based on purchase
+                    orders or receptions. This allows you to control invoices
+                    you receive from your supplier according to the draft
+                    document in OpenERP.
+                </p>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d2060016866..8502fd7ee3f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -792,14 +792,6 @@ class purchase_order_line(osv.osv):
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
-    def _get_uom_id(self, cr, uid, context=None):
-        try:
-            proxy = self.pool.get('ir.model.data')
-            result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit')
-            return result[1]
-        except Exception, ex:
-            return False
-
     _columns = {
         'name': fields.text('Description', required=True),
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
@@ -826,7 +818,6 @@ class purchase_order_line(osv.osv):
 
     }
     _defaults = {
-        'product_uom' : _get_uom_id,
         'product_qty': lambda *a: 1.0,
         'state': lambda *args: 'draft',
         'invoiced': lambda *a: 0,
@@ -1057,9 +1048,10 @@ class procurement_order(osv.osv):
             purchase_date = self._get_purchase_order_date(cr, uid, procurement, company, schedule_date, context=context)
 
             #Passing partner_id to context for purchase order line integrity of Line name
-            context.update({'lang': partner.lang, 'partner_id': partner_id})
+            new_context = context.copy()
+            new_context.update({'lang': partner.lang, 'partner_id': partner_id})
 
-            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=new_context)
             taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
             taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
 
@@ -1088,7 +1080,7 @@ class procurement_order(osv.osv):
                 'company_id': procurement.company_id.id,
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
             }
-            res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=context)
+            res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=new_context)
             self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
             self.running_send_note(cr, uid, [procurement.id], context=context)
         return res
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 7702d182b09..23bb8e7e278 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -285,6 +285,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index dc222a42398..66fd58060b8 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -167,4 +167,4 @@
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
   </pto>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index c17d145fea1..5ab19390656 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -267,16 +267,13 @@ class procurement_order(osv.osv):
     }
     def make_po(self, cr, uid, ids, context=None):
         res = {}
-        sequence_obj = self.pool.get('ir.sequence')
         requisition_obj = self.pool.get('purchase.requisition')
         warehouse_obj = self.pool.get('stock.warehouse')
         procurement = self.browse(cr, uid, ids, context=context)[0]
         if procurement.product_id.purchase_requisition:
-             seq_name = sequence_obj.get(cr, uid, 'purchase.order.requisition')
              warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id or company.id)], context=context)
              res[procurement.id] = requisition_obj.create(cr, uid, 
                    {
-                    'name': seq_name,
                     'origin': procurement.origin,
                     'date_end': procurement.date_planned,
                     'warehouse_id':warehouse_id and warehouse_id[0] or False,
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 1fafec92bc7..eab920113a8 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -102,8 +102,9 @@
                 </notebook>
             </sheet>
             <div class="oe_chatter">
-                  <field name="message_ids" widget="mail_thread"/>
-                  <field name="message_follower_ids" widget="mail_followers"/>
+                <field name="message_is_follower" invisible="1"/>
+                <field name="message_ids" widget="mail_thread"/>
+                <field name="message_follower_ids" widget="mail_followers"/>
             </div> 
             </form>
         </field>
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index e1ce5a38c6b..b03289c8748 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -107,7 +107,7 @@ class WebKitParser(report_sxw):
         tmp_dir = tempfile.gettempdir()
         out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
         files = []
-        file_to_del = []
+        file_to_del = [out_filename]
         if comm_path:
             command = [comm_path]
         else:
@@ -160,22 +160,33 @@ class WebKitParser(report_sxw):
             file_to_del.append(html_file.name)
             command.append(html_file.name)
         command.append(out_filename)
+        stderr_fd, stderr_path = tempfile.mkstemp(text=True)
+        file_to_del.append(stderr_path)
         try:
-            status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr
+            status = subprocess.call(command, stderr=stderr_fd)
+            os.close(stderr_fd) # ensure flush before reading
+            stderr_fd = None # avoid closing again in finally block
+            fobj = open(stderr_path, 'r')
+            error_message = fobj.read()
+            fobj.close()
+            if not error_message:
+                error_message = _('No diagnosis message was provided')
+            else:
+                error_message = _('The following diagnosis message was provided:\n') + error_message
             if status :
-                raise except_osv(
-                                _('Webkit raise an error!' ),
-                                status
-                            )
-        except Exception:
-            for f_to_del in file_to_del :
-                os.unlink(f_to_del)
-
-        pdf = file(out_filename, 'rb').read()
-        for f_to_del in file_to_del :
-            os.unlink(f_to_del)
-
-        os.unlink(out_filename)
+                raise except_osv(_('Webkit error' ),
+                                 _("The command 'wkhtmltopdf' failed with error code = %s. Message: %s") % (status, error_message))
+            pdf_file = open(out_filename, 'rb')
+            pdf = pdf_file.read()
+            pdf_file.close()
+        finally:
+            if stderr_fd is not None:
+                os.close(stderr_fd)
+            for f_to_del in file_to_del:
+                try:
+                    os.unlink(f_to_del)
+                except (OSError, IOError), exc:
+                    _logger.error('cannot remove file %s: %s', f_to_del, exc)
         return pdf
 
     def translate_call(self, src):
diff --git a/addons/report_webkit_sample/report/report_webkit_html.mako b/addons/report_webkit_sample/report/report_webkit_html.mako
index 164a697f386..3ffca9f669c 100644
--- a/addons/report_webkit_sample/report/report_webkit_html.mako
+++ b/addons/report_webkit_sample/report/report_webkit_html.mako
@@ -8,7 +8,7 @@
     %for inv in objects :
     <% setLang(inv.partner_id.lang) %>
     <table class="dest_address">
-        <tr><td ><b>${inv.partner_id.title or ''|entity}  ${inv.partner_id.name |entity}</b></td></tr>
+        <tr><td ><b>${inv.partner_id.title and inv.partner_id.title.name or ''|entity}  ${inv.partner_id.name |entity}</b></td></tr>
         <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
         <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
         <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 9f7ba06db95..32926cc0626 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -153,6 +153,12 @@
   </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 3048b1414cd..0ae2e4f7133 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -93,6 +93,7 @@ class sale_report(osv.osv):
                             left join product_template t on (p.product_tmpl_id=t.id)
                     left join product_uom u on (u.id=l.product_uom)
                     left join product_uom u2 on (u2.id=t.uom_id)
+                where l.product_id is not null
                 group by
                     l.product_id,
                     l.product_uom_qty,
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 9ebbc36f8de..6150d4ce1a3 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -12,10 +12,6 @@
                     <group>
                         <label for="id" string="Invoicing Process"/>
                         <div>
-                            <div>
-                                <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
-                                <label for="group_invoice_so_lines"/>
-                            </div>
                             <div name="timesheet">
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index d7bcd5804ee..5e8d05b62c1 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -26,9 +26,13 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     def _sale_order_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for partner in self.browse(cr, uid, ids, context):
-            res[partner.id] = len(partner.sale_order_ids)
+        res = dict(map(lambda x: (x,0), ids))
+        # The current user may not have access rights for sale orders
+        try:
+            for partner in self.browse(cr, uid, ids, context):
+                res[partner.id] = len(partner.sale_order_ids)
+        except:
+            pass
         return res
 
     def copy(self, cr, uid, record_id, default=None, context=None):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 23d2c556f40..343f06c2d69 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -174,7 +174,7 @@
                     </h1>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}"/>
                             <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
@@ -310,6 +310,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_is_follower" invisible="1"/>
                     <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
@@ -364,7 +365,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="context">{}</field>
+            <field name="context">{'show_address': 1}</field>
             <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -406,7 +407,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">{}</field>
+            <field name="context">{'show_address': 1}</field>
             <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="help" type="html">
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index d0d14fc76a1..670c863a022 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -37,7 +37,7 @@ access_product_ul_sale_manager,product.ul salemanager,product.model_product_ul,b
 access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1
 access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
 access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1
-access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
+access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
 access_product_price_type_sale_manager,product.price.type salemanager,product.model_product_price_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,product.model_product_pricelist_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index b6d5ec25ce1..80e9f3b4f42 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -23,13 +23,27 @@ from osv import osv,fields
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
-
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
+    def create(self, cr, uid, vals, context=None):
+        order =  super(sale_order, self).create(cr, uid, vals, context=context)
+        section_id = self.browse(cr, uid, order, context=context).section_id
+        if section_id:
+            followers = [follow.id for follow in section_id.message_follower_ids]
+            self.message_subscribe(cr, uid, [order], followers, context=context)
+        return order
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('section_id'):
+            section_id = self.pool.get('crm.case.section').browse(cr, uid, vals.get('section_id'), context=context)
+            if section_id:
+                vals['message_follower_ids'] = [(4, follower.id) for follower in section_id.message_follower_ids]
+        return super(sale_order, self).write(cr, uid, ids, vals, context=context)
+
 sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index a48b766f3bb..490af81ed41 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -253,7 +253,6 @@ class sale_order(osv.osv):
         assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
         finished = True
         canceled = False
-        notcanceled = False
         write_done_ids = []
         write_cancel_ids = []
         for order in self.browse(cr, uid, ids, context={}):
@@ -268,8 +267,6 @@ class sale_order(osv.osv):
                         canceled = True
                         if line.state != 'exception':
                             write_cancel_ids.append(line.id)
-                    else:
-                        notcanceled = True
         if write_done_ids:
             self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'})
         if write_cancel_ids:
@@ -279,9 +276,6 @@ class sale_order(osv.osv):
             return finished
         elif mode == 'canceled':
             return canceled
-            if notcanceled:
-                return False
-            return canceled
 
     def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
         return {
diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py
index 008dd424fa5..0d90aec3eb7 100644
--- a/addons/share/ir_model.py
+++ b/addons/share/ir_model.py
@@ -40,6 +40,7 @@ class ir_model_access(osv.Model):
                         LEFT JOIN ir_module_category c ON (c.id=g.category_id)
                       WHERE
                         m.model=%s AND
+                        a.active IS true AND
                         (g.share IS NULL or g.share IS false) AND
                         a.perm_''' + access_mode, (model_name,))
         return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]
diff --git a/addons/stock/i18n/es_MX.po b/addons/stock/i18n/es_MX.po
index 3cf93515b09..3ad451daa04 100644
--- a/addons/stock/i18n/es_MX.po
+++ b/addons/stock/i18n/es_MX.po
@@ -1,92 +1,103 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* stock
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 09:19+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-27 04:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@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: 2011-09-05 04:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#~ msgid "Stock Management"
-#~ msgstr "Gestión de inventario"
+"X-Launchpad-Export-Date: 2012-09-28 04:39+0000\n"
+"X-Generator: Launchpad (build 16043)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr "Lotes de seguimiento en salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_upload
-msgid "Stock ups upload"
-msgstr "Stock ups carga"
-
-#. module: stock
-#: code:addons/stock/product.py:76
-#, python-format
-msgid "Variation Account is not specified for Product Category: %s"
 msgstr ""
-"No se ha especificado la cuenta de variación para la categoría de producto: "
-"%s"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Stock move Split lines"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. This is the default "
+"value for all products in this category. It can also directly be set on each "
+"product"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Ubicación encadenada si fija"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Put in a new pack"
-msgstr "Poner en un paquete nuevo"
-
-#. module: stock
-#: field:stock.move.split.lines,action:0
-msgid "Action"
-msgstr "Acción"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
 #: view:stock.production.lot:0
+#, python-format
 msgid "Upstream Traceability"
-msgstr "Trazabilidad hacia arriba"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.todo.category,name:stock.category_stock_management_config
+msgid "Stock Management"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr "Último inventario de productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr "Hoy"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr "Número de revisión"
+msgstr ""
 
 #. module: stock
-#: view:stock.move.memory.in:0
-#: view:stock.move.memory.out:0
+#: view:stock.move:0
+msgid "Orders processed Today or planned for Today"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move.line:0 view:stock.partial.picking:0
+#: field:stock.partial.picking,move_ids:0 view:stock.partial.picking.line:0
+#: view:stock.return.picking.memory:0
 msgid "Product Moves"
-msgstr "Movimientos productos"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "UoM Categories"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr "Análisis movimientos"
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -94,8 +105,12 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
-"Número interno de referencia en caso de que sea diferente del número de "
-"serie del fabricante."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#, python-format
+msgid "You cannot perform this operation on more than one Stock Inventories."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -104,39 +119,36 @@ msgid ""
 "per location. You can use it once a year when you do the general inventory "
 "or whenever you need it, to correct the current stock level of a product."
 msgstr ""
-"Los inventarios periódicos se utilizan para contar el número de productos "
-"disponibles por ubicación. Lo puede utilizar una vez al año cuando realice "
-"el inventario general, o cuando lo necesite, para corregir el nivel actual "
-"de stock de un producto."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#, python-format
+msgid "Quantity cannot be negative."
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:report.stock.inventory,product_qty:0
 #: field:report.stock.move,product_qty:0
 #: field:stock.change.product.qty,new_quantity:0
 #: field:stock.inventory.line,product_qty:0
 #: field:stock.inventory.line.split,qty:0
-#: report:stock.inventory.move:0
-#: field:stock.move,product_qty:0
-#: field:stock.move.consume,product_qty:0
-#: field:stock.move.memory.in,quantity:0
-#: field:stock.move.memory.out,quantity:0
-#: field:stock.move.scrap,product_qty:0
-#: field:stock.move.split,qty:0
-#: field:stock.move.split.lines,quantity:0
-#: field:stock.move.split.lines.exist,quantity:0
-#: report:stock.picking.list:0
-#: field:stock.report.prodlots,qty:0
-#: field:stock.report.tracklots,name:0
+#: field:stock.inventory.line.split.lines,quantity:0
+#: report:stock.inventory.move:0 field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0 field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0 field:stock.move.split.lines,quantity:0
+#: field:stock.partial.move.line,quantity:0
+#: field:stock.partial.picking.line,quantity:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0 field:stock.report.tracklots,name:0
+#: field:stock.return.picking.memory,quantity:0
 #: field:stock.split.into,quantity:0
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
@@ -144,76 +156,75 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
-"Esta es la lista de albaranes de salida que deben ser preparados, en función "
-"de sus pedidos de venta y sus reglas logísticas."
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,day:0
+#: view:report.stock.move:0 field:report.stock.move,day:0
 msgid "Day"
-msgstr "Día"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: field:stock.inventory.line.split,product_uom:0
-#: view:stock.move:0
-#: field:stock.move.split,product_uom:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0 field:stock.move.split,product_uom:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "UoM"
-msgstr "UdM"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:104
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
-#, python-format
 msgid "Physical Inventories"
-msgstr "Inventarios físicos"
+msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
-#: view:report.stock.move:0
+#: field:product.category,property_stock_journal:0 view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr "Diario de inventario"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Incoming"
-msgstr "Entrada"
-
-#. module: stock
-#: help:product.category,property_stock_account_output_categ:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"outgoing stock moves will be posted in this account. This is the default "
-"value for all products in this category, it can also directly be set on each "
-"product."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de salida se creará "
-"en esta cuenta. Este es el valor por defecto para todos los productos de "
-"esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2415
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current month"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:222
+#, python-format
+msgid "Unable to assign all lots to this move!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2516
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr "Faltan datos del albarán parcial para el movimiento #%s"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr "Enviar/Recibir productos"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:135
 #, python-format
 msgid "You cannot delete any record!"
-msgstr "¡No puede eliminar ningún registro!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,update_cost:0
+#: field:stock.partial.picking.line,update_cost:0
+msgid "Need cost update"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -223,56 +234,51 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
-"La línea de movimiento actual ya está asignada a un albarán, elimínela "
-"primero si realmente quiere cambiarla ' # 'para este este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr "No aplicable"
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr "Otra referencia o número de serie."
+msgstr ""
 
 #. module: stock
-#: field:stock.move,origin:0
-#: view:stock.picking:0
-#: field:stock.picking,origin:0
+#: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
 msgid "Origin"
-msgstr "Origen"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
+msgid "Incoming Products"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr "No factura"
+msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Pack Identification"
-msgstr "Identificación paquete"
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: field:stock.move,picking_id:0
-#: field:stock.picking,name:0
+#: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
-msgstr "Referencia"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
+#: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
 #, python-format
 msgid "Products to Process"
-msgstr "Productos a procesar"
-
-#. module: stock
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+msgstr ""
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -280,238 +286,219 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
-"Si se marca, todas las cantidades de producto se ponen a cero para ayudar a "
-"realizar un inventario físico real."
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines
-msgid "Split lines"
-msgstr "Dividir líneas"
+#: view:stock.partial.move:0 view:stock.partial.picking:0
+msgid "_Validate"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1149
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
-"¡No puede cancelar el albarán porqué el movimiento de stock está en estado "
-"realizado!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
+#: code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
-msgstr "Agrupar por empresa"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_res_partner
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,partner_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,partner_id:0
-#: view:stock.move:0
-#: field:stock.move,partner_id:0
-#: view:stock.picking:0
+#: model:ir.model,name:stock.model_res_partner view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0 view:report.stock.move:0
+#: field:report.stock.move,partner_id:0 view:stock.move:0
+#: field:stock.move,partner_id:0 view:stock.picking:0
 #: field:stock.picking,partner_id:0
 msgid "Partner"
-msgstr "Empresa"
+msgstr ""
 
 #. module: stock
-#: help:stock.move.memory.in,currency:0
-#: help:stock.move.memory.out,currency:0
-msgid "Currency in which Unit cost is expressed"
-msgstr "Moneda en la que se expresa el coste unidad."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/stock.py:2119
 #, python-format
+msgid ""
+"Can not create Journal Entry, Input Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
 msgid "No invoicing"
-msgstr "No facturación"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that have been processed"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Production lot"
-msgstr "Lote de producción"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
-msgid "Units of Measure Categories"
-msgstr "Categorías de unidades de medida"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr "Código para Incoterms"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr "Movimientos para este paquete"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments Available"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "Ubicación interna"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Confirm Inventory"
-msgstr "Confirmar el inventario"
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: field:report.stock.move,state:0
-#: view:stock.inventory:0
-#: field:stock.inventory,state:0
-#: field:stock.inventory.line,state:0
-#: view:stock.move:0
-#: field:stock.move,state:0
-#: view:stock.picking:0
-#: field:stock.picking,state:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,state:0
+#: view:report.stock.move:0 field:report.stock.move,state:0
+#: view:stock.inventory:0 field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0 view:stock.move:0
+#: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0
 #: report:stock.picking.list:0
 msgid "State"
-msgstr "Estado"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr "Valor stock real"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr "Retraso (días)"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr "Acción trazabilidad "
-
-#. module: stock
-#: field:stock.location,posy:0
-msgid "Shelves (Y)"
-msgstr "Estantería (Y)"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr "UdM"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
-#: selection:stock.picking,state:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,stock_available:0
+#: selection:report.stock.move,state:0 view:stock.move:0
+#: selection:stock.move,state:0 view:stock.picking:0
+#: view:stock.production.lot:0 field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr "Reservado"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: field:stock.picking,min_date:0
+#: view:stock.picking:0 field:stock.picking,min_date:0
 msgid "Expected Date"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
-msgid "Outgoing Product"
-msgstr "Albarán de salida"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
 msgid ""
 "Create and manage your warehouses and assign them a location from here"
-msgstr "Cree y gestione sus almacenes y asígneles una ubicación desde aquí."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr "En cantidad"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
 #, python-format
 msgid "No product in this location."
-msgstr "No hay producto en esta ubicación."
+msgstr ""
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "Ubicación de salida"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr "Dividir en"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Internal Locations"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr "Moneda para precio promedio"
-
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de entrada se creará "
-"en esta cuenta. Si no se indica en el producto, se utilizará la definida en "
-"la categoría del producto."
 
 #. module: stock
-#: field:report.stock.inventory,location_type:0
-#: field:stock.location,usage:0
+#: help:product.category,property_stock_valuation_account_id:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
 msgid "Location Type"
-msgstr "Tipo de ubicación"
+msgstr ""
 
 #. module: stock
-#: help:report.stock.move,type:0
-#: help:stock.picking,type:0
+#: help:report.stock.move,type:0 help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr "Indica el tipo de envío, recepción o envío de mercancías."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
-msgstr "Etiquetas artículos"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
 msgid "Moves Statistics"
-msgstr "Estadísticas de movimientos"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr "Filtro lotes de producto"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
 msgid "["
-msgstr "["
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
@@ -519,58 +506,58 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
-"Cantidad actual de productos con este número de lote de producción "
-"disponible en almacenes de la compañía."
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr "Historial movimientos (movimientos hijos)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:2125
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de salida de stock para este producto o su "
-"categoría: \"%s\" (id: %d)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 #: field:stock.picking,move_lines:0
 msgid "Internal Moves"
-msgstr "Albaranes internos"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr "Ubicación destino"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:754
+#: model:ir.model,name:stock.model_stock_partial_move_line
+msgid "stock.partial.move.line"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:760
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "No puede procesar un albarán sin movimientos de stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "Empaquetado"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr "Pedido (origen)"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr "Total:"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
@@ -580,53 +567,42 @@ msgid ""
 "buttons on the right of each line. You can filter the products to deliver by "
 "customer, products or sale order (using the Origin field)."
 msgstr ""
-"En esta lista encontrará todos los productos que ha de entregar a sus "
-"clientes. Puede procesar las entregas directamente desde esta lista usando "
-"los botones a la derecha de cada línea. Puede filtrar los productos a "
-"entregar por cliente, producto o pedido de venta (utilizando el campo "
-"origen)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr "Control inventario"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: field:stock.location,comment:0
+#: view:stock.location:0 field:stock.location,comment:0
 msgid "Additional Information"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr "Ubicación / Producto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1303
+#: field:stock.move,address_id:0
+msgid "Destination Address "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1333
 #, python-format
 msgid "Reception"
-msgstr "Recepción"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr "Referencia adicional"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "Revisiones de lote de producción"
-
-#. module: stock
-#: help:product.product,track_outgoing:0
-msgid ""
-"Forces to specify a Production Lot for all moves containing this product and "
-"going to a Customer Location"
 msgstr ""
-"Fuerza a indicar un lote de producción para todos los movimientos que "
-"contienen este producto y van a una ubicación del cliente."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -636,97 +612,129 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
-"El sistema de existencias diarias le permite asignar a cada operación de "
-"existencias a un diario específico según el tipo de operación a realizar por "
-"el trabajador/equipo que debe realizar la operación. Ejemplos de diarios de "
-"existencias pueden ser: control de calidad, listas de selección, embalaje, "
-"etc."
 
 #. module: stock
-#: field:stock.location,complete_name:0
-#: field:stock.location,name:0
+#: field:stock.location,complete_name:0 field:stock.location,name:0
 msgid "Location Name"
-msgstr "Nombre ubicación"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"Our records indicate that the following payments are still due. If the "
+"amount\n"
+"has already been paid, please disregard this notice. However, if you have "
+"any\n"
+"queries regarding your account, please contact us.\n"
+"Thank you in advance.\n"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr "Inventario enviado"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"The Incoming Shipments is the list of all orders you will receive from your "
+"suppliers. An incoming shipment contains a list of products to be received "
+"according to the original purchase order. You can validate the shipment "
+"totally or partially."
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,wizard_exist_id:0
+msgid "Parent Wizard (for existing lines)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
 msgid "Move Information"
-msgstr "Información de movimiento"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2131
+#, python-format
+msgid ""
+"There is no inventory Valuation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr "Salida"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr "Agosto"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.model,name:stock.model_stock_tracking
-#: model:ir.ui.menu,name:stock.menu_action_tracking_form
-#: view:stock.tracking:0
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0
 msgid "Packs"
-msgstr "Paquetes"
+msgstr ""
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
+msgstr ""
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Ventas y Compras"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr "Junio"
+msgstr ""
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "Ubicación de abastecimiento"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: field:stock.inventory.line.split,line_exist_ids:0
 #: field:stock.inventory.line.split,line_ids:0
-#: field:stock.move.split,line_exist_ids:0
-#: field:stock.move.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0 field:stock.move.split,line_ids:0
 msgid "Production Lots"
-msgstr "Lotes de producción"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
-msgstr "Destinatario"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator
+msgid "Refrigerator"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr "Estructura ubicaciones"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr "Octubre"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr "Línea inventario"
+msgstr ""
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -734,20 +742,27 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, este es el diario "
-"contable donde los asientos se crearán automáticamente cuando los "
-"movimientos de stock se procesen."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr "Procesar albarán"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:358
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:417
 #, python-format
 msgid "Future Receptions"
-msgstr "Recepciones futuras"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr ""
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -756,149 +771,159 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
-"Marque esta opción para seleccionar lotes existentes en la lista inferior, "
-"de lo contrario debe introducir otros de nuevos línea por la línea."
+
+#. module: stock
+#: code:addons/stock/product.py:75
+#, python-format
+msgid "Valuation Account is not specified for Product Category: %s"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr "Movimiento destino"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process Now"
-msgstr "Procesar ahora"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Dirección ubicación"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
 msgstr ""
-"Lote de producción se utiliza para poner un número de serie a la producción."
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "Ubicación de entrada"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr "Fecha de la orden."
+msgstr ""
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr "Periódico (manual)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr "Abastecimientos"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr "Proveedores TI"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr "Inventarios físicos borrador"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr "Ubicación de tránsito para transferencias inter-compañías"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr "Cambiar cantidad producto"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,month:0
+msgid "unknown"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr "Fusionar inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:374
+#: code:addons/stock/product.py:433
 #, python-format
 msgid "Future P&L"
-msgstr "P&L futuras"
+msgstr ""
 
 #. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4 view:stock.picking:0
 msgid "Incoming Shipments"
-msgstr "Albaranes de entrada"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Scrap"
-msgstr "Desecho"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,child_ids:0
 msgid "Contains"
-msgstr "Contiene"
-
-#. module: stock
-#: view:board.board:0
-msgid "Incoming Products Delay"
-msgstr "Retraso albaranes entrada"
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr "Ubicaciones stock"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:stock.move,price_unit:0
 msgid "Unit Price"
-msgstr "Precio un."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines_exist
-msgid "Exist Split lines"
-msgstr "Dividir líneas existentes"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "Fecha prevista"
+msgstr ""
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr "Buscar paquete"
-
-#. module: stock
-#: selection:stock.move,priority:0
-msgid "Urgent"
-msgstr "Urgente"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
-#: report:stock.picking.list:0
-msgid "Journal"
-msgstr "Diario"
+msgid "Pickings already processed"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1315
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 report:stock.picking.list:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
 msgstr ""
@@ -910,24 +935,26 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
-"Déjelo vacío si produce en la ubicación donde los productos terminados son "
-"necesarios. Indique un lugar si produce en una ubicación fija. Esto puede "
-"ser una ubicación de empresa si subcontrata las operaciones de fabricación."
 
 #. module: stock
 #: view:res.partner:0
 msgid "Inventory Properties"
-msgstr "Propiedades inventario"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr "Tiempo inicial de ejecución (días)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move Processing Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "Existencias por ubicacion"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -935,113 +962,88 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
-"Dirección opcional cuando las mercancías deben ser entregadas, utilizado "
-"específicamente para lotes."
 
 #. module: stock
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Month-1"
-msgstr "Mes-1"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar la ubicación sin eliminarla."
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
-msgid "Packing list"
-msgstr "Albarán"
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Pickings"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr "Stock virtual"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr "Vista"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Last month"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr "Padre izquierdo"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:132
-#, python-format
-msgid "Delivery Information"
-msgstr "Información de envío"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: code:addons/stock/stock.py:1349
 #, python-format
-msgid "Stock Inventory is done"
-msgstr "Inventario de stock realizado"
+msgid "is waiting."
+msgstr ""
 
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Error: Código EAN no válido"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:148
+#: code:addons/stock/product.py:147
 #, python-format
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de salida de stock para este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "Ubicación de producción"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr "Dirección de la empresa."
+msgstr ""
 
 #. module: stock
-#: model:res.company,overdue_msg:stock.res_company_shop0
-#: model:res.company,overdue_msg:stock.res_company_tinyshop0
-msgid ""
-"\n"
-"Date: %(date)s\n"
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Please find in attachment a reminder of all your unpaid invoices, for a "
-"total amount due of:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Thanks,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-"        "
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
 msgstr ""
-"\n"
-"Fecha: %(date)s\n"
-"\n"
-"Estimado %(partner_name)s,\n"
-"\n"
-"En el adjunto encontrará un recordatorio de todas las facturas no pagadas, "
-"por un importe total de:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Gracias,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-"        "
 
 #. module: stock
 #: help:stock.location,usage:0
@@ -1070,91 +1072,76 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
-"* Ubicación proveedor: Ubicación virtual que representa la ubicación de "
-"origen para los productos procedentes de sus proveedores.\n"
-"\n"
-"* Vista: Ubicación virtual para crear una estructura jerárquica de su "
-"almacén, agregando sus ubicaciones hijas. No puede contener los productos "
-"directamente.\n"
-"\n"
-"* Ubicación interna: Ubicación física dentro de su propios almacenes.\n"
-"\n"
-"* Ubicación cliente: Ubicación virtual que representa la ubicación de "
-"destino para los productos enviados a sus clientes.\n"
-"\n"
-"* Inventario: Ubicación virtual que actúa como contrapartida de las "
-"operaciones de inventario utilizadas para corregir los niveles de "
-"existencias (inventarios físicos).\n"
-"\n"
-"* Abastecimiento: Ubicación virtual que actúa como contrapartida temporal de "
-"las operaciones de abastecimiento cuando el origen (proveedor o producción) "
-"no se conoce todavía. Esta ubicación debe estar vacía cuando el planificador "
-"de abastecimientos haya terminado de ejecutarse.\n"
-"\n"
-"* Producción: Ubicación virtual de contrapartida para operaciones de "
-"producción: esta ubicación consume la materia prima y produce los productos "
-"terminados.\n"
-"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr "Autor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1302
+#: code:addons/stock/stock.py:1332
 #, python-format
 msgid "Delivery Order"
-msgstr "Albarán de salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_in
-msgid "stock.move.memory.in"
-msgstr "stock.movimiento.memoria.entrada"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr "Operación manual"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: view:stock.move:0
+#: view:stock.location:0 view:stock.move:0
 msgid "Supplier"
-msgstr "Proveedor"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2727
+#, python-format
+msgid ""
+"In order to cancel this inventory, you must first unpost related journal "
+"entries."
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr "Fecha realizado"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#, python-format
+msgid ""
+"The uom rounding does not allow you to ship \"%s %s\", only roundings of "
+"\"%s %s\" is accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Expected Shipping Date"
-msgstr "Fecha de envío prevista"
-
-#. module: stock
-#: selection:stock.move,state:0
-msgid "Not Available"
-msgstr "No disponible"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "March"
-msgstr "Marzo"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
 #: model:ir.model,name:stock.model_stock_inventory_line_split
-#: view:stock.inventory:0
-#: view:stock.inventory.line:0
+#: view:stock.inventory:0 view:stock.inventory.line:0
 msgid "Split inventory lines"
-msgstr "Dividir líneas de inventario"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr "Inventario físico"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1162,9 +1149,6 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
-"La compañía a la que pertenece el albarán que contiene el movimiento "
-"encadenado (dejarlo vacío para utilizar las reglas por defecto para "
-"determinar la compañía)."
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1173,53 +1157,53 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
-"Tipo de envío del albarán que va a contener el movimiento encadenado (dejar "
-"vacío para detectar automáticamente el tipo basado en las ubicaciones de "
-"origen y destino)."
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr "Número de lote"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
+#: field:stock.move.consume,product_uom:0 field:stock.move.scrap,product_uom:0
 msgid "Product UOM"
-msgstr "UdM del producto"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "Ubicaciones de empresas"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current year"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total quantity"
-msgstr "Cantidad total"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr "Movimiento consumo"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
 msgid "European Customers"
-msgstr "Clientes europeos"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr "Retraso entre movimiento original y movimiento encadenado en días."
+msgstr ""
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr "Importar inventario de productos actual para la siguiente ubicación"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1230,17 +1214,21 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
-"La opción 'Movimiento automático' creará un movimiento de stock después del "
-"actual que se validará automáticamente. Con 'Operación manual', el "
-"movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
-"automático, paso no añadido', la ubicación se reemplaza en el movimiento "
-"original."
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Downstream Traceability"
-msgstr "Trazabilidad hacia abajo"
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Packing List:"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Waiting Another Move"
+msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1249,25 +1237,24 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la de por defecto, como la ubicación de origen para los movimientos de "
-"stock generados por las órdenes de producción."
 
 #. module: stock
-#: code:addons/stock/stock.py:2006
-#, python-format
-msgid ""
-"Can not create Journal Entry, Output Account defined on this product and "
-"Variant account on category of this product are same."
+#: view:product.product:0
+msgid "Expected Stock Variations"
 msgstr ""
-"No se puede crear el asiento, la cuenta de salida definida en este producto "
-"y la cuenta variante de la categoría de producto son la misma."
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1350
 #, python-format
 msgid "is in draft state."
-msgstr "está en estado borrador."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1275,242 +1262,228 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
-"Esta es la lista de todos sus albaranes. Cuando selecciona un albarán, puede "
-"obtener la trazabilidad hacia arriba o hacia abajo de los productos que "
-"forman este paquete."
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr "Stock ups final"
-
-#. module: stock
-#: field:stock.location,chained_auto_packing:0
-msgid "Chaining Type"
-msgstr "Tipo encadenado"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
+#: selection:stock.return.picking,invoice_state:0
 msgid "To be refunded/invoiced"
-msgstr "Para ser abonado/facturado"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr "Tienda 1"
+msgstr ""
 
 #. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
-#: view:stock.fill.inventory:0
-#: view:stock.inventory.merge:0
-#: view:stock.invoice.onshipping:0
-#: view:stock.location.product:0
-#: view:stock.move:0
-#: view:stock.move.track:0
-#: view:stock.picking:0
-#: view:stock.split.into:0
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0 view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0 view:stock.location.product:0
+#: view:stock.move:0 view:stock.partial.move:0 view:stock.partial.picking:0
+#: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0
 msgid "_Cancel"
-msgstr "_Cancelar"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Ready"
-msgstr "Preparado"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr "Vista calendario"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
-#, python-format
-msgid "Operation forbidden"
-msgstr "Operación prohibida"
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
 msgid "From"
-msgstr "Desde"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#, python-format
-msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
-"¡Sólo puede devolver albaranes que estén confirmados, reservados o "
-"realizados!"
 
 #. module: stock
 #: view:stock.picking:0
-#: field:stock.picking,invoice_state:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,invoice_state:0
 msgid "Invoice Control"
-msgstr "Control factura"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr "Revisiones de lote de producción"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr "Albarán interno"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 view:stock.picking:0
 msgid "Waiting"
-msgstr "En espera"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: selection:stock.move.split.lines,action:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Split"
-msgstr "Dividir"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr "Buscar albarán stock"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:93
+#: code:addons/stock/product.py:92
 #, python-format
 msgid "Company is not specified in Location"
-msgstr "No se ha especificado una compañía en la ubicación"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
-#: field:stock.partial.move,type:0
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Available Pickings"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr "Proveedores TI genéricos"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved out of this location and into an internal location, instead of "
+"the generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr "Albarán:"
+msgstr ""
 
 #. module: stock
-#: field:stock.inventory,date:0
-#: field:stock.move,create_date:0
-#: field:stock.production.lot,date:0
-#: field:stock.tracking,date:0
+#: field:stock.inventory,date:0 field:stock.move,create_date:0
+#: field:stock.production.lot,date:0 field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr "Fecha creación"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr "Id línea de inventario"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr "Dirección del cliente o proveedor."
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,picking_id:0
+#: view:report.stock.move:0 field:report.stock.move,picking_id:0
 msgid "Packing"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "Ubicación del cliente"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
+#: code:addons/stock/stock.py:2312
 #, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
+msgid "You can only delete draft moves."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:139
-#, python-format
-msgid "Receive Information"
-msgstr "Información de recepción"
+#: model:ir.model,name:stock.model_stock_inventory_line_split_lines
+msgid "Inventory Split lines"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr "Resumen inventario ubicación"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement
-msgid "Stock Replacement"
-msgstr "Reemplazo stock"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
-msgstr "Información general"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Ninguno"
+#: view:report.stock.inventory:0
+msgid "Analysis including future moves (similar to virtual stock)"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action3
-#: view:stock.tracking:0
+#: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
 msgid "Downstream traceability"
-msgstr "Trazabilidad hacia abajo"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "No Invoices were created"
-msgstr "No se han creado facturas"
+msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_company
-msgid "OpenERP S.A."
-msgstr "OpenERP S.A."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:140
-#, python-format
-msgid "Receive"
-msgstr "Recibir"
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,active:0
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar un INCOTERM sin eliminarlo."
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-#: field:stock.picking,date:0
+#: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
 msgid "Order Date"
-msgstr "Fecha orden"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,location_id:0
+#: code:addons/stock/wizard/stock_change_product_qty.py:88
+#, python-format
+msgid "INV: %s"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr "Ubicación padre"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,state:0
@@ -1523,44 +1496,34 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
-"* Borrador: No se ha confirmado todavía y no se planificará hasta que se "
-"confirme.\n"
-"* Confirmado: A la espera de la disponibilidad de productos.\n"
-"* Reservado: Productos reservados, esperando la confirmación del envío.\n"
-"* En espera: Esperando que otro movimiento se realice antes de que sea "
-"disponible de forma automática (por ejemplo, en flujos "
-"Obtener_bajo_pedido).\n"
-"* Realizado: Ha sido procesado, no se puede modificar o cancelar nunca más.\n"
-"* Cancelado: Se ha cancelado, no se puede confirmar nunca más."
 
 #. module: stock
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
-"Deje este campo vacío si esta ubicación está compartida entre todas las "
-"compañías."
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2337
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr "¡Introduzca una cantidad positiva a desechar!"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr "Tiempo inicial encadenado"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
-#, python-format
-msgid "Cannot deliver products which are already delivered !"
-msgstr "¡No se pueden enviar productos que ya están enviados!"
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr "Stock factura en el envío"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1572,36 +1535,31 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'No disponible' si el planificador no ha "
-"encontrado los productos.\n"
-" Cuando los productos están reservados se establece como 'Reservado'.\n"
-" Cuando el albarán se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "Ubicación del proveedor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2254
+#: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr "estaban desechados"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Partial"
-msgstr "Parcial"
+#: help:stock.partial.move.line,currency:0
+#: help:stock.partial.picking.line,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "September"
-msgstr "Septiembre"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,backorder_id:0
@@ -1609,283 +1567,271 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
-"Si este albarán se dividió, este campo enlaza con el albarán que contiene la "
-"otra parte que ya ha sido procesada."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr "Estadísticas de stock"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,currency:0
-#: field:stock.move.memory.out,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr "Lotes seguimiento de fabricación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:44
-#, python-format
-msgid ""
-"Please select multiple physical inventories to merge in the list view."
+#: view:stock.picking:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_out_account_id:0
+msgid "Stock Valuation Account (Outgoing)"
 msgstr ""
-"Seleccione varios inventarios físicos para fusionar en la vista lista."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 #: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
+#: model:ir.ui.menu,name:stock.menu_action_move_form2 view:stock.inventory:0
+#: view:stock.move:0 view:stock.picking:0 view:stock.production.lot:0
 #: view:stock.tracking:0
 msgid "Stock Moves"
-msgstr "Movimientos de stock"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr "Envío mercancías"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr "Cancelar disponibilidad"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr "Fecha planificada para el procesado de este movimiento."
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
-msgstr "Movimientos creados"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_in_account_id:0
+msgid "Stock Valuation Account (Incoming)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr "Estante 2"
+msgstr ""
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr "Lote seguimiento"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr "Albaranes pendientes"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr "Propiedades de las ubicaciones parte recíproca"
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr "Ubicación"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr "Informe de stock por lotes de seguimiento"
-
-#. module: stock
-#: code:addons/stock/product.py:370
+#: code:addons/stock/product.py:429
 #, python-format
 msgid "Delivered Qty"
-msgstr "Ctdad enviada"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
-#: view:stock.inventory.line.split:0
-#: view:stock.move.split:0
+#: view:stock.inventory.line.split:0 view:stock.move.split:0
 msgid "Split in lots"
-msgstr "Dividir en lotes"
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr "Números lote de producción"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,date:0
-#: field:report.stock.move,date:0
-#: view:stock.inventory:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,date:0
-#: field:stock.partial.move,date:0
-#: field:stock.partial.picking,date:0
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. When not set on "
+"the product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Day Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0 view:stock.inventory:0
+#: report:stock.inventory.move:0 view:stock.move:0 field:stock.move,date:0
+#: field:stock.partial.move,date:0 field:stock.partial.picking,date:0
 #: view:stock.picking:0
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
+msgstr ""
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "Ubicación stock"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
 #, python-format
 msgid "Merging is only allowed on draft inventories."
-msgstr "La fusión sólo es permitida en inventarios borrador."
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_track
-msgid "Track moves"
-msgstr "Movimientos seguimiento"
+msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr "Código"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr "Número lotes"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr "Tablero almacén"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:513
 #, python-format
 msgid "You can not remove a lot line !"
-msgstr "¡No puede eliminar una línea de lote!"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_scrap
-#: view:stock.move:0
-#: view:stock.move.scrap:0
-#: view:stock.picking:0
+#: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
+#: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr "Desechar productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1128
+#: code:addons/stock/stock.py:1157
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr "¡No puede eliminar el albarán que está en estado %s!"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.picking:0
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.picking:0
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "Devolver albarán"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Split in production lots"
-msgstr "Dividir en lotes de producción"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_location
-#: view:report.stock.inventory:0
+#: field:product.product,location_id:0 view:report.stock.inventory:0
 #: field:report.stock.inventory,location_id:0
 #: field:stock.change.product.qty,location_id:0
 #: field:stock.fill.inventory,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: report:stock.inventory.move:0
-#: view:stock.location:0
-#: view:stock.move:0
-#: field:stock.move.consume,location_id:0
-#: field:stock.move.scrap,location_id:0
-#: field:stock.picking,location_id:0
-#: report:stock.picking.list:0
+#: field:stock.inventory.line,location_id:0 report:stock.inventory.move:0
+#: view:stock.location:0 view:stock.move:0
+#: field:stock.move.consume,location_id:0 field:stock.move.scrap,location_id:0
+#: field:stock.partial.move.line,location_id:0
+#: field:stock.partial.picking.line,location_id:0
+#: field:stock.picking,location_id:0 report:stock.picking.list:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
 msgid "Location"
-msgstr "Ubicación"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
-msgstr "Información"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr "Dirección de envío:"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
-msgid "Provide the quantities of the returned products."
-msgstr "Indique las cantidades de los productos devueltos."
-
-#. module: stock
-#: code:addons/stock/stock.py:2009
-#, python-format
-msgid ""
-"Can not create Journal Entry, Input Account defined on this product and "
-"Variant account on category of this product are same."
 msgstr ""
-"No se puede crear el asiento, la cuenta de entrada definido en este producto "
-"y la cuenta variante en la categoría del producto son la misma."
+
+#. module: stock
+#: help:stock.location,valuation_in_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved from an internal location into this location, instead of the "
+"generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Provide the quantities of the returned products."
+msgstr ""
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr "Precio coste"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: field:product.product,valuation:0
+#: view:product.product:0 field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr "Valoración inventario"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Create Invoice"
-msgstr "Crear factura"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-#: view:stock.picking:0
+msgid "Orders planned for today"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process Later"
-msgstr "Procesar más tarde"
+msgstr ""
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1893,24 +1839,11 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
-"Esta ubicación de stock será utilizada, en lugar de la ubicación por "
-"defecto, como la ubicación de origen para recibir mercancías desde esta "
-"empresa"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr "Dirección propietario"
-
-#. module: stock
-#: help:stock.move,price_unit:0
-msgid ""
-"Technical field used to record the product cost set by the user during a "
-"picking confirmation (when average price costing method is used)"
 msgstr ""
-"Campo técnico utilizado para registrar el coste del producto indicado por el "
-"usuario durante una confirmación de albarán (cuando se utiliza el método del "
-"precio medio de coste)."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1919,51 +1852,58 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
-"El análisis de movimientos le permite analizar y verificar fácilmente los "
-"movimientos de stock de su compañía. Utilice este informe cuando quiera "
-"analizar las diferentes rutas tomadas por sus productos y el rendimiento de "
-"la gestión de su inventario."
+
+#. module: stock
+#: code:addons/stock/stock.py:2116
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr "Tiempo inicial planificado (días)"
+msgstr ""
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr "Precio"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking_memory
+msgid "stock.return.picking.memory"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr "Buscar inventario"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "Cantidad por lote"
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:2122
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de entrada de stock para este producto o su "
-"categoría: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:360
+#: code:addons/stock/product.py:419
 #, python-format
 msgid "Received Qty"
-msgstr "Ctdad recibida"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr "Referencia interna"
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -1971,73 +1911,32 @@ msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
 msgstr ""
-"Prefijo opcional a añadir cuando se muestre el número de serie: "
-"PREFIJO/SERIE [REF_INT]"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr "Importar inventario"
+msgstr ""
 
 #. module: stock
-#: field:stock.incoterms,name:0
-#: field:stock.move,name:0
+#: field:stock.incoterms,name:0 field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
-msgstr "Stocks"
+msgstr ""
 
 #. module: stock
-#: model:ir.module.module,description:stock.module_meta_information
+#: help:stock.partial.move,hide_tracking:0
+#: help:stock.partial.picking,hide_tracking:0
 msgid ""
-"OpenERP Inventory Management module can manage multi-warehouses, multi and "
-"structured stock locations.\n"
-"Thanks to the double entry management, the inventory controlling is powerful "
-"and flexible:\n"
-"* Moves history and planning,\n"
-"* Different inventory methods (FIFO, LIFO, ...)\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules (stock level, JIT, ...)\n"
-"* Bar code supported\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-"* Dashboard for warehouse that includes:\n"
-"    * Products to receive in delay (date < = today)\n"
-"    * Procurement in exception\n"
-"    * Graph : Number of Receive products vs planned (bar graph on week par "
-"day)\n"
-"    * Graph : Number of Delivery products vs planned (bar graph on week par "
-"day)\n"
-"    "
+"This field is for internal purpose. It is used to decide if the column "
+"prodlot has to be shown on the move_ids field or not"
 msgstr ""
-"El módulo de OpenERP de gestión de inventario puede gestionar múltiples "
-"almacenes, y varias ubicaciones estructuradas.\n"
-"Gracias a la gestión de doble entrada, el control de inventario es potente y "
-"flexible:\n"
-"* Historial de movimientos y planificación,\n"
-"* Diferentes métodos de inventario (FIFO, LIFO, ...)\n"
-"* Valoración de existencias (precio estándar o medio, ...)\n"
-"* Robustez frente a las diferencias de inventario\n"
-"* Normas de reordenación automática (nivel de existencias, JIT, ...)\n"
-"* Código de barras soportado\n"
-"* Detección rápida de errores a través del sistema de entrada doble\n"
-"* Trazabilidad (hacia arriba/hacia abajo, lotes de producción, número de "
-"serie, ...)\n"
-"* Panel de almacén que incluye:\n"
-"    * Productos a recibir con retraso (fecha <= hoy)\n"
-"    * Compras en excepción\n"
-"    * Gráfico: Número de productos Recibidos frente al previsto (gráfico de "
-"barras semanal por día)\n"
-"    * Gráfico: Número de productos Entregados frente al previsto (gráfico de "
-"barras semanal por día)\n"
-"    "
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2046,49 +1945,47 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la por defecto, como la ubicación de origen para los movimientos de stock "
-"generados cuando realiza un inventario."
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr "Almacenable"
+msgstr ""
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr "Tiempo real (automatizado)"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr "Unidad de envío logística: Palet, caja, paquete, ..."
+msgstr ""
 
 #. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
+#: view:stock.location:0
+msgid "Customer Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr "_Aplicar"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
 msgid "]"
-msgstr "]"
+msgstr ""
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "Ubicación de inventario"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total value"
-msgstr "Valor total"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2096,55 +1993,56 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
-"Diario de inventario en el que el movimiento encadenado será escrito, si el "
-"tipo de encadenamiento no es transparente (no se utiliza ningún diario si se "
-"deja vacío)."
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_incoming_product_board
-msgid "Incoming Product"
-msgstr "Albarán de entrada"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr "Creación"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,cost:0
-#: field:stock.move.memory.out,cost:0
+#: view:report.stock.inventory:0
+msgid ""
+"Analysis of current inventory (only moves that have already been processed)"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,cost:0
+#: field:stock.partial.picking.line,cost:0
 msgid "Cost"
-msgstr "Coste"
+msgstr ""
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 #: field:stock.change.standard.price,stock_account_input:0
-#: field:stock.location,valuation_in_account_id:0
 msgid "Stock Input Account"
-msgstr "Cuenta entrada stock"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Shipping type specify, goods coming in or going out"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
 msgid "Warehouse Management"
-msgstr "Gestión de almacenes"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr "Entrega parcial"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Mov. automático, paso no añadido"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr "Análisis ubicación stock"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,date:0
@@ -2152,57 +2050,46 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
-"Fecha del movimiento: Fecha planificada hasta que el movimiento esté "
-"realizado, después fecha real en que el movimiento ha sido procesado."
 
 #. module: stock
-#: field:report.stock.lines.date,date:0
-msgid "Latest Inventory Date"
-msgstr "Fecha último inventario"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr "Agrupar por..."
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr "Ubicaciones encadenadas"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr "Pérdidas de inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1311
+#: code:addons/stock/stock.py:1341
 #, python-format
 msgid "Document"
-msgstr "Documento"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr "Albarán de entrada"
+msgstr ""
 
 #. module: stock
-#: field:stock.move,product_uom:0
-#: field:stock.move.memory.in,product_uom:0
-#: field:stock.move.memory.out,product_uom:0
+#: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
+#: field:stock.partial.picking.line,product_uom:0
 msgid "Unit of Measure"
-msgstr "Unidad de medida"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:176
+#: code:addons/stock/product.py:175
 #, python-format
 msgid "Products: "
-msgstr "Productos: "
+msgstr ""
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -2210,142 +2097,122 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
-"Fuerza a especificar un lote de producción para todos los movimientos que "
-"contienen este producto y generados por una orden de fabricación."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.track_line_old
-#: view:stock.move.track:0
-msgid "Tracking a move"
-msgstr "Seguimiento de un movimiento"
 
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr "Actualizar"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
 #: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
 msgid "Stock Journals"
-msgstr "Diarios de stock"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr "Otros"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:90
+#: code:addons/stock/product.py:89
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
 msgstr ""
-"¡No se puede encontrar ninguna diferencia entre precio estándar y precio "
-"nuevo!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_partial_picking
-msgid "Partial Picking"
-msgstr "Empaquetado parcial"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Desechado"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr "Productos "
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr "Lotes de seguimiento de entrada"
+msgstr ""
 
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr "Tablero almacén"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:380
+#: code:addons/stock/product.py:439
 #, python-format
 msgid "Future Qty"
-msgstr "Ctdad futura"
+msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta variación stock"
-
-#. module: stock
-#: field:stock.move,note:0
-#: view:stock.picking:0
-#: field:stock.picking,note:0
+#: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
 msgid "Notes"
-msgstr "Notas"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Value"
-msgstr "Valor"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.move,type:0
-#: field:stock.location,chained_picking_type:0
+#: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr "Tipo de envío"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2210
-#, python-format
-msgid "You can only delete draft moves."
-msgstr "Sólo puede eliminar movimientos borrador."
+#: view:stock.move:0
+msgid "Stock moves that are Confirmed, Available or Waiting"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
 #: model:ir.actions.act_window,name:stock.act_product_location_open
-#: model:ir.ui.menu,name:stock.menu_stock_products_menu
-#: view:stock.inventory:0
-#: view:stock.picking:0
-#, python-format
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu view:stock.inventory:0
+#: view:stock.partial.move:0 view:stock.partial.picking:0 view:stock.picking:0
 msgid "Products"
-msgstr "Productos"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
-msgstr "Cambiar precio"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,move_type:0
 msgid "Delivery Method"
-msgstr "Método entrega"
+msgstr ""
 
 #. module: stock
 #: help:report.stock.move,location_dest_id:0
-#: help:stock.move,location_dest_id:0
-#: help:stock.picking,location_dest_id:0
+#: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "Ubicación donde el sistema almacenará los productos finalizados."
+msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation:0
-msgid ""
-"When real-time inventory valuation is enabled on a product, this account "
-"will hold the current value of the products."
+#: view:stock.move:0
+msgid "Stock to be delivered (Available or not)"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
+msgid "Outgoing Products"
 msgstr ""
-"Cuando está activada una valoración de inventario en tiempo real de un "
-"producto, esta cuenta contiene el valor actual de los productos."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2356,50 +2223,48 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
-"Aquí podrá recibir los productos individuales, sin importar de que pedido de "
-"compra o albarán de entrada provienen. Encontrará la lista de todos los "
-"productos que está esperando. Una vez recibido el albarán, puede filtrar "
-"basándose en el nombre del proveedor o en la referencia del pedido de "
-"compra. Entonces, puede confirmar todos los productos recibidos usando los "
-"botones a la derecha de cada línea."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
 msgid "Stock Move"
-msgstr "Movimiento stock"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr "Retraso (días)"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,move_id:0
-#: field:stock.move.memory.out,move_id:0
-msgid "Move"
-msgstr "Movimiento"
+#: code:addons/stock/stock.py:1697
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr "Fecha prevista para procesar el albarán."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:376
+#: code:addons/stock/product.py:435
 #, python-format
 msgid "P&L Qty"
-msgstr "Ctdad P&L"
+msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-#: field:stock.production.lot,revisions:0
+#: view:stock.picking:0
+msgid "Internal Pickings to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0 field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr "Revisiones"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr "Esta operación cancelará el envío. ¿Desea continuar?"
+msgstr ""
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2410,12 +2275,6 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
-"Si la valoración en tiempo real está habilitada para un producto, el sistema "
-"automáticamente escribirá asientos en el diario correspondientes a los "
-"movimientos de stock. La cuenta de variación de inventario especificada en "
-"la categoría del producto representará el valor de inventario actual, y la "
-"cuenta de entrada y salida de stock contendrán las contrapartidas para los "
-"productos entrantes y salientes."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2424,19 +2283,13 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
-"El análisis de inventario le permite verificar y analizar fácilmente los "
-"niveles de stock de su compañia. Ordene y agrupe por criterios de selección "
-"para analizar y gestionar mejor las actividades de su empresa."
 
 #. module: stock
-#: help:report.stock.move,location_id:0
-#: help:stock.move,location_id:0
+#: help:report.stock.move,location_id:0 help:stock.move,location_id:0
 msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
-"Indica una ubicación si se producen en una ubicación fija. Puede ser una "
-"ubicación de empresa si subcontrata las operaciones de fabricación."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -2451,109 +2304,95 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
-"Defina sus ubicaciones para reflejar la estructura de su almacén y "
-"organización. OpenERP es capaz de manejar ubicaciones físicas (almacén, "
-"estante, caja, etc.), ubicaciones de empresa (clientes, proveedores) y "
-"ubicaciones virtuales que son la contrapartida de las operaciones de stock "
-"como los consumos por órdenes de la fabricación, inventarios, etc. Cada "
-"operación de stock en OpenERP mueve los productos de una ubicación a otra. "
-"Por ejemplo, si recibe productos de un proveedor, OpenERP moverá productos "
-"desde la ubicación del proveedor a la ubicación del stock. Cada informe "
-"puede ser realizado sobre ubicaciones físicas, de empresa o virtuales."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
 msgid "Create"
-msgstr "Crear"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Dates"
-msgstr "Fechas"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,priority:0
 msgid "Priority"
-msgstr "Prioridad"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr "Origen"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
-#: field:stock.inventory.line,inventory_id:0
-#: report:stock.inventory.move:0
+#: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0
 #: selection:stock.location,usage:0
-#, python-format
 msgid "Inventory"
-msgstr "Inventario"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
-"¡La combinación de número de serie y referencia interna debe ser única!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups
-msgid "Stock ups"
-msgstr "Stock ups"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr "Cancelar el inventario"
-
-#. module: stock
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines.exist,name:0
-msgid "Tracking serial"
-msgstr "Seguimiento nº serie"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
-#: code:addons/stock/report/report_stock.py:135
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/report/report_stock.py:135 code:addons/stock/stock.py:760
 #, python-format
 msgid "Error !"
-msgstr "¡Error!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement_result
-msgid "Stock Replacement result"
-msgstr "Resultado reemplazo stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 msgid "Units of Measure"
-msgstr "Unidades de medida"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr "Ubicaciones fijas"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/stock.py:2486
+#, python-format
+msgid "Product  '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: model:product.template,description:stock.product_icecream_product_template
+msgid ""
+"Ice cream can be mass-produced and thus is widely available in developed "
+"parts of the world. Ice cream can be purchased in large cartons (vats and "
+"squrounds) from supermarkets and grocery stores, in smaller quantities from "
+"ice cream shops, convenience stores, and milk bars, and in individual "
+"servings from small carts or vans at public events."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "July"
-msgstr "Julio"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr "Consumible"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2563,259 +2402,233 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
-"Muestra los últimos inventarios realizados sobre sus productos y los ordena "
-"fácilmente con filtros específicos. Si realiza inventarios parciales "
-"frecuentemente, necesita este informe para asegurar que el stock de cada "
-"producto ha sido controlado al menos una vez al año."
+
+#. module: stock
+#: model:stock.location,name:stock.location_opening
+msgid "opening"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
-msgstr "Previsión nivel de stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
-#: field:report.stock.move,stock_journal:0
-#: view:stock.journal:0
-#: field:stock.journal,name:0
-#: field:stock.picking,stock_journal_id:0
+#: field:report.stock.move,stock_journal:0 view:stock.journal:0
+#: field:stock.journal,name:0 field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
-msgstr "Diario de inventario"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "Abastecimiento"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr "Proveedores Maxtor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
-#: code:addons/stock/wizard/stock_change_standard_price.py:106
+#: code:addons/stock/wizard/stock_change_product_qty.py:78
+#: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr "No se ha establecido el ID activo en el Contexto"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr "Forzar disponibilidad"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.move_scrap
-#: view:stock.move.scrap:0
+#: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr "Movimiento desecho"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:138
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
-#: model:ir.ui.menu,name:stock.menu_action_pdct_in
-#: view:stock.move:0
-#, python-format
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in view:stock.move:0
 msgid "Receive Products"
-msgstr "Recibir productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:131
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
-#, python-format
 msgid "Deliver Products"
-msgstr "Enviar productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Stock of Products"
-msgstr "Ver stock de productos"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Internal Picking List"
-msgstr "Albarán interno"
-
-#. module: stock
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 #: field:report.stock.move,month:0
 msgid "Month"
-msgstr "Mes"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr "Fecha de realización."
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr "Lote de producción único, se mostrará como: PREFIJO/SERIE [REF_INT]"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Your Company"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar un paquete sin eliminarlo."
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Yes"
-msgstr "Sí"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr "Inventarios"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr "Por hacer"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,company_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,company_id:0
-#: field:stock.inventory,company_id:0
-#: field:stock.inventory.line,company_id:0
-#: field:stock.location,company_id:0
-#: field:stock.move,company_id:0
-#: field:stock.picking,company_id:0
-#: field:stock.production.lot,company_id:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0 field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0 field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0 field:stock.move,company_id:0
+#: field:stock.picking,company_id:0 field:stock.production.lot,company_id:0
 #: field:stock.production.lot.revision,company_id:0
 #: field:stock.warehouse,company_id:0
 msgid "Company"
-msgstr "Compañía"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr "Unidad de medida"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:122
+#: code:addons/stock/product.py:121
 #, python-format
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de entrada de stock para este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2445
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
-"¡No se puede consumir un movimiento con una cantidad negativa o cero!"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr "Stock real"
+msgstr ""
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr "Rellenar inventario"
+msgstr ""
 
 #. module: stock
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
 
 #. module: stock
-#: help:product.category,property_stock_account_input_categ:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. This is the default "
-"value for all products in this category, it can also directly be set on each "
-"product."
+#: model:stock.location,name:stock.location_delivery_counter
+msgid "Delivery Counter"
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de entrada se creará "
-"en esta cuenta. Este es el valor por defecto para todos los productos de "
-"esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: field:stock.production.lot.revision,date:0
-msgid "Revision Date"
-msgstr "Fecha de revisión"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
-#: field:stock.move.split.lines,lot_id:0
-#: field:stock.move.split.lines.exist,lot_id:0
-#: report:stock.picking.list:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0 report:stock.picking.list:0
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr "Número lote de producción"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2697
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr "Cantidad (UdV)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1664
+#: code:addons/stock/stock.py:1743
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
-"Está moviendo %.2f %s productos pero sólo %.2f %s están disponibles en este "
-"lote."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr "Reservar"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr "Dirección de contacto :"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr "Albarán pendiente"
+msgstr ""
 
 #. module: stock
-#: field:stock.incoterms,active:0
-#: field:stock.location,active:0
+#: field:stock.incoterms,active:0 field:stock.location,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
-msgstr "Activo"
-
-#. module: stock
-#: model:ir.module.module,shortdesc:stock.module_meta_information
-msgid "Inventory Management"
-msgstr "Almacenes y logística"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
-msgstr "Propiedades"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:974
+#: code:addons/stock/stock.py:1082
 #, python-format
 msgid "Error, no partner !"
-msgstr "¡Error, sin empresa!"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split.lines,wizard_exist_id:0
+#: field:stock.inventory.line.split.lines,wizard_id:0
+#: field:stock.move.split.lines,wizard_id:0
+msgid "Parent Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2823,14 +2636,18 @@ msgstr "¡Error, sin empresa!"
 #: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr "Incoterms"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: model:ir.model,name:stock.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
 msgid "Total:"
-msgstr "Total:"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,name:0
@@ -2839,9 +2656,6 @@ msgid ""
 "costs and responsibilities between buyer and seller and reflect state-of-the-"
 "art transportation practices."
 msgstr ""
-"Los Incoterms son una serie de términos de ventas. Se utilizan para dividir "
-"los costes de transacción y las responsabilidades entre el comprador y el "
-"vendedor, y reflejan las prácticas de transporte más recientes."
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -2849,290 +2663,267 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
-"Si se marca, los productos que figuran en las ubicaciones hijas de la "
-"ubicación seleccionada se incluirán también."
-
-#. module: stock
-#: field:stock.move.track,tracking_prefix:0
-msgid "Tracking prefix"
-msgstr "Prefijo seguimiento"
 
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr "Referencia inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1304
+#: code:addons/stock/stock.py:1334
 #, python-format
 msgid "Internal picking"
-msgstr "Albarán interno"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr "Abrir producto"
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,to_date:0
 msgid "To"
-msgstr "Hasta"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process"
-msgstr "Procesar"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr "Nombre de revisión"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
 #: model:ir.ui.menu,name:stock.menu_stock_root
-#: view:stock.warehouse:0
+#: field:product.product,warehouse_id:0 view:stock.warehouse:0
 msgid "Warehouse"
-msgstr "Almacén"
+msgstr ""
 
 #. module: stock
-#: view:stock.location.product:0
-msgid ""
-"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
-"filter all resources of the day for the 'From' date and 23:59:59 for the "
-"'To' date)"
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
 msgstr ""
-"(Déjelo vacío para abrir la situación actual. Ponga HH:MM:SS a 00:00:00 para "
-"filtrar todos los recursos del día en el campo fecha 'Desde' y 23:59:59 en "
-"el campo fecha 'Hasta'.)"
 
 #. module: stock
 #: view:product.category:0
 msgid "Accounting Stock Properties"
-msgstr "Propiedades contables del stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr "Paquetes cliente"
+msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
+#: selection:report.stock.inventory,state:0 view:report.stock.move:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.move:0 selection:stock.move,state:0 view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Done"
-msgstr "Realizado"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_standard_price
 #: model:ir.model,name:stock.model_stock_change_standard_price
 #: view:stock.change.standard.price:0
 msgid "Change Standard Price"
-msgstr "Cambiar precio estándar"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr "Ubicaciones virtuales"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
-msgstr "Fecha realización"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:975
+#: code:addons/stock/stock.py:1083
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
 msgstr ""
-"Por favor indique una empresa en el albarán si desea generar factura."
 
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Not urgent"
-msgstr "No urgente"
-
-#. module: stock
-#: view:stock.move:0
-msgid "To Do"
-msgstr "Para hacer"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
 msgid "Warehouses"
-msgstr "Almacenes"
+msgstr ""
 
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock
-#: field:stock.move,returned_price:0
-msgid "Returned product price"
-msgstr "Precio producto devuelto"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr "Análisis inventario"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
-msgstr "Diario de destino"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
-msgstr "Stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
-#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
-#: model:ir.ui.menu,name:stock.menu_stock_product
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_id:0
-#: field:report.stock.lines.date,product_id:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0 view:report.stock.move:0
 #: field:report.stock.move,product_id:0
 #: field:stock.change.product.qty,product_id:0
 #: field:stock.inventory.line,product_id:0
-#: field:stock.inventory.line.split,product_id:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,product_id:0
-#: field:stock.move.consume,product_id:0
-#: field:stock.move.memory.in,product_id:0
-#: field:stock.move.memory.out,product_id:0
-#: field:stock.move.scrap,product_id:0
+#: field:stock.inventory.line.split,product_id:0 report:stock.inventory.move:0
+#: view:stock.move:0 field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0 field:stock.move.scrap,product_id:0
 #: field:stock.move.split,product_id:0
-#: view:stock.production.lot:0
+#: field:stock.partial.move.line,product_id:0
+#: field:stock.partial.picking.line,product_id:0 view:stock.production.lot:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
 #: field:stock.report.tracklots,product_id:0
+#: field:stock.return.picking.memory,product_id:0
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
+#: view:stock.return.picking:0
+msgid "Return"
+msgstr ""
+
+#. module: stock
+#: field:stock.return.picking,invoice_state:0
 msgid "Invoicing"
-msgstr "Facturación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Please provide Proper Quantity !"
-msgstr "¡Indique cantidad correcta!"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "UdV del producto"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
-msgstr "Altura (Z)"
-
-#. module: stock
-#: field:stock.ups,weight:0
-msgid "Lot weight"
-msgstr "Peso lote"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr "Consumir productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1742
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr "¡Stock insuficiente en el lote!"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr "Padre derecho"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
-msgstr "Dirección"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Variants"
-msgstr "Variantes"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,posx:0
 msgid "Corridor (X)"
-msgstr "Pasillo (X)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
 msgid "Suppliers"
-msgstr "Proveedores"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
+#: field:report.stock.inventory,value:0 field:report.stock.move,value:0
 msgid "Total Value"
-msgstr "Valor total"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr "Productos por categoría"
+msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
-msgstr "Categorías de productos"
+#: selection:stock.picking,state:0
+msgid "Waiting Another Operation"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,wizard_id:0
-#: field:stock.move.memory.out,wizard_id:0
+#: view:stock.location:0
+msgid "Supplier Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,wizard_id:0
+#: field:stock.partial.picking.line,wizard_id:0
+#: field:stock.return.picking.memory,wizard_id:0
 msgid "Wizard"
-msgstr "Asistente"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Completed Stock-Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
 #: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
-msgstr "Productos por ubicación"
+msgstr ""
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr "Incluir hijos"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr "Estante 1"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -3144,159 +2935,154 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
-"Los movimientos internos muestran todas las operaciones de inventario que se "
-"deben realizar en su almacén. Todas las operaciones pueden ser clasificadas "
-"en diarios de stock, para que cada trabajador tenga su propia lista de "
-"operaciones a realizar en su propio diario. La mayor parte de operaciones "
-"son preparadas automáticamente por OpenERP según sus reglas de logística "
-"preconfiguradas, pero también puede registrar operaciones de stock de forma "
-"manual."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr "Orden"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price :"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr "Referencia paquete"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_id:0
-#: field:stock.move,location_id:0
+#: view:report.stock.move:0 field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
+#: field:stock.move,location_id:0 field:stock.move.split,location_id:0
 msgid "Source Location"
-msgstr "Ubicación origen"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid " Waiting"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr "Asientos contables"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_manager
+msgid "Manager"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr "Total"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr "Envíos internos"
+msgstr ""
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr "Activa cuenta relacionada"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr "Valor stock virtual"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: view:stock.inventory.line.split:0
+#: view:product.product:0 view:stock.inventory.line.split:0
 #: view:stock.move.split:0
 msgid "Lots"
-msgstr "Lotes"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "New Pack"
-msgstr "Nuevo paquete"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr "Destinación"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
-msgstr "Todo junto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1620
+#: code:addons/stock/stock.py:1698
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
-"Las cantidades, UdM, productos y ubicaciones no se pueden modificar en los "
-"movimientos de stock que ya han sido procesados (excepto por el "
-"administrador)"
 
 #. module: stock
-#: code:addons/stock/product.py:386
+#: code:addons/stock/product.py:445
 #, python-format
 msgid "Future Productions"
-msgstr "Producciones futuras"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
+#: view:stock.return.picking:0
 msgid "Return lines"
-msgstr "Líneas de devolución"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr "Fechas de inventarios"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total incoming quantity"
-msgstr "Cantidad de entrada total"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr "Ctdad salida"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr "Movimientos para este lote de producción"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_out
-msgid "stock.move.memory.out"
-msgstr "stock.movimiento.memoria.salida"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:115
-#, python-format
-msgid "Message !"
-msgstr "¡ Mensaje !"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Put in current pack"
-msgstr "Poner en el paquete actual"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "Regularización de inventario"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr "Motivo"
+msgstr ""
 
 #. module: stock
-#: report:stock.picking.list:0
-msgid "Delivery Order:"
-msgstr "Albarán de salida:"
+#: model:product.template,name:stock.product_icecream_product_template
+msgid "Ice Cream"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3308,107 +3094,102 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
-"Esta es la lista de todos los lotes de producción (números de serie) que "
-"registró. Cuando selecciona un lote, puede obtener la trazabilidad hacia "
-"arriba o hacia abajo de los productos que componen el lote. Por defecto, la "
-"lista es filtrada según los números de serie disponibles en su almacén, pero "
-"puede desmarcar el botón 'Disponible' para obtener todos los lotes que "
-"produjo, recibió o entregó a sus clientes."
 
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr "Icono"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2209
-#: code:addons/stock/stock.py:2617
+#: code:addons/stock/stock.py:2311 code:addons/stock/stock.py:2726
 #, python-format
 msgid "UserError"
-msgstr "Error de usuario"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.move.track:0
-#: view:stock.split.into:0
+#: field:stock.partial.move,hide_tracking:0
+#: field:stock.partial.move.line,tracking:0
+#: field:stock.partial.picking,hide_tracking:0
+#: field:stock.partial.picking.line,tracking:0
+msgid "Tracking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.split.into:0
 msgid "Ok"
-msgstr "Aceptar"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. This is the "
+"default value for all products in this category. It can also directly be set "
+"on each product"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr "Clientes no europeos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:76
-#: code:addons/stock/product.py:90
-#: code:addons/stock/product.py:93
-#: code:addons/stock/product.py:100
-#: code:addons/stock/product.py:121
-#: code:addons/stock/product.py:147
-#: code:addons/stock/stock.py:2006
-#: code:addons/stock/stock.py:2009
-#: code:addons/stock/stock.py:2012
-#: code:addons/stock/stock.py:2015
-#: code:addons/stock/stock.py:2018
-#: code:addons/stock/stock.py:2021
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/product.py:75 code:addons/stock/product.py:89
+#: code:addons/stock/product.py:92 code:addons/stock/product.py:99
+#: code:addons/stock/product.py:120 code:addons/stock/product.py:146
+#: code:addons/stock/stock.py:2116 code:addons/stock/stock.py:2119
+#: code:addons/stock/stock.py:2122 code:addons/stock/stock.py:2125
+#: code:addons/stock/stock.py:2128 code:addons/stock/stock.py:2131
+#: code:addons/stock/stock.py:2445
 #: code:addons/stock/wizard/stock_fill_inventory.py:47
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
 msgid "Error!"
-msgstr "¡Error!"
-
-#. module: stock
-#: code:addons/stock/stock.py:2021
-#, python-format
-msgid ""
-"There is no inventory variation account defined on the product category: "
-"\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de variación de inventario en la categoría del "
-"producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories?"
-msgstr "¿Desea fusionar estos inventarios?"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Confirmed Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
 msgid "Picking"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
-msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr "Este albarán no requiere facturación."
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr "Recepción mercancías"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_location_type:0
@@ -3424,36 +3205,39 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
-"Determina si esta ubicación está encadenada a otra, por ejemplo cualquier "
-"producto que entre en esta ubicación debe ir a la siguiente ubicación "
-"encadenada. La ubicación encadenada se determina en función del tipo: \n"
-"*Ninguna: No se encadena con ninguna.\n"
-"*Cliente: Se utiliza la ubicación encadenada definida en el campo Ubicación "
-"del cliente del formulario del cliente especificado en el albarán de los "
-"productos entrantes.\n"
-"*Ubicación fija: Se utiliza la ubicación encadenada del siguiente campo: "
-"Ubicación encadenada si fija."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#: code:addons/stock/wizard/stock_partial_picking.py:159
 #, python-format
 msgid "Warning"
-msgstr "Advertencia"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:1348
 #, python-format
 msgid "is done."
-msgstr "está realizado."
+msgstr ""
 
 #. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 #: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree view:stock.picking:0
 msgid "Delivery Orders"
-msgstr "Albaranes de salida"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders already processed"
+msgstr ""
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3461,126 +3245,126 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
-"Esta ubicación de stock será utilizada, en lugar de la ubicación por "
-"defecto, como la ubicación de destino para enviar mercancías a esta empresa"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
 #: view:stock.picking:0
-#: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr "Confirmado"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
 
 #. module: stock
-#: help:stock.location,icon:0
-msgid "Icon show in  hierarchical tree view"
-msgstr "Icono mostrado en la vista de árbol jerárquica."
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge Inventories"
-msgstr "Fusionar inventarios"
+msgstr ""
 
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr "Recepción:"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
-"Marque esta opción para permitir utilizar esta ubicación para poner "
-"mercancías desechadas/defectuosas."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "Albarán relacionado"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Year Planned"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr "Cantidad de salida total"
+msgstr ""
 
 #. module: stock
-#: field:stock.picking,backorder_id:0
-msgid "Back Order of"
-msgstr "Albarán pendiente de"
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "New"
+msgstr ""
 
 #. module: stock
-#: help:stock.move.memory.in,cost:0
-#: help:stock.move.memory.out,cost:0
+#: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
 msgid "Unit Cost for this product line"
-msgstr "Coste unidad para esta línea de producto"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_categ_id:0
-#: view:report.stock.move:0
+#: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:88
-#, python-format
-msgid "INV: %s"
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "Informe"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1313
+#: code:addons/stock/stock.py:1343
 #, python-format
 msgid " for the "
-msgstr " para el "
+msgstr ""
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to Leave in the Current Pack"
-msgstr "Cantidad a dejar en el paquete actual"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock available to be delivered"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 #: view:stock.invoice.onshipping:0
 msgid "Create invoice"
-msgstr "Crear factura"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
-msgstr "Configuración"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr "Lotes existentes"
+msgstr ""
 
 #. module: stock
-#: field:product.product,location_id:0
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "Ubicación de stock"
+msgstr ""
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -3591,105 +3375,94 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
-"Si el precio de coste se incrementa, la cuenta la variación de existencias "
-"irá al debe y la cuenta de salida de stock irá al haber con el valor = "
-"(diferencia de cantidad * cantidad disponible).\n"
-"Si el precio de coste se reduce, la cuenta la variación de existencias irá "
-"al haber y la cuenta de entrada de stock irá al debe."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr "Diario encadenamiento"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr "No suficiente stock, no ha sido posible reservar los productos."
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
-msgstr "Clientes"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1317
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Waiting Availability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1347
 #, python-format
 msgid "is cancelled."
-msgstr "está cancelado."
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
-msgstr "Líneas regularización de inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
-#, python-format
-msgid "Process Document"
-msgstr "Procesar documento"
+#: view:stock.move:0
+msgid "Waiting "
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:368
+#: code:addons/stock/product.py:427
 #, python-format
 msgid "Future Deliveries"
-msgstr "Entregas futuras"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr "Información adicional"
-
-#. module: stock
-#: view:stock.move:0
-#: field:stock.move,tracking_id:0
-msgid "Pack"
-msgstr "Paquete"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Date Expected"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree4
-msgid ""
-"The Incoming Shipments is the list of all orders you will receive from your "
-"supplier. An incoming shipment contains a list of products to be received "
-"according to the original purchase order. You can validate the shipment "
-"totally or partially."
 msgstr ""
-"Los albaranes de entrada son la lista de todos los pedidos que va a recibir "
-"de su proveedor. Un albarán de entrada contiene la lista de productos a "
-"recibir en función del pedido de compra original. Puede validar el envío "
-"totalmente o parcialmente."
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "Auto validar"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr "Plantilla producto"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr "Diciembre"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3698,19 +3471,16 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
-"Este menú le da la trazabilidad completa de las operaciones de inventario "
-"sobre un producto específico. Puede filtrar sobre el producto para ver todos "
-"los movimientos pasados o futuros para el producto."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr "Devolver productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr "Validar inventario"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3718,69 +3488,62 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
-"Campo técnico utilizado para registrar la moneda elegida por el usuario "
-"durante una confirmación de albarán (cuando se utiliza el método de precio "
-"medio de coste)."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Stock Inventory is already Validated."
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr "Movimientos de productos"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: stock
-#: field:stock.move,address_id:0
-msgid "Destination Address"
-msgstr "Dirección destino"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr "Fecha prevista máx."
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr "Auto-Albarán"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr "Tienda 2"
+msgstr ""
 
 #. module: stock
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,type:0
-#: view:stock.location:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: selection:report.stock.move,type:0 view:stock.location:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Internal"
-msgstr "Interno"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr "Inventario stock"
+msgstr ""
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3791,27 +3554,17 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'Confirmado'.\n"
-" Si está reservado en stock se establece como 'Reservado'.\n"
-" Cuando el albarán se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
 
 #. module: stock
-#: view:board.board:0
-msgid "Outgoing Products Delay"
-msgstr "Retraso albaranes salida"
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.split.lines,use_exist:0
-msgid "Existing Lot"
-msgstr "Lote existente"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr "¡Introduzca por lo menos una cantidad que no sea cero!"
+msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3819,65 +3572,66 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la por defecto, como la ubicación de origen para los movimientos de stock "
-"generados por los abastecimientos."
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1346
 #, python-format
 msgid "is ready to process."
-msgstr "preparado para procesar."
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr "Referencia del documento que ha generado este albarán."
+msgstr ""
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
 msgid "Set to zero"
-msgstr "Inicializar a cero"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: model:res.groups,name:stock.group_stock_user
+msgid "User"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr "Ninguno de estos albaranes requiere facturación."
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr "Noviembre"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
+#: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido un diario en la categoría de producto: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:382
+#: code:addons/stock/product.py:441
 #, python-format
 msgid "Unplanned Qty"
-msgstr "Ctdad no planificada"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr "Compañía encadenada"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Check Availability"
-msgstr "Comprobar disponibilidad"
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr "Enero"
+msgstr ""
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3885,43 +3639,35 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
-"Fuerza a introducir un lote de producción para todos los movimientos que "
-"contiene este producto y procedente de una ubicación de proveedores."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr "Movimientos de stock futuros"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr "Historial movimientos (mov. padres)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:364
+#: code:addons/stock/product.py:423
 #, python-format
 msgid "Future Stock"
-msgstr "Stock futuro"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:512
-#: code:addons/stock/stock.py:1120
-#: code:addons/stock/stock.py:1128
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
+#: code:addons/stock/stock.py:1157
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "Error"
-msgstr "Error"
-
-#. module: stock
-#: field:stock.ups.final,xmlfile:0
-msgid "XML File"
-msgstr "Fichero XML"
+msgstr ""
 
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr "Seleccionar cantidad"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3930,54 +3676,48 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
-"Esta es la estructura de los almacenes y ubicaciones de su compañía. Puede "
-"pulsar sobre una ubicación para obtener la lista de los productos y su nivel "
-"de stock en esta ubicación específica y todos sus hijas."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
 #: field:stock.change.product.qty,prodlot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
-#: report:stock.inventory.move:0
-#: field:stock.move,prodlot_id:0
-#: field:stock.move.memory.in,prodlot_id:0
-#: field:stock.move.memory.out,prodlot_id:0
-#: field:stock.move.split.lines.exist,prodlot_id:0
-#: view:stock.production.lot:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: report:stock.inventory.move:0 field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0 view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 msgid "Production Lot"
-msgstr "Lote de producción"
+msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_traceability
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
+#: model:ir.ui.menu,name:stock.menu_traceability view:stock.move:0
+#: view:stock.picking:0 view:stock.production.lot:0 view:stock.tracking:0
 msgid "Traceability"
-msgstr "Trazabilidad"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
-#: model:ir.ui.menu,name:stock.menu_action_location_form
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_location_form view:stock.picking:0
 msgid "Locations"
-msgstr "Ubicaciones"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "General Information"
-msgstr "Información general"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr "Prefijo"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3986,1088 +3726,259 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
-"Cantidad total después de que la división exceda la cantidad para dividir "
-"para este producto: \"%s\" (id: %d)"
 
 #. module: stock
-#: view:stock.move:0
-#: field:stock.partial.move,product_moves_in:0
-#: field:stock.partial.move,product_moves_out:0
-#: field:stock.partial.picking,product_moves_in:0
-#: field:stock.partial.picking,product_moves_out:0
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. When not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,move_ids:0
+#: field:stock.return.picking,product_return_moves:0
 msgid "Moves"
-msgstr "Movimientos"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_dest_id:0
+#: view:report.stock.move:0 field:report.stock.move,location_dest_id:0
+#: field:stock.partial.move.line,location_dest_id:0
+#: field:stock.partial.picking.line,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr "Ubicación destino"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
 msgstr ""
-"Indica los atributos del empaquetado como el tipo, la cantidad de paquetes, "
-"etc."
-
-#. module: stock
-#: code:addons/stock/stock.py:2386
-#, python-format
-msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2595
-#, python-format
-msgid "Inventory '%s' is done."
-msgstr ""
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr "Previsto"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
-msgstr "Producción"
+msgstr ""
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr "Dividir movimiento"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:92
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
-"¡No hay productos para devolver (sólo las líneas en estado Realizado y "
-"todavía no devueltas totalmente pueden ser devueltas)!"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Future Stock-Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
 msgid "Split in Production lots"
-msgstr "Dividir en lotes de producción"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid "Processing Error"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr "Real"
+msgstr ""
 
 #. module: stock
-#: report:stock.picking.list:0
-#: view:stock.production.lot.revision:0
+#: report:stock.picking.list:0 view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr "Mayo"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:133
-#, python-format
-msgid "Deliver"
-msgstr "Enviar"
-
-#. module: stock
-#: help:product.template,property_stock_account_output:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"outgoing stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de salida se creará "
-"en esta cuenta. Si no se indica en el producto, se utilizará la cuenta de la "
-"categoría del producto."
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
-#: view:stock.tracking:0
+#: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
 msgid "Upstream traceability"
-msgstr "Trazabilidad hacia arriba"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr "Contenido ubicación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:388
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Produced Qty"
-msgstr "Ctdad producida"
+msgstr ""
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 #: field:stock.change.standard.price,stock_account_output:0
-#: field:stock.location,valuation_out_account_id:0
 msgid "Stock Output Account"
-msgstr "Cuenta salida stock"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr "Tipo ubicaciones encadenadas"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr "Reporte de inventario por lotes de producción"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: selection:stock.location,chained_location_type:0
+#: view:stock.location:0 selection:stock.location,chained_location_type:0
 #: view:stock.move:0
 msgid "Customer"
-msgstr "Cliente"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr "Febrero"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr "Identificación lote de producción"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,scrap_location:0
-#: view:stock.move.scrap:0
+#: model:stock.location,name:stock.location_refrigerator_small
+msgid "Small Refrigerator"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_convenience_shop
+msgid "Convenient Store"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "Ubicación desecho"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr "Abril"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
+#: view:report.stock.inventory:0 view:stock.move:0
 msgid "Future"
-msgstr "Futuro"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
 msgid "Invoiced date"
-msgstr "Fecha facturado"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:732
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#: code:addons/stock/wizard/stock_return_picking.py:92
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/stock.py:738
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Warning !"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr "Salida"
+msgstr ""
 
 #. module: stock
-#: selection:stock.move.split.lines,action:0
-msgid "Keep in one lot"
-msgstr "Mantener en un lote"
+#: help:stock.tracking,name:0
+msgid ""
+"By default, the pack reference is generated following the sscc standard. "
+"(Serial number + 1 check digit)"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-msgid "Cost Price:"
-msgstr "Precio coste:"
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid ""
+"The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
+"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
+"accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid ""
+"Production lot quantity %d of %s is larger than available quantity (%d) !"
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr "Opcional: Siguiente movimiento de stock cuando se encadenan."
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,year:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,year:0
+#: view:report.stock.move:0 field:report.stock.move,year:0
 msgid "Year"
-msgstr "Año"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr "Ubicaciones físicas"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_partial_move
-msgid "Partial Move"
-msgstr "Movimiento parcial"
+#: view:stock.picking:0 selection:stock.picking,state:0
+msgid "Ready to Process"
+msgstr ""
 
 #. module: stock
-#: help:stock.location,posx:0
-#: help:stock.location,posy:0
+#: help:stock.location,posx:0 help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr "Detalles de ubicación opcionales, sólo para fines de información."
-
-#~ msgid "Sub Products"
-#~ msgstr "Sub productos"
-
-#~ msgid "STOCK_SAVE"
-#~ msgstr "STOCK_SAVE"
-
-#~ msgid "STOCK_QUIT"
-#~ msgstr "STOCK_QUIT"
-
-#~ msgid "STOCK_CANCEL"
-#~ msgstr "STOCK_CANCEL"
-
-#~ msgid "STOCK_NEW"
-#~ msgstr "STOCK_NEW"
-
-#~ msgid "STOCK_UNDERLINE"
-#~ msgstr "STOCK_UNDERLINE"
-
-#~ msgid "STOCK_PREFERENCES"
-#~ msgstr "STOCK_PREFERENCES"
-
-#~ msgid "LIFO"
-#~ msgstr "LIFO"
-
-#~ msgid "terp-account"
-#~ msgstr "terp-account"
-
-#~ msgid "STOCK_SORT_ASCENDING"
-#~ msgstr "STOCK_SORT_ASCENDING"
-
-#~ msgid "Revision"
-#~ msgstr "Revisión"
-
-#~ msgid "STOCK_MEDIA_FORWARD"
-#~ msgstr "STOCK_MEDIA_FORWARD"
-
-#~ msgid "STOCK_ZOOM_100"
-#~ msgstr "STOCK_ZOOM_100"
-
-#~ msgid "Return packing"
-#~ msgstr "Devolución de paquete"
-
-#~ msgid "Fill Inventory for specific location"
-#~ msgstr "Rellenar inventario para una determinada ubicación"
-
-#~ msgid "Amount"
-#~ msgstr "Cantidad"
-
-#~ msgid "Products Received"
-#~ msgstr "Productos recibidos"
-
-#~ msgid "Move History"
-#~ msgstr "Histórico movimientos"
-
-#~ msgid "Make Parcel"
-#~ msgstr "Hacer envíos parciales"
-
-#~ msgid "STOCK_GOTO_TOP"
-#~ msgstr "STOCK_GOTO_TOP"
-
-#~ msgid "STOCK_ABOUT"
-#~ msgstr "STOCK_ABOUT"
-
-#~ msgid "terp-hr"
-#~ msgstr "terp-hr"
-
-#~ msgid "terp-purchase"
-#~ msgstr "terp-purchase"
-
-#~ msgid "STOCK_DND"
-#~ msgstr "STOCK_DND"
-
-#~ msgid "Products Sent"
-#~ msgstr "Productos enviados"
-
-#~ msgid "STOCK_GOTO_FIRST"
-#~ msgstr "STOCK_GOTO_FIRST"
-
-#~ msgid "Serial"
-#~ msgstr "Nº serie"
-
-#~ msgid "STOCK_FLOPPY"
-#~ msgstr "STOCK_FLOPPY"
-
-#~ msgid "Stock location"
-#~ msgstr "Ubicación de existencias"
-
-#~ msgid "Unreceived Products"
-#~ msgstr "Productos no recibidos"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Include all childs for the location"
-#~ msgstr "Incluir todos los descendientes de la ubicación"
-
-#~ msgid "Track line"
-#~ msgstr "Línea de seguimiento"
-
-#~ msgid "STOCK_BOLD"
-#~ msgstr "STOCK_BOLD"
-
-#~ msgid "terp-graph"
-#~ msgstr "terp-graph"
-
-#~ msgid "Stock Level 1"
-#~ msgstr "Nivel de Existencias 1"
-
-#~ msgid "STOCK_MEDIA_REWIND"
-#~ msgstr "STOCK_MEDIA_REWIND"
-
-#~ msgid "Stock Properties"
-#~ msgstr "Propiedades de stock"
-
-#~ msgid "Draft Moves"
-#~ msgstr "Movimientos borrador"
-
-#~ msgid "Product Id"
-#~ msgstr "Id producto"
-
-#~ msgid "Customer Invoice"
-#~ msgstr "Factura de cliente"
-
-#~ msgid "Force to use a Production Lot during production order"
-#~ msgstr ""
-#~ "Fuerza a utilizar un lote de producción durante la orden de producción"
-
-#~ msgid "STOCK_CUT"
-#~ msgstr "STOCK_CUT"
-
-#~ msgid ""
-#~ "For the current product (template), this stock location will be used, "
-#~ "instead of the default one, as the source location for stock moves generated "
-#~ "when you do an inventory"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de existencia se "
-#~ "utilizará, en lugar de la por defecto, como la ubicación origen para "
-#~ "movimientos de stock generados cuando realice un inventario"
-
-#~ msgid "This account will be used to value the output stock"
-#~ msgstr "Esta cuenta será utilizada para calcular las salidas de existencias"
-
-#~ msgid "STOCK_ZOOM_FIT"
-#~ msgstr "STOCK_ZOOM_FIT"
-
-#~ msgid ""
-#~ "This journal will be used for the accounting move generated by stock move"
-#~ msgstr ""
-#~ "Este diario será utilizado para contabilizar un movimiento generado por un "
-#~ "movimiento de Existencias"
-
-#~ msgid "Calendar of Deliveries"
-#~ msgstr "Calendario de entregas"
-
-#~ msgid "STOCK_SAVE_AS"
-#~ msgstr "STOCK_SAVE_AS"
-
-#~ msgid "STOCK_DIALOG_ERROR"
-#~ msgstr "STOCK_DIALOG_ERROR"
-
-#~ msgid "Latest Date of Inventory"
-#~ msgstr "Última fecha de inventario"
-
-#~ msgid "STOCK_INDEX"
-#~ msgstr "STOCK_INDEX"
-
-#~ msgid "STOCK_GOTO_BOTTOM"
-#~ msgstr "STOCK_GOTO_BOTTOM"
-
-#~ msgid "Tracking Lot"
-#~ msgstr "Lote de seguimiento"
-
-#~ msgid "STOCK_GO_FORWARD"
-#~ msgstr "STOCK_GO_FORWARD"
-
-#~ msgid "STOCK_UNDELETE"
-#~ msgstr "STOCK_UNDELETE"
-
-#~ msgid "STOCK_EXECUTE"
-#~ msgstr "STOCK_EXECUTE"
-
-#~ msgid "STOCK_DIALOG_QUESTION"
-#~ msgstr "STOCK_DIALOG_QUESTION"
-
-#~ msgid "Tracking/Serial"
-#~ msgstr "Seguimiento/Número de serie"
-
-#~ msgid "STOCK_SELECT_FONT"
-#~ msgstr "STOCK_SELECT_FONT"
-
-#~ msgid "STOCK_PASTE"
-#~ msgstr "STOCK_PASTE"
-
-#~ msgid ""
-#~ "Tracking lot is the code that will be put on the logistical unit/pallet"
-#~ msgstr ""
-#~ "Lote de seguimiento es el código que se colocará en la unidad/palet "
-#~ "logístico."
-
-#~ msgid "Tracking Number"
-#~ msgstr "Número seguimiento"
-
-#~ msgid "terp-stock"
-#~ msgstr "terp-stock"
-
-#~ msgid "Packing List:"
-#~ msgstr "Albarán:"
-
-#~ msgid "STOCK_MEDIA_RECORD"
-#~ msgstr "STOCK_MEDIA_RECORD"
-
-#~ msgid "Non Assigned Products:"
-#~ msgstr "Productos no asignados:"
-
-#~ msgid "terp-report"
-#~ msgstr "terp-report"
-
-#~ msgid "Location Content (With children)"
-#~ msgstr "Contenido ubicación (con hijos)"
-
-#~ msgid "STOCK_FILE"
-#~ msgstr "STOCK_FILE"
-
-#~ msgid "STOCK_EDIT"
-#~ msgstr "STOCK_EDIT"
-
-#~ msgid "STOCK_CONNECT"
-#~ msgstr "STOCK_CONNECT"
-
-#~ msgid "STOCK_GO_DOWN"
-#~ msgstr "STOCK_GO_DOWN"
-
-#~ msgid "STOCK_OK"
-#~ msgstr "STOCK_OK"
-
-#~ msgid "New Internal Packing"
-#~ msgstr "Nuevo albarán interno"
-
-#~ msgid "Finished products"
-#~ msgstr "Productos finalizados"
-
-#~ msgid "Date create"
-#~ msgstr "Fecha creación"
-
-#~ msgid "Set to Zero"
-#~ msgstr "Fijar a cero"
-
-#~ msgid "All Stock Moves"
-#~ msgstr "Todos los movimientos de stock"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "STOCK_HELP"
-#~ msgstr "STOCK_HELP"
-
-#~ msgid "This account will be used to value the input stock"
-#~ msgstr "Esta cuenta será utilizada para calcular el stock de entrada"
-
-#, python-format
-#~ msgid "Invoice state"
-#~ msgstr "Estado de la factura"
-
-#~ msgid "STOCK_UNDO"
-#~ msgstr "STOCK_UNDO"
-
-#~ msgid "Date Created"
-#~ msgstr "Fecha creación"
-
-#~ msgid "STOCK_GO_BACK"
-#~ msgstr "STOCK_GO_BACK"
-
-#~ msgid "STOCK_JUSTIFY_FILL"
-#~ msgstr "STOCK_JUSTIFY_FILL"
-
-#~ msgid "Allocation Method"
-#~ msgstr "Método asignación"
-
-#~ msgid "terp-administration"
-#~ msgstr "terp-administration"
-
-#~ msgid "STOCK_APPLY"
-#~ msgstr "STOCK_APPLY"
-
-#, python-format
-#~ msgid "Please select at least two inventories."
-#~ msgstr "Por favor, seleccione por lo menos dos inventarios."
-
-#~ msgid "Dest. Address"
-#~ msgstr "Dirección destinatario"
-
-#~ msgid "Periodical Inventory"
-#~ msgstr "Inventario periódico"
-
-#~ msgid "terp-crm"
-#~ msgstr "terp-crm"
-
-#~ msgid "STOCK_STRIKETHROUGH"
-#~ msgstr "STOCK_STRIKETHROUGH"
-
-#~ msgid "terp-partner"
-#~ msgstr "terp-partner"
-
-#~ msgid "Draft Periodical Inventories"
-#~ msgstr "Inventarios periódicos borrador"
-
-#~ msgid "STOCK_MISSING_IMAGE"
-#~ msgstr "STOCK_MISSING_IMAGE"
-
-#~ msgid "STOCK_SPELL_CHECK"
-#~ msgstr "STOCK_SPELL_CHECK"
-
-#~ msgid "Stock Tracking Lots"
-#~ msgstr "Lotes seguimiento de stock"
-
-#~ msgid "Origin Reference"
-#~ msgstr "Referencia origen"
-
-#~ msgid "Available Moves"
-#~ msgstr "Movimientos disponibles"
-
-#~ msgid "STOCK_HARDDISK"
-#~ msgstr "STOCK_HARDDISK"
-
-#~ msgid "Open Products"
-#~ msgstr "Abrir productos"
-
-#~ msgid "Input Packing List"
-#~ msgstr "Albaranes de entrada"
-
-#~ msgid "Packing List"
-#~ msgstr "Albarán"
-
-#~ msgid "STOCK_COPY"
-#~ msgstr "STOCK_COPY"
-
-#~ msgid "STOCK_CDROM"
-#~ msgstr "STOCK_CDROM"
-
-#~ msgid "Not from Packing"
-#~ msgstr "No a partir de albarán"
-
-#~ msgid "Internal Ref"
-#~ msgstr "Ref. interna"
-
-#~ msgid "STOCK_REFRESH"
-#~ msgstr "STOCK_REFRESH"
-
-#~ msgid "STOCK_STOP"
-#~ msgstr "STOCK_STOP"
-
-#~ msgid "STOCK_FIND_AND_REPLACE"
-#~ msgstr "STOCK_FIND_AND_REPLACE"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "STOCK_DIALOG_WARNING"
-#~ msgstr "STOCK_DIALOG_WARNING"
-
-#~ msgid "STOCK_ZOOM_IN"
-#~ msgstr "STOCK_ZOOM_IN"
-
-#~ msgid "STOCK_CONVERT"
-#~ msgstr "STOCK_CONVERT"
-
-#~ msgid "Move lines"
-#~ msgstr "Líneas de movimientos"
-
-#~ msgid "terp-calendar"
-#~ msgstr "terp-calendar"
-
-#~ msgid "STOCK_ITALIC"
-#~ msgstr "STOCK_ITALIC"
-
-#~ msgid "STOCK_YES"
-#~ msgstr "STOCK_YES"
-
-#~ msgid "Fill From Unreceived Products"
-#~ msgstr "Rellenar a partir de productos no recibidos"
-
-#~ msgid "Dest. Move"
-#~ msgstr "Mov. destino"
-
-#~ msgid "New Periodical Inventory"
-#~ msgstr "Nuevo inventario periódico"
-
-#~ msgid "FIFO"
-#~ msgstr "FIFO"
-
-#~ msgid "Delivery Orders to Process"
-#~ msgstr "Órdenes de entrega a procesar"
-
-#~ msgid "Invoice Status"
-#~ msgstr "Estado de facturación"
-
-#~ msgid "STOCK_JUSTIFY_LEFT"
-#~ msgstr "STOCK_JUSTIFY_LEFT"
-
-#~ msgid "Future Stock Forecast"
-#~ msgstr "Previsión de futuro stock"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Planned Date"
-#~ msgstr "Fecha prevista"
-
-#, python-format
-#~ msgid "No production sequence defined"
-#~ msgstr "No se ha definido una secuencia de producción"
-
-#~ msgid "STOCK_COLOR_PICKER"
-#~ msgstr "STOCK_COLOR_PICKER"
-
-#~ msgid "Lots by location"
-#~ msgstr "Lotes por ubicación"
-
-#~ msgid "STOCK_DELETE"
-#~ msgstr "STOCK_DELETE"
-
-#~ msgid "STOCK_CLEAR"
-#~ msgstr "STOCK_CLEAR"
-
-#~ msgid "Created Date"
-#~ msgstr "Fecha creación"
-
-#~ msgid "terp-mrp"
-#~ msgstr "terp-mrp"
-
-#~ msgid "STOCK_GO_UP"
-#~ msgstr "STOCK_GO_UP"
-
-#~ msgid "STOCK_SORT_DESCENDING"
-#~ msgstr "STOCK_SORT_DESCENDING"
-
-#~ msgid "Tracking Lots"
-#~ msgstr "Lotes seguimiento"
-
-#~ msgid "STOCK_HOME"
-#~ msgstr "STOCK_HOME"
-
-#~ msgid "STOCK_PROPERTIES"
-#~ msgstr "STOCK_PROPERTIES"
-
-#~ msgid "Create invoices"
-#~ msgstr "Crear facturas"
-
-#~ msgid "Set Stock to Zero"
-#~ msgstr "Fijar stock a cero"
-
-#~ msgid "STOCK_MEDIA_STOP"
-#~ msgstr "STOCK_MEDIA_STOP"
-
-#~ msgid "Make packing"
-#~ msgstr "Realizar albarán"
-
-#~ msgid "STOCK_DND_MULTIPLE"
-#~ msgstr "STOCK_DND_MULTIPLE"
-
-#~ msgid "STOCK_REMOVE"
-#~ msgstr "STOCK_REMOVE"
-
-#~ msgid "STOCK_DIALOG_AUTHENTICATION"
-#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
-
-#~ msgid "STOCK_ZOOM_OUT"
-#~ msgstr "STOCK_ZOOM_OUT"
-
-#~ msgid "Nearest"
-#~ msgstr "El más cercano"
-
-#~ msgid "STOCK_SELECT_COLOR"
-#~ msgstr "STOCK_SELECT_COLOR"
-
-#~ msgid "STOCK_PRINT"
-#~ msgstr "STOCK_PRINT"
-
-#~ msgid "STOCK_NO"
-#~ msgstr "STOCK_NO"
-
-#~ msgid "Workshop"
-#~ msgstr "Tienda"
-
-#~ msgid "STOCK_REDO"
-#~ msgstr "STOCK_REDO"
-
-#~ msgid "Tiny sprl"
-#~ msgstr "Tiny sprl"
-
-#~ msgid "STOCK_CLOSE"
-#~ msgstr "STOCK_CLOSE"
-
-#~ msgid "Force to use a Production Lot during deliveries"
-#~ msgstr "Fuerza a utilizar un lote de producción durante las entregas"
-
-#~ msgid "Split move lines in two"
-#~ msgstr "Dividir líneas de movimiento en dos"
-
-#~ msgid "Return"
-#~ msgstr "Devolver"
-
-#~ msgid "Auto-Packing"
-#~ msgstr "Auto-Empaquetado"
-
-#~ msgid "STOCK_JUMP_TO"
-#~ msgstr "STOCK_JUMP_TO"
-
-#~ msgid "terp-tools"
-#~ msgstr "terp-tools"
-
-#~ msgid "Location Overview"
-#~ msgstr "Vista general ubicaciones"
-
-#~ msgid "STOCK_DIALOG_INFO"
-#~ msgstr "STOCK_DIALOG_INFO"
-
-#~ msgid "Split move line"
-#~ msgstr "Partir línea de movimiento"
-
-#~ msgid "terp-sale"
-#~ msgstr "terp-sale"
-
-#~ msgid "STOCK_ADD"
-#~ msgstr "STOCK_ADD"
-
-#~ msgid "Chained Delay (days)"
-#~ msgstr "Retraso encadenado (días)"
-
-#~ msgid "STOCK_MEDIA_PAUSE"
-#~ msgstr "STOCK_MEDIA_PAUSE"
-
-#~ msgid "STOCK_PRINT_PREVIEW"
-#~ msgstr "STOCK_PRINT_PREVIEW"
-
-#~ msgid "STOCK_FIND"
-#~ msgstr "STOCK_FIND"
-
-#~ msgid "Tracking"
-#~ msgstr "Seguimiento"
-
-#~ msgid ""
-#~ "This account will be used, instead of the default one, to value input stock"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en lugar de la por defecto para valorar el stock de "
-#~ "entrada"
-
-#~ msgid "Components"
-#~ msgstr "Componentes"
-
-#~ msgid "Max. Planned Date"
-#~ msgstr "Fecha prevista máx."
-
-#~ msgid "STOCK_MEDIA_PLAY"
-#~ msgstr "STOCK_MEDIA_PLAY"
-
-#~ msgid "STOCK_OPEN"
-#~ msgstr "STOCK_OPEN"
-
-#~ msgid "STOCK_MEDIA_PREVIOUS"
-#~ msgstr "STOCK_MEDIA_PREVIOUS"
-
-#~ msgid "Stock Locations Structure"
-#~ msgstr "Estructura ubicaciones stock"
-
-#~ msgid "STOCK_DISCONNECT"
-#~ msgstr "STOCK_DISCONNECT"
-
-#~ msgid ""
-#~ "This account will be used, instead of the default one, to value output stock"
-#~ msgstr ""
-#~ "Esta cuenta será utilizada, en lugar de la por defecto, para calcular el "
-#~ "stock de salida"
-
-#~ msgid "Confirm (Do Not Process Now)"
-#~ msgstr "Confirmar (no procesar ahora)"
-
-#~ msgid "Moves Tracked"
-#~ msgstr "Seguimiento movimientos"
-
-#~ msgid "STOCK_NETWORK"
-#~ msgstr "STOCK_NETWORK"
-
-#~ msgid "terp-project"
-#~ msgstr "terp-project"
-
-#~ msgid "Stock by Lots"
-#~ msgstr "Stock por lotes"
-
-#~ msgid "STOCK_UNINDENT"
-#~ msgstr "STOCK_UNINDENT"
-
-#~ msgid "STOCK_GOTO_LAST"
-#~ msgstr "STOCK_GOTO_LAST"
-
-#~ msgid "STOCK_DIRECTORY"
-#~ msgstr "STOCK_DIRECTORY"
-
-#~ msgid ""
-#~ "For the current product (template), this stock location will be used, "
-#~ "instead of the default one, as the source location for stock moves generated "
-#~ "by production orders"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de stock se utilizará, "
-#~ "en lugar de la por defecto, como la ubicación origen para movimientos de "
-#~ "stock generados por órdenes de producción"
-
-#~ msgid "Add"
-#~ msgstr "Añadir"
-
-#~ msgid "STOCK_JUSTIFY_CENTER"
-#~ msgstr "STOCK_JUSTIFY_CENTER"
-
-#~ msgid "Set Stock to 0"
-#~ msgstr "Fijar stock a 0"
-
-#~ msgid "Localisation"
-#~ msgstr "Ubicación"
-
-#~ msgid "Do you want to set stocks to zero ?"
-#~ msgstr "¿Desea fijar stocks a cero?"
-
-#~ msgid "Direct Delivery"
-#~ msgstr "Entrega directa"
-
-#~ msgid "STOCK_REVERT_TO_SAVED"
-#~ msgstr "STOCK_REVERT_TO_SAVED"
-
-#~ msgid "Track Production Lots"
-#~ msgstr "Lotes seguimiento de producción"
-
-#~ msgid "Split in Two"
-#~ msgstr "Partir en dos"
-
-#~ msgid ""
-#~ "For the current product (template), this stock location will be used, "
-#~ "instead of the default one, as the source location for stock moves generated "
-#~ "by procurements"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de stock se utilizará, "
-#~ "en lugar de la por defecto, como la ubicación origen para movimientos de "
-#~ "stock generados por abastecimientos"
-
-#~ msgid "stock.picking.move.wizard"
-#~ msgstr "stock.picking.move.wizard"
-
-#~ msgid "Date Order"
-#~ msgstr "Fecha orden"
-
-#~ msgid "Supplier Invoice"
-#~ msgstr "Factura de proveedor"
-
-#, python-format
-#~ msgid "to be invoiced"
-#~ msgstr "Para facturar"
-
-#~ msgid "terp-product"
-#~ msgstr "terp-product"
-
-#~ msgid "Close"
-#~ msgstr "Cerrar"
-
-#~ msgid "Inventory Account"
-#~ msgstr "Cuenta inventario"
-
-#~ msgid "Set Stocks to Zero"
-#~ msgstr "Fijar stocks a cero"
-
-#~ msgid "Low Level"
-#~ msgstr "Nivel inferior"
-
-#~ msgid "STOCK_INDENT"
-#~ msgstr "STOCK_INDENT"
-
-#~ msgid "Delivery"
-#~ msgstr "Entrega"
-
-#~ msgid "Locations' Values"
-#~ msgstr "Valores ubicaciones"
-
-#~ msgid "STOCK_JUSTIFY_RIGHT"
-#~ msgstr "STOCK_JUSTIFY_RIGHT"
-
-#~ msgid "Inventory line"
-#~ msgstr "Línea de inventario"
-
-#~ msgid "Others info"
-#~ msgstr "Otras info."
-
-#~ msgid "STOCK_MEDIA_NEXT"
-#~ msgstr "STOCK_MEDIA_NEXT"
-
-#~ msgid "Move State"
-#~ msgstr "Estado de movimientos"
-
-#, python-format
-#~ msgid "Invoice is not created"
-#~ msgstr "No se ha creado factura"
-
-#, python-format
-#~ msgid "Invoice cannot be created from Packing."
-#~ msgstr "No se puede crear factura desde albaranes."
-
-#~ msgid "Future Delivery Orders"
-#~ msgstr "Órdenes de entrega futuras"
-
-#~ msgid ""
-#~ "This is used only if you selected a chained location type.\n"
-#~ "The 'Automatic Move' value will create a stock move after the current one "
-#~ "that will be validated automatically. With 'Manual Operation', the stock "
-#~ "move has to be validated by a worker. With 'Automatic No Step Added', the "
-#~ "location is replaced in the original move."
-#~ msgstr ""
-#~ "Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
-#~ "La opción 'Movimiento automático' creará un movimiento de stock después del "
-#~ "actual que se validará automáticamente. Con 'Operación manual', el "
-#~ "movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
-#~ "automático, paso no añadido', la ubicación se reemplaza en el movimiento "
-#~ "original."
-
-#~ msgid "Make Picking"
-#~ msgstr "Realizar albarán"
-
-#~ msgid "Packing result"
-#~ msgstr "Resultado albarán"
-
-#~ msgid "Available Packing"
-#~ msgstr "Albarán disponible"
-
-#~ msgid "Packing Done"
-#~ msgstr "Albarán realizado"
-
-#~ msgid "The packing has been successfully made !"
-#~ msgstr "¡El albarán ha sido realizado correctamente!"
-
-#~ msgid "Packing to Process"
-#~ msgstr "Albaranes a procesar"
-
-#~ msgid "Confirmed Packing Waiting Availability"
-#~ msgstr "Albarán confirmado esperando disponibilidad"
-
-#~ msgid "Partial packing"
-#~ msgstr "Albarán parcial"
-
-#~ msgid "Incoming Products"
-#~ msgstr "Albaranes de entrada"
-
-#~ msgid "Outgoing Products"
-#~ msgstr "Albaranes de salida"
-
-#~ msgid "Force to use a Production Lot during receptions"
-#~ msgstr "Fuerza a usar un lote de producción durante la recepción"
-
-#~ msgid "Print Item Labels"
-#~ msgstr "Imprimir etiquetas"
-
-#, python-format
-#~ msgid "Please select one and only one inventory !"
-#~ msgstr "¡ Por favor, seleccione un y sólo un inventario !"
-
-#, python-format
-#~ msgid "Invoice is already created."
-#~ msgstr "La factura ya está creada."
-
-#~ msgid "Units"
-#~ msgstr "Unidades"
-
-#~ msgid "Total :"
-#~ msgstr "Total:"
-
-#~ msgid ""
-#~ "Scheduled date for the movement of the products or real date if the move is "
-#~ "done."
-#~ msgstr ""
-#~ "Fecha programada para el movimiento de productos o fecha real si el "
-#~ "movimiento ha sido realizado."
-
-#~ msgid "New Reception Packing"
-#~ msgstr "Nuevo albarán de entrada"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Customer Refund"
-#~ msgstr "Factura rectificativa (abono) de cliente"
-
-#~ msgid "Move Lines"
-#~ msgstr "Líneas movimiento"
-
-#~ msgid "Supplier Refund"
-#~ msgstr "Factura rectificativa (abono) de proveedor"
-
-#~ msgid ""
-#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
-#~ "structured stock locations.\n"
-#~ "Thanks to the double entry management, the inventory controlling is powerful "
-#~ "and flexible:\n"
-#~ "* Moves history and planning,\n"
-#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
-#~ "* Stock valuation (standard or average price, ...)\n"
-#~ "* Robustness faced with Inventory differences\n"
-#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
-#~ "* Bar code supported\n"
-#~ "* Rapid detection of mistakes through double entry system\n"
-#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-#~ "    "
-#~ msgstr ""
-#~ "El módulo de inventario y logística de OpenERP puede gestionar multi-"
-#~ "almacenes y multi-ubicaciones jerárquicas de stock.\n"
-#~ "Gracias a la gestión de partida doble, el control de inventario es potente y "
-#~ "flexible:\n"
-#~ "* Historial de movimientos y planificación,\n"
-#~ "* Métodos de inventario diferentes (FIFO, LIFO ...)\n"
-#~ "* Valoración de existencias (estándar o precio medio ...)\n"
-#~ "* Robustez frente a las diferencias de inventario\n"
-#~ "* Reglas automáticas de abastecimiento (nivel de stock mínimo, JIT ...)\n"
-#~ "* Soporte a código de barras\n"
-#~ "* Detección rápida de errores a través de sistema de partida doble\n"
-#~ "* Trazabilidad (hacia arriba/abajo, lotes de producción, número de serie "
-#~ "...)\n"
-#~ "    "
-
-#, python-format
-#~ msgid "is consumed with"
-#~ msgstr "es consumido con"
-
-#, python-format
-#~ msgid "Product "
-#~ msgstr "Producto "
-
-#, python-format
-#~ msgid "is scheduled"
-#~ msgstr "está planificado"
-
-#, python-format
-#~ msgid "quantity."
-#~ msgstr "cantidad."
-
-#, python-format
-#~ msgid "INV: "
-#~ msgstr "INV: "
+msgstr ""
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index aeb34d4265e..4f8aedcd5a6 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -167,6 +167,7 @@ class report_stock_inventory(osv.osv):
               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.'),
         'location_type': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True),
+        'scrap_location': fields.boolean('scrap'),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_inventory')
@@ -177,7 +178,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
         to_char(m.date, 'YYYY') as year,
         to_char(m.date, 'MM') as month,
         m.partner_id as partner_id, m.location_id as location_id,
-        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type, l.scrap_location as scrap_location,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
 
@@ -194,14 +195,14 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id,  m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
+        m.prodlot_id, m.date, m.state, l.usage, l.scrap_location, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
         to_char(m.date, 'YYYY') as year,
         to_char(m.date, 'MM') as month,
         m.partner_id as partner_id, m.location_dest_id as location_id,
-        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type, l.scrap_location as scrap_location,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(pt.standard_price * m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as value,
@@ -217,7 +218,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
+        m.prodlot_id, m.date, m.state, l.usage, l.scrap_location, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
     )
 );
         """)
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 4c911dd6e7c..9b53ffd6d58 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -155,7 +155,7 @@
                     <field name="state"/>
                     <field name="location_type"/>
                     <field name="date"/>
-                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
+                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('scrap_location','=','True')]"/>
                 </group>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index f3abb9bbc95..9cc8553f4ea 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -2,6 +2,16 @@
 <openerp>
     <data>
 
+        <!-- After installation of the module, open the related menu -->
+        <record id="action_client_warehouse_menu" model="ir.actions.client">
+            <field name="name">Open Warehouse Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('menu_stock_root')}"/>
+        </record>
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_warehouse_menu"/>
+            <field name="state">open</field>
+        </record>
         <record id="view_stock_config_settings" model="ir.ui.view">
             <field name="name">stock settings</field>
             <field name="model">stock.config.settings</field>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index b0ae333a9ef..84b475adf1d 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -36,8 +36,8 @@ access_stock_report_tracklots,stock.report.tracklots,model_stock_report_tracklot
 access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,0,0,0
 access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,1
 access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,1
-access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,0,0,0
-access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,0,0,0
+access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,1,0,0
+access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,1,0,0
 access_account_invoice_user,account.invoice stock user,account.model_account_invoice,stock.group_stock_user,1,1,1,0
 access_account_invoice_line_user,account.invoice.line stock user,account.model_account_invoice_line,stock.group_stock_user,1,1,1,0
 access_account_invoice_tax_user,account.invoice.tax stock user,account.model_account_invoice_tax,stock.group_stock_user,1,1,1,0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index efd596684cb..8e1180352c2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -510,9 +510,13 @@ class stock_tracking(osv.osv):
         return self.name_get(cr, user, ids, context)
 
     def name_get(self, cr, uid, ids, context=None):
+        """Append the serial to the name"""
         if not len(ids):
             return []
-        res = [(r['id'], r['name']+' ['+(r['serial'] or '')+']') for r in self.read(cr, uid, ids, ['name', 'serial'], context)]
+        res = [ (r['id'], r['serial'] and '%s [%s]' % (r['name'], r['serial'])
+                                      or r['name'] )
+                for r in self.read(cr, uid, ids, ['name', 'serial'],
+                                   context=context) ]
         return res
 
     def unlink(self, cr, uid, ids, context=None):
@@ -644,7 +648,7 @@ class stock_picking(osv.osv):
         ),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  store=True, type='datetime', string='Scheduled Date', select=1, help="Scheduled date for the shipment to be processed"),
-        'date': fields.datetime('Order Date', help="Date of order", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+        'date': fields.datetime('Date', help="Creation date, usually the date of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'date_done': fields.datetime('Date Done', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
@@ -675,6 +679,7 @@ class stock_picking(osv.osv):
     def action_process(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        """Open the partial picking wizard"""
         context.update({
             'active_model': self._name,
             'active_ids': ids,
@@ -723,6 +728,7 @@ class stock_picking(osv.osv):
         return {}
 
     def action_explode(self, cr, uid, moves, context=None):
+        """Hook to allow other modules to split the moves of a picking."""
         return moves
 
     def action_confirm(self, cr, uid, ids, context=None):
@@ -864,14 +870,20 @@ class stock_picking(osv.osv):
     # TODO: change and create a move if not parents
     #
     def action_done(self, cr, uid, ids, context=None):
-        """ Changes picking state to done.
+        """Changes picking state to done.
+        
+        This method is called at the end of the workflow by the activity "done".
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def action_move(self, cr, uid, ids, context=None):
-        """ Changes move state to assigned.
+        """Process the Stock Moves of the Picking
+        
+        This method is called by the workflow by the activity "move".
+        Normally that happens when the signal button_done is received (button 
+        "Done" pressed on a Picking view). 
         @return: True
         """
         for pick in self.browse(cr, uid, ids, context=context):
@@ -1274,9 +1286,14 @@ class stock_picking(osv.osv):
             for move in too_few:
                 product_qty = move_product_qty[move.id]
                 if not new_picking:
+                    new_picking_name = pick.name
+                    self.write(cr, uid, [pick.id], 
+                               {'name': sequence_obj.get(cr, uid,
+                                            'stock.picking.%s'%(pick.type)),
+                               })
                     new_picking = self.copy(cr, uid, pick.id,
                             {
-                                'name': sequence_obj.get(cr, uid, 'stock.picking.%s'%(pick.type)),
+                                'name': new_picking_name,
                                 'move_lines' : [],
                                 'state':'draft',
                             })
@@ -1296,9 +1313,10 @@ class stock_picking(osv.osv):
                     move_obj.copy(cr, uid, move.id, defaults)
                 move_obj.write(cr, uid, [move.id],
                         {
-                            'product_qty' : move.product_qty - partial_qty[move.id],
+                            'product_qty': move.product_qty - partial_qty[move.id],
                             'product_uos_qty': move.product_qty - partial_qty[move.id], #TODO: put correct uos_qty
-
+                            'prodlot_id': False,
+                            'tracking_id': False,
                         })
 
             if new_picking:
@@ -1343,6 +1361,22 @@ class stock_picking(osv.osv):
             res[pick.id] = {'delivered_picking': delivered_pack.id or False}
 
         return res
+    
+    # views associated to each picking type
+    _VIEW_LIST = {
+        'out': 'view_picking_out_form',
+        'in': 'view_picking_in_form',
+        'internal': 'view_picking_form',
+    }
+    def _get_view_id(self, cr, uid, type):
+        """Get the view id suiting the given type
+        
+        @param type: the picking type as a string
+        @return: view i, or False if no view found
+        """
+        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 
+            'stock', self._VIEW_LIST.get(type, 'view_picking_form'))            
+        return res and res[1] or False
 
     def log_picking(self, cr, uid, ids, context=None):
         """ This function will create log messages for picking.
@@ -1353,7 +1387,6 @@ class stock_picking(osv.osv):
         """
         if context is None:
             context = {}
-        data_obj = self.pool.get('ir.model.data')
         for pick in self.browse(cr, uid, ids, context=context):
             msg=''
             if pick.auto_picking:
@@ -1363,11 +1396,6 @@ class stock_picking(osv.osv):
                 'in':_('Reception'),
                 'internal': _('Internal picking'),
             }
-            view_list = {
-                'out': 'view_picking_out_form',
-                'in': 'view_picking_in_form',
-                'internal': 'view_picking_form',
-            }
             message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
             if pick.min_date:
                 msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
@@ -1379,8 +1407,7 @@ class stock_picking(osv.osv):
                 'auto': _('is waiting.'),
                 'draft': _('is in draft state.'),
             }
-            res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form'))
-            context.update({'view_id': res and res[1] or False})
+            context['view_id'] = self._get_view_id(cr, uid, pick.type)
             message += state_list[pick.state]
         return True
 
@@ -1620,7 +1647,8 @@ class stock_move(osv.osv):
                    (move.product_id.track_production and move.location_id.usage == 'production') or \
                    (move.product_id.track_production and move.location_dest_id.usage == 'production') or \
                    (move.product_id.track_incoming and move.location_id.usage == 'supplier') or \
-                   (move.product_id.track_outgoing and move.location_dest_id.usage == 'customer') \
+                   (move.product_id.track_outgoing and move.location_dest_id.usage == 'customer') or \
+                   (move.product_id.track_incoming and move.location_id.usage == 'inventory') \
                )):
                 return False
         return True
@@ -1642,7 +1670,16 @@ class stock_move(osv.osv):
         'date_expected': fields.datetime('Scheduled Date', states={'done': [('readonly', True)]},required=True, select=True, help="Scheduled date for the processing of this move"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
 
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True,states={'done': [('readonly', True)]}),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'),
+            required=True,states={'done': [('readonly', True)]},
+            help="This is the quantity of products from an inventory "
+                "point of view. For moves in the state 'done', this is the "
+                "quantity of products that were actually moved. For other "
+                "moves, this is the quantity of product that is planned to "
+                "be moved. Lowering this quantity does not generate a "
+                "backorder. Changing this quantity on assigned moves affects "
+                "the product reservation, and should be done with care."
+        ),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,states={'done': [('readonly', True)]}),
         'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product Unit of Measure'), states={'done': [('readonly', True)]}),
         'product_uos': fields.many2one('product.uom', 'Product UOS', states={'done': [('readonly', True)]}),
@@ -1677,7 +1714,7 @@ class stock_move(osv.osv):
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
-        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order", select=True),
+        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order of", select=True),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Source", store=True),
 
         # used for colors in tree views:
@@ -1863,19 +1900,32 @@ class stock_move(osv.osv):
         result = {
                   'product_uos_qty': 0.00
           }
+        warning = {}
 
         if (not product_id) or (product_qty <=0.0):
+            result['product_qty'] = 0.0
             return {'value': result}
 
         product_obj = self.pool.get('product.product')
         uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
+        
+        # Warn if the quantity was decreased 
+        if ids:
+            for move in self.read(cr, uid, ids, ['product_qty']):
+                if product_qty < move['product_qty']:
+                    warning.update({
+                       'title': _('Information'),
+                       'message': _("By changing this quantity here, you accept the "
+                                "new quantity as complete: OpenERP will not "
+                                "automatically generate a back order.") })
+                break
 
         if product_uos and product_uom and (product_uom != product_uos):
             result['product_uos_qty'] = product_qty * uos_coeff['uos_coeff']
         else:
             result['product_uos_qty'] = product_qty
 
-        return {'value': result}
+        return {'value': result, 'warning': warning}
 
     def onchange_uos_quantity(self, cr, uid, ids, product_id, product_uos_qty,
                           product_uos, product_uom):
@@ -1889,19 +1939,30 @@ class stock_move(osv.osv):
         result = {
                   'product_qty': 0.00
           }
+        warning = {}
 
         if (not product_id) or (product_uos_qty <=0.0):
+            result['product_uos_qty'] = 0.0
             return {'value': result}
 
         product_obj = self.pool.get('product.product')
         uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
+        
+        # Warn if the quantity was decreased 
+        for move in self.read(cr, uid, ids, ['product_uos_qty']):
+            if product_uos_qty < move['product_uos_qty']:
+                warning.update({
+                   'title': _('Warning: No Back Order'),
+                   'message': _("By changing the quantity here, you accept the "
+                                "new quantity as complete: OpenERP will not "
+                                "automatically generate a Back Order.") })
+                break
 
         if product_uos and product_uom and (product_uom != product_uos):
             result['product_qty'] = product_uos_qty / uos_coeff['uos_coeff']
         else:
             result['product_qty'] = product_uos_qty
-
-        return {'value': result}
+        return {'value': result, 'warning': warning}
 
     def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False,
                             loc_dest_id=False, partner_id=False):
@@ -1927,7 +1988,8 @@ class stock_move(osv.osv):
             'product_uom': product.uom_id.id,
             'product_uos': uos_id,
             'product_qty': 1.00,
-            'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty']
+            'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty'],
+            'prodlot_id' : False,
         }
         if not ids:
             result['name'] = product.partner_ref
@@ -2114,6 +2176,10 @@ class stock_move(osv.osv):
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'assigned'})
+        wf_service = netsvc.LocalService('workflow')
+        for move in self.browse(cr, uid, ids, context):
+            if move.picking_id:
+                wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
         return True
 
     def cancel_assign(self, cr, uid, ids, context=None):
@@ -2490,8 +2556,6 @@ class stock_move(osv.osv):
                 'tracking_id': move.tracking_id.id,
                 'prodlot_id': move.prodlot_id.id,
             }
-            if move.location_id.usage <> 'internal':
-                default_val.update({'location_id': move.location_dest_id.id})
             new_move = self.copy(cr, uid, move.id, default_val)
 
             res += [new_move]
@@ -2505,6 +2569,7 @@ class stock_move(osv.osv):
         return res
 
     # action_split function is not used anywhere
+    # FIXME: deprecate this method
     def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
         """ Split Stock Move lines into production lot which specified split by quantity.
         @param cr: the database cursor
@@ -2709,8 +2774,10 @@ class stock_move(osv.osv):
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, [move.id],
                     {
-                        'product_qty' : move.product_qty - product_qty,
-                        'product_uos_qty':move.product_qty - product_qty,
+                        'product_qty': move.product_qty - product_qty,
+                        'product_uos_qty': move.product_qty - product_qty,
+                        'prodlot_id': False,
+                        'tracking_id': False,
                     })
 
 
@@ -2749,7 +2816,7 @@ class stock_inventory(osv.osv):
         'name': fields.char('Inventory Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date': fields.datetime('Creation Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_done': fields.datetime('Date done'),
-        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
+        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
         'state': fields.selection( (('draft', 'Draft'), ('cancel','Cancelled'), ('confirm','Confirmed'), ('done', 'Done')), 'Status', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -2896,11 +2963,11 @@ class stock_inventory_line(osv.osv):
         @return:  Dictionary of changed values
         """
         if not product:
-            return {'value': {'product_qty': 0.0, 'product_uom': False}}
+            return {'value': {'product_qty': 0.0, 'product_uom': False, 'prod_lot_id': False}}
         obj_product = self.pool.get('product.product').browse(cr, uid, product)
         uom = uom or obj_product.uom_id.id
         amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom, 'to_date': to_date, 'compute_child': False})[product]
-        result = {'product_qty': amount, 'product_uom': uom}
+        result = {'product_qty': amount, 'product_uom': uom, 'prod_lot_id': False}
         return {'value': result}
 
 stock_inventory_line()
@@ -2945,7 +3012,7 @@ class stock_picking_in(osv.osv):
     _name = "stock.picking.in"
     _inherit = "stock.picking"
     _table = "stock_picking"
-    _description = "Incomming Shipments"
+    _description = "Incoming Shipments"
 
     def check_access_rights(self, cr, uid, operation, raise_exception=True):
         #override in order to redirect the check of acces rights on the stock.picking object
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 83fed186f42..d991e811777 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -759,26 +759,26 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_edit_only"/>
                     <h1>
-                        <field name="name" class="oe_inline"/>
+                        <field name="name" class="oe_inline" attrs="{'invisible': [('name','=','/')]}" readonly="1"/>
                     </h1>
                     <group>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
-                            <field name="backorder_id" readonly="1"/>
+                            <field name="backorder_id" readonly="1" attrs="{'invisible': [('backorder_id','=',False)]}"/>
                             <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice" attrs="{'invisible':[('invoice_state', '=', 'none')]}"/>
                             <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                         <group>
                             <field name="date"/>
-                            <field name="min_date" readonly="1"/>
+                            <field name="min_date" readonly="1" attrs="{'invisible': [('min_date','=',False)]}"/>
                             <field name="origin" placeholder="e.g. PO0032" class="oe_inline"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Products">
                             <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
+                            <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
                         </page>
                         <page string="Additional Info">
                             <group>
@@ -793,9 +793,6 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Notes">
-                            <field name="note" placeholder="Add an internal note..."/>
-                        </page>
                     </notebook>
                 </sheet>
                 </form>
@@ -913,10 +910,11 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
                     </xpath>
                     <xpath expr="//field[@name='move_lines']" position="replace">
-                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
+                        <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
+                            <field name="message_is_follower" invisible="1"/>
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                             <field name="message_follower_ids" widget="mail_followers"/>
                         </div>
@@ -1043,6 +1041,7 @@
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
+                            <field name="message_is_follower" invisible="1"/>
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                             <field name="message_follower_ids" widget="mail_followers"/>
                         </div>
@@ -1120,7 +1119,7 @@
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
+            <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel';red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
                     <field name="name"/>
@@ -1494,7 +1493,7 @@
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{'product_receive': True, 'search_default_future': True, 'picking_type': 'in'}</field>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
                 Click to register a product reception. 
               </p><p>
                 Here you can receive individual products, no matter what
@@ -1629,6 +1628,9 @@
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{'picking_type': 'out', 'search_default_future': True}</field>
             <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to register a product delivery.
+              </p>
               <p>
                 You will find in this list all products you have to deliver to
                 your customers. You can process the deliveries directly from
@@ -1694,7 +1696,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
                 Click to create a new journal. 
               </p><p>
                 The stock journal system allows you to assign each stock
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 9b730d22982..11907b674a1 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -109,16 +109,17 @@ class stock_fill_inventory(osv.osv_memory):
             for move in move_obj.browse(cr, uid, move_ids, context=context):
                 lot_id = move.prodlot_id.id
                 prod_id = move.product_id.id
-                if move.location_dest_id.id == location:
-                    qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
-                else:
-                    qty = -uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                if move.location_dest_id.id != move.location_id.id:
+                    if move.location_dest_id.id == location:
+                        qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                    else:
+                        qty = -uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
 
 
-                if datas.get((prod_id, lot_id)):
-                    qty += datas[(prod_id, lot_id)]['product_qty']
+                    if datas.get((prod_id, lot_id)):
+                        qty += datas[(prod_id, lot_id)]['product_qty']
 
-                datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
+                    datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
 
             if datas:
                 flag = True
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 2cf0a743faa..61ae519f65f 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -65,6 +65,7 @@ class stock_partial_picking_line(osv.TransientModel):
 
 class stock_partial_picking(osv.osv_memory):
     _name = "stock.partial.picking"
+    _rec_name = 'picking_id'
     _description = "Partial Picking Processing Wizard"
 
     def _hide_tracking(self, cursor, user, ids, name, arg, context=None):
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 45916e04aee..25137f6303c 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -72,7 +72,7 @@ class subscription_subscription(osv.osv):
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status'),
         'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
-        'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription"),
+        'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription", states={'running':[('readonly',True)], 'done':[('readonly',True)]}),
         'note': fields.text('Notes', help="Description or Summary of Subscription"),
     }
     _defaults = {
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 2426ae5eeed..f618a95cccf 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -145,10 +145,14 @@ class survey(osv.osv):
         return report
 
     def fill_survey(self, cr, uid, ids, context=None):
-        sur_obj = self.read(cr, uid, ids,['title'], context=context)
+        sur_obj = self.read(cr, uid, ids,['title', 'page_ids'], context=context)
         for sur in sur_obj:
             name = sur['title']
-            context.update({'active':False,'survey_id': ids[0]})
+            pages = sur['page_ids']
+            if not pages:
+                raise osv.except_osv(_('Warning!'), _('This survey has no question defined. Please define the questions and answers first.'))
+            else:
+                context.update({'active':False,'survey_id': ids[0]})
         return {
             'view_type': 'form',
             'view_mode': 'form',