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_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c74ca5f833a..36aa8660bc4 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -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")
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..78b76e5c9b7 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -284,6 +284,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 +402,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 +434,6 @@
                             <field name="type" invisible="True"/>
                         </group>
                     </group>
-
                     <notebook>
                         <page string="Payment Information" groups="base.group_user">
                         	<label for="line_cr_ids"/>
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_lead.py b/addons/crm/crm_lead.py
index d8b7fb58e49..d3f7e1d77ef 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
 
@@ -790,7 +794,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_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/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/event/event_view.xml b/addons/event/event_view.xml
index fd396053d5d..40019513126 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"
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/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5d4c2ae9d45..6e23a714848 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -350,10 +350,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>
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..ca90e98e516 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>
 
@@ -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>
@@ -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..388e5262f6e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -195,12 +195,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_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ef3c0ea2e9f..3ba9467395e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -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_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_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/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/security/mail_security.xml b/addons/mail/security/mail_security.xml
index a12314e6f25..1d6d8d90579 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -4,7 +4,7 @@
 
         <!-- CATEGORY -->
         <record model="ir.module.category" id="module_category_social">
-            <field name="name">Social and Sharing Tools</field>
+            <field name="name">Home</field>
             <field name="parent_id" ref="base.module_category_tools"/>
             <field name="sequence">26</field>
         </record>
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index cf33bd64640..d1dd9f89fb7 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);
         },
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 32ce34d48d1..cf31ab3e24c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -11,6 +11,11 @@
             <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>
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/mrp/mrp.py b/addons/mrp/mrp.py
index 94ee4bdb3b2..049c7c712fb 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -461,7 +461,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",
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d05893cf778..c003711ceb1 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"/>
@@ -513,7 +513,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 +529,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"
@@ -644,7 +656,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"/>
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/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/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index bd73af6c2cd..6d27b527383 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -1,17 +1,36 @@
-.oe_pad_head {
-    box-sizing: border-box;
-    width: 100%;
-    display: block;
-    padding: 4px;
-    text-align: right;
-}
-.oe_pad_head .oe_pad_switch {
-    
+.oe_pad {
+    margin-top: 16px;
 }
 
-.oe_pad_readonly {
-    border: 1px solid #ddd;
-    padding: 8px;
+.oe_pad_switch_positioner {
+    position: relative;
+}
+
+.oe_pad_switch {
+    position: absolute;
+    top: 5px;
+    left: 383px;
+    width: 28px;
+    height: 28px;
+    background-image: -webkit-linear-gradient(top, white, #f0f0f0);
+    border: solid 1px #ccc;
+    border-radius:3px;
+    text-align: center;
+    line-height: 22px;
+    overflow: hidden;
+    -webkit-box-sizing: border-box;
+    color: #666666;
+    padding-top:-3px;
+    padding-left:-1px;
+    cursor: pointer;
+}
+
+.oe_pad_switch:hover{
+    background-image: -webkit-linear-gradient(top, #f4f4f4, #e4e4e4);
+}
+
+.oe_pad_fullscreen .oe_pad_switch {
+    top:4px;
 }
 
 .oe_pad_fullscreen {
@@ -27,9 +46,9 @@
     z-index: 1000;
 }
 
-.oe_pad_content {
+.oe_pad.oe_configured .oe_pad_content.oe_editing{
     border: solid 1px #c4c4c4;
-    height: 150px;
+    height:300px;
     -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
        -moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
         -ms-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
@@ -37,12 +56,7 @@
             box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 }
 
-.oe_pad_content > p {
-    text-align: center;
-    opacity: 0.75;
-}
-
-.oe_pad_fullscreen .oe_pad_content {
+.oe_pad.oe_configured.oe_pad_fullscreen .oe_pad_content {
     height: 100%;
     border: none;
     -webkit-box-shadow: none;
@@ -52,6 +66,16 @@
             box-shadow: none;
 }
 
+.oe_pad.oe_unconfigured > p {
+    text-align: center;
+    opacity: 0.75;
+}
+
+.oe_pad_loading{
+    text-align: center;
+    opacity: 0.75;
+}
+
 .etherpad_readonly ul, .etherpad_readonly ol {
     margin-before: 1em;
     margin-after: 1em;
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index e598ecca4f5..1e45b535867 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,62 +1,61 @@
 openerp.pad = function(instance) {
+    
+    instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
+        template: 'FieldPad',
+        configured: false,
+        content: "",
+        set_value: function(val) {
+            var self = this;
+            var _super = self._super;
+            _super.apply(self,[val]);
 
-instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
-    template: 'FieldPad',
-    start: function() {
-        this._super();
-        var self = this;
-        this.$el.find('div.oe_pad_head').click(function(ev) {
-            self.$el.toggleClass('oe_pad_fullscreen');
-        });
-        this.on("change:effective_readonly", this, function() {
-            this.render_value();
-        });
-    },
-    set_value: function(val) {
-        var self = this;
-        var _super = self._super;
-        _super.apply(self,[val]);
-
-        if (val === false || val === "") {
-            self.field_manager.dataset.call('pad_generate_url',{context:{
-                    model: self.field_manager.model,
-                    field_name: self.name,
-                    object_id: self.field_manager.datarecord.id
-                }}).then(function(data) {
-                if(data&&data.url){
-                    _super.apply(self,[data.url]);
-                    self.render_value();
-                }
-            });
-        } else {
-            self.render_value();
-        }
-        this._dirty_flag = true;
-    },
-    render_value: function() {
-        var self = this;
-        var value = this.get('value');
-
-        if (!_.str.startsWith(value, "http")) {
-            self.$('.oe_pad_content').html(instance.web.qweb.render('FieldPad.unconfigured'));
-        } else {
-            if (!this.get("effective_readonly")) {
-                var pad_username = this.session.username;
-                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+pad_username+'"></iframe>';
-                this.$('.oe_pad_content').html(code);
-            } else {
-                $.get(value+'/export/html').success(function(data) {
-                    self.$('.oe_pad_content').html('<div class="oe_pad_readonly">'+data+'</div>');
-                }).error(function() {
-                    self.$('.oe_pad_content').text('Unable to load pad');
+            if (val === false || val === "") {
+                self.field_manager.dataset.call('pad_generate_url',{context:{
+                        model: self.field_manager.model,
+                        field_name: self.name,
+                        object_id: self.field_manager.datarecord.id
+                    }}).then(function(data) {
+                    if(data&&data.url){
+                        _super.apply(self,[data.url]);
+                        self.renderElement();
+                    }
                 });
+            } else {
+                self.renderElement();
             }
-        }
-    },
-});
-
-instance.web.form.widgets = instance.web.form.widgets.extend({
-    'pad': 'instance.web.form.FieldPad',
-});
+            this._dirty_flag = true;
+        },
+        renderElement: function(){
+            var self  = this;
+            var value = this.get('value');
+            if(!_.str.startsWith(value,'http')){
+                this.configured = false;
+                this.content = "";
+            }else{
+                this.configured = true;
+                if(!this.get('effective_readonly')){
+                    this.content = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+this.session.username+'"></iframe>';
+                }else{
+                    this.content = '<div class="oe_pad_loading">... Loading pad ...</div>';
+                    $.get(value+'/export/html').success(function(data){
+                        self.$('.oe_pad_content').html('<div class="oe_pad_readonly">'+data+'<div>');
+                    }).error(function(){
+                        self.$('.oe_pad_content').text('Unable to load pad');
+                    });
+                }
+            }
+            this._super();
+            this.$('.oe_pad_content').html(this.content);
+            this.$('.oe_pad_switch').click(function(){
+                self.$el.toggleClass('oe_pad_fullscreen');
+            });
+            this.on('change:effective_readonly',this,function(){
+                self.renderElement();
+            });
+        },
+    });
 
+    instance.web.form.widgets = instance.web.form.widgets.extend({
+        'pad': 'instance.web.form.FieldPad',
+    });
 };
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index 911655b6b89..eaa519dc04b 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -2,17 +2,35 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-<t t-name="FieldPad">
-    <div class="oe_form_field_text oe_pad">
-        <div class="oe_pad_head">
-            <button class="oe_pad_switch oe_button">Fullscreen</button>
-        </div>
-        <div class="oe_pad_content"></div>
-    </div>
-</t>
-<t t-name="FieldPad.unconfigured">
-    <p>
-    You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.<br/>
-    </p>
-</t>
+
+    <t t-name="FieldPad">
+
+        <t t-if="!widget.configured">
+            <div class="oe_form_field_text oe_pad oe_unconfigured">
+                <p>
+                    You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.
+                </p>
+            </div>
+        </t>
+
+        <t t-if="widget.configured">
+            <t t-if="widget.get('effective_readonly')">
+                <div class="oe_form_field_text oe_pad oe_configured">
+                    <div class="oe_pad_content etherpad_readonly">
+                    </div>
+                </div>
+            </t>
+
+            <t t-if="!widget.get('effective_readonly')">
+                <div class="oe_form_field_text oe_pad oe_configured">
+                    <div class="oe_pad_switch_positioner">
+                        <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
+                    </div>
+                    <div class="oe_pad_content oe_editing">
+                    </div>
+                </div>
+            </t>
+        </t>
+    </t>
+
 </templates>
diff --git a/addons/project/project.py b/addons/project/project.py
index 3572fd094b3..dbb579e2f7d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1100,6 +1100,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 +1113,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..4ce02f5a437 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">
@@ -153,7 +152,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <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>
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_view.xml b/addons/project_issue/project_issue_view.xml
index 8d54520261f..3214b93c8d3 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -340,13 +340,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_view.xml b/addons/project_long_term/project_long_term_view.xml
index 55a91b36f08..909f838a0f8 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>
@@ -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_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/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/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 ""