diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index ebbd5459cea..c538614fd0f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -159,6 +159,5 @@ for a particular financial year and for preparation of vouchers there is a modul
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0080331923549',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index ea903654a4e..17df4377548 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -117,6 +117,9 @@ class account_config_settings(osv.osv_memory):
         'group_multi_currency': fields.boolean('Allow multi currencies',
             implied_group='base.group_multi_currency',
             help="Allows you multi currency environment"),
+        'group_analytic_accounting': fields.boolean('Analytic accounting',
+            implied_group='analytic.group_analytic_accounting',
+            help="Allows you to use the analytic accounting."),
     }
 
     def _default_company(self, cr, uid, context=None):
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index d7618fbff5a..0e4b1fa64c4 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -129,6 +129,10 @@
                                 <field name="module_account_accountant" class="oe_inline"/>
                                 <label for="module_account_accountant"/>
                             </div>
+                            <div>
+                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <label for="group_analytic_accounting"/>
+                            </div>
                             <div>
                                 <field name="module_account_asset" class="oe_inline"/>
                                 <label for="module_account_asset"/>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 442b51466f8..4b90e0c8ad5 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -16,7 +16,7 @@
     </record>
 
     <record id="group_account_manager" model="res.groups">
-        <field name="name">Manager</field>
+        <field name="name">Financial Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 3c391d8d885..980f565b3e5 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -43,6 +43,5 @@ It assigns manager and user access rights to the Administrator and only user rig
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '00395091383933390541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index d7ed9c1ad13..e02db45fcd8 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -26,9 +26,11 @@
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
             <field name="subject">Accounting and Finance application installed!</field>
-            <field name="body">With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.
+            <field name="body"><![CDATA[
+                With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.
 
-The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</field>
+<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>
+            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 3e8c579b729..7675ef9f38e 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -47,7 +47,6 @@ Adds menu to show relevant information to each manager.You can also view the rep
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0042927202589',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index ef01867983a..213d055f8de 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -47,7 +47,6 @@ Allows to automatically select analytic accounts based on criterions:
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0074229833581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 675723f423a..af5b5654b99 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -79,7 +79,6 @@ The analytic plan validates the minimum and maximum percentage at the time of cr
     'test': ['test/acount_analytic_plans_report.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0036417675373',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 234d6fe0cf8..91caa6936bc 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -262,6 +262,7 @@ account_analytic_plan_instance()
 class account_analytic_plan_instance_line(osv.osv):
     _name = "account.analytic.plan.instance.line"
     _description = "Analytic Instance Line"
+    _rec_name = "analytic_account_id"
     _columns = {
         'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]),
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 330d0df0000..6482a110f1d 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -46,7 +46,6 @@ account.""",
     'data': ['product_view.xml',],
     'auto_install': False,
     'installable': True,
-    'certificate':'00557423080410733581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 928e87f1202..222178b940c 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -69,6 +69,5 @@ Three reports are available:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0043819694157',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index b1feedda55a..468840c19d5 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -38,9 +38,6 @@ If set to true it allows user to cancel entries & invoices.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '001101250473177981989',
-
-
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index 2c458ceb49f..8f619cd1471 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -36,6 +36,5 @@ Deactivates minimal chart of accounts.
     'data': [],
     'demo': [],
     'installable': True,
-    'certificate': '0073332443901',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/i18n/en_AU.po b/addons/account_coda/i18n/en_AU.po
new file mode 100644
index 00000000000..319220741c5
--- /dev/null
+++ b/addons/account_coda/i18n/en_AU.po
@@ -0,0 +1,3739 @@
+# English (Australia) 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: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-27 03:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Australia) <en_AU@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: 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
+msgid "Cash withdrawal on card (PROTON)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_412
+msgid "Advice of expiry charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_11
+msgid "Your purchase of luncheon vouchers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_05
+msgid "Partial payment subscription"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_54
+msgid "Unexecutable transfer order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_02
+msgid "Individual transfer order initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_21
+msgid "Charges for preparing pay packets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_9
+msgid "Detail of 7. The records in a separate application keep type 9."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_426
+msgid "Belgian broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_031
+msgid "Charges foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_002
+msgid "Interest paid"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.type,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_62
+msgid ""
+"cheques debited on account, but debit cancelled afterwards for lack of cover "
+"(double debit/contra-entry of transaction 01 or 05)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_05
+msgid "Bill claimed back"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_016
+msgid "BLIW/IBLC dues"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:911
+#, python-format
+msgid "CODA File is Imported  :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_066
+msgid "Fixed loan advance - reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_05
+msgid "Purchase of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:277
+#: code:addons/account_coda/wizard/account_coda_import.py:469
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Family : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_030
+msgid "Account insurance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_042
+msgid "Payment card costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_212
+msgid "Warehousing fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:300
+#, python-format
+msgid ""
+"Cannot delete CODA Bank Statement '%s' of Journal '%s'.\n"
+"The associated Bank Statement has already been confirmed !\n"
+"Please undo this action first!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_66
+msgid "Financial centralization"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_420
+msgid "Retention charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_50
+msgid "Transfer in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_87
+#: model:account.coda.trans.code,description:account_coda.actcc_04_87
+#: model:account.coda.trans.code,description:account_coda.actcc_05_87
+#: model:account.coda.trans.code,description:account_coda.actcc_07_87
+#: model:account.coda.trans.code,description:account_coda.actcc_09_87
+#: model:account.coda.trans.code,description:account_coda.actcc_11_87
+#: model:account.coda.trans.code,description:account_coda.actcc_13_87
+#: model:account.coda.trans.code,description:account_coda.actcc_30_87
+#: model:account.coda.trans.code,description:account_coda.actcc_35_87
+#: model:account.coda.trans.code,description:account_coda.actcc_41_87
+#: model:account.coda.trans.code,description:account_coda.actcc_43_87
+#: model:account.coda.trans.code,description:account_coda.actcc_47_87
+msgid "Reimbursement of costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_56
+msgid "Remittance of supplier's bill with guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_002
+msgid "Communication of the bank"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_70
+msgid "Only with stockbrokers when they deliver the securities to the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_413
+msgid "Acceptance charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:144
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_39
+msgid "Return of an irregular bill of exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_011
+msgid "VAT"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_09
+msgid "Debit of the agios to the account of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_comm_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_comm_type_form
+msgid "CODA Structured Communication Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_50
+msgid "Spot sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_58
+msgid "Remittance of supplier's bill without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_03
+msgid "Payment receipt card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_207
+msgid "Non-conformity fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_022
+msgid "Priority costs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:268
+#: code:addons/account_coda/wizard/account_coda_import.py:460
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_045
+msgid "Handling costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_13
+msgid "Debit customer, payment of agios, interest, exchange commission, etc."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_039
+msgid "Telecommunications"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:399
+#, python-format
+msgid "Delete operation not allowed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_000
+msgid "Net amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_11
+msgid "Department store cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_206
+msgid "Surety fee/payment under reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_53
+msgid "Cash deposit at an ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_52
+msgid "Forward sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_05
+msgid ""
+"Debit of the subscriber for the complementary payment of partly-paid shares"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_33
+#: model:account.coda.trans.code,description:account_coda.actcc_00_83
+msgid "Value correction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_27
+msgid "For publications of the financial institution"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_01
+msgid "Payment of foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_024
+msgid "Growth premium"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_13
+msgid "Discount foreign supplier's bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_05
+msgid "Direct debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_11
+msgid "Bills of lading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_00
+msgid "Undefined transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_62
+msgid "When reimbursed separately to the subscriber"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+msgid "CODA Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_067
+msgid "Fixed loan advance - extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_07
+msgid "Your repayment instalment credits"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_13
+msgid "On the account of the head office"
+msgstr ""
+
+#. module: account_coda
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_115
+msgid "Terminal cash deposit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:301
+#: code:addons/account_coda/wizard/account_coda_import.py:493
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid Structured Communication Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_01
+msgid ""
+"Debit of a cheque in foreign currency or in EUR in favour of a foreigner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_54
+msgid "Discount abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_62
+msgid "Remittance of documents abroad - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_35
+#: model:account.coda.trans.code,description:account_coda.actcc_00_85
+msgid "Correction"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:404
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No partner record assigned: There are multiple partners with the "
+"same Bank Account Number '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_33
+#: model:account.coda.trans.code,description:account_coda.actcc_30_83
+msgid "Value (date) correction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_063
+msgid "Rounding differences"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:295
+#: code:addons/account_coda/wizard/account_coda_import.py:487
+#, python-format
+msgid "Transaction Category unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+msgid "CODA Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_052
+msgid "Residence state tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_17
+msgid "Amount of the cheque; if any, charges receive code 37"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_120
+msgid "Correction of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_64
+#: model:account.coda.trans.code,description:account_coda.actcc_41_64
+msgid "Transfer to your account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_124
+msgid "Number of the credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_13
+msgid "Renting of safes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_bbacom:0
+msgid ""
+"Partner lookup via the 'BBA' Structured Communication field of the Invoice."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_104
+msgid "Equivalent in EUR"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_50
+msgid "Remittance of foreign bill credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_03
+msgid "Your purchase by payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_1
+msgid ""
+"Amount as totalised by the customer; e.g. a file regrouping payments of "
+"wages or payments made to suppliers or a file regrouping collections for "
+"which the customer is debited or credited with one single amount. As a "
+"matter of principle, this type is also used when no detailed data is "
+"following (type 5)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:519
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.type,type:0
+msgid "Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "Object to store CODA Data Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_029
+msgid "Protest charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_053
+#: model:account.coda.trans.code,description:account_coda.actcc_80_43
+msgid "Printing of forms"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_003
+msgid "Credit commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_58
+msgid "Remittance of foreign cheque credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_8
+msgid "Detail of 3."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_05_58
+msgid ""
+"(cancellation of an undue debit of the debtor at the initiative of the "
+"financial institution or the debtor for lack of cover)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_11
+msgid "Payable coupons/repayable securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_50
+msgid "Sale of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_51
+msgid "Transfer in your favour – initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_data:0
+#: field:account.coda.import,coda_data:0
+msgid "CODA File"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_38
+msgid "Provisionally unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_003
+msgid "RBP data"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_06
+msgid "Share option plan – exercising an option"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_051
+msgid "Withholding tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_006
+msgid "Information concerning the detail amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_37
+msgid "Costs relating to payment of foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,parent_id:0
+msgid "Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_66
+msgid "Retrocession of issue commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_68
+msgid "Credit after Proton payments"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:588
+#: code:addons/account_coda/wizard/account_coda_import.py:926
+#, python-format
+msgid "CODA Import failed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_01
+msgid ""
+"Withdrawal by counter cheque or receipt; cash remitted by the bank clerk"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_01
+msgid "Short-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_01
+msgid "Domestic or local SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_03
+msgid "Settlement credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_402
+msgid "Certification costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_015
+msgid "Correspondent charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_415
+#: model:account.coda.trans.code,description:account_coda.actcc_80_39
+msgid "Surety fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_017
+#: model:account.coda.trans.code,description:account_coda.actcc_80_23
+#: model:account.coda.trans.code,description:account_coda.actcc_80_41
+msgid "Research costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_07
+msgid "Collective transfer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:912
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Number of statements : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_05
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_07
+msgid ""
+"The principal will be debited for the total amount of the file entered."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:332
+#: code:addons/account_coda/wizard/account_coda_import.py:357
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_52
+msgid "Payment in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_08
+msgid "Registering compensation for savings accounts"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_51
+msgid "Company issues paper in return for cash"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,journal:0
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_19
+msgid "Settlement of credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_87
+msgid "Reimbursement of cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_50
+msgid "Settlement of instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_52
+msgid "Payment by a third person"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_60
+msgid "Remittance of documents abroad - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_52
+msgid "Loading GSM cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end_real:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_64
+msgid "Your issue"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:870
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Bank Journal: %s\n"
+"CODA Version: %s\n"
+"CODA Sequence Number: %s\n"
+"Paper Statement Sequence Number: %s\n"
+"Bank Account: %s\n"
+"Account Holder Name: %s\n"
+"Date: %s, Starting Balance:  %.2f, Ending Balance: %.2f%s"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_01
+msgid ""
+"Purchase of domestic or foreign securities, including subscription rights, "
+"certificates, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_38
+msgid "Costs relating to incoming foreign and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_52
+msgid "Whatever the currency of the security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_069
+msgid "Forward arbitrage contracts : sum to be supplied by customer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:388
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        There is no invoice matching the Structured Communication '%s'!\n"
+"        Please verify and adjust the invoice and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_407
+msgid "Costs Article 45"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_007
+msgid "Information concerning the detail cash"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+#: field:coda.bank.account,company_id:0
+#: field:coda.bank.statement,company_id:0
+#: field:coda.bank.statement.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_35
+msgid "Cash advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_47
+msgid "Foreign commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_15
+msgid ""
+"Hire-purchase agreement under which the financial institution is the lessor"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_66
+msgid "Remittance of cheque by your branch - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_50
+msgid "Credit of the remitter"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.category,category:0
+msgid "Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_09
+msgid "Purchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_52
+msgid "Remittance of foreign bill credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_061
+#: model:account.coda.trans.code,description:account_coda.actcc_80_47
+msgid "Charging fees for transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_category
+msgid "CODA transaction category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_21
+msgid "Other credit applications"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_009
+msgid "Travelling expenses"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_30
+msgid "Various transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_406
+msgid "Collection charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_50
+msgid "Cash payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_27
+msgid "Subscription fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_036
+msgid "Costs relating to a refused cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_101
+msgid "Credit transfer or cash payment with structured format communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_127
+msgid "European direct debit (SEPA)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_068
+msgid "Countervalue of an entry"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_010
+#: model:account.coda.trans.code,description:account_coda.actcc_80_31
+msgid "Writ service fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:635
+#, python-format
+msgid ""
+"\n"
+"The CODA Statement %s Starting Balance (%.2f) does not correspond with the "
+"previous Closing Balance (%.2f) in journal %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_13
+msgid "Your repurchase of issue"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_409
+msgid "Safe deposit charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_055
+msgid "Repayment loan or credit capital"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_05
+msgid "Settlement of fixed advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_15
+msgid ""
+"Commission collected to the debit of the customer to whom the bank delivers "
+"a key which gives access to the night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_059
+msgid "Default interest"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,coda_st_naming:0
+msgid ""
+"Define the rules to create the name of the Bank Statements generated by the "
+"CODA processing.\n"
+"E.g. %(code)s%(y)s/%(paper)s\n"
+"\n"
+"Variables:\n"
+"Bank Journal Code: %(code)s\n"
+"Current Year with Century: %(year)s\n"
+"Current Year without Century: %(y)s\n"
+"CODA sequence number: %(coda)s\n"
+"Paper Statement sequence number: %(paper)s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_108
+#: model:account.coda.trans.code,description:account_coda.actcc_35_01
+#: model:account.coda.trans.code,description:account_coda.actcc_35_50
+msgid "Closing"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_05
+msgid "Commercial paper claimed back"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_411
+msgid "Fixed collection charge"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_64
+msgid "Your winning lottery ticket"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_009
+msgid ""
+"Identification of the de ultimate ordering customer/debtor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_05
+msgid "Card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_03
+msgid "Payment card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_54
+msgid "Remittance of commercial paper for discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_01
+msgid "Payment"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_07
+msgid "Purchase of gold/pieces"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_15
+msgid "Balance due insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_11
+msgid "Debit of the issuer by the bank in charge of the financial service"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_58
+msgid "Remittance of cheques, vouchers, etc. credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_19
+#: model:account.coda.trans.code,description:account_coda.actcc_09_68
+msgid "Difference in payment"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:193
+#, python-format
+msgid ""
+"\n"
+"Please check if the 'Bank Account Number', 'Currency' and 'Account "
+"Description' fields of your configuration record match with '%s', '%s' and "
+"'%s' !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_58
+msgid "Idem without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:139
+#, python-format
+msgid ""
+"\n"
+"CODA File with Filename '%s' and Creation Date '%s' has already been "
+"imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_63
+msgid "Second credit of unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_065
+msgid "Interest payment advice"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,type:0
+#: field:coda.bank.account,state:0
+#: field:coda.bank.statement,type:0
+#: field:coda.bank.statement.line,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_112
+msgid "ATM payment (usually Eurocheque card)"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description1:0
+msgid "Primary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_126
+msgid "Term investments"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_100
+msgid ""
+"(SEPA) payment with a structured format communication applying the ISO "
+"standard 11649: Structured creditor reference to remittan"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:164
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with IBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_100
+msgid "Gross amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_62
+msgid "Reversal of cheques"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:299
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_64
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_13
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_64
+msgid "Intracompany"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_01
+msgid "Spot purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_429
+msgid "Foreign Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_05
+#: model:account.coda.trans.code,description:account_coda.actcc_05_54
+msgid "Reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:868
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_405
+msgid "Bill guarantee commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_06
+msgid "Extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_008
+msgid "Identification of the de ultimate beneficiary/creditor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_49
+msgid "Foreign counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_01
+msgid "Cash withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_37
+msgid ""
+"Fixed right, either one-off or periodical; for details, see \"categories\""
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_05
+msgid "Loading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_21
+msgid "Pay-packet charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,transfer_account:0
+msgid "Default Internal Transfer Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_074
+msgid "Mailing costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_07
+msgid "Unpaid foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_07
+msgid "Payment by GSM"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_50
+msgid "Credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_80
+msgid "Separately charged costs and provisions"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,currency:0
+#: field:coda.bank.statement,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_06
+msgid "Extension of maturity date"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_15
+msgid "Night safe"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_214
+msgid "Issue commission (delivery order)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_07
+msgid ""
+"Often by standing order or direct debit. In case of direct debit, family 13 "
+"is used."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_01
+msgid "Loading a GSM card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_021
+msgid "Costs for drawing up a bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_026
+msgid "Handling commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_201
+msgid "Advice notice commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_64
+#: model:account.coda.trans.code,description:account_coda.actcc_47_64
+msgid "Warrant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_07
+msgid "Unpaid commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:120
+#: code:addons/account_coda/wizard/account_coda_import.py:130
+#: code:addons/account_coda/wizard/account_coda_import.py:159
+#: code:addons/account_coda/wizard/account_coda_import.py:168
+#: code:addons/account_coda/wizard/account_coda_import.py:174
+#: code:addons/account_coda/wizard/account_coda_import.py:198
+#: code:addons/account_coda/wizard/account_coda_import.py:272
+#: code:addons/account_coda/wizard/account_coda_import.py:281
+#: code:addons/account_coda/wizard/account_coda_import.py:305
+#: code:addons/account_coda/wizard/account_coda_import.py:440
+#: code:addons/account_coda/wizard/account_coda_import.py:464
+#: code:addons/account_coda/wizard/account_coda_import.py:473
+#: code:addons/account_coda/wizard/account_coda_import.py:497
+#, python-format
+msgid "Data Error!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_010
+msgid "Information pertaining to sale or purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_54
+msgid "Your payment ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_123
+msgid "Fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:689
+#, python-format
+msgid ""
+"Free Communication:\n"
+" %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_15
+msgid "Purchase of an international bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,coda_st_naming:0
+msgid "Bank Statement Naming Policy"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_00
+#: model:account.coda.trans.code,description:account_coda.actcc_30_39
+#: model:account.coda.trans.code,description:account_coda.actcc_30_89
+msgid "Undefined transaction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_06
+msgid "Costs chargeable to the remitter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_205
+msgid ""
+"Documentary payment commission | Document commission | Drawdown fee | "
+"Negotiation fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_60
+msgid "Settlement of mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_01
+msgid "Purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import Log"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_07
+msgid "Domestic commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_034
+msgid "Reinvestment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_12
+msgid "Costs for opening a bank guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_414
+msgid "Regularisation charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement.line,statement_id:0
+#: model:ir.actions.act_window,name:account_coda.act_account_bank_statement_goto_coda_bank_statement
+#: model:ir.model,name:account_coda.model_coda_bank_statement
+msgid "CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_15
+msgid "Your repayment hire-purchase and similar claims"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_62
+msgid "Reversal of cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_032
+msgid "Drawing up a circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Seq"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_52
+msgid "Payment night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_bank_statement
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_006
+msgid "Various fees/commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_209
+msgid "Transfer commission"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_39
+#: model:account.coda.trans.code,description:account_coda.actcc_00_89
+msgid "Cancellation of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_3
+msgid ""
+"Simple amount with detailed data; e.g. in case of charges for cross-border "
+"credit transfers."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_15
+msgid "Your purchase of lottery tickets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_05
+msgid "Collective payments of wages"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_17
+msgid "Collected for unsealed deposit of securities, and other parcels"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_004
+msgid "Counterparty’s banker"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:426
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No matching partner record found!\n"
+"        Please adjust the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,journal:0
+msgid "Bank Journal for the Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_54
+msgid "Fixed advance – capital and interest"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_11
+msgid "Payment documents abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_09
+msgid ""
+"Postage recouped to the debit of the customer (including forwarding charges)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_04
+msgid "Costs for holding a documentary cash credit"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_13
+msgid "Settlement of bank acceptances"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_200
+msgid "Overall documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_25
+msgid "Renting of direct debit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_52
+msgid ""
+"Payment of coupons from a deposit or settlement of coupons delivered over "
+"the counter - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_level:0
+msgid ""
+"The value which is mentioned (1 to 9), specifies the hierarchy level of the "
+"globalisation of which this record is the first.\n"
+"The same code will be repeated at the end of the globalisation."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description2:0
+msgid "Secondary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_211
+msgid "Credit arrangement fee | Additional credit arrangement fee"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statements
+#: model:ir.ui.menu,name:account_coda.menu_coda_bank_statements
+msgid "CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_62
+msgid "Term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_70
+msgid "Sale of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,name:0
+#: field:coda.bank.statement,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_creation_date:0
+msgid "CODA Creation Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:583
+#: code:addons/account_coda/wizard/account_coda_import.py:904
+#, python-format
+msgid ""
+"\n"
+"Unknown Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_035
+msgid "Charges foreign documentary bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_39
+msgid "Agios on guarantees given"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_070
+msgid "Forward arbitrage contracts : sum to be supplied by bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_56
+#: model:account.coda.trans.code,description:account_coda.actcc_11_56
+msgid "Reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_23
+msgid ""
+"Costs charged for all kinds of research (information on past transactions, "
+"address retrieval, ...)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_14
+msgid "Handling costs instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_6
+msgid ""
+"Detail of 2. Simple amount without detailed data. Normally, data of this "
+"kind comes after type 2. The customer may ask for a separate file containing "
+"the detailed data. In that case, one will speak of a ‘separate application’. "
+"The records in a separate application keep type 6."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_17
+msgid "Financial centralisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_404
+msgid "Discount commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_45
+msgid "Documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:913
+#, python-format
+msgid ""
+"\n"
+"Number of errors : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_22
+msgid "Management/custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_51
+msgid "Tender"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_56
+msgid "Non-presented certified cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_408
+msgid "Cover commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_071
+msgid "Fixed loan advance - availability"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+#: field:account.coda.import,coda_fname:0
+msgid "CODA Filename"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_31
+msgid "E.g. for signing invoices"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_37
+msgid "Various costs for possessing or using a payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_37
+msgid "Costs related to commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_043
+#: model:account.coda.trans.code,description:account_coda.actcc_80_07
+msgid "Insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_431
+msgid "Delivery of a copy"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,transfer_account:0
+msgid ""
+"Set here the default account that will be used for internal transfer between "
+"own bank accounts (e.g. transfer between current and deposit bank accounts)."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: view:coda.bank.account:0
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:580
+#: code:addons/account_coda/wizard/account_coda_import.py:897
+#, python-format
+msgid ""
+"\n"
+"System Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_60
+msgid "Non-presented circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,line_ids:0
+msgid "CODA Bank Statement lines"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda:0
+msgid "This CODA has already been imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_19
+msgid "Documentary import credits"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:320
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_001
+msgid "Data concerning the counterparty"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+msgid "CODA Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_07
+msgid "Contra-entry of a direct credit or of a discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_55
+msgid "Interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_007
+#: model:account.coda.trans.code,description:account_coda.actcc_80_37
+msgid "Access right to database"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_type
+msgid "CODA transaction type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_37
+msgid "Costs relating to the payment of a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_13
+msgid "Eurocheque written out abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_01
+msgid "Capital and/or interest (specified by the category)"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_17
+msgid "Charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_102
+msgid ""
+"Credit transfer or cash payment with reconstituted structured format "
+"communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_86
+msgid "Payment after cession"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_14
+#: model:account.coda.trans.code,description:account_coda.actcc_47_14
+msgid "Warrant fallen due"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_imported_coda_files
+#: model:ir.ui.menu,name:account_coda.menu_imported_coda_files
+msgid "Imported CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_29
+msgid "Charges collected for: - commercial information - sundry information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_15
+msgid "In case of subscription before the interest due date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_43
+msgid "Foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_62
+msgid "Sale of gold/pieces under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_51
+msgid "The bank takes the initiative for crediting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_05
+msgid "Full or partial reimbursement of a fixed advance at maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_26
+msgid "Travel insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_416
+msgid "Charges for the deposit of security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_04
+msgid "At home as well as abroad"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:192
+#, python-format
+msgid ""
+"\n"
+"No matching CODA Bank Account Configuration record found !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_50
+msgid "Remittance of commercial paper - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Search CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_410
+msgid "Reclamation charges"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,help:account_coda.action_coda_bank_statements
+msgid ""
+"The CODA Bank Statements contain the information encoded in their "
+"originating CODA file in a human readable format. The Bank Statements "
+"associated with a CODA contain the subset of the CODA Bank Statement data "
+"that is required for the creation of the Accounting Entries."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_114
+msgid "POS credit - individual transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_70
+msgid "Settlement of discount bank acceptance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_02
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_08
+msgid "Eurozone = countries which have the euro as their official currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_02
+msgid "The bank takes the initiative for debiting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_58
+msgid "Reversal"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Info"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_02
+msgid "Costs relating to electronic output"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda.comm.type:0
+msgid "The Structured Communication Code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#, python-format
+msgid "Wizard in incorrect state. Please hit the Cancel button!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_418
+msgid "Endorsement commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_005
+msgid "Renting of letterbox"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_13
+msgid "Commission for renting a safe deposit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_39
+msgid "To be used for issued circular cheques given in consignment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_11
+msgid "Securities"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Free Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_2
+msgid ""
+"Amount as totalised by the bank; e.g. : the total amount of a series of "
+"credit transfers with a structured communication As a matter of principle, "
+"this type will also be used when no detailed data (type 6 or 7) is following."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_37
+msgid "Cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_033
+msgid "Charges for a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_13
+msgid "Cash withdrawal by your branch or agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_049
+msgid "Fiscal stamps/stamp duty"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_58
+msgid ""
+"Also for vouchers, postal orders, anything but bills of exchange, "
+"acquittances, promissory notes, etc."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Select Your File :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_06
+msgid "Damage relating to bills and cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_09
+msgid "Unpaid voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_13
+msgid "Unissued part (see 64)"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_1
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_2
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Import CODA File"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:289
+#: code:addons/account_coda/wizard/account_coda_import.py:481
+#, python-format
+msgid "Transaction Code unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_55
+msgid "Fixed advance – interest only"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+msgid "CODA Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_level:0
+msgid "Globalisation Level"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_020
+msgid "Costs of physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_60
+msgid "Sale of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_52
+msgid "Remittance of commercial paper - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the Bank "
+"Account without removing it."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_54
+msgid "Among other things advances or promissory notes"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_10
+msgid "Purchase of Smartcard"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:664
+#, python-format
+msgid ""
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_208
+msgid "Commitment fee deferred payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_005
+msgid "Data concerning the correspondent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_66
+msgid "For professionals such as insurances and stockbrokers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_19
+msgid ""
+"Collected for securities, gold, pass-books, etc. placed in safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_19
+msgid ""
+"Used in case of payments accepted under reserve of count, result of "
+"overcrediting"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:630
+#, python-format
+msgid ""
+"\n"
+"Configuration Error in journal %s!\n"
+"Please verify the Default Debit and Credit Account settings."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_09
+msgid "Agio on supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_213
+msgid "Financing fee"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement.line.global,coda_statement_line_ids:0
+msgid "CODA Bank Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:170
+#, python-format
+msgid ""
+"\n"
+"Unsupported bank account structure !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_037
+msgid "Commission for handling charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_03
+msgid "Subscription to securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_425
+msgid "Foreign broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_7
+msgid ""
+"Detail of 2. Simple account with detailed data The records in a separate "
+"application keep type 7."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_125
+#: model:account.coda.trans.code,description:account_coda.actcf_13
+#: view:coda.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:155
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with BBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_09
+msgid "Counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_coda_bank_statement_line
+msgid "CODA Bank Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_17
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_66
+msgid ""
+"In case of centralisation by the bank, type 2 will be allotted to this "
+"transaction. This total can be followed by the detailed movement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_057
+msgid "Interest subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_41
+msgid "International credit transfers - non-SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_87
+msgid "Overall amount, VAT included"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_01
+msgid "Payment of a foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "General"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:856
+#, python-format
+msgid ""
+"\n"
+"Incorrect ending Balance in CODA Statement %s for Bank Account %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_04
+msgid "Issues"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_37
+msgid ""
+"If any, detail in the category (e.g. costs for presentation for acceptance, "
+"etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_17
+msgid "Purchase of fiscal stamps"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_01
+#: model:account.coda.trans.code,description:account_coda.actcc_41_50
+msgid "Transfer"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_20
+msgid "Drawing up a certificate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_013
+msgid "Payment commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_01
+msgid ""
+"Bills of exchange, acquittances, promissory notes; debit of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View CODA Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_15
+msgid "Your purchase bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_05
+msgid "Payment of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_68
+msgid "Documentary export credits"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_bbacom:0
+msgid "Lookup Invoice"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_03
+msgid "Cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_56
+msgid "Unexecutable reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_03
+msgid "Unpaid debt"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_52
+msgid ""
+"First credit of cheques, vouchers, luncheon vouchers, postal orders, credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_05
+msgid ""
+"Bill claimed back at the drawer's request (bill claimed back before maturity "
+"date)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_11
+msgid ""
+"Costs chargeable to clients who ask to have their correspondence kept at "
+"their disposal at the bank's counter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_64
+msgid ""
+"Amount paid to the issuer by the bank in charge of the placement (firm "
+"underwriting or not); also used for the payment in full of partly-paid "
+"shares, see transaction 05"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_15
+msgid "Cheque drawn by the bank on itself, usually with charges."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_072
+msgid "Countervalue of commission to third party"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_01
+msgid "Individual transfer order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:436
+#, python-format
+msgid ""
+"\n"
+"Movement data records of type 2.%s are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_02
+msgid "Payment by means of a payment card within the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_01
+msgid ""
+"Credit transfer given by the customer on paper or electronically, even if "
+"the execution date of this transfer is in the future. Domestic payments as "
+"well as euro payments meeting the requirements."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_35
+msgid "Closing (periodical settlements for interest, costs,…)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_51
+msgid "Unloading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_019
+msgid "Tax on physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,statement_id:0
+msgid "Associated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_08
+msgid ""
+"Debit of the remitter when the drawee pays in advance directly to the "
+"remitter (regards bank acceptances)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_103
+msgid "number (e.g. of the cheque, of the card, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_24
+msgid "Participation in and management of interest refund system"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_58
+msgid "Payment by your branch/agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_25
+#: model:account.coda.trans.code,description:account_coda.actcc_43_70
+msgid "Purchase of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_39
+msgid "Your issue circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_09
+msgid ""
+"For professionals (stockbrokers) only, whoever the issuer may be (Belgian or "
+"foreigner)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_33
+msgid ""
+"Costs not specified otherwise, often with a manual communication (e.g. for "
+"collecting, ordering funds). VAT excluded = type 0 VAT included = type 3 (at "
+"least 3 articles)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_023
+msgid "Exercising fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:934
+#, python-format
+msgid "Import CODA File result"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_111
+msgid "POS credit – Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:577
+#, python-format
+msgid ""
+"\n"
+"Application Error : "
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,description1:0
+#: help:coda.bank.account,description2:0
+msgid ""
+"The Primary or Secondary Account Description should match the corresponding "
+"Account Description in the CODA file."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_17
+msgid "Management fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_03
+msgid "Cash withdrawal by card (ATM)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_16
+msgid "Bank confirmation to revisor or accountant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_04
+msgid "Cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_type_form
+msgid "CODA Transaction Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_50
+msgid "Credit after a payment at a terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_02
+msgid "Long-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_05
+#: model:account.coda.trans.code,description:account_coda.actcc_30_54
+msgid "Capital and/or interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_68
+msgid "Credit of a payment via electronic purse"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_028
+msgid "Fidelity premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_39
+msgid "Provisionally unpaid due to other reason than manual presentation"
+msgstr ""
+
+#. module: account_coda
+#: constraint:coda.bank.account:0
+msgid ""
+"\n"
+"\n"
+"Configuration Error! \n"
+"The Bank Account Currency should match the Journal Currency !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_35
+msgid ""
+"Costs charged for calculating the amount of the tax to be paid (e.g. "
+"Fiscomat)."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_014
+msgid "Collection commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_52
+msgid "Remittance of foreign cheque credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_03
+msgid "See annexe III : communication 124"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:420
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        The bank account '%s' is not defined for the partner '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_113
+msgid "ATM/POS debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_03
+msgid "Forward purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_50
+msgid "Credit of a payment via terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_52
+msgid "Credit provider"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_68
+msgid "In case coupons attached to a purchased security are missing"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#: code:addons/account_coda/wizard/account_coda_import.py:325
+#: code:addons/account_coda/wizard/account_coda_import.py:337
+#: code:addons/account_coda/wizard/account_coda_import.py:362
+#: code:addons/account_coda/wizard/account_coda_import.py:513
+#: code:addons/account_coda/wizard/account_coda_import.py:524
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement,type:0
+msgid ""
+"No Bank Statements are associated with CODA Bank Statements of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_58
+msgid ""
+"Takes priority over transaction 52 (hence a payment made by an agent in a "
+"night safe = 58 and not 52)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_121
+msgid "Commercial bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_11
+msgid "Costs for the safe custody of correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_041
+msgid "Credit card costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_56
+msgid "Subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_06
+msgid "Payment with tank card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_107
+msgid "Direct debit – DOM’80"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_60
+msgid "Reversal of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_87
+msgid "Costs refunded"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_17
+msgid "Financial centralisation (debit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_02
+msgid "Payment to the bank on maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_025
+msgid "Individual entry for exchange charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_004
+#: model:account.coda.trans.code,description:account_coda.actcc_80_09
+msgid "Postage"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_50
+msgid ""
+"For own account - the comment for the client is given in the communication; "
+"also for mixed payments (cash + cheques) - not to be communicated to the "
+"clients; for payments made by a third person: see family 01"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_68
+msgid ""
+"In case of payment accepted under reserve of count; result of undercrediting "
+"- see also transaction 19"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,bank_id:0
+msgid ""
+"Bank Account Number.\n"
+"The CODA import function will find its CODA processing parameters on this "
+"number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_05
+msgid "Payment of wages, etc."
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:coda.bank.account:0
+msgid ""
+"The combination of Bank Account, Account Description and Currency must be "
+"unique !"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_10
+msgid "Renewal of agreed maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_55
+msgid "Income from payments by GSM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_19
+msgid "Regularisation costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_13
+#: model:account.coda.trans.code,description:account_coda.actcc_41_13
+msgid "Transfer from your account"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,currency:0
+#: help:coda.bank.statement,currency:0
+msgid "The currency of the CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_07
+msgid "Collective transfers"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:116
+#, python-format
+msgid ""
+"\n"
+"CODA V%s statements are not supported, please contact your bank!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_427
+msgid "Belgian Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_12
+msgid "Safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_001
+msgid "Interest received"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_105
+msgid "original amount of the transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_09
+msgid "Your semi-standing order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:508
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_09
+#: model:account.coda.trans.code,description:account_coda.actcc_11_70
+msgid "Settlement of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_01
+msgid "Debit customer who is loading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_047
+msgid "Charges extension bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_18
+msgid "Trade information"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_203
+msgid ""
+"Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | "
+"Confirmation reservation commission | Additional reservation commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_027
+msgid "Charges for unpaid bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_204
+msgid "Amendment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_11
+msgid "Your semi-standing order – payment to employees"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "CODA Processing"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_11
+msgid "Your repayment mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_37
+#: model:account.coda.trans.code,description:account_coda.actcc_01_37
+#: model:account.coda.trans.code,description:account_coda.actcc_04_37
+#: model:account.coda.trans.code,description:account_coda.actcc_05_37
+#: model:account.coda.trans.code,description:account_coda.actcc_09_37
+#: model:account.coda.trans.code,description:account_coda.actcc_11_37
+#: model:account.coda.trans.code,description:account_coda.actcc_30_37
+#: model:account.coda.trans.code,description:account_coda.actcc_35_37
+#: model:account.coda.trans.code,description:account_coda.actcc_80_35
+msgid "Costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_050
+msgid "Capital term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_05
+msgid "Payment of holiday pay, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_25
+msgid ""
+"Commission for the renting of boxes put at the disposal for the "
+"correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_008
+#: model:account.coda.trans.code,description:account_coda.actcc_80_29
+msgid "Information charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_03
+msgid ""
+"Credit transfer for which the order has been given once and which is carried "
+"out again at regular intervals without any change."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_0
+msgid ""
+"Simple amount without detailed data; e.g. : an individual credit transfer "
+"(free of charges)."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_partner:0
+msgid "Partner lookup via Bank Account Number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_403
+msgid "Minimum discount rate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_56
+msgid "Remittance of guaranteed foreign supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_02
+msgid "Tenders"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_07
+msgid "Unpaid foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_03
+msgid ""
+"Bonds, shares, tap issues of CDs, with or without payment of interest, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_66
+msgid "Repurchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_058
+msgid "Capital premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_15
+#: model:account.coda.trans.code,description:account_coda.actcc_11_62
+msgid "Interim interest on subscription"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_202
+msgid "Advising commission | Additional advising commission"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_partner:0
+msgid "Lookup Partner"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statement_line
+#: model:ir.ui.menu,name:account_coda.coda_bank_statement_line
+msgid "CODA Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_amount:0
+msgid "Globalisation Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_13
+msgid ""
+"Transfer from one account to another account of the same customer at the "
+"bank's or the customer's initiative (intracompany)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:890
+#, python-format
+msgid ""
+"\n"
+"Error ! "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_code
+msgid "CODA transaction code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_52
+msgid "Credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:125
+#, python-format
+msgid ""
+"\n"
+"The CODA creation date doesn't fall within a defined Accounting Period!\n"
+"Please create the Accounting Period for date %s."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_50
+msgid "Except Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_011
+msgid "Information pertaining to coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_122
+msgid "Bills - calculation of interest"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_code_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_code_form
+msgid "CODA Transaction Codes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,state:0
+msgid ""
+"No Bank Statements will be generated for CODA Bank Statements from Bank "
+"Accounts of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_49_03
+msgid "ATM withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_012
+msgid "Exchange commission"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_account_form
+#: model:ir.model,name:account_coda.model_coda_bank_account
+#: model:ir.ui.menu,name:account_coda.menu_action_coda_bank_account_form
+msgid "CODA Bank Account Configuration"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:724
+#, python-format
+msgid ""
+"Partner name: %s \n"
+"Partner Account Number: %s\n"
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_04
+msgid "Cash withdrawal from an ATM"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end:0
+msgid "Balance"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_statement_id:0
+msgid "Associated CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_37
+msgid "Credit-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_manage_coda
+msgid "CODA Configuration"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_39
+msgid "Debit of the drawer after credit under usual reserve or discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_66
+msgid "Financial centralisation (credit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_08
+msgid "Payment in advance"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_19
+msgid "Special charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_01
+msgid "Payment of your cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_07
+msgid "Foreign cheque remitted for collection that returns unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_07
+msgid ""
+"- insurance costs of account holders against fatal accidents - passing-on of "
+"several insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,awaiting_account:0
+msgid ""
+"Set here the default account that will be used if the partner cannot be "
+"unambiguously identified."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:280
+#, python-format
+msgid "No CODA Bank Statement found for this Bank Statement!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_07
+msgid "Definitely unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_08
+msgid "Payment by means of a payment card outside the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_106
+msgid ""
+"Method of calculation (VAT, withholding tax on income, commission, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_comm_type
+msgid "CODA structured communication type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_64
+msgid "Reversal of settlement of credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_58
+msgid ""
+"Repayable securities from a deposit or delivered at the counter - credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_5
+msgid ""
+"Detail of 1. Standard procedure is no detailing. However, the customer may "
+"ask for detailed data to be included into his file after the overall record "
+"(type 1)."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,description:0
+#: field:account.coda.trans.category,description:0
+#: field:account.coda.trans.code,description:0
+#: field:account.coda.trans.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_01
+msgid "Payment commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_419
+msgid "Bank service fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_37
+msgid "Costs relating to outgoing foreign transfers and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_17
+msgid "Your certified cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_400
+msgid "Acceptance fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_68
+msgid "Compensation for missing coupon"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_33
+msgid "Miscellaneous fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_03
+#: model:account.coda.trans.code,description:account_coda.actcc_41_03
+msgid "Standing order"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Customer"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_49
+#: model:account.coda.trans.code,description:account_coda.actcc_01_99
+#: model:account.coda.trans.code,description:account_coda.actcc_03_49
+#: model:account.coda.trans.code,description:account_coda.actcc_03_99
+#: model:account.coda.trans.code,description:account_coda.actcc_04_49
+#: model:account.coda.trans.code,description:account_coda.actcc_04_99
+#: model:account.coda.trans.code,description:account_coda.actcc_05_49
+#: model:account.coda.trans.code,description:account_coda.actcc_05_99
+#: model:account.coda.trans.code,description:account_coda.actcc_07_49
+#: model:account.coda.trans.code,description:account_coda.actcc_07_99
+#: model:account.coda.trans.code,description:account_coda.actcc_09_49
+#: model:account.coda.trans.code,description:account_coda.actcc_09_99
+#: model:account.coda.trans.code,description:account_coda.actcc_11_49
+#: model:account.coda.trans.code,description:account_coda.actcc_11_99
+#: model:account.coda.trans.code,description:account_coda.actcc_13_49
+#: model:account.coda.trans.code,description:account_coda.actcc_13_99
+#: model:account.coda.trans.code,description:account_coda.actcc_30_49
+#: model:account.coda.trans.code,description:account_coda.actcc_30_99
+#: model:account.coda.trans.code,description:account_coda.actcc_35_49
+#: model:account.coda.trans.code,description:account_coda.actcc_35_99
+#: model:account.coda.trans.code,description:account_coda.actcc_41_49
+#: model:account.coda.trans.code,description:account_coda.actcc_41_99
+#: model:account.coda.trans.code,description:account_coda.actcc_43_49
+#: model:account.coda.trans.code,description:account_coda.actcc_43_99
+#: model:account.coda.trans.code,description:account_coda.actcc_47_49
+#: model:account.coda.trans.code,description:account_coda.actcc_47_99
+#: model:account.coda.trans.code,description:account_coda.actcc_80_49
+#: model:account.coda.trans.code,description:account_coda.actcc_80_99
+msgid "Cancellation or correction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,bank_id:0
+#: field:coda.bank.statement,coda_bank_account_id:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,coda_bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_56
+msgid "Interest or capital subsidy"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_62
+msgid "Unpaid postal order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_428
+msgid "Interest accrued"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,code:0
+msgid "Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_401
+msgid "Visa charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_210
+msgid "Commitment fee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_category_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_category_form
+msgid "CODA Transaction Categories"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,coda_id:0
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_coda
+msgid "CODA Data File"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "CODA Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_073
+msgid "Costs of ATM abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_018
+msgid "Tental guarantee charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_430
+msgid "Recovery of foreign tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_01
+msgid "Guarantee card charges"
+msgstr ""
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 43b1c4b2859..87b04c18219 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -64,7 +64,6 @@ Note that if you want to check the follow-up level for a given partner/account e
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0072481076453',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index dd08386b064..66d0201b2fe 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -65,6 +65,5 @@ have a new option to import payment orders as bank statement lines.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0061703998541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 16f13dc5178..2c4b157303f 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -49,7 +49,6 @@ You can customize the following attributes of the sequence:
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '00475376442024623469',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index a6bb9dc5159..c0011c8b3c5 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -72,7 +72,6 @@ This module manages:
         'test/case4_cad_chf.yml',
         'test/case_eur_usd.yml',
     ],
-    'certificate': '0037580727101',
     'auto_install': False,
     'application': True,
     'installable': True,
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/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 656d2c2cd91..fd25fec9493 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -7,11 +7,11 @@
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
             <field name="subject">eInvoicing &amp; Payments application installed!</field>
-            <field name="body">OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
+            <field name="body"><![CDATA[
+                OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.  
 
-You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability.
-
-For advanced accounting features, you should install the "Accounting and Finance" module.</field>
+<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>
+            ]]></field>
         </record>
     </data>
 </openerp>
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 c41ed6d5577..78b76e5c9b7 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -71,6 +71,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
+                        	<label for="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}"/>
                             <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -84,6 +85,7 @@
                                     <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
+                            <label for="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" 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="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -155,6 +157,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
+                        	<label for="line_dr_ids"/>
                             <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Supplier 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}"
@@ -170,6 +173,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
+                            <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <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}"
@@ -280,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>
@@ -293,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}"/>
@@ -325,9 +434,9 @@
                             <field name="type" invisible="True"/>
                         </group>
                     </group>
-
                     <notebook>
                         <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}"
@@ -344,6 +453,7 @@
                                     <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}"
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 10762a1d2be..417d2b29b20 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -43,6 +43,5 @@ that have no counterpart in the general financial accounts.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00462253285027988541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index f23296012d2..d788342648c 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -45,6 +45,5 @@ compatible with older configurations.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0082277138269',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index 865fb19ea07..ac63d0e01f1 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -48,7 +48,6 @@ anonymization process to recover your previous data.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00719010980872226045',
     'images': ['images/anonymization1.jpeg','images/anonymization2.jpeg','images/anonymization3.jpeg'],
 }
 
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 665968c6613..35b520e06f8 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -37,7 +37,6 @@ membership products (schemes).
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0078696047261',
     'images': ['images/association1.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 3ba8c59a2f3..41958c84f66 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -42,7 +42,6 @@ and can check logs.
     'demo': ['audittrail_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062572348749',
     'images': ['images/audittrail1.jpeg','images/audittrail2.jpeg','images/audittrail3.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py
index aa7c93e4146..844f6d9fa84 100644
--- a/addons/auth_ldap/__openerp__.py
+++ b/addons/auth_ldap/__openerp__.py
@@ -107,7 +107,6 @@ authentication if installed at the same time.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001141446349334700221',
     'external_dependencies' : {
         'python' : ['ldap'],
     }
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index c9483f00360..973567c613f 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -44,7 +44,6 @@ trigger an automatic reminder email.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001017908446466333429',
     'images': ['images/base_action_rule1.jpeg','images/base_action_rule2.jpeg','images/base_action_rule3.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
index ec4f5070d63..b6447567083 100644
--- a/addons/base_calendar/__init__.py
+++ b/addons/base_calendar/__init__.py
@@ -21,6 +21,5 @@
 
 import base_calendar
 import crm_meeting
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 1e17a504919..313ddb8453a 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -23,7 +23,7 @@
     'name': 'Calendar',
     'version': '1.0',
     'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
-    'summary': 'Personnal & Shared Agenda',
+    'summary': 'Personal & Shared Calendar',
     'description': """
 This is a full-featured calendar system.
 ========================================
@@ -32,7 +32,6 @@ It supports:
 ------------
     - Calendar of events
     - Recurring events
-    - Invitations to people
 
 If you need to manage your meetings, you should install the CRM module.
     """,
@@ -43,7 +42,6 @@ If you need to manage your meetings, you should install the CRM module.
     'data': [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
-        'wizard/base_calendar_invite_attendee_view.xml',
         'base_calendar_view.xml',
         'crm_meeting_view.xml',
         'base_calendar_data.xml',
@@ -53,7 +51,6 @@ If you need to manage your meetings, you should install the CRM module.
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '00694071962960352821',
     'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
 }
 
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 73811d5ba71..7555621945d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1058,8 +1058,40 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'active': fields.boolean('Active', help="If the active field is set to \
          true, it will allow you to hide the event alarm information without removing it."),
         'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"),
+        'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
     }
 
+    def create_attendees(self, cr, uid, ids, context):
+        att_obj = self.pool.get('calendar.attendee')
+        user_obj = self.pool.get('res.users')
+        current_user = user_obj.browse(cr, uid, uid, context=context)
+        for event in self.browse(cr, uid, ids, context):
+            attendees = {}
+            for att in event.attendee_ids:
+                attendees[att.partner_id.id] = True
+            new_attendees = []
+            mail_to = []
+            for partner in event.partner_ids:
+                if partner.id in attendees:
+                    continue
+                att_id = self.pool.get('calendar.attendee').create(cr, uid, {
+                    'partner_id': partner.id,
+                    'user_id': partner.user_ids and partner.user_ids[0].id or False,
+                    'ref': self._name+','+str(event.id),
+                    'email': partner.email
+                }, context=context)
+                if partner.email:
+                    mail_to.append(partner.email)
+                self.write(cr, uid, [event.id], {
+                    'attendee_ids': [(4, att_id)]
+                }, context=context)
+                new_attendees.append(att_id)
+
+            if mail_to and current_user.email:
+                att_obj._send_mail(cr, uid, new_attendees, mail_to,
+                    email_from = current_user.email)
+        return True
+
     def default_organizer(self, cr, uid, context=None):
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
@@ -1366,6 +1398,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             vals['vtimezone'] = vals['vtimezone'][40:]
 
         res = super(calendar_event, self).write(cr, uid, ids, vals, context=context)
+        if vals.get('partner_ids', False):
+            self.create_attendees(cr, uid, ids, context)
 
         if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
                 or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
@@ -1489,17 +1523,10 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
-        #updated_vals = self.onchange_dates(cr, uid, [],
-        #    vals.get('date', False),
-        #    vals.get('duration', False),
-        #    vals.get('date_deadline', False),
-        #    vals.get('allday', False),
-        #    context=context)
-        #vals.update(updated_vals.get('value', {}))
-
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
+        self.create_attendees(cr, uid, [res], context)
         return res
 
     def do_tentative(self, cr, uid, ids, context=None, *args):
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 0ea2be4f37f..fe292a489ab 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -11,7 +11,6 @@
                     <header>
                         <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
                         <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
-                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                         <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
                         <field name="state" widget="statusbar"
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
@@ -226,10 +225,6 @@
                         <field name="description"/>
                     </page>
                     <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" colspan="4"
                             nolabel="1" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
@@ -248,12 +243,6 @@
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
                                     type="object" icon="gtk-cancel"/>
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
@@ -281,13 +270,6 @@
                                                 states="needs-action,tentative,accepted"
                                                 type="object"
                                                 icon="gtk-cancel"/>
-                                            <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate"
-                                                type="action"
-                                                icon="gtk-sort-descending"
-                                                states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                                         </group>
                                     </page>
                                     </notebook>
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 0ee23ed1d0f..b87114f3a66 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -71,6 +71,34 @@ class crm_meeting(base_state, osv.Model):
         default['attendee_ids'] = False
         return super(crm_meeting, self).copy(cr, uid, id, default, context)
 
+    def onchange_partner_ids(self, cr, uid, ids, value, context=None):
+        """ The basic purpose of this method is to check that destination partners
+            effectively have email addresses. Otherwise a warning is thrown.
+            :param value: value format: [[6, 0, [3, 4]]]
+        """
+        res = {'value': {}}
+        if not value or not value[0] or not value[0][0] == 6:
+            return
+        res.update(self.check_partners_email(cr, uid, value[0][2], context=context))
+        return res
+
+    def check_partners_email(self, cr, uid, partner_ids, context=None):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning. """
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {}
+        warning_msg = _('The following contacts have no email address :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        return {'warning': {
+                    'title': _('Email addresses not found'),
+                    'message': warning_msg,
+                    }
+                }
     # ----------------------------------------
     # OpenChatter
     # ----------------------------------------
@@ -80,7 +108,7 @@ class crm_meeting(base_state, osv.Model):
         return [('date','<=',time.strftime('%Y-%M-%D 23:59:59')), ('date_deadline','>=', time.strftime('%Y-%M-%D 00:00:00')), ('user_id','=',uid)]
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-        return 'Meeting'
+        return _('Meeting')
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_("Meeting <b>confirmed</b>."), context=context)
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index fc936f416ad..2da18447820 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -80,7 +80,9 @@
                         </h1>
                         <label for="partner_ids" class="oe_edit_only"/>
                         <h2>
-                            <field name="partner_ids" widget="many2many_tags"/>
+                            <field name="partner_ids" widget="many2many_tags"
+                                context="{'force_email':True}"
+                                on_change="onchange_partner_ids(partner_ids)"/>
                         </h2>
                     </div>
                     <notebook>
@@ -88,11 +90,12 @@
                         <group>
                             <group>
                                 <field name="date" string="Starting at"/>
-                                <label for="duration" attrs="{'invisible': [('allday','=',True)]}"/>
-                                <div attrs="{'invisible': [('allday','=',True)]}">
+                                <label for="duration"/>
+                                <div>
                                     <field name="duration" widget="float_time"
                                         on_change="onchange_dates(date,duration,False,allday)"
-                                        class="oe_inline"/> hours
+                                        class="oe_inline" attrs="{'invisible': [('allday','=',True)]}"/>
+                                    <label string="hours" attrs="{'invisible': [('allday','=',True)]}"/>
                                     (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
                                     <label for="allday" string="All Day?"/>)
                                 </div>
@@ -165,18 +168,16 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                    <!--
+                        Temporarily removing invitation feature as the implementation
+                        was not clean. Invitation should be trigerred automatically
+                        based on partner_ids.
+                    -->
+                    <page string="Invitations">
                         <field name="attendee_ids" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
-                                <field name="sent_by_uid" string="From"/>
-                                <field name="user_id" string="To"/>
+                                <field name="partner_id"/>
                                 <field name="email" string="Mail To"/>
-                                <field name="role" />
                                 <field name="state" />
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
@@ -188,11 +189,6 @@
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
                                     type="object" />
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <header>
@@ -205,10 +201,6 @@
                                     <button name="do_decline" type="object"
                                         states="needs-action,tentative,accepted"
                                         string="Decline" />
-                                    <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" type="action"
-                                        states="needs-action,tentative,declined,accepted"
-                                        string="Delegate" 
-                                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 </header>
                                 <group>
@@ -219,6 +211,7 @@
                                         <field name="role" />
                                     </group>
                                     <group>
+                                        <field name="partner_id"/>
                                         <field name="user_id"/>
                                     </group>
                                 </group>
@@ -307,7 +300,7 @@
           <p class="oe_view_nocontent_create">
             Click to schedule a new meeting. 
           </p><p>
-            The agenda is shared between employees and fully integrated with
+            The calendar is shared between employees and fully integrated with
             other applications such as the employee holidays or the business
             opportunities.
           </p>
@@ -339,10 +332,10 @@
     </record>
 
     <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
-        name="Agenda" action="action_crm_meeting"/>
+        name="Calendar" action="action_crm_meeting"/>
 
-    <menuitem name="Agenda"
-        id="mail_menu_agenda" parent="mail.mail_my_stuff"
+    <menuitem name="Calendar"
+        id="mail_menu_calendar" parent="mail.mail_my_stuff"
         sequence="10" action="action_crm_meeting"/>
 
     </data>
diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml
index 2f5ff7945ee..cc1b3c3b292 100644
--- a/addons/base_calendar/test/base_calendar_test.yml
+++ b/addons/base_calendar/test/base_calendar_test.yml
@@ -54,24 +54,3 @@
 -
     !python {model: calendar.event}: |
      self.write(cr, uid, [ref("calendar_event_alldaytestevent0")], {'alarm_id': ref("res_alarm_daybeforeeventstarts0")})
--
-  In order to assign attendee I will invite Demo user
-- 
-  !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
-    type: internal
-    send_mail: False
-    partner_id: base.res_partner_9 # Put bcz of problem in read
-    user_ids:
-      - base.user_demo
--
-  Then I click on Invite Button
--
-    !python {model: base_calendar.invite.attendee}: |
-     self.do_invite(cr, uid, [ref("base_calendar_invite_attendee_0")], {'active_id': ref("calendar_event_alldaytestevent0"), 'model' : 'calendar.event', 'attendee_field':'attendee_ids'})
--
-  Now I will Accept this invitation
--
-    !python {model: calendar.attendee}: |
-        ids = self.search(cr, uid, [('ref', '=', 'calendar.event' + ',' + str(ref("calendar_event_alldaytestevent0")))])
-        if ids:
-            self.do_accept(cr, uid, ids, context=context)
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
deleted file mode 100644
index 344056eb585..00000000000
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from .. import base_calendar
-from osv import fields, osv
-from tools.translate import _
-import tools
-
-
-class base_calendar_invite_attendee(osv.osv_memory):
-    """
-    Invite attendee.
-    """
-
-    _name = "base_calendar.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True, help="Select whom you want to Invite"),
-        'user_ids': fields.many2many('res.users', 'invite_user_rel',
-                                  'invite_id', 'user_id', 'Users'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'email': fields.char('Email', size=124, help="Provide external email address who will receive this invitation."),
-        'contact_ids': fields.many2many('res.partner', 'invite_contact_rel',
-                                  'invite_id', 'contact_id', 'Contacts'),
-        'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
-send an Email to Invited Person')
-    }
-
-    _defaults = {
-        'type': 'internal',
-        'send_mail': True
-    }
-
-    def do_invite(self, cr, uid, ids, context=None):
-        """
-        Invites attendee for meeting..
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of {}.
-        """
-
-        if context is None:
-            context = {}
-
-        model = False
-        context_id = context and context.get('active_id', False) or False
-        if not context or not context.get('model'):
-            return {'type': 'ir.actions.act_window_close'}
-        else:
-            model = context.get('model')
-
-        model_field = context.get('attendee_field', False)
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context_id, context=context)
-        att_obj = self.pool.get('calendar.attendee')
-        user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid, context=context)
-
-        for datas in self.read(cr, uid, ids, context=context):
-            type = datas.get('type')
-            vals = []
-            mail_to = []
-            attendees = []
-            ref = {}
-
-            if not model == 'calendar.attendee':
-                if context_id:
-                    ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
-                else:
-                    return {'type': 'ir.actions.act_window_close'}
-            if type == 'internal':
-
-                if not datas.get('user_ids'):
-                    raise osv.except_osv(_('Error!'), ("Please select any user."))
-                for user_id in datas.get('user_ids'):
-                    user = user_obj.browse(cr, uid, user_id)
-                    res = {
-                           'user_id': user_id,
-                           'email': user.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if user.email:
-                        mail_to.append(user.email)
-
-            elif  type == 'external' and datas.get('email'):
-                res = {'email': datas['email']}
-                res.update(ref)
-                vals.append(res)
-                mail_to.append(datas['email'])
-
-            elif  type == 'partner':
-                add_obj = self.pool.get('res.partner')
-                for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                    res = {
-                           'partner_id': contact.id,
-                           'email': contact.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if contact.email:
-                        mail_to.append(contact.email)
-
-            for att_val in vals:
-                if model == 'calendar.attendee':
-                    att = att_obj.browse(cr, uid, context_id)
-                    att_val.update({
-                        'parent_ids': [(4, att.id)],
-                        'ref': att.ref and (att.ref._name + ',' +str(att.ref.id)) or False
-                        })
-
-                attendees.append(att_obj.create(cr, uid, att_val))
-            if model_field:
-                for attendee in attendees:
-                    obj.write(cr, uid, res_obj.id, {model_field: [(4, attendee)]})
-
-            if datas.get('send_mail'):
-                if not mail_to:
-                    name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
-                                       self._columns['type'].selection))
-                    raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail.") %(name[0]))
-                att_obj._send_mail(cr, uid, attendees, mail_to, \
-                       email_from = current_user.email or tools.config.get('email_from', False))
-
-        return {'type': 'ir.actions.act_window_close'}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        """
-        Make entry on contact_ids on change of partner_id field.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @param partner_id: id of Partner
-        @return: dictionary of value.
-        """
-
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('SELECT id FROM res_partner \
-                         WHERE id=%s or parent_id =%s' , (partner_id,partner_id,))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        return {'value': {'contact_ids': contacts}}
-
-base_calendar_invite_attendee()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
deleted file mode 100644
index 5510259a7a7..00000000000
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--    Attendee invite wizard-->
-
-        <record id="view_calendar_invite_attendee_wizard"
-            model="ir.ui.view">
-            <field name="name">Invite Attendees</field>
-            <field name="model">base_calendar.invite.attendee</field>
-            <field name="arch" type="xml">
-                <form string="Invite People" version="7.0">
-                    <separator string="Invite People" colspan="4"/>
-                    <field name="type"/>
-                    <field name="send_mail"/>
-                    <notebook colspan="4">
-                        <page string="Data">
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
-                                <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
-                                <separator string="Users" colspan="4"/>
-                                <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
-                                <newline/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
-                                <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
-                                <newline/>
-                                <separator string="Partner Contacts" colspan="6"/>
-                                <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
-                            </group>
-                        </page>
-                    </notebook>
-                    <footer>
-                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-
-        <!--    Attendee invite action-->
-
-        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-            <field name="name">Invite Attendees</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base_calendar.invite.attendee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index d0252f6810c..97f6c98aeb8 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -58,7 +58,6 @@ will disable LDAP authentication completely if installed at the same time.
     'data': [],
     'auto_install': False,
     'installable': True,
-    'certificate': '00721290471310299725',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 76c397586c9..7f966255bbf 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -35,7 +35,6 @@ with a single statement.
     'data': ['base_iban_data.xml' , 'base_iban_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0050014379549',
     'images': ['images/base_iban1.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index 100a90dbd96..f1de13bc7f0 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -42,7 +42,6 @@ This module generates the Technical Guides of selected modules in Restructured T
     ],
     'demo': [],
     'installable': True,
-    'certificate': '001288481437217734509',
     'images': ['images/base_module_doc_rst1.jpeg'],
 }
 
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 00af464b3ee..532dcfc932e 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -53,7 +53,6 @@ Select datetime criteria of recording and objects to be recorded and Record modu
     ],
     'demo': [],
     'installable': True,
-    'certificate': '0083134865813',
     'images': ['images/base_module_record1.jpeg','images/base_module_record2.jpeg','images/base_module_record3.jpeg',]
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 3e0ca2152da..36e15c96877 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -38,7 +38,6 @@ Once you have modified it you can upload the report using the same wizard.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056379010493',
     'images': ['images/base_report_designer1.jpeg','images/base_report_designer2.jpeg',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index cf69933c84a..de2d8236ece 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -43,7 +43,6 @@ Shows you a list of applications features to install from.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086711085869',
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
     'js': ['static/src/js/base_setup.js'],
     'css': ['static/src/css/base_setup.css'],
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 9db3ece7d8b..2cb5a4c1859 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -307,7 +307,7 @@ class base_stage(object):
                 destination=False)
 
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        if 'message_post' in self:
+        if hasattr(self, 'message_post'):
             for case in self.browse(cr, uid, ids, context=context):
                 if destination:
                     recipient_id = case.user_id.partner_id.id
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index 84f10e78959..71f6cbe549c 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -13,7 +13,6 @@ Creates menu link for Tools from where tools like survey, lunch, idea are access
     """,
     'data': ['tools_view.xml'],
     'installable': True,
-    'certificate' : '00571588675379342237'
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index dfa23bb54fe..3071ddf2f5a 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -58,7 +58,6 @@ only the country code will be validated.
     'data': ['base_vat_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0084849360989',
     'images': ['images/1_partner_vat.jpeg'],
 }
 
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 2690012f3b4..e699e091176 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -42,7 +42,6 @@ Allows users to create custom dashboard.
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0076912305725',
     'images': ['images/1_dashboard_definition.jpeg','images/2_publish_note.jpeg','images/3_admin_dashboard.jpeg',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 4d35b00bdb4..45edd6e659e 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -69,7 +69,6 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00924841426645403741',
     'images': ['images/calendar_collections.jpeg','images/calendars.jpeg','images/export_ics_file.jpeg'],
 }
 
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 9e3f7f59ca2..453312233f6 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -35,7 +35,6 @@ Adds a Claim link to the delivery order.
               'claim_delivery_data.xml',],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001101649349223746957',
     'images': ['images/1_claim_link_delivery_order.jpeg'],
 }
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 135f4237f1c..2a7996655a2 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -122,7 +122,6 @@ Dashboard for CRM will include:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0079056041421',
     'images': ['images/sale_crm_crm_dashboard.png', 'images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 fff47205582..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
 
@@ -300,6 +304,10 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'city' : partner.city,
                 'state_id' : partner.state_id and partner.state_id.id or False,
                 'country_id' : partner.country_id and partner.country_id.id or False,
+                'email_from' : partner.email,
+                'phone' : partner.phone,
+                'mobile' : partner.mobile,
+                'fax' : partner.fax,
             }
         return {'value' : values}
 
@@ -594,6 +602,8 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'email_from': customer and customer.email or lead.email_from,
+                'phone': customer and customer.phone or lead.phone,
         }
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
@@ -784,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 4f4d73d5f43..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>
@@ -446,13 +450,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
-        <menuitem id="menu_crm_payment_mode" name="Fund Raising"
-            parent="base.menu_base_config" sequence="85" groups="crm.group_fund_raising"/>
             
         <menuitem action="action_crm_payment_mode"
             id="menu_crm_payment_mode_act"
+            groups="base.group_no_one"
             name="Payment Modes"
-            parent="menu_crm_payment_mode" />
+            parent="base.menu_crm_config_lead" />
     </data>
 </openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 3b382a072f4..9bb54441aa3 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -60,5 +60,18 @@
         <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field>
     </record>
 
+    <record id="crm_rule_personal_phonecall" model="ir.rule">
+        <field name="name">Personal Phone Calls</field>
+        <field ref="model_crm_phonecall" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+    <record id="crm_rule_all_phones" model="ir.rule">
+        <field name="name">All Phones</field>
+        <field ref="model_crm_phonecall" name="model_id"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index a9e74f306e5..c201f484989 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -55,6 +55,8 @@ class crm_lead2partner(osv.osv_memory):
         partner = self.pool.get('res.partner')
         lead = self.pool.get('crm.lead')
         this = lead.browse(cr, uid, context.get('active_id'), context=context)
+        if this.partner_id:
+            return this.partner_id.id
         partner_id = False
         if this.email_from:
             partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index f1f9f05cafd..ffcb23fd315 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -42,7 +42,6 @@ Caldav features in Meeting.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001088048737252670109',
     'images': ['images/caldav_browse_step1.jpeg','images/caldav_browse_step2.jpeg'],
 }
 
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index f35dd306e93..f5ab836401b 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -48,7 +48,6 @@ automatically new claims based on incoming emails.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00612027414703404749',
     'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'],
 }
 
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index bb881d62a58..3782a3a7c00 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -10,7 +10,7 @@
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
-            parent="base.menu_main_pm" sequence="2" />
+            parent="base.menu_base_partner" sequence="2" />
 
         <!-- Claims Menu -->
         <record model="ir.actions.act_window" id="crm_case_categ_claim0">
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index e2d246cb2db..2d8aff643bd 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -47,7 +47,6 @@ and categorize your interventions with a channel and a priority level.
     'test': ['test/process/help-desk.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00830691522781519309',
     'images': ['images/helpdesk_analysis.jpeg','images/helpdesk_categories.jpeg','images/helpdesk_requests.jpeg'],
 }
 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 612537bdb77..9bd56cf3944 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from base_status.base_state import base_state
+from base_status.base_stage import base_stage
 from crm import crm
 from osv import fields, osv
 import tools
@@ -31,7 +32,7 @@ CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_helpdesk(base_state, osv.osv):
+class crm_helpdesk(base_state, base_stage, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index b70662e3339..58b522d0dee 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -3,11 +3,10 @@
     <data noupdate="1">
 
         <!-- Top menu item -->
-        <menuitem name="Project"
-            id="base.menu_main_pm"
-            sequence="90"/>
+        <menuitem name="Sales"
+            id="base.menu_base_partner"/>
 
-        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_base_partner" />
 
         <!-- Help Desk (menu) -->
 
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index c9d6990025c..cb952606e76 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -50,7 +50,6 @@ You can also use the geolocalization without using the GPS coordinates.
     'test': ['test/partner_assign.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00503409558942442061',
     'images': ['images/partner_geo_localization.jpeg','images/partner_grade.jpeg'],
 }
 
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 99e1b6c5f41..4f182f4d447 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -47,7 +47,6 @@ were overlapping.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0033984979005',
     'images': ['images/profiling_questionnaires.jpeg','images/profiling_questions.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 8da8533f494..d51d36425d0 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Open Questionnaire" version="7.0">
                     <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree" width="550" height="200"/>
                     <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 107fb49a1c5..5360adbd6f2 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -37,7 +37,6 @@ The decimal precision is configured per company.
     ],
     'demo': [],
     'installable': True,
-    'certificate' : '001307317809612974621',
     'images': ['images/1_decimal_accuracy_form.jpeg','images/1_decimal_accuracy_list.jpeg'],
 }
 
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 6a355096e4e..0ea891bb6ae 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -44,7 +44,6 @@ invoices from picking, OpenERP is able to add and compute the shipping line.
     'test': ['test/delivery_cost.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0033981912253',
     'images': ['images/1_delivery_method.jpeg','images/2_delivery_pricelist.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index deb59983ef2..9d4fe1797fe 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -90,7 +90,7 @@
         </record>
 
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
-            <field name="name">Delivery Method</field>
+            <field name="name">Delivery Methods</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 212965a8162..e3354efff0c 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -57,9 +57,9 @@ 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,
-    'certificate': '0070515416461',
     'images': ['images/1_directories.jpeg','images/2_storage_media.jpeg','images/3_directories_structure.jpeg'],
 }
 
diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js
new file mode 100644
index 00000000000..2dde2696c81
--- /dev/null
+++ b/addons/document/static/src/js/document.js
@@ -0,0 +1,10 @@
+openerp.document = function (instance) {
+    _t = instance.web._t;
+    instance.web.Sidebar.include({
+        init : function(){
+            this._super.apply(this, arguments);
+            this.sections.splice(1, 0, { 'name' : 'files', 'label' : _t('Attachment(s)'), });
+            this.items['files'] = [];
+        }
+    });
+};
\ No newline at end of file
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index f8968d6c3df..23ff8f1e37d 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -48,7 +48,6 @@ FTP client.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00934787762705016005',
     'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
     'post_load': 'post_load',
 }
diff --git a/addons/document_page/__openerp__.py b/addons/document_page/__openerp__.py
index eec5166b0bf..f08315bf61e 100644
--- a/addons/document_page/__openerp__.py
+++ b/addons/document_page/__openerp__.py
@@ -42,7 +42,6 @@ Web pages
     'test': ['test/document_page_test00.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086363630317',
     'images': [],
     'css' : ['static/src/css/document_page.css'],
 }
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 1f7cb20e795..ec112ec7c38 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -70,7 +70,6 @@ which needs explicit configuration in openerp-server.conf too.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001236490750845657973',
     'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
 }
 
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index eb64d9b3fdd..b06c01eb03b 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -43,7 +43,6 @@ documentation at http://doc.openerp.com.
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '002046536359186',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index aaf2f52289a..f79800a76b9 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -65,7 +65,6 @@ campaigns on any OpenERP document.
     'demo': ['res_partner_demo.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00817073628967384349',
     'images': ['images/1_email_account.jpeg','images/2_email_template.jpeg','images/3_emails.jpeg'],
 }
 
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/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py
index 19e763e91b0..0a565200f35 100644
--- a/addons/event_moodle/event_moodle.py
+++ b/addons/event_moodle/event_moodle.py
@@ -54,7 +54,7 @@ class event_moodle(osv.osv):
         """
         moodle_config_wiz_ids = self.search(cr, uid, [], context=context)
         if not moodle_config_wiz_ids:
-            raise osv.except_osv(('Error!'),("First configure your moodle connection."))
+            raise osv.except_osv(_('Error!'),_("First configure your moodle connection."))
         return moodle_config_wiz_ids[0]
 
     def make_url(self, cr, uid, ids, context=None):
@@ -101,6 +101,8 @@ class event_moodle(osv.osv):
         """
         #connect to moodle
         url = self.browse(cr, uid, id, context=context).url
+        if not url:
+            raise osv.except_osv(_('Error!'),_("You must configure your moodle connection."))
         sock = xmlrpclib.ServerProxy(url)
         return sock.core_course_create_courses(courses)
 
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index b6710c8bac4..81fb24455f5 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -36,7 +36,6 @@ This module allows you to create retro planning for managing your events.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0069726863885',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index c39cff04bd9..52f935a0760 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -6,7 +6,7 @@
              <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="after">
+                <field name="purchase_ok" position="before">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                     <label for="event_ok"/>
                 </field>
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 3bfcf4d95a3..bba1fc22e07 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -64,7 +64,6 @@ For more specific needs, you may also assign custom-defined actions
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00692978332890137453',
     'images': ['images/1_email_servers.jpeg'],
 }
 
diff --git a/addons/google_base_account/i18n/ru.po b/addons/google_base_account/i18n/ru.po
new file mode 100644
index 00000000000..9be23ab6515
--- /dev/null
+++ b/addons/google_base_account/i18n/ru.po
@@ -0,0 +1,123 @@
+# Russian 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: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-26 14:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-27 04:36+0000\n"
+"X-Generator: Launchpad (build 16033)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Имя пользователя"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Логин Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Ошибка импорта контактов Google!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Синхронизация "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Вы не можете создать двух пользователей с одним логином!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Ошибка"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Логин Google"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Пароль Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Аккаунт Google"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Имя пользователя Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Установите, пожалуйста, gdata-python-client с http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Контакт Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Логин"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Выбранная компания отсутствует в списке разрешённых компаний для этого "
+"пользователя"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Пароль"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Ошибка авторизации, проверьте имя пользователя и пароля!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "пример: user@gmail.com"
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 270c105daab..f1477f9c7f2 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -134,8 +134,8 @@ class config(osv.osv):
     _description = "Google Docs templates config"
 
     _columns = {
-        'model_id': fields.many2one('ir.model', 'Model'),
-        'gdocs_resource_id': fields.char('Google resource ID', size=64,help='''
+        'model_id': fields.many2one('ir.model', 'Model', required=True),
+        'gdocs_resource_id': fields.char('Google Resource ID to Use as Template', size=64,help='''
 This is the id of the template document, on google side. You can find it thanks to its URL: 
 *for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`
 *for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`
@@ -143,7 +143,7 @@ This is the id of the template document, on google side. You can find it thanks
 *for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
 ...
 '''),
-        'name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
+        'name_template': fields.char('Google Doc Name Pattern', size=64, help='Choose how the new google docs will be named, on google side'),
     }
 
     _defaults = {
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 694f5736c72..bcfd24f8c0d 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -13,7 +13,7 @@ var _t = instance.web._t;
             });
             if (! flag) {
                 this.add_items('files', [
-                    { label: _t('Google Doc'), callback: self.on_google_doc },
+                    { label: _t('Add Google Doc...'), callback: self.on_google_doc },
                 ]);
             }
         },
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index f5577b17994..e1963e3f8f4 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -33,11 +33,12 @@ Using this you can directly open Google Map from the URL widget.""",
     'website': 'http://www.openerp.com',
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
-    'data': [],
+    'data': [
+        'google_map_view.xml'
+    ],
     'demo': [],
     'js': ['static/src/js/google_map.js'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0029498930765',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_map/google_map_launch.py b/addons/google_map/google_map_launch.py
index 8ee9a16fb0a..f3ac20ac734 100644
--- a/addons/google_map/google_map_launch.py
+++ b/addons/google_map/google_map_launch.py
@@ -25,8 +25,7 @@ class launch_map(osv.osv):
     _inherit = "res.partner"
 
     def open_map(self, cr, uid, ids, context=None):
-        address_obj= self.pool.get('res.partner')
-        partner = address_obj.browse(cr, uid, ids, context=context)[0]
+        partner = self.browse(cr, uid, ids, context=context)[0]
         url="http://maps.google.com/maps?oi=map&q="
         if partner.street:
             url+=partner.street.replace(' ','+')
@@ -39,9 +38,9 @@ class launch_map(osv.osv):
         if partner.zip:
             url+='+'+partner.zip.replace(' ','+')
         return {
-        'type': 'ir.actions.act_url',
-        'url':url,
-        'target': 'new'
+            'type': 'ir.actions.act_url',
+            'url':url,
+            'target': 'new'
         }
 
 launch_map()
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
new file mode 100644
index 00000000000..46cf9d48807
--- /dev/null
+++ b/addons/google_map/google_map_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_partner_google_map_inherit">
+            <field name="name">res.partner.google.map.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <field name="website" position="before">
+                    <label for="open_map" string="Open Google Map"/>
+                    <div>
+                        <button name="open_map"
+                        string="Map" type="object"/>
+                    </div>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b99482ef8c5..0a93d844180 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -68,7 +68,6 @@ You can manage:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0086710558965',
     'css': [ 'static/src/css/hr.css' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 4d01038b671..84db6128f41 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -22,6 +22,20 @@
         <field name="view_mode">form</field>
         <field name="usage">menu</field>
         <field name="view_id" ref="board_hr_form"/>
+            <field name="help" type="html">
+              <div class="oe_empty_custom_dashboard">
+                  <p>
+                    <b>Human Resources dashboard is empty.</b>
+                  </p><p>
+                    To add your first report into this dashboard, go to any
+                    menu, switch to list or graph view, and click <i>'Add to
+                    Dashboard'</i> in the extended search options.
+                  </p><p>
+                    You can filter and group data before inserting into the
+                    dashboard using the search options.
+                  </p>
+              </div>
+            </field>
     </record>
     <menuitem id="menu_hr_dashboard" 
               parent="base.menu_reporting_dashboard" 
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 cb2cd261773..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': [
@@ -51,7 +51,6 @@ actions(Sign in/Sign out) performed by them.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0063495605613',
     
     #web
     "js": ["static/src/js/attendance.js"],
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/base_calendar/wizard/__init__.py b/addons/hr_attendance/res_config.py
similarity index 68%
rename from addons/base_calendar/wizard/__init__.py
rename to addons/hr_attendance/res_config.py
index cd0690b1dc0..0da2d183409 100644
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/hr_attendance/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,7 +19,15 @@
 #
 ##############################################################################
 
-import base_calendar_invite_attendee
+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/__openerp__.py b/addons/hr_contract/__openerp__.py
index 98f6162778a..ec33b5f44aa 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -48,6 +48,5 @@ You can assign several contracts per employee.
     'test': ['test/test_hr_contract.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0046298028637',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 6a8a802e1e1..fb3d87f2bc1 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -62,7 +62,6 @@ Key Features
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00883207679172998429',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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/__openerp__.py b/addons/hr_expense/__openerp__.py
index 64648c65fee..4b273a9cc81 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -67,7 +67,6 @@ This module also uses analytic accounting and is compatible with the invoice on
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062479841789',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 8049255afbf..388e5262f6e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -195,9 +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="after">
-            <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
-            </field>
+                <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"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 512ab8e425d..3cf4a30a2e1 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -66,6 +66,5 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0086579209325',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 62a0348940b..dfa87622264 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -67,7 +67,6 @@ Generic Payroll system.
     'demo': ['hr_payroll_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001046261404562128861',
     'application': False,
 }
 
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_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 3f960507a8d..7c7e7bd9dda 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -44,7 +44,6 @@ Generic Payroll system Integrated with Accounting.
     'test': ['test/hr_payroll_account.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00923971112835220957',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index d498e41498d..a5a1ec310d5 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -64,7 +64,6 @@ You can define the different phases of interviews and easily rate the applicant
     'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '001073437025460275621',
     'application': True,
 }
 
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 2162b6095e8..c7af21ee0be 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -62,6 +62,5 @@ up a management by affair.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0071405533469',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 047f0b414dc..65ccc8948c2 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -54,6 +54,5 @@ reports.""",
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056091842381',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index fbe4bc85503..9aab412d425 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -64,7 +64,6 @@ The validation can be configured in the company:
     'test':['test/test_hr_timesheet_sheet.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0073297700829',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 14b2d045d6c..49600f63ddd 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -43,7 +43,6 @@ document and Wiki based Hidden.
     'demo': ['knowledge_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001278773815843749581',
     'images': ['images/1_config_knowledge.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index c2ccf511e3c..a956ea7ebe0 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -76,7 +76,6 @@ Wizards provided by this module:
     ],
     'demo': [],
     'installable': True,
-    'certificate': '0031977724637',
     'images': ['images/1_config_chart_l10n_be.jpeg','images/2_l10n_be_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py
index bd323478886..2c8931f484c 100644
--- a/addons/l10n_be_coda/__openerp__.py
+++ b/addons/l10n_be_coda/__openerp__.py
@@ -105,7 +105,6 @@ If required, you can manually adjust the descriptions via the CODA configuration
     'auto_install': False,
     'installable': True,
     'license': 'AGPL-3',
-    'certificate' : '001237207321716002029',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 99923f1a5e5..766ae6c60bb 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -75,7 +75,6 @@ for online use of 'private modules'.""",
         'l10n_br_view.xml',
                 ],
     'installable': True,
-    'certificate' : '001280994939126801405',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 5f12d7331b6..9c3cfea2fb1 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -46,7 +46,6 @@ Canadian accounting charts and localizations.
     ],
     'demo': [],
     'installable': True,
-    'certificate': '00941680933773696173',
     'images': ['images/config_chart_l10n_ca.jpeg','images/l10n_ca_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 4e8f13fda7a..ec50d9b0f8e 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -102,7 +102,6 @@ TODO :
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '001103836064567088989',
     'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg']
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 0cc26a5052e..3dd702a2d67 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -40,7 +40,6 @@
     'license': 'GPL-3',
     'auto_install': False,
     'installable': True,
-    'certificate': '00925445983542952285',
     'images': ['images/config_chart_l10n_cn.jpeg','images/l10n_cn_chart.jpeg'],
 }
 
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index cc90ed3be9e..79a769e9e8e 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -68,7 +68,6 @@ please go to http://translations.launchpad.net/openerp-costa-rica.
     'license': 'Other OSI approved licence',
     'installable': True,
     'auto_install': False,
-    'certificate' : '00531476623680631853',
     'images': ['images/config_chart_l10n_cr.jpeg','images/l10n_cr_chart.jpeg'],
 }
 
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 299174da592..e9507595402 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -148,7 +148,6 @@ German accounting chart and localization.
         'l10n_de_wizard.xml',
     ],
     'installable': True,
-    'certificate': '00517849017945584893',
     'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'],
 }
 
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 62a32a526c3..3414f969dcd 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -42,7 +42,6 @@ Accounting chart and localization for Ecuador.
     ],
     'demo': [],
     'installable': True,
-    'certificate' : '001226484516187330589',
     'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'],
 }
 
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index 9b7a7517974..2264988fd99 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -54,7 +54,6 @@ Spanish Charts of Accounts (PGCE 2008).
     'demo': [],
     'auto_install': False,
     'installable': True,
-    'certificate': '00408828172062583229',
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
 
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 65a2621f03a..e1d4b9ac334 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -68,7 +68,6 @@ configuration of their taxes and fiscal positions manually.
     ],
     'test': ['test/l10n_fr_report.yml'],
     'demo': [],
-    'certificate': '00435321693876313629',
     'auto_install': False,
     'installable': True,
     'images': ['images/config_chart_l10n_fr.jpeg','images/l10n_fr_chart.jpeg'],
diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py
index 327ab35d5c0..386f4be71e8 100644
--- a/addons/l10n_fr_rib/__openerp__.py
+++ b/addons/l10n_fr_rib/__openerp__.py
@@ -53,7 +53,6 @@ Accounts in OpenERP: the first with the type 'RIB', the second with the type 'IB
     'depends': ['account', 'base_iban'],
     'data': ['bank_data.xml', 'bank_view.xml'],
     'installable': True,
-    'certificate': '003407950790',
     'auto_install': False,
 }
 
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 62d82b544d8..aac13487189 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -41,7 +41,6 @@ Greek accounting chart and localization.
                'l10n_gr_wizard.xml'
     ],
     'installable': True,
-    'certificate': '001146244418929008029',
     'images': ['images/config_chart_l10n_gr.jpeg','images/l10n_gr_chart.jpeg'],
 }
 
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index e36e418ee21..adba0898449 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -54,7 +54,6 @@ taxes and the Quetzal currency.""",
     ],
     'demo': [],
     'installable': True,
-    'certificate': '00815146661827601309',
     'images': ['images/config_chart_l10n_gt.jpeg','images/l10n_gt_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index b1cab835f96..b3dab229201 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -45,7 +45,6 @@ Indian accounting chart and localization.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001308250150600713245',
     'images': ['images/config_chart_l10n_in.jpeg','images/l10n_in_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index a9177fee033..00ba19e9c42 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -52,6 +52,5 @@ Italian accounting chart and localization.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00926677190009155165',
     'images': ['images/config_chart_l10n_it.jpeg','images/l10n_it_chart.jpeg'],
 }
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 70f30444a3e..588102989ac 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -45,7 +45,6 @@ This is the base module to manage the accounting chart for Luxembourg.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0078164766621',
     'images': ['images/config_chart_l10n_lu.jpeg','images/l10n_lu_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 37f477d363c..6cc213c8d2f 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -36,7 +36,6 @@ Seddik au cours du troisième trimestre 2010.""",
     'website': 'http://www.kazacube.com',
     'depends' : ['base', 'account'],
     'data' : [
-        'security/compta_security.xml',
         'security/ir.model.access.csv',
         'account_type.xml',
         'account_pcg_morocco.xml',
@@ -47,7 +46,6 @@ Seddik au cours du troisième trimestre 2010.""",
     'demo' : [],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00599614652359069981',
     'images': ['images/config_chart_l10n_ma.jpeg','images/l10n_ma_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/security/compta_security.xml b/addons/l10n_ma/security/compta_security.xml
deleted file mode 100644
index 8d511ae7154..00000000000
--- a/addons/l10n_ma/security/compta_security.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
-
-    <record id="group_expert_comptable" model="res.groups">
-        <field name="name">Finance / Expert Comptable </field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-</data>
-</openerp>
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 25ec7cc98c4..02904431151 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -37,7 +37,6 @@ Mexican accounting chart and localization.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '00858539161332598061',
     'images': ['images/config_chart_l10n_mx.jpeg','images/l10n_mx_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index a263f912183..b612d07c147 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -127,7 +127,6 @@ De extra cijfers worden dan achter het rekeningnummer aangevult met 'nullen'.
     ],
     'demo' : [],
     'installable': True,
-    'certificate': '00976041422960053277',
     'images': ['images/config_chart_l10n_nl.jpeg','images/l10n_nl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py
index 9ae3e351d13..f194576aa27 100644
--- a/addons/l10n_pe/__openerp__.py
+++ b/addons/l10n_pe/__openerp__.py
@@ -42,7 +42,6 @@ SUNAT 2011 (PCGE 2010).
     'demo': [],
     'active': False,
     'installable': True,
-    'certificate' : '0045046493412',
     'images': ['images/config_chart_l10n_pe.jpeg','images/l10n_pe_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index df8d2955e8e..a14828fe9de 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -41,7 +41,6 @@ VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów zakł
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00885794372803776829',
     'images': ['images/config_chart_l10n_pl.jpeg','images/l10n_pl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 22df6955a5f..8026d49c3db 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -36,7 +36,6 @@ Romanian accounting chart and localization.
     'data' : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001308250150602948125',
     'images': ['images/config_chart_l10n_ro.jpeg','images/l10n_ro_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index d2c5d07142a..94340954abc 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -34,7 +34,6 @@ Thai accounting chart and localization.
     'depends': ['account_chart'],
     'data': [ 'account_data.xml' ],
     'installable': True,
-    'certificate' : '00722263103978957725',
     'images': ['images/config_chart_l10n_th.jpeg','images/l10n_th_chart.jpeg'],
 }
 
diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py
index e5e7aaf59c8..2a6f10ddb29 100644
--- a/addons/l10n_uy/__openerp__.py
+++ b/addons/l10n_uy/__openerp__.py
@@ -46,7 +46,6 @@ Provide Templates for Chart of Accounts, Taxes for Uruguay.
     'demo': [],
     'auto_install': False,
     'installable': True,
-    'certificate': '0078287892698',
     'images': ['images/config_chart_l10n_uy.jpeg','images/l10n_uy_chart.jpeg'],
 }
 
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index fcb5110714e..f10f4d0db61 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -41,7 +41,6 @@ Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '00763145921185574557',
     'images': ['images/config_chart_l10n_ve.jpeg','images/l10n_ve_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index f84edb1db35..f3791da7acd 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -46,7 +46,6 @@ Category for the product.
     'demo': ['lunch_demo.xml'],
     'test': ['test/test_lunch.yml', 'test/lunch_report.yml'],
     'installable': True,
-    'certificate' : '001292377792581874189',
     'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'],
 }
 
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/__openerp__.py b/addons/mail/__openerp__.py
index 387b1e19301..5a3c48de675 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -67,7 +67,6 @@ Main Features
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '001056784984222247309',
     'images': [
         'images/customer_history.jpeg',
         'images/messages_form.jpeg',
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.js b/addons/mail/static/src/js/mail.js
index 57c777441e7..326b2f442b1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -349,7 +349,8 @@ openerp.mail = function(session) {
             // event: click on 'Reply by email' in msg side menu
             this.$el.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
                 if (! self.compose_message_widget) return true;
-                var msg_id = event.srcElement.dataset.msg_id;
+                evt = event.target || event.srcElement;
+                var msg_id = evt.dataset.msg_id;
                 if (! msg_id) return false;
                 self.compose_message_widget.refresh({
                     'default_composition_mode': 'reply',
@@ -370,9 +371,10 @@ openerp.mail = function(session) {
 
         on_message_read: function (event) {
             //TDE: TODO
-            var msg_id = event.srcElement.dataset.id;
+            evt = event.target || event.srcElement;
+            var msg_id = evt.dataset.id;
             if (! msg_id) return false;
-            $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+            $(evt).parents('li.oe_mail_thread_msg').eq(0).remove();
             return this.ds_notification.call('set_message_read', [parseInt(msg_id)]);
         },
 
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/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 57a59e2595f..7a84a2abd78 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -320,7 +320,9 @@ class test_mail(TestMailMockups):
         for sent_email in sent_emails:
             self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
             self.assertEqual(sent_email['body'], _mail_body1 + '\n<pre>Bert Tartopoils</pre>\n', 'sent_email body incorrect')
-            self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils', 'sent_email body_alternative is incorrect')
+            # the html2plaintext uses etree or beautiful soup, so the result may be slighly different
+            # depending if you have installed beautiful soup.
+            self.assertIn(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect')
         # Test: mail_message: partner_ids = group followers
         message_pids = set([partner.id for partner in message.partner_ids])
         test_pids = set([p_a_id, p_b_id, p_c_id])
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 90f6e076cae..0c77fe59a86 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -42,7 +42,6 @@ Contains the installer for marketing-related modules.
     'demo': ['marketing_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00598574977629228189',
     'images': ['images/config_marketing.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 61d5d2ada29..a51347fd1bb 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -68,7 +68,6 @@ input segments, workflow.
     'test': ['test/marketing_campaign.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00421723279617928365',
     'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 19b9536c432..189bd8285f2 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -5,21 +5,36 @@
     <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
 
     <!-- Marketing Campaign -->
-    <act_window name="All Segments"
-        res_model="marketing.campaign.segment"
-        src_model="marketing.campaign"
-        view_type="form"
-        view_mode="tree,form"
-        id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
+    
+    <record id="act_marketing_campaing_segment_opened" model="ir.actions.act_window">
+        <field name="res_model">marketing.campaign.segment</field>
+        <field name="view_type">form</field>
+        <field name="name">Segments</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
+    
+    <!-- Campaign Follow-ups -->
+        
+    <record id="act_marketing_campaing_followup" model="ir.actions.act_window">
+        <field name="res_model">marketing.campaign.workitem</field>
+        <field name="view_type">form</field>
+        <field name="name">Workitems</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
+    
+    <!-- Campaign Statistics -->
+    
+    <record id="act_marketing_campaing_stat" model="ir.actions.act_window" >
+        <field name="res_model">campaign.analysis</field>
+        <field name="view_type">form</field>
+        <field name="name">Campaign Follow-up</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
 
     <!-- Campaign Followups -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_followup"
-        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
 
     <record model="ir.ui.view" id="view_marketing_campaign_form">
         <field name="name">marketing.campaign.form</field>
@@ -35,12 +50,15 @@
             </header>
             <sheet string="Campaign">
                 <div class="oe_right oe_button_box" name="button_box">
-                        <button type="action"
+                    <button type="action"
+                        name="%(act_marketing_campaing_stat)d"
+                        string="Campaign Statistics"/>
+                    <button type="action"
+                        name="%(act_marketing_campaing_segment_opened)d"
+                        string="Segments"/>  
+                    <button type="action"
                         name="%(act_marketing_campaing_followup)d"
                         string="Follow-Up"/>
-                        <button type="action"
-                        name="%(act_marketing_campaing_segment_opened)d"
-                        string="Segments"/>
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
@@ -422,29 +440,5 @@
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/>
 
-    <act_window name="All Segments"
-        res_model="marketing.campaign.segment"
-        src_model="marketing.campaign"
-        view_type="form"
-        view_mode="tree,form"
-        id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
-
-    <!-- Campaign Follow-ups -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_followup"
-        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
-
-    <!-- Campaign Statistics -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_stat"
-        name="Campaign Statistics" res_model="campaign.analysis"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
-
     </data>
 </openerp>
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index aae0d72e9d0..9265561bd64 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -39,7 +39,6 @@ Creates demo data like leads, campaigns and segments for the module marketing_ca
     'demo': ['marketing_campaign_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '001005497972871352957',
     'images': ['images/campaigns.jpeg','images/email_templates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 316a2f0f120..4a0a80694b3 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -51,7 +51,6 @@ invoice and send propositions for membership renewal.
     'test': ['test/test_membership.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0042907796381',
     'images': ['images/members.jpeg','images/membership_list.jpeg', 'images/membership_products.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index cce5272bd79..73564f2b460 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -84,6 +84,5 @@ Dashboard / Reports for MRP will include:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0032052481373',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index ddd5e3d63fb..9df8ab9908b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -45,6 +45,5 @@ In that case, you can not use priorities any more on the different picking.
     'test': ['test/mrp_jit.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086634760061',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index a5bda80f924..97c76f90546 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -73,6 +73,5 @@ So, that we can compare the theoretic delay and real delay.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056233813133',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index da4070d6210..d522bdc36e8 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -59,6 +59,5 @@ The following topics should be covered by this module:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0060814381277',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index c45584eb1a9..6475cbe4a91 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -50,6 +50,5 @@ With this module:
     'test': ['test/mrp_subproduct.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0050060616733',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 501740188db..bbaa161ee57 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -41,7 +41,6 @@ This module is the base module for other multi-company modules.
     'demo': ['multi_company_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001115526094673097933',
     'images': ['images/companies.jpeg','images/default_company_per_object_form.jpeg', 'images/default_company_per_object_list.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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/__openerp__.py b/addons/pad/__openerp__.py
index 50b280d2c32..b99e6d828c9 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -18,7 +18,6 @@ pads (by default, http://ietherpad.com/).
     'installable': True,
     'auto_install': False,
     'web': True,
-    'certificate' : '001183545978470526509',
     'js': ['static/src/js/pad.js'],
     'qweb' : ['static/src/xml/*.xml'],
     'images': ['static/src/img/pad_link_companies.jpeg'],
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/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py
index 3f26399e71f..98a1d70eb9f 100644
--- a/addons/plugin_outlook/__openerp__.py
+++ b/addons/plugin_outlook/__openerp__.py
@@ -40,7 +40,6 @@ into mail.message with attachments.
     'data' : ['plugin_outlook.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001278773815818292125',
     'images': ['images/config_outlook.jpeg','images/outlook_config_openerp.jpeg','images/outlook_push.jpeg'],
 
 }
diff --git a/addons/plugin_thunderbird/__openerp__.py b/addons/plugin_thunderbird/__openerp__.py
index 54e05603e53..56c9d47cd65 100644
--- a/addons/plugin_thunderbird/__openerp__.py
+++ b/addons/plugin_thunderbird/__openerp__.py
@@ -40,6 +40,5 @@ HR Applicant and Project Issue from selected mails.
     'data' : ['plugin_thunderbird.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00899858104035139949',
     'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'],
 }
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 1030dedbdf8..6502d92b4dc 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -5,6 +5,7 @@
         <record id="portal_project_issue_kanban_view" model="ir.ui.view">
             <field name="name">Project Issue Kanban</field>
             <field name="model">project.issue</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_portal_project_issue">
                     <field name="priority"/>
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index f0ece3704dc..fcae18c5490 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -43,7 +43,6 @@ This module shows the basic processes involved in the selected modules and in th
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0055447636669',
     'images': ['images/process_nodes.jpeg','images/process_transitions.jpeg', 'images/processes.jpeg'],
     'js': [
         'static/src/js/process.js'
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index e797766eb40..a1aed1dfba8 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -61,7 +61,6 @@ depending on the product's configuration.
     'test': ['test/procurement.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '00954248826881074509',
     'images': ['images/compute_schedulers.jpeg','images/config_companies_sched.jpeg', 'images/minimum_stock_rules.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 0c14b999e99..fdadda2e4d4 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -66,7 +66,6 @@ Print product labels with barcode.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0068861431437',
     'images': ['images/product_uom.jpeg','images/product_pricelists.jpeg','images/products_categories.jpeg', 'images/products_form.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index c333000621a..f189b854fe5 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -394,6 +394,12 @@ class product_pricelist_item(osv.osv):
                     return False
         return True
 
+    def _check_margin(self, cr, uid, ids, context=None):
+        for item in self.browse(cr, uid, ids, context=context):
+            if item.price_max_margin and item.price_min_margin and (item.price_min_margin > item.price_max_margin):
+                return False
+        return True
+
     _columns = {
         'name': fields.char('Rule Name', size=64, help="Explicit rule name for this pricelist line."),
         'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
@@ -401,13 +407,13 @@ class product_pricelist_item(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
         'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
 
-        'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
+        'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells equal to or more than this quantity."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
         'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
         'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add or substract(if negative) to the amount calculated with the discount.'),
         'price_discount': fields.float('Price Discount', digits=(16,4)),
         'price_round': fields.float('Price Rounding',
             digits_compute= dp.get_precision('Product Price'),
@@ -416,15 +422,16 @@ class product_pricelist_item(osv.osv):
               "To have prices that end in 9.99, set rounding 10, surcharge -0.01" \
             ),
         'price_min_margin': fields.float('Min. Price Margin',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the minimum amount of margin over the base price.'),
         'price_max_margin': fields.float('Max. Price Margin',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the maximum amount of margin over the base price.'),
         'company_id': fields.related('price_version_id','company_id',type='many2one',
             readonly=True, relation='res.company', string='Company', store=True)
     }
 
     _constraints = [
-        (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id'])
+        (_check_recursion, 'Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id']),
+        (_check_margin, 'Error! The minimum margin should be lower than the maximum margin.', ['price_min_margin', 'price_max_margin'])
     ]
 
     def product_id_change(self, cr, uid, ids, product_id, context=None):
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index dc120660c43..01cb4dc54eb 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -219,7 +219,7 @@
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"
-            parent="base.menu_base_config" sequence="20" groups="product.group_sale_pricelist"/>
+            parent="product.menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
 
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 8bc0789d44b..d04f308bc4b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -743,6 +743,14 @@ class product_product(osv.osv):
         else:
             return super(product_product, self).copy(cr, uid, id, default=default,
                     context=context)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context and context.get('search_default_categ_id', False):
+            args.append((('categ_id', 'child_of', context['search_default_categ_id'])))
+        return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False)
+
 product_product()
 
 class product_packaging(osv.osv):
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 5ae76a87695..9808fa732e9 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -7,7 +7,11 @@
         <record id="product_category_all" model="product.category">
             <field name="name">All products</field>
         </record>
-
+        <record id="product_category_1" model="product.category">
+            <field name="parent_id" ref="product_category_all"/>
+            <field name="name">Saleable</field>
+        </record>
+        
         <record id="product_uom_categ_unit" model="product.uom.categ">
             <field name="name">Unit</field>
         </record>
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 97d6e03205c..66b86fc7b63 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -9,11 +9,7 @@
         <!--
     Resource: product.category
     -->
-
-        <record id="product_category_1" model="product.category">
-            <field name="parent_id" ref="product.product_category_all"/>
-            <field name="name">Saleable</field>
-        </record>
+ 
         <record id="product_category_2" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Internal</field>
@@ -23,27 +19,27 @@
             <field name="name">Other Products</field>
         </record>
         <record id="product_category_4" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Computers</field>
         </record>
         <record id="product_category_5" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Services</field>
         </record>
         <record id="product_category_6" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">External Devices</field>
         </record>
         <record id="product_category_7" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Accessories</field>
         </record>
         <record id="product_category_8" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Components</field>
         </record>
         <record id="product_category_9" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Softwares</field>
         </record>
         <record id="product_category_10" model="product.category">
diff --git a/addons/product/product_pricelist_demo.yml b/addons/product/product_pricelist_demo.yml
index 39f6cfc16b2..efb812ad5e2 100644
--- a/addons/product/product_pricelist_demo.yml
+++ b/addons/product/product_pricelist_demo.yml
@@ -47,7 +47,7 @@
             - name: 20% Discount given by my supplier
               sequence: 1
               price_min_margin: 2
-              price_max_margin: -5
+              price_max_margin: 5
               product_id: product_product_6
               base: -2
 -
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c08bbc412e3..8c19aee026f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -467,11 +467,15 @@
                         </group>
                         <group>
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
+                            <p attrs="{'invisible':[('uom_type','!=','smaller')]}" colspan="2">
+                                e.g: 1 * (reference unit) = ratio * (this unit)
+                            </p>
+                            <p attrs="{'invisible':[('uom_type','!=','bigger')]}" colspan="2">
+                                e.g: 1 * (this unit) = ratio * (reference unit)
+                            </p>
                             <field name="rounding"/>
                             <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml
index 85230261312..66e256d4cd1 100644
--- a/addons/product/test/product_pricelist.yml
+++ b/addons/product/test/product_pricelist.yml
@@ -49,14 +49,14 @@
   !python {model: product.product}: |
     context.update({'quantity':1, 'date': False, 'partner': ref('base.res_partner_4'), 'pricelist': ref("supplier_pricelist")})
     product = self.browse(cr, uid, ref("product_product_6"), context=context)
-    assert product.price == 785, "cost price is not correspond."
+    assert product.price == 792, "cost price is not correspond."
 -
   I check cost price of LCD Monitor if more than 3 Unit.
 -
   !python {model: product.product}: |
     context.update({'quantity':3})
     product = self.browse(cr, uid, ref("product_product_6"), context=context)
-    assert product.price == 780, "cost price is not correspond."
+    assert product.price == 787, "cost price is not correspond."
 
 -
  I print the sale prices report.
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index b4f66edc482..ae65c9092b3 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -39,7 +39,6 @@ Used, for example, in food industries.""",
     'data' : ['product_expiry_view.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate': '00421222123914960109',
     'images': ['images/production_lots_dates.jpeg','images/products_dates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 8e24f8476f0..f43ed923860 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -41,7 +41,6 @@ You can now define the following for a product:
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '00720153953662760781',
     'images': ['images/products_manufacturer.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 76e4d3964b1..41c2a53474a 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -41,7 +41,6 @@ The wizard to launch the report has several options to help you get the data you
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0064392591773',
     'images': ['images/open_margins.jpeg','images/product_margins_form.jpeg', 'images/product_margins_list.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index d3c35dfe8b0..09cf5ce61fd 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -40,7 +40,6 @@ To this end, a new check box named 'Visible Discount' is added to the pricelist
     'data': ['product_visible_discount_view.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001144718884654279901',
     'images': ['images/pricelists_visible_discount.jpeg'],
 }
 
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index ddd1eba5ca0..17588a4de02 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -38,7 +38,6 @@ modules like share, lunch, pad, idea, survey and subscription.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00557100228403879621',
     'images': ['images/config_extra_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index edf0100c8bc..85e33be777a 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -85,6 +85,5 @@ Dashboard / Reports for Project Management will include:
     'application': True,
     'css': ['static/src/css/project.css'],
     'js': ['static/src/js/project.js'],
-    'certificate': '0075116868317',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 93d01a5619b..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">
@@ -104,7 +103,7 @@
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
-                                <kanban quick_create="true" create="false">
+                                <kanban quick_create="false" create="true">
                                     <field name="name"/>
                                     <templates>
                                         <t t-name="kanban-box">
@@ -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_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index ae1d5ee909c..eb05cdfa848 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -53,6 +53,5 @@ GTD rests on the principle that a person needs to move tasks out of the mind by
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0043525236301',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 1c4006329a9..f35ca0251d3 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -61,7 +61,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '001236490750848623845',
     'js': ['static/src/js/project_issue.js'],
 }
 
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_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index e12bc1a14cd..3eac04133d4 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -44,7 +44,6 @@ Worklogs can be maintained to signify number of hours spent by users to handle a
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00856032058128997037',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 2968a5b035d..3a3307d2898 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -58,7 +58,6 @@ Features:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '001227470751077315069',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index dd20c1c9c1e..91212b92c1d 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -55,6 +55,5 @@ task is completed.
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0031976495453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index e3e7a444676..4fc0dc41a75 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -37,6 +37,5 @@ the tasks will change accordingly.
     'test': ['test/deadline_change.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0057235475485',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 805556c1a96..0651d7b9ce4 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -49,6 +49,5 @@ with the effect of creating, editing and deleting either ways.
     ],
     'installable': True,
     'auto_install': True,
-    'certificate': '0075123647453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 66104ee0d8c..c7d6ab15ab4 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -97,7 +97,7 @@
         <menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
             id="menu_hr_timesheet_sign_in"
             parent="hr_attendance.menu_hr_attendance"
-            sequence="5" />
+            sequence="5" groups="base.group_hr_attendance" />
 
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 38706d96670..a7c66344f4a 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -84,7 +84,6 @@ Dashboard / Reports for Purchase Management will include:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0057234283549',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 955d55b3825..d2060016866 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -179,7 +179,7 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Bases on incoming shipments')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Bases on incoming shipments: let you create an invoice when receptions are validated."
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 759c0561631..7702d182b09 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -367,7 +367,7 @@
             <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_draft': 1, 'search_default_to_approve': 1}</field>
             <field name="domain">[('state','in',('draft','sent','confirmed'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 9d23e97b385..dc222a42398 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -2,7 +2,7 @@
 <document filename="Request for Quotation.pdf">
   <template title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
+      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 801551c7a07..98a1ee2a704 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -39,6 +39,5 @@ on a supplier purchase order into several accounts and analytic plans.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062176518909',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index d224b9800f7..6feb6d27bf2 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -13,5 +13,30 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="purchase_order_form_analytic_inherit">
+        <field name="name">purchase.order.form.analytic.inherit</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- inherited view to make the purchase order lines list in the form non-editable
+             for the members of some usability groups -->
+    <record id="view_purchase_order_form_editable_list" model="ir.ui.view">
+        <field name="name">purchase.order.form.editable.list</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="groups_id" eval="[(6, 0, [ref('product.group_uom'), ref('purchase.group_analytic_accounting')])]"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+        </field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index d05870ca951..8c56f2af9ed 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -46,9 +46,7 @@ exceeds minimum amount set by configuration wizard.
     ],
     'demo': [],
     'installable': True,
-    'auto_install': False,
-    'certificate' : '00436592682510544157',
-
+    'auto_install': False
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/board_purchase_view.xml b/addons/purchase_double_validation/board_purchase_view.xml
index 0557963fcb1..c2cc4df88b8 100644
--- a/addons/purchase_double_validation/board_purchase_view.xml
+++ b/addons/purchase_double_validation/board_purchase_view.xml
@@ -3,7 +3,7 @@
     <data>
  
         <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
+            <field name="name">Purchase Orders Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -17,7 +17,7 @@
             <field name="inherit_id" ref="purchase.board_purchase_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column/action[@string='Request for Quotations']" position="after">
-                    <action name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"/>
+                    <action name="%(purchase_waiting)d" string="Purchase Orders Waiting Approval"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index f2492b207c0..2ba0ad95e09 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -32,7 +32,7 @@ When a purchase order is created, you now have the opportunity to save the
 related requisition. This new object will regroup and will allow you to easily
 keep track and order all your purchase orders.
 """,
-    'depends' : ['purchase','mrp'],
+    'depends' : ['purchase'],
     'demo': ['purchase_requisition_demo.xml'],
     'data': ['security/purchase_tender.xml',
               'wizard/purchase_requisition_partner_view.xml',
@@ -48,7 +48,6 @@ keep track and order all your purchase orders.
         'test/cancel_purchase_requisition.yml',
     ],
     'installable': True,
-    'certificate': '001023264099823179629',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 3a2b9e95ea5..2bfba48b204 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -38,7 +38,6 @@ modules like base_report_designer and base_report_creator.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00764037194670093149',
     'images': ['images/config_reporting_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index aa4fa31a0b0..0fa57977db1 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -43,7 +43,6 @@ European Union.""",
     'test': ['test/report_intrastat_report.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056982189085',
     'images': ['images/country_intrastat_code.jpeg','images/intrastat_code.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 28ad16b63d4..5b88cb78eb4 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -91,7 +91,6 @@ TODO:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '001159699313338995949',
     'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'],
 }
 
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index d10c336609e..7ea85759732 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -49,7 +49,6 @@ You have to create the print buttons by calling the wizard. For more details see
     'data': ['report_webkit_html_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00436592682591421981',
     'images': ['images/webkit_invoice_report.jpeg'],
 }
 
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 94c55105c2a..b8a9f57c910 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -47,7 +47,6 @@ associated to every resource. It also manages the leaves of every resource.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00746371192190459469',
     'images': ['images/resource_leaves_calendar.jpeg','images/resource_leaves_form.jpeg'],
 }
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 13f0fb53696..d76ea064c2c 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -88,6 +88,5 @@ The Dashboard for the Sales Manager will include
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '0058103601429',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index df33feae578..5f4d980a339 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -37,6 +37,5 @@ Using this module you will be able to link analytic accounts to sales orders.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0066055860861',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 4846b61f624..88608af8922 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -49,6 +49,5 @@ modules.
     'test': ['test/sale_crm.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '0064360130141',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index b6d5ec25ce1..80e9f3b4f42 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -23,13 +23,27 @@ from osv import osv,fields
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
-
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
+    def create(self, cr, uid, vals, context=None):
+        order =  super(sale_order, self).create(cr, uid, vals, context=context)
+        section_id = self.browse(cr, uid, order, context=context).section_id
+        if section_id:
+            followers = [follow.id for follow in section_id.message_follower_ids]
+            self.message_subscribe(cr, uid, [order], followers, context=context)
+        return order
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('section_id'):
+            section_id = self.pool.get('crm.case.section').browse(cr, uid, vals.get('section_id'), context=context)
+            if section_id:
+                vals['message_follower_ids'] = [(4, follower.id) for follower in section_id.message_follower_ids]
+        return super(sale_order, self).write(cr, uid, ids, vals, context=context)
+
 sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 9ca3858f817..30a6a281c49 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -61,6 +61,5 @@ Some statistics by journals are provided.
     'test': [ ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0077661619085',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 6cacdcda7b4..9b393b6c5ad 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -37,7 +37,6 @@ Price and Cost Price.
     'data':['security/ir.model.access.csv','sale_margin_view.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001165700015525701661',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index c93fdcc91fd..bc9b84cd471 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -43,6 +43,5 @@ from sales order. It adds sales name and sales Reference on production order.
     'test':['test/sale_mrp.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '00395598976683092013',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index 7c3360f3547..6db8f2b27d9 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -43,7 +43,6 @@ You can add the following additional dates to a sale order:
     'test': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00867497685972962845',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 87a2f68bb04..94eccba2a56 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -50,7 +50,6 @@ synchronization with other companies.
     ],
     'installable': True,
     'web': True,
-    'certificate' : '001301246528927038493',
     'js': ['static/src/js/share.js'],
     'css': ['static/src/css/share.css'],
     'qweb' : ['static/src/xml/*.xml'],
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index b7d9ec1ceb9..966186121b6 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -98,7 +98,6 @@ Dashboard / Reports for Warehouse Management will include:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0055421559965',
     'css': [ 'static/src/css/stock.css' ],
 }
 
diff --git a/addons/stock/i18n/es_MX.po b/addons/stock/i18n/es_MX.po
index 3cf93515b09..3ad451daa04 100644
--- a/addons/stock/i18n/es_MX.po
+++ b/addons/stock/i18n/es_MX.po
@@ -1,92 +1,103 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* stock
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 09:19+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-27 04:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 04:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#~ msgid "Stock Management"
-#~ msgstr "Gestión de inventario"
+"X-Launchpad-Export-Date: 2012-09-28 04:39+0000\n"
+"X-Generator: Launchpad (build 16043)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr "Lotes de seguimiento en salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_upload
-msgid "Stock ups upload"
-msgstr "Stock ups carga"
-
-#. module: stock
-#: code:addons/stock/product.py:76
-#, python-format
-msgid "Variation Account is not specified for Product Category: %s"
 msgstr ""
-"No se ha especificado la cuenta de variación para la categoría de producto: "
-"%s"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Stock move Split lines"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. This is the default "
+"value for all products in this category. It can also directly be set on each "
+"product"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Ubicación encadenada si fija"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Put in a new pack"
-msgstr "Poner en un paquete nuevo"
-
-#. module: stock
-#: field:stock.move.split.lines,action:0
-msgid "Action"
-msgstr "Acción"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
 #: view:stock.production.lot:0
+#, python-format
 msgid "Upstream Traceability"
-msgstr "Trazabilidad hacia arriba"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.todo.category,name:stock.category_stock_management_config
+msgid "Stock Management"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr "Último inventario de productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr "Hoy"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr "Número de revisión"
+msgstr ""
 
 #. module: stock
-#: view:stock.move.memory.in:0
-#: view:stock.move.memory.out:0
+#: view:stock.move:0
+msgid "Orders processed Today or planned for Today"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move.line:0 view:stock.partial.picking:0
+#: field:stock.partial.picking,move_ids:0 view:stock.partial.picking.line:0
+#: view:stock.return.picking.memory:0
 msgid "Product Moves"
-msgstr "Movimientos productos"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "UoM Categories"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr "Análisis movimientos"
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -94,8 +105,12 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
-"Número interno de referencia en caso de que sea diferente del número de "
-"serie del fabricante."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#, python-format
+msgid "You cannot perform this operation on more than one Stock Inventories."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -104,39 +119,36 @@ msgid ""
 "per location. You can use it once a year when you do the general inventory "
 "or whenever you need it, to correct the current stock level of a product."
 msgstr ""
-"Los inventarios periódicos se utilizan para contar el número de productos "
-"disponibles por ubicación. Lo puede utilizar una vez al año cuando realice "
-"el inventario general, o cuando lo necesite, para corregir el nivel actual "
-"de stock de un producto."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#, python-format
+msgid "Quantity cannot be negative."
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:report.stock.inventory,product_qty:0
 #: field:report.stock.move,product_qty:0
 #: field:stock.change.product.qty,new_quantity:0
 #: field:stock.inventory.line,product_qty:0
 #: field:stock.inventory.line.split,qty:0
-#: report:stock.inventory.move:0
-#: field:stock.move,product_qty:0
-#: field:stock.move.consume,product_qty:0
-#: field:stock.move.memory.in,quantity:0
-#: field:stock.move.memory.out,quantity:0
-#: field:stock.move.scrap,product_qty:0
-#: field:stock.move.split,qty:0
-#: field:stock.move.split.lines,quantity:0
-#: field:stock.move.split.lines.exist,quantity:0
-#: report:stock.picking.list:0
-#: field:stock.report.prodlots,qty:0
-#: field:stock.report.tracklots,name:0
+#: field:stock.inventory.line.split.lines,quantity:0
+#: report:stock.inventory.move:0 field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0 field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0 field:stock.move.split.lines,quantity:0
+#: field:stock.partial.move.line,quantity:0
+#: field:stock.partial.picking.line,quantity:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0 field:stock.report.tracklots,name:0
+#: field:stock.return.picking.memory,quantity:0
 #: field:stock.split.into,quantity:0
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
@@ -144,76 +156,75 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
-"Esta es la lista de albaranes de salida que deben ser preparados, en función "
-"de sus pedidos de venta y sus reglas logísticas."
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,day:0
+#: view:report.stock.move:0 field:report.stock.move,day:0
 msgid "Day"
-msgstr "Día"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: field:stock.inventory.line.split,product_uom:0
-#: view:stock.move:0
-#: field:stock.move.split,product_uom:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0 field:stock.move.split,product_uom:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "UoM"
-msgstr "UdM"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:104
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
-#, python-format
 msgid "Physical Inventories"
-msgstr "Inventarios físicos"
+msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
-#: view:report.stock.move:0
+#: field:product.category,property_stock_journal:0 view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr "Diario de inventario"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Incoming"
-msgstr "Entrada"
-
-#. module: stock
-#: help:product.category,property_stock_account_output_categ:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"outgoing stock moves will be posted in this account. This is the default "
-"value for all products in this category, it can also directly be set on each "
-"product."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de salida se creará "
-"en esta cuenta. Este es el valor por defecto para todos los productos de "
-"esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2415
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current month"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:222
+#, python-format
+msgid "Unable to assign all lots to this move!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2516
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr "Faltan datos del albarán parcial para el movimiento #%s"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr "Enviar/Recibir productos"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:135
 #, python-format
 msgid "You cannot delete any record!"
-msgstr "¡No puede eliminar ningún registro!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,update_cost:0
+#: field:stock.partial.picking.line,update_cost:0
+msgid "Need cost update"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -223,56 +234,51 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
-"La línea de movimiento actual ya está asignada a un albarán, elimínela "
-"primero si realmente quiere cambiarla ' # 'para este este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr "No aplicable"
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr "Otra referencia o número de serie."
+msgstr ""
 
 #. module: stock
-#: field:stock.move,origin:0
-#: view:stock.picking:0
-#: field:stock.picking,origin:0
+#: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
 msgid "Origin"
-msgstr "Origen"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
+msgid "Incoming Products"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr "No factura"
+msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Pack Identification"
-msgstr "Identificación paquete"
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: field:stock.move,picking_id:0
-#: field:stock.picking,name:0
+#: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
-msgstr "Referencia"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
+#: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
 #, python-format
 msgid "Products to Process"
-msgstr "Productos a procesar"
-
-#. module: stock
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+msgstr ""
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -280,238 +286,219 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
-"Si se marca, todas las cantidades de producto se ponen a cero para ayudar a "
-"realizar un inventario físico real."
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines
-msgid "Split lines"
-msgstr "Dividir líneas"
+#: view:stock.partial.move:0 view:stock.partial.picking:0
+msgid "_Validate"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1149
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
-"¡No puede cancelar el albarán porqué el movimiento de stock está en estado "
-"realizado!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
+#: code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
-msgstr "Agrupar por empresa"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_res_partner
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,partner_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,partner_id:0
-#: view:stock.move:0
-#: field:stock.move,partner_id:0
-#: view:stock.picking:0
+#: model:ir.model,name:stock.model_res_partner view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0 view:report.stock.move:0
+#: field:report.stock.move,partner_id:0 view:stock.move:0
+#: field:stock.move,partner_id:0 view:stock.picking:0
 #: field:stock.picking,partner_id:0
 msgid "Partner"
-msgstr "Empresa"
+msgstr ""
 
 #. module: stock
-#: help:stock.move.memory.in,currency:0
-#: help:stock.move.memory.out,currency:0
-msgid "Currency in which Unit cost is expressed"
-msgstr "Moneda en la que se expresa el coste unidad."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/stock.py:2119
 #, python-format
+msgid ""
+"Can not create Journal Entry, Input Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
 msgid "No invoicing"
-msgstr "No facturación"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that have been processed"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Production lot"
-msgstr "Lote de producción"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
-msgid "Units of Measure Categories"
-msgstr "Categorías de unidades de medida"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr "Código para Incoterms"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr "Movimientos para este paquete"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments Available"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "Ubicación interna"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Confirm Inventory"
-msgstr "Confirmar el inventario"
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: field:report.stock.move,state:0
-#: view:stock.inventory:0
-#: field:stock.inventory,state:0
-#: field:stock.inventory.line,state:0
-#: view:stock.move:0
-#: field:stock.move,state:0
-#: view:stock.picking:0
-#: field:stock.picking,state:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,state:0
+#: view:report.stock.move:0 field:report.stock.move,state:0
+#: view:stock.inventory:0 field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0 view:stock.move:0
+#: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0
 #: report:stock.picking.list:0
 msgid "State"
-msgstr "Estado"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr "Valor stock real"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr "Retraso (días)"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr "Acción trazabilidad "
-
-#. module: stock
-#: field:stock.location,posy:0
-msgid "Shelves (Y)"
-msgstr "Estantería (Y)"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr "UdM"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
-#: selection:stock.picking,state:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,stock_available:0
+#: selection:report.stock.move,state:0 view:stock.move:0
+#: selection:stock.move,state:0 view:stock.picking:0
+#: view:stock.production.lot:0 field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr "Reservado"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: field:stock.picking,min_date:0
+#: view:stock.picking:0 field:stock.picking,min_date:0
 msgid "Expected Date"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
-msgid "Outgoing Product"
-msgstr "Albarán de salida"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
 msgid ""
 "Create and manage your warehouses and assign them a location from here"
-msgstr "Cree y gestione sus almacenes y asígneles una ubicación desde aquí."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr "En cantidad"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
 #, python-format
 msgid "No product in this location."
-msgstr "No hay producto en esta ubicación."
+msgstr ""
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "Ubicación de salida"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr "Dividir en"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Internal Locations"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr "Moneda para precio promedio"
-
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de entrada se creará "
-"en esta cuenta. Si no se indica en el producto, se utilizará la definida en "
-"la categoría del producto."
 
 #. module: stock
-#: field:report.stock.inventory,location_type:0
-#: field:stock.location,usage:0
+#: help:product.category,property_stock_valuation_account_id:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
 msgid "Location Type"
-msgstr "Tipo de ubicación"
+msgstr ""
 
 #. module: stock
-#: help:report.stock.move,type:0
-#: help:stock.picking,type:0
+#: help:report.stock.move,type:0 help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr "Indica el tipo de envío, recepción o envío de mercancías."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
-msgstr "Etiquetas artículos"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
 msgid "Moves Statistics"
-msgstr "Estadísticas de movimientos"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr "Filtro lotes de producto"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
 msgid "["
-msgstr "["
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
@@ -519,58 +506,58 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
-"Cantidad actual de productos con este número de lote de producción "
-"disponible en almacenes de la compañía."
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr "Historial movimientos (movimientos hijos)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:2125
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de salida de stock para este producto o su "
-"categoría: \"%s\" (id: %d)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 #: field:stock.picking,move_lines:0
 msgid "Internal Moves"
-msgstr "Albaranes internos"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr "Ubicación destino"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:754
+#: model:ir.model,name:stock.model_stock_partial_move_line
+msgid "stock.partial.move.line"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:760
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "No puede procesar un albarán sin movimientos de stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "Empaquetado"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr "Pedido (origen)"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr "Total:"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
@@ -580,53 +567,42 @@ msgid ""
 "buttons on the right of each line. You can filter the products to deliver by "
 "customer, products or sale order (using the Origin field)."
 msgstr ""
-"En esta lista encontrará todos los productos que ha de entregar a sus "
-"clientes. Puede procesar las entregas directamente desde esta lista usando "
-"los botones a la derecha de cada línea. Puede filtrar los productos a "
-"entregar por cliente, producto o pedido de venta (utilizando el campo "
-"origen)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr "Control inventario"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: field:stock.location,comment:0
+#: view:stock.location:0 field:stock.location,comment:0
 msgid "Additional Information"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr "Ubicación / Producto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1303
+#: field:stock.move,address_id:0
+msgid "Destination Address "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1333
 #, python-format
 msgid "Reception"
-msgstr "Recepción"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr "Referencia adicional"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "Revisiones de lote de producción"
-
-#. module: stock
-#: help:product.product,track_outgoing:0
-msgid ""
-"Forces to specify a Production Lot for all moves containing this product and "
-"going to a Customer Location"
 msgstr ""
-"Fuerza a indicar un lote de producción para todos los movimientos que "
-"contienen este producto y van a una ubicación del cliente."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -636,97 +612,129 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
-"El sistema de existencias diarias le permite asignar a cada operación de "
-"existencias a un diario específico según el tipo de operación a realizar por "
-"el trabajador/equipo que debe realizar la operación. Ejemplos de diarios de "
-"existencias pueden ser: control de calidad, listas de selección, embalaje, "
-"etc."
 
 #. module: stock
-#: field:stock.location,complete_name:0
-#: field:stock.location,name:0
+#: field:stock.location,complete_name:0 field:stock.location,name:0
 msgid "Location Name"
-msgstr "Nombre ubicación"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"Our records indicate that the following payments are still due. If the "
+"amount\n"
+"has already been paid, please disregard this notice. However, if you have "
+"any\n"
+"queries regarding your account, please contact us.\n"
+"Thank you in advance.\n"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr "Inventario enviado"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"The Incoming Shipments is the list of all orders you will receive from your "
+"suppliers. An incoming shipment contains a list of products to be received "
+"according to the original purchase order. You can validate the shipment "
+"totally or partially."
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,wizard_exist_id:0
+msgid "Parent Wizard (for existing lines)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
 msgid "Move Information"
-msgstr "Información de movimiento"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2131
+#, python-format
+msgid ""
+"There is no inventory Valuation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr "Salida"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr "Agosto"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.model,name:stock.model_stock_tracking
-#: model:ir.ui.menu,name:stock.menu_action_tracking_form
-#: view:stock.tracking:0
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0
 msgid "Packs"
-msgstr "Paquetes"
+msgstr ""
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
+msgstr ""
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Ventas y Compras"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr "Junio"
+msgstr ""
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "Ubicación de abastecimiento"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: field:stock.inventory.line.split,line_exist_ids:0
 #: field:stock.inventory.line.split,line_ids:0
-#: field:stock.move.split,line_exist_ids:0
-#: field:stock.move.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0 field:stock.move.split,line_ids:0
 msgid "Production Lots"
-msgstr "Lotes de producción"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
-msgstr "Destinatario"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator
+msgid "Refrigerator"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr "Estructura ubicaciones"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr "Octubre"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr "Línea inventario"
+msgstr ""
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -734,20 +742,27 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, este es el diario "
-"contable donde los asientos se crearán automáticamente cuando los "
-"movimientos de stock se procesen."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr "Procesar albarán"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:358
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:417
 #, python-format
 msgid "Future Receptions"
-msgstr "Recepciones futuras"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr ""
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -756,149 +771,159 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
-"Marque esta opción para seleccionar lotes existentes en la lista inferior, "
-"de lo contrario debe introducir otros de nuevos línea por la línea."
+
+#. module: stock
+#: code:addons/stock/product.py:75
+#, python-format
+msgid "Valuation Account is not specified for Product Category: %s"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr "Movimiento destino"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process Now"
-msgstr "Procesar ahora"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Dirección ubicación"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
 msgstr ""
-"Lote de producción se utiliza para poner un número de serie a la producción."
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "Ubicación de entrada"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr "Fecha de la orden."
+msgstr ""
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr "Periódico (manual)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr "Abastecimientos"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr "Proveedores TI"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr "Inventarios físicos borrador"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr "Ubicación de tránsito para transferencias inter-compañías"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr "Cambiar cantidad producto"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,month:0
+msgid "unknown"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr "Fusionar inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:374
+#: code:addons/stock/product.py:433
 #, python-format
 msgid "Future P&L"
-msgstr "P&L futuras"
+msgstr ""
 
 #. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4 view:stock.picking:0
 msgid "Incoming Shipments"
-msgstr "Albaranes de entrada"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Scrap"
-msgstr "Desecho"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,child_ids:0
 msgid "Contains"
-msgstr "Contiene"
-
-#. module: stock
-#: view:board.board:0
-msgid "Incoming Products Delay"
-msgstr "Retraso albaranes entrada"
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr "Ubicaciones stock"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:stock.move,price_unit:0
 msgid "Unit Price"
-msgstr "Precio un."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines_exist
-msgid "Exist Split lines"
-msgstr "Dividir líneas existentes"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "Fecha prevista"
+msgstr ""
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr "Buscar paquete"
-
-#. module: stock
-#: selection:stock.move,priority:0
-msgid "Urgent"
-msgstr "Urgente"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
-#: report:stock.picking.list:0
-msgid "Journal"
-msgstr "Diario"
+msgid "Pickings already processed"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1315
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 report:stock.picking.list:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
 msgstr ""
@@ -910,24 +935,26 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
-"Déjelo vacío si produce en la ubicación donde los productos terminados son "
-"necesarios. Indique un lugar si produce en una ubicación fija. Esto puede "
-"ser una ubicación de empresa si subcontrata las operaciones de fabricación."
 
 #. module: stock
 #: view:res.partner:0
 msgid "Inventory Properties"
-msgstr "Propiedades inventario"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr "Tiempo inicial de ejecución (días)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move Processing Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "Existencias por ubicacion"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -935,113 +962,88 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
-"Dirección opcional cuando las mercancías deben ser entregadas, utilizado "
-"específicamente para lotes."
 
 #. module: stock
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Month-1"
-msgstr "Mes-1"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar la ubicación sin eliminarla."
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
-msgid "Packing list"
-msgstr "Albarán"
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Pickings"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr "Stock virtual"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr "Vista"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Last month"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr "Padre izquierdo"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:132
-#, python-format
-msgid "Delivery Information"
-msgstr "Información de envío"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: code:addons/stock/stock.py:1349
 #, python-format
-msgid "Stock Inventory is done"
-msgstr "Inventario de stock realizado"
+msgid "is waiting."
+msgstr ""
 
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Error: Código EAN no válido"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:148
+#: code:addons/stock/product.py:147
 #, python-format
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de salida de stock para este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "Ubicación de producción"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr "Dirección de la empresa."
+msgstr ""
 
 #. module: stock
-#: model:res.company,overdue_msg:stock.res_company_shop0
-#: model:res.company,overdue_msg:stock.res_company_tinyshop0
-msgid ""
-"\n"
-"Date: %(date)s\n"
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Please find in attachment a reminder of all your unpaid invoices, for a "
-"total amount due of:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Thanks,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-"        "
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
 msgstr ""
-"\n"
-"Fecha: %(date)s\n"
-"\n"
-"Estimado %(partner_name)s,\n"
-"\n"
-"En el adjunto encontrará un recordatorio de todas las facturas no pagadas, "
-"por un importe total de:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Gracias,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-"        "
 
 #. module: stock
 #: help:stock.location,usage:0
@@ -1070,91 +1072,76 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
-"* Ubicación proveedor: Ubicación virtual que representa la ubicación de "
-"origen para los productos procedentes de sus proveedores.\n"
-"\n"
-"* Vista: Ubicación virtual para crear una estructura jerárquica de su "
-"almacén, agregando sus ubicaciones hijas. No puede contener los productos "
-"directamente.\n"
-"\n"
-"* Ubicación interna: Ubicación física dentro de su propios almacenes.\n"
-"\n"
-"* Ubicación cliente: Ubicación virtual que representa la ubicación de "
-"destino para los productos enviados a sus clientes.\n"
-"\n"
-"* Inventario: Ubicación virtual que actúa como contrapartida de las "
-"operaciones de inventario utilizadas para corregir los niveles de "
-"existencias (inventarios físicos).\n"
-"\n"
-"* Abastecimiento: Ubicación virtual que actúa como contrapartida temporal de "
-"las operaciones de abastecimiento cuando el origen (proveedor o producción) "
-"no se conoce todavía. Esta ubicación debe estar vacía cuando el planificador "
-"de abastecimientos haya terminado de ejecutarse.\n"
-"\n"
-"* Producción: Ubicación virtual de contrapartida para operaciones de "
-"producción: esta ubicación consume la materia prima y produce los productos "
-"terminados.\n"
-"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr "Autor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1302
+#: code:addons/stock/stock.py:1332
 #, python-format
 msgid "Delivery Order"
-msgstr "Albarán de salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_in
-msgid "stock.move.memory.in"
-msgstr "stock.movimiento.memoria.entrada"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr "Operación manual"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: view:stock.move:0
+#: view:stock.location:0 view:stock.move:0
 msgid "Supplier"
-msgstr "Proveedor"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2727
+#, python-format
+msgid ""
+"In order to cancel this inventory, you must first unpost related journal "
+"entries."
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr "Fecha realizado"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#, python-format
+msgid ""
+"The uom rounding does not allow you to ship \"%s %s\", only roundings of "
+"\"%s %s\" is accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Expected Shipping Date"
-msgstr "Fecha de envío prevista"
-
-#. module: stock
-#: selection:stock.move,state:0
-msgid "Not Available"
-msgstr "No disponible"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "March"
-msgstr "Marzo"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
 #: model:ir.model,name:stock.model_stock_inventory_line_split
-#: view:stock.inventory:0
-#: view:stock.inventory.line:0
+#: view:stock.inventory:0 view:stock.inventory.line:0
 msgid "Split inventory lines"
-msgstr "Dividir líneas de inventario"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr "Inventario físico"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1162,9 +1149,6 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
-"La compañía a la que pertenece el albarán que contiene el movimiento "
-"encadenado (dejarlo vacío para utilizar las reglas por defecto para "
-"determinar la compañía)."
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1173,53 +1157,53 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
-"Tipo de envío del albarán que va a contener el movimiento encadenado (dejar "
-"vacío para detectar automáticamente el tipo basado en las ubicaciones de "
-"origen y destino)."
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr "Número de lote"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
+#: field:stock.move.consume,product_uom:0 field:stock.move.scrap,product_uom:0
 msgid "Product UOM"
-msgstr "UdM del producto"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "Ubicaciones de empresas"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current year"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total quantity"
-msgstr "Cantidad total"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr "Movimiento consumo"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
 msgid "European Customers"
-msgstr "Clientes europeos"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr "Retraso entre movimiento original y movimiento encadenado en días."
+msgstr ""
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr "Importar inventario de productos actual para la siguiente ubicación"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1230,17 +1214,21 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
-"La opción 'Movimiento automático' creará un movimiento de stock después del "
-"actual que se validará automáticamente. Con 'Operación manual', el "
-"movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
-"automático, paso no añadido', la ubicación se reemplaza en el movimiento "
-"original."
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Downstream Traceability"
-msgstr "Trazabilidad hacia abajo"
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Packing List:"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Waiting Another Move"
+msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1249,25 +1237,24 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la de por defecto, como la ubicación de origen para los movimientos de "
-"stock generados por las órdenes de producción."
 
 #. module: stock
-#: code:addons/stock/stock.py:2006
-#, python-format
-msgid ""
-"Can not create Journal Entry, Output Account defined on this product and "
-"Variant account on category of this product are same."
+#: view:product.product:0
+msgid "Expected Stock Variations"
 msgstr ""
-"No se puede crear el asiento, la cuenta de salida definida en este producto "
-"y la cuenta variante de la categoría de producto son la misma."
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1350
 #, python-format
 msgid "is in draft state."
-msgstr "está en estado borrador."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1275,242 +1262,228 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
-"Esta es la lista de todos sus albaranes. Cuando selecciona un albarán, puede "
-"obtener la trazabilidad hacia arriba o hacia abajo de los productos que "
-"forman este paquete."
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr "Stock ups final"
-
-#. module: stock
-#: field:stock.location,chained_auto_packing:0
-msgid "Chaining Type"
-msgstr "Tipo encadenado"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
+#: selection:stock.return.picking,invoice_state:0
 msgid "To be refunded/invoiced"
-msgstr "Para ser abonado/facturado"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr "Tienda 1"
+msgstr ""
 
 #. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
-#: view:stock.fill.inventory:0
-#: view:stock.inventory.merge:0
-#: view:stock.invoice.onshipping:0
-#: view:stock.location.product:0
-#: view:stock.move:0
-#: view:stock.move.track:0
-#: view:stock.picking:0
-#: view:stock.split.into:0
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0 view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0 view:stock.location.product:0
+#: view:stock.move:0 view:stock.partial.move:0 view:stock.partial.picking:0
+#: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0
 msgid "_Cancel"
-msgstr "_Cancelar"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Ready"
-msgstr "Preparado"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr "Vista calendario"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
-#, python-format
-msgid "Operation forbidden"
-msgstr "Operación prohibida"
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
 msgid "From"
-msgstr "Desde"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#, python-format
-msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
-"¡Sólo puede devolver albaranes que estén confirmados, reservados o "
-"realizados!"
 
 #. module: stock
 #: view:stock.picking:0
-#: field:stock.picking,invoice_state:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,invoice_state:0
 msgid "Invoice Control"
-msgstr "Control factura"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr "Revisiones de lote de producción"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr "Albarán interno"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 view:stock.picking:0
 msgid "Waiting"
-msgstr "En espera"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: selection:stock.move.split.lines,action:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Split"
-msgstr "Dividir"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr "Buscar albarán stock"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:93
+#: code:addons/stock/product.py:92
 #, python-format
 msgid "Company is not specified in Location"
-msgstr "No se ha especificado una compañía en la ubicación"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
-#: field:stock.partial.move,type:0
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Available Pickings"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr "Proveedores TI genéricos"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved out of this location and into an internal location, instead of "
+"the generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr "Albarán:"
+msgstr ""
 
 #. module: stock
-#: field:stock.inventory,date:0
-#: field:stock.move,create_date:0
-#: field:stock.production.lot,date:0
-#: field:stock.tracking,date:0
+#: field:stock.inventory,date:0 field:stock.move,create_date:0
+#: field:stock.production.lot,date:0 field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr "Fecha creación"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr "Id línea de inventario"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr "Dirección del cliente o proveedor."
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,picking_id:0
+#: view:report.stock.move:0 field:report.stock.move,picking_id:0
 msgid "Packing"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "Ubicación del cliente"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
+#: code:addons/stock/stock.py:2312
 #, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
+msgid "You can only delete draft moves."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:139
-#, python-format
-msgid "Receive Information"
-msgstr "Información de recepción"
+#: model:ir.model,name:stock.model_stock_inventory_line_split_lines
+msgid "Inventory Split lines"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr "Resumen inventario ubicación"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement
-msgid "Stock Replacement"
-msgstr "Reemplazo stock"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
-msgstr "Información general"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Ninguno"
+#: view:report.stock.inventory:0
+msgid "Analysis including future moves (similar to virtual stock)"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action3
-#: view:stock.tracking:0
+#: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
 msgid "Downstream traceability"
-msgstr "Trazabilidad hacia abajo"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "No Invoices were created"
-msgstr "No se han creado facturas"
+msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_company
-msgid "OpenERP S.A."
-msgstr "OpenERP S.A."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:140
-#, python-format
-msgid "Receive"
-msgstr "Recibir"
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,active:0
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar un INCOTERM sin eliminarlo."
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-#: field:stock.picking,date:0
+#: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
 msgid "Order Date"
-msgstr "Fecha orden"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,location_id:0
+#: code:addons/stock/wizard/stock_change_product_qty.py:88
+#, python-format
+msgid "INV: %s"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr "Ubicación padre"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,state:0
@@ -1523,44 +1496,34 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
-"* Borrador: No se ha confirmado todavía y no se planificará hasta que se "
-"confirme.\n"
-"* Confirmado: A la espera de la disponibilidad de productos.\n"
-"* Reservado: Productos reservados, esperando la confirmación del envío.\n"
-"* En espera: Esperando que otro movimiento se realice antes de que sea "
-"disponible de forma automática (por ejemplo, en flujos "
-"Obtener_bajo_pedido).\n"
-"* Realizado: Ha sido procesado, no se puede modificar o cancelar nunca más.\n"
-"* Cancelado: Se ha cancelado, no se puede confirmar nunca más."
 
 #. module: stock
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
-"Deje este campo vacío si esta ubicación está compartida entre todas las "
-"compañías."
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2337
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr "¡Introduzca una cantidad positiva a desechar!"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr "Tiempo inicial encadenado"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
-#, python-format
-msgid "Cannot deliver products which are already delivered !"
-msgstr "¡No se pueden enviar productos que ya están enviados!"
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr "Stock factura en el envío"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1572,36 +1535,31 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'No disponible' si el planificador no ha "
-"encontrado los productos.\n"
-" Cuando los productos están reservados se establece como 'Reservado'.\n"
-" Cuando el albarán se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "Ubicación del proveedor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2254
+#: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr "estaban desechados"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Partial"
-msgstr "Parcial"
+#: help:stock.partial.move.line,currency:0
+#: help:stock.partial.picking.line,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "September"
-msgstr "Septiembre"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,backorder_id:0
@@ -1609,283 +1567,271 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
-"Si este albarán se dividió, este campo enlaza con el albarán que contiene la "
-"otra parte que ya ha sido procesada."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr "Estadísticas de stock"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,currency:0
-#: field:stock.move.memory.out,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr "Lotes seguimiento de fabricación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:44
-#, python-format
-msgid ""
-"Please select multiple physical inventories to merge in the list view."
+#: view:stock.picking:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_out_account_id:0
+msgid "Stock Valuation Account (Outgoing)"
 msgstr ""
-"Seleccione varios inventarios físicos para fusionar en la vista lista."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 #: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
+#: model:ir.ui.menu,name:stock.menu_action_move_form2 view:stock.inventory:0
+#: view:stock.move:0 view:stock.picking:0 view:stock.production.lot:0
 #: view:stock.tracking:0
 msgid "Stock Moves"
-msgstr "Movimientos de stock"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr "Envío mercancías"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr "Cancelar disponibilidad"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr "Fecha planificada para el procesado de este movimiento."
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
-msgstr "Movimientos creados"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_in_account_id:0
+msgid "Stock Valuation Account (Incoming)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr "Estante 2"
+msgstr ""
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr "Lote seguimiento"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr "Albaranes pendientes"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr "Propiedades de las ubicaciones parte recíproca"
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr "Ubicación"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr "Informe de stock por lotes de seguimiento"
-
-#. module: stock
-#: code:addons/stock/product.py:370
+#: code:addons/stock/product.py:429
 #, python-format
 msgid "Delivered Qty"
-msgstr "Ctdad enviada"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
-#: view:stock.inventory.line.split:0
-#: view:stock.move.split:0
+#: view:stock.inventory.line.split:0 view:stock.move.split:0
 msgid "Split in lots"
-msgstr "Dividir en lotes"
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr "Números lote de producción"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,date:0
-#: field:report.stock.move,date:0
-#: view:stock.inventory:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,date:0
-#: field:stock.partial.move,date:0
-#: field:stock.partial.picking,date:0
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. When not set on "
+"the product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Day Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0 view:stock.inventory:0
+#: report:stock.inventory.move:0 view:stock.move:0 field:stock.move,date:0
+#: field:stock.partial.move,date:0 field:stock.partial.picking,date:0
 #: view:stock.picking:0
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
+msgstr ""
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "Ubicación stock"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
 #, python-format
 msgid "Merging is only allowed on draft inventories."
-msgstr "La fusión sólo es permitida en inventarios borrador."
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_track
-msgid "Track moves"
-msgstr "Movimientos seguimiento"
+msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr "Código"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr "Número lotes"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr "Tablero almacén"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:513
 #, python-format
 msgid "You can not remove a lot line !"
-msgstr "¡No puede eliminar una línea de lote!"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_scrap
-#: view:stock.move:0
-#: view:stock.move.scrap:0
-#: view:stock.picking:0
+#: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
+#: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr "Desechar productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1128
+#: code:addons/stock/stock.py:1157
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr "¡No puede eliminar el albarán que está en estado %s!"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.picking:0
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.picking:0
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "Devolver albarán"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Split in production lots"
-msgstr "Dividir en lotes de producción"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_location
-#: view:report.stock.inventory:0
+#: field:product.product,location_id:0 view:report.stock.inventory:0
 #: field:report.stock.inventory,location_id:0
 #: field:stock.change.product.qty,location_id:0
 #: field:stock.fill.inventory,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: report:stock.inventory.move:0
-#: view:stock.location:0
-#: view:stock.move:0
-#: field:stock.move.consume,location_id:0
-#: field:stock.move.scrap,location_id:0
-#: field:stock.picking,location_id:0
-#: report:stock.picking.list:0
+#: field:stock.inventory.line,location_id:0 report:stock.inventory.move:0
+#: view:stock.location:0 view:stock.move:0
+#: field:stock.move.consume,location_id:0 field:stock.move.scrap,location_id:0
+#: field:stock.partial.move.line,location_id:0
+#: field:stock.partial.picking.line,location_id:0
+#: field:stock.picking,location_id:0 report:stock.picking.list:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
 msgid "Location"
-msgstr "Ubicación"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
-msgstr "Información"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr "Dirección de envío:"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
-msgid "Provide the quantities of the returned products."
-msgstr "Indique las cantidades de los productos devueltos."
-
-#. module: stock
-#: code:addons/stock/stock.py:2009
-#, python-format
-msgid ""
-"Can not create Journal Entry, Input Account defined on this product and "
-"Variant account on category of this product are same."
 msgstr ""
-"No se puede crear el asiento, la cuenta de entrada definido en este producto "
-"y la cuenta variante en la categoría del producto son la misma."
+
+#. module: stock
+#: help:stock.location,valuation_in_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved from an internal location into this location, instead of the "
+"generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Provide the quantities of the returned products."
+msgstr ""
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr "Precio coste"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: field:product.product,valuation:0
+#: view:product.product:0 field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr "Valoración inventario"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Create Invoice"
-msgstr "Crear factura"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-#: view:stock.picking:0
+msgid "Orders planned for today"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process Later"
-msgstr "Procesar más tarde"
+msgstr ""
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1893,24 +1839,11 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
-"Esta ubicación de stock será utilizada, en lugar de la ubicación por "
-"defecto, como la ubicación de origen para recibir mercancías desde esta "
-"empresa"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr "Dirección propietario"
-
-#. module: stock
-#: help:stock.move,price_unit:0
-msgid ""
-"Technical field used to record the product cost set by the user during a "
-"picking confirmation (when average price costing method is used)"
 msgstr ""
-"Campo técnico utilizado para registrar el coste del producto indicado por el "
-"usuario durante una confirmación de albarán (cuando se utiliza el método del "
-"precio medio de coste)."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1919,51 +1852,58 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
-"El análisis de movimientos le permite analizar y verificar fácilmente los "
-"movimientos de stock de su compañía. Utilice este informe cuando quiera "
-"analizar las diferentes rutas tomadas por sus productos y el rendimiento de "
-"la gestión de su inventario."
+
+#. module: stock
+#: code:addons/stock/stock.py:2116
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr "Tiempo inicial planificado (días)"
+msgstr ""
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr "Precio"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking_memory
+msgid "stock.return.picking.memory"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr "Buscar inventario"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "Cantidad por lote"
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:2122
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de entrada de stock para este producto o su "
-"categoría: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:360
+#: code:addons/stock/product.py:419
 #, python-format
 msgid "Received Qty"
-msgstr "Ctdad recibida"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr "Referencia interna"
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -1971,73 +1911,32 @@ msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
 msgstr ""
-"Prefijo opcional a añadir cuando se muestre el número de serie: "
-"PREFIJO/SERIE [REF_INT]"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr "Importar inventario"
+msgstr ""
 
 #. module: stock
-#: field:stock.incoterms,name:0
-#: field:stock.move,name:0
+#: field:stock.incoterms,name:0 field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
-msgstr "Stocks"
+msgstr ""
 
 #. module: stock
-#: model:ir.module.module,description:stock.module_meta_information
+#: help:stock.partial.move,hide_tracking:0
+#: help:stock.partial.picking,hide_tracking:0
 msgid ""
-"OpenERP Inventory Management module can manage multi-warehouses, multi and "
-"structured stock locations.\n"
-"Thanks to the double entry management, the inventory controlling is powerful "
-"and flexible:\n"
-"* Moves history and planning,\n"
-"* Different inventory methods (FIFO, LIFO, ...)\n"
-"* Stock valuation (standard or average price, ...)\n"
-"* Robustness faced with Inventory differences\n"
-"* Automatic reordering rules (stock level, JIT, ...)\n"
-"* Bar code supported\n"
-"* Rapid detection of mistakes through double entry system\n"
-"* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-"* Dashboard for warehouse that includes:\n"
-"    * Products to receive in delay (date < = today)\n"
-"    * Procurement in exception\n"
-"    * Graph : Number of Receive products vs planned (bar graph on week par "
-"day)\n"
-"    * Graph : Number of Delivery products vs planned (bar graph on week par "
-"day)\n"
-"    "
+"This field is for internal purpose. It is used to decide if the column "
+"prodlot has to be shown on the move_ids field or not"
 msgstr ""
-"El módulo de OpenERP de gestión de inventario puede gestionar múltiples "
-"almacenes, y varias ubicaciones estructuradas.\n"
-"Gracias a la gestión de doble entrada, el control de inventario es potente y "
-"flexible:\n"
-"* Historial de movimientos y planificación,\n"
-"* Diferentes métodos de inventario (FIFO, LIFO, ...)\n"
-"* Valoración de existencias (precio estándar o medio, ...)\n"
-"* Robustez frente a las diferencias de inventario\n"
-"* Normas de reordenación automática (nivel de existencias, JIT, ...)\n"
-"* Código de barras soportado\n"
-"* Detección rápida de errores a través del sistema de entrada doble\n"
-"* Trazabilidad (hacia arriba/hacia abajo, lotes de producción, número de "
-"serie, ...)\n"
-"* Panel de almacén que incluye:\n"
-"    * Productos a recibir con retraso (fecha <= hoy)\n"
-"    * Compras en excepción\n"
-"    * Gráfico: Número de productos Recibidos frente al previsto (gráfico de "
-"barras semanal por día)\n"
-"    * Gráfico: Número de productos Entregados frente al previsto (gráfico de "
-"barras semanal por día)\n"
-"    "
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2046,49 +1945,47 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la por defecto, como la ubicación de origen para los movimientos de stock "
-"generados cuando realiza un inventario."
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr "Almacenable"
+msgstr ""
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr "Tiempo real (automatizado)"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr "Unidad de envío logística: Palet, caja, paquete, ..."
+msgstr ""
 
 #. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
+#: view:stock.location:0
+msgid "Customer Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr "_Aplicar"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
 msgid "]"
-msgstr "]"
+msgstr ""
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "Ubicación de inventario"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total value"
-msgstr "Valor total"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2096,55 +1993,56 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
-"Diario de inventario en el que el movimiento encadenado será escrito, si el "
-"tipo de encadenamiento no es transparente (no se utiliza ningún diario si se "
-"deja vacío)."
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_incoming_product_board
-msgid "Incoming Product"
-msgstr "Albarán de entrada"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr "Creación"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,cost:0
-#: field:stock.move.memory.out,cost:0
+#: view:report.stock.inventory:0
+msgid ""
+"Analysis of current inventory (only moves that have already been processed)"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,cost:0
+#: field:stock.partial.picking.line,cost:0
 msgid "Cost"
-msgstr "Coste"
+msgstr ""
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 #: field:stock.change.standard.price,stock_account_input:0
-#: field:stock.location,valuation_in_account_id:0
 msgid "Stock Input Account"
-msgstr "Cuenta entrada stock"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Shipping type specify, goods coming in or going out"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
 msgid "Warehouse Management"
-msgstr "Gestión de almacenes"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr "Entrega parcial"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Mov. automático, paso no añadido"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr "Análisis ubicación stock"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,date:0
@@ -2152,57 +2050,46 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
-"Fecha del movimiento: Fecha planificada hasta que el movimiento esté "
-"realizado, después fecha real en que el movimiento ha sido procesado."
 
 #. module: stock
-#: field:report.stock.lines.date,date:0
-msgid "Latest Inventory Date"
-msgstr "Fecha último inventario"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr "Agrupar por..."
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr "Ubicaciones encadenadas"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr "Pérdidas de inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1311
+#: code:addons/stock/stock.py:1341
 #, python-format
 msgid "Document"
-msgstr "Documento"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr "Albarán de entrada"
+msgstr ""
 
 #. module: stock
-#: field:stock.move,product_uom:0
-#: field:stock.move.memory.in,product_uom:0
-#: field:stock.move.memory.out,product_uom:0
+#: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
+#: field:stock.partial.picking.line,product_uom:0
 msgid "Unit of Measure"
-msgstr "Unidad de medida"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:176
+#: code:addons/stock/product.py:175
 #, python-format
 msgid "Products: "
-msgstr "Productos: "
+msgstr ""
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -2210,142 +2097,122 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
-"Fuerza a especificar un lote de producción para todos los movimientos que "
-"contienen este producto y generados por una orden de fabricación."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.track_line_old
-#: view:stock.move.track:0
-msgid "Tracking a move"
-msgstr "Seguimiento de un movimiento"
 
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr "Actualizar"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
 #: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
 msgid "Stock Journals"
-msgstr "Diarios de stock"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr "Otros"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:90
+#: code:addons/stock/product.py:89
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
 msgstr ""
-"¡No se puede encontrar ninguna diferencia entre precio estándar y precio "
-"nuevo!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_partial_picking
-msgid "Partial Picking"
-msgstr "Empaquetado parcial"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Desechado"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr "Productos "
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr "Lotes de seguimiento de entrada"
+msgstr ""
 
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr "Tablero almacén"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:380
+#: code:addons/stock/product.py:439
 #, python-format
 msgid "Future Qty"
-msgstr "Ctdad futura"
+msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta variación stock"
-
-#. module: stock
-#: field:stock.move,note:0
-#: view:stock.picking:0
-#: field:stock.picking,note:0
+#: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
 msgid "Notes"
-msgstr "Notas"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Value"
-msgstr "Valor"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.move,type:0
-#: field:stock.location,chained_picking_type:0
+#: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr "Tipo de envío"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2210
-#, python-format
-msgid "You can only delete draft moves."
-msgstr "Sólo puede eliminar movimientos borrador."
+#: view:stock.move:0
+msgid "Stock moves that are Confirmed, Available or Waiting"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
 #: model:ir.actions.act_window,name:stock.act_product_location_open
-#: model:ir.ui.menu,name:stock.menu_stock_products_menu
-#: view:stock.inventory:0
-#: view:stock.picking:0
-#, python-format
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu view:stock.inventory:0
+#: view:stock.partial.move:0 view:stock.partial.picking:0 view:stock.picking:0
 msgid "Products"
-msgstr "Productos"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
-msgstr "Cambiar precio"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,move_type:0
 msgid "Delivery Method"
-msgstr "Método entrega"
+msgstr ""
 
 #. module: stock
 #: help:report.stock.move,location_dest_id:0
-#: help:stock.move,location_dest_id:0
-#: help:stock.picking,location_dest_id:0
+#: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "Ubicación donde el sistema almacenará los productos finalizados."
+msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation:0
-msgid ""
-"When real-time inventory valuation is enabled on a product, this account "
-"will hold the current value of the products."
+#: view:stock.move:0
+msgid "Stock to be delivered (Available or not)"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
+msgid "Outgoing Products"
 msgstr ""
-"Cuando está activada una valoración de inventario en tiempo real de un "
-"producto, esta cuenta contiene el valor actual de los productos."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2356,50 +2223,48 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
-"Aquí podrá recibir los productos individuales, sin importar de que pedido de "
-"compra o albarán de entrada provienen. Encontrará la lista de todos los "
-"productos que está esperando. Una vez recibido el albarán, puede filtrar "
-"basándose en el nombre del proveedor o en la referencia del pedido de "
-"compra. Entonces, puede confirmar todos los productos recibidos usando los "
-"botones a la derecha de cada línea."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
 msgid "Stock Move"
-msgstr "Movimiento stock"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr "Retraso (días)"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,move_id:0
-#: field:stock.move.memory.out,move_id:0
-msgid "Move"
-msgstr "Movimiento"
+#: code:addons/stock/stock.py:1697
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr "Fecha prevista para procesar el albarán."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:376
+#: code:addons/stock/product.py:435
 #, python-format
 msgid "P&L Qty"
-msgstr "Ctdad P&L"
+msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-#: field:stock.production.lot,revisions:0
+#: view:stock.picking:0
+msgid "Internal Pickings to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0 field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr "Revisiones"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr "Esta operación cancelará el envío. ¿Desea continuar?"
+msgstr ""
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2410,12 +2275,6 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
-"Si la valoración en tiempo real está habilitada para un producto, el sistema "
-"automáticamente escribirá asientos en el diario correspondientes a los "
-"movimientos de stock. La cuenta de variación de inventario especificada en "
-"la categoría del producto representará el valor de inventario actual, y la "
-"cuenta de entrada y salida de stock contendrán las contrapartidas para los "
-"productos entrantes y salientes."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2424,19 +2283,13 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
-"El análisis de inventario le permite verificar y analizar fácilmente los "
-"niveles de stock de su compañia. Ordene y agrupe por criterios de selección "
-"para analizar y gestionar mejor las actividades de su empresa."
 
 #. module: stock
-#: help:report.stock.move,location_id:0
-#: help:stock.move,location_id:0
+#: help:report.stock.move,location_id:0 help:stock.move,location_id:0
 msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
-"Indica una ubicación si se producen en una ubicación fija. Puede ser una "
-"ubicación de empresa si subcontrata las operaciones de fabricación."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -2451,109 +2304,95 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
-"Defina sus ubicaciones para reflejar la estructura de su almacén y "
-"organización. OpenERP es capaz de manejar ubicaciones físicas (almacén, "
-"estante, caja, etc.), ubicaciones de empresa (clientes, proveedores) y "
-"ubicaciones virtuales que son la contrapartida de las operaciones de stock "
-"como los consumos por órdenes de la fabricación, inventarios, etc. Cada "
-"operación de stock en OpenERP mueve los productos de una ubicación a otra. "
-"Por ejemplo, si recibe productos de un proveedor, OpenERP moverá productos "
-"desde la ubicación del proveedor a la ubicación del stock. Cada informe "
-"puede ser realizado sobre ubicaciones físicas, de empresa o virtuales."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
 msgid "Create"
-msgstr "Crear"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Dates"
-msgstr "Fechas"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,priority:0
 msgid "Priority"
-msgstr "Prioridad"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr "Origen"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
-#: field:stock.inventory.line,inventory_id:0
-#: report:stock.inventory.move:0
+#: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0
 #: selection:stock.location,usage:0
-#, python-format
 msgid "Inventory"
-msgstr "Inventario"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
-"¡La combinación de número de serie y referencia interna debe ser única!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups
-msgid "Stock ups"
-msgstr "Stock ups"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr "Cancelar el inventario"
-
-#. module: stock
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines.exist,name:0
-msgid "Tracking serial"
-msgstr "Seguimiento nº serie"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
-#: code:addons/stock/report/report_stock.py:135
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/report/report_stock.py:135 code:addons/stock/stock.py:760
 #, python-format
 msgid "Error !"
-msgstr "¡Error!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement_result
-msgid "Stock Replacement result"
-msgstr "Resultado reemplazo stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 msgid "Units of Measure"
-msgstr "Unidades de medida"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr "Ubicaciones fijas"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/stock.py:2486
+#, python-format
+msgid "Product  '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: model:product.template,description:stock.product_icecream_product_template
+msgid ""
+"Ice cream can be mass-produced and thus is widely available in developed "
+"parts of the world. Ice cream can be purchased in large cartons (vats and "
+"squrounds) from supermarkets and grocery stores, in smaller quantities from "
+"ice cream shops, convenience stores, and milk bars, and in individual "
+"servings from small carts or vans at public events."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "July"
-msgstr "Julio"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr "Consumible"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2563,259 +2402,233 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
-"Muestra los últimos inventarios realizados sobre sus productos y los ordena "
-"fácilmente con filtros específicos. Si realiza inventarios parciales "
-"frecuentemente, necesita este informe para asegurar que el stock de cada "
-"producto ha sido controlado al menos una vez al año."
+
+#. module: stock
+#: model:stock.location,name:stock.location_opening
+msgid "opening"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
-msgstr "Previsión nivel de stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
-#: field:report.stock.move,stock_journal:0
-#: view:stock.journal:0
-#: field:stock.journal,name:0
-#: field:stock.picking,stock_journal_id:0
+#: field:report.stock.move,stock_journal:0 view:stock.journal:0
+#: field:stock.journal,name:0 field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
-msgstr "Diario de inventario"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "Abastecimiento"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr "Proveedores Maxtor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
-#: code:addons/stock/wizard/stock_change_standard_price.py:106
+#: code:addons/stock/wizard/stock_change_product_qty.py:78
+#: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr "No se ha establecido el ID activo en el Contexto"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr "Forzar disponibilidad"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.move_scrap
-#: view:stock.move.scrap:0
+#: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr "Movimiento desecho"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:138
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
-#: model:ir.ui.menu,name:stock.menu_action_pdct_in
-#: view:stock.move:0
-#, python-format
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in view:stock.move:0
 msgid "Receive Products"
-msgstr "Recibir productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:131
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
-#, python-format
 msgid "Deliver Products"
-msgstr "Enviar productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Stock of Products"
-msgstr "Ver stock de productos"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Internal Picking List"
-msgstr "Albarán interno"
-
-#. module: stock
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 #: field:report.stock.move,month:0
 msgid "Month"
-msgstr "Mes"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr "Fecha de realización."
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr "Lote de producción único, se mostrará como: PREFIJO/SERIE [REF_INT]"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Your Company"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar un paquete sin eliminarlo."
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Yes"
-msgstr "Sí"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr "Inventarios"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr "Por hacer"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,company_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,company_id:0
-#: field:stock.inventory,company_id:0
-#: field:stock.inventory.line,company_id:0
-#: field:stock.location,company_id:0
-#: field:stock.move,company_id:0
-#: field:stock.picking,company_id:0
-#: field:stock.production.lot,company_id:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0 field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0 field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0 field:stock.move,company_id:0
+#: field:stock.picking,company_id:0 field:stock.production.lot,company_id:0
 #: field:stock.production.lot.revision,company_id:0
 #: field:stock.warehouse,company_id:0
 msgid "Company"
-msgstr "Compañía"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr "Unidad de medida"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:122
+#: code:addons/stock/product.py:121
 #, python-format
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de entrada de stock para este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2445
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
-"¡No se puede consumir un movimiento con una cantidad negativa o cero!"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr "Stock real"
+msgstr ""
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr "Rellenar inventario"
+msgstr ""
 
 #. module: stock
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
 
 #. module: stock
-#: help:product.category,property_stock_account_input_categ:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. This is the default "
-"value for all products in this category, it can also directly be set on each "
-"product."
+#: model:stock.location,name:stock.location_delivery_counter
+msgid "Delivery Counter"
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de entrada se creará "
-"en esta cuenta. Este es el valor por defecto para todos los productos de "
-"esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: field:stock.production.lot.revision,date:0
-msgid "Revision Date"
-msgstr "Fecha de revisión"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
-#: field:stock.move.split.lines,lot_id:0
-#: field:stock.move.split.lines.exist,lot_id:0
-#: report:stock.picking.list:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0 report:stock.picking.list:0
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr "Número lote de producción"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2697
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr "Cantidad (UdV)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1664
+#: code:addons/stock/stock.py:1743
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
-"Está moviendo %.2f %s productos pero sólo %.2f %s están disponibles en este "
-"lote."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr "Reservar"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr "Dirección de contacto :"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr "Albarán pendiente"
+msgstr ""
 
 #. module: stock
-#: field:stock.incoterms,active:0
-#: field:stock.location,active:0
+#: field:stock.incoterms,active:0 field:stock.location,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
-msgstr "Activo"
-
-#. module: stock
-#: model:ir.module.module,shortdesc:stock.module_meta_information
-msgid "Inventory Management"
-msgstr "Almacenes y logística"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
-msgstr "Propiedades"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:974
+#: code:addons/stock/stock.py:1082
 #, python-format
 msgid "Error, no partner !"
-msgstr "¡Error, sin empresa!"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split.lines,wizard_exist_id:0
+#: field:stock.inventory.line.split.lines,wizard_id:0
+#: field:stock.move.split.lines,wizard_id:0
+msgid "Parent Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2823,14 +2636,18 @@ msgstr "¡Error, sin empresa!"
 #: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr "Incoterms"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: model:ir.model,name:stock.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
 msgid "Total:"
-msgstr "Total:"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,name:0
@@ -2839,9 +2656,6 @@ msgid ""
 "costs and responsibilities between buyer and seller and reflect state-of-the-"
 "art transportation practices."
 msgstr ""
-"Los Incoterms son una serie de términos de ventas. Se utilizan para dividir "
-"los costes de transacción y las responsabilidades entre el comprador y el "
-"vendedor, y reflejan las prácticas de transporte más recientes."
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -2849,290 +2663,267 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
-"Si se marca, los productos que figuran en las ubicaciones hijas de la "
-"ubicación seleccionada se incluirán también."
-
-#. module: stock
-#: field:stock.move.track,tracking_prefix:0
-msgid "Tracking prefix"
-msgstr "Prefijo seguimiento"
 
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr "Referencia inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1304
+#: code:addons/stock/stock.py:1334
 #, python-format
 msgid "Internal picking"
-msgstr "Albarán interno"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr "Abrir producto"
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,to_date:0
 msgid "To"
-msgstr "Hasta"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process"
-msgstr "Procesar"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr "Nombre de revisión"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
 #: model:ir.ui.menu,name:stock.menu_stock_root
-#: view:stock.warehouse:0
+#: field:product.product,warehouse_id:0 view:stock.warehouse:0
 msgid "Warehouse"
-msgstr "Almacén"
+msgstr ""
 
 #. module: stock
-#: view:stock.location.product:0
-msgid ""
-"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
-"filter all resources of the day for the 'From' date and 23:59:59 for the "
-"'To' date)"
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
 msgstr ""
-"(Déjelo vacío para abrir la situación actual. Ponga HH:MM:SS a 00:00:00 para "
-"filtrar todos los recursos del día en el campo fecha 'Desde' y 23:59:59 en "
-"el campo fecha 'Hasta'.)"
 
 #. module: stock
 #: view:product.category:0
 msgid "Accounting Stock Properties"
-msgstr "Propiedades contables del stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr "Paquetes cliente"
+msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
+#: selection:report.stock.inventory,state:0 view:report.stock.move:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.move:0 selection:stock.move,state:0 view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Done"
-msgstr "Realizado"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_standard_price
 #: model:ir.model,name:stock.model_stock_change_standard_price
 #: view:stock.change.standard.price:0
 msgid "Change Standard Price"
-msgstr "Cambiar precio estándar"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr "Ubicaciones virtuales"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
-msgstr "Fecha realización"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:975
+#: code:addons/stock/stock.py:1083
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
 msgstr ""
-"Por favor indique una empresa en el albarán si desea generar factura."
 
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Not urgent"
-msgstr "No urgente"
-
-#. module: stock
-#: view:stock.move:0
-msgid "To Do"
-msgstr "Para hacer"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
 msgid "Warehouses"
-msgstr "Almacenes"
+msgstr ""
 
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock
-#: field:stock.move,returned_price:0
-msgid "Returned product price"
-msgstr "Precio producto devuelto"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr "Análisis inventario"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
-msgstr "Diario de destino"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
-msgstr "Stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
-#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
-#: model:ir.ui.menu,name:stock.menu_stock_product
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_id:0
-#: field:report.stock.lines.date,product_id:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0 view:report.stock.move:0
 #: field:report.stock.move,product_id:0
 #: field:stock.change.product.qty,product_id:0
 #: field:stock.inventory.line,product_id:0
-#: field:stock.inventory.line.split,product_id:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,product_id:0
-#: field:stock.move.consume,product_id:0
-#: field:stock.move.memory.in,product_id:0
-#: field:stock.move.memory.out,product_id:0
-#: field:stock.move.scrap,product_id:0
+#: field:stock.inventory.line.split,product_id:0 report:stock.inventory.move:0
+#: view:stock.move:0 field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0 field:stock.move.scrap,product_id:0
 #: field:stock.move.split,product_id:0
-#: view:stock.production.lot:0
+#: field:stock.partial.move.line,product_id:0
+#: field:stock.partial.picking.line,product_id:0 view:stock.production.lot:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
 #: field:stock.report.tracklots,product_id:0
+#: field:stock.return.picking.memory,product_id:0
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
+#: view:stock.return.picking:0
+msgid "Return"
+msgstr ""
+
+#. module: stock
+#: field:stock.return.picking,invoice_state:0
 msgid "Invoicing"
-msgstr "Facturación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Please provide Proper Quantity !"
-msgstr "¡Indique cantidad correcta!"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "UdV del producto"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
-msgstr "Altura (Z)"
-
-#. module: stock
-#: field:stock.ups,weight:0
-msgid "Lot weight"
-msgstr "Peso lote"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr "Consumir productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1742
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr "¡Stock insuficiente en el lote!"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr "Padre derecho"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
-msgstr "Dirección"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Variants"
-msgstr "Variantes"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,posx:0
 msgid "Corridor (X)"
-msgstr "Pasillo (X)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
 msgid "Suppliers"
-msgstr "Proveedores"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
+#: field:report.stock.inventory,value:0 field:report.stock.move,value:0
 msgid "Total Value"
-msgstr "Valor total"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr "Productos por categoría"
+msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
-msgstr "Categorías de productos"
+#: selection:stock.picking,state:0
+msgid "Waiting Another Operation"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,wizard_id:0
-#: field:stock.move.memory.out,wizard_id:0
+#: view:stock.location:0
+msgid "Supplier Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,wizard_id:0
+#: field:stock.partial.picking.line,wizard_id:0
+#: field:stock.return.picking.memory,wizard_id:0
 msgid "Wizard"
-msgstr "Asistente"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Completed Stock-Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
 #: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
-msgstr "Productos por ubicación"
+msgstr ""
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr "Incluir hijos"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr "Estante 1"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -3144,159 +2935,154 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
-"Los movimientos internos muestran todas las operaciones de inventario que se "
-"deben realizar en su almacén. Todas las operaciones pueden ser clasificadas "
-"en diarios de stock, para que cada trabajador tenga su propia lista de "
-"operaciones a realizar en su propio diario. La mayor parte de operaciones "
-"son preparadas automáticamente por OpenERP según sus reglas de logística "
-"preconfiguradas, pero también puede registrar operaciones de stock de forma "
-"manual."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr "Orden"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price :"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr "Referencia paquete"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_id:0
-#: field:stock.move,location_id:0
+#: view:report.stock.move:0 field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
+#: field:stock.move,location_id:0 field:stock.move.split,location_id:0
 msgid "Source Location"
-msgstr "Ubicación origen"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid " Waiting"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr "Asientos contables"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_manager
+msgid "Manager"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr "Total"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr "Envíos internos"
+msgstr ""
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr "Activa cuenta relacionada"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr "Valor stock virtual"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: view:stock.inventory.line.split:0
+#: view:product.product:0 view:stock.inventory.line.split:0
 #: view:stock.move.split:0
 msgid "Lots"
-msgstr "Lotes"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "New Pack"
-msgstr "Nuevo paquete"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr "Destinación"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
-msgstr "Todo junto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1620
+#: code:addons/stock/stock.py:1698
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
-"Las cantidades, UdM, productos y ubicaciones no se pueden modificar en los "
-"movimientos de stock que ya han sido procesados (excepto por el "
-"administrador)"
 
 #. module: stock
-#: code:addons/stock/product.py:386
+#: code:addons/stock/product.py:445
 #, python-format
 msgid "Future Productions"
-msgstr "Producciones futuras"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
+#: view:stock.return.picking:0
 msgid "Return lines"
-msgstr "Líneas de devolución"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr "Fechas de inventarios"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total incoming quantity"
-msgstr "Cantidad de entrada total"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr "Ctdad salida"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr "Movimientos para este lote de producción"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_out
-msgid "stock.move.memory.out"
-msgstr "stock.movimiento.memoria.salida"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:115
-#, python-format
-msgid "Message !"
-msgstr "¡ Mensaje !"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Put in current pack"
-msgstr "Poner en el paquete actual"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "Regularización de inventario"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr "Motivo"
+msgstr ""
 
 #. module: stock
-#: report:stock.picking.list:0
-msgid "Delivery Order:"
-msgstr "Albarán de salida:"
+#: model:product.template,name:stock.product_icecream_product_template
+msgid "Ice Cream"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3308,107 +3094,102 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
-"Esta es la lista de todos los lotes de producción (números de serie) que "
-"registró. Cuando selecciona un lote, puede obtener la trazabilidad hacia "
-"arriba o hacia abajo de los productos que componen el lote. Por defecto, la "
-"lista es filtrada según los números de serie disponibles en su almacén, pero "
-"puede desmarcar el botón 'Disponible' para obtener todos los lotes que "
-"produjo, recibió o entregó a sus clientes."
 
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr "Icono"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2209
-#: code:addons/stock/stock.py:2617
+#: code:addons/stock/stock.py:2311 code:addons/stock/stock.py:2726
 #, python-format
 msgid "UserError"
-msgstr "Error de usuario"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.move.track:0
-#: view:stock.split.into:0
+#: field:stock.partial.move,hide_tracking:0
+#: field:stock.partial.move.line,tracking:0
+#: field:stock.partial.picking,hide_tracking:0
+#: field:stock.partial.picking.line,tracking:0
+msgid "Tracking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.split.into:0
 msgid "Ok"
-msgstr "Aceptar"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. This is the "
+"default value for all products in this category. It can also directly be set "
+"on each product"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr "Clientes no europeos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:76
-#: code:addons/stock/product.py:90
-#: code:addons/stock/product.py:93
-#: code:addons/stock/product.py:100
-#: code:addons/stock/product.py:121
-#: code:addons/stock/product.py:147
-#: code:addons/stock/stock.py:2006
-#: code:addons/stock/stock.py:2009
-#: code:addons/stock/stock.py:2012
-#: code:addons/stock/stock.py:2015
-#: code:addons/stock/stock.py:2018
-#: code:addons/stock/stock.py:2021
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/product.py:75 code:addons/stock/product.py:89
+#: code:addons/stock/product.py:92 code:addons/stock/product.py:99
+#: code:addons/stock/product.py:120 code:addons/stock/product.py:146
+#: code:addons/stock/stock.py:2116 code:addons/stock/stock.py:2119
+#: code:addons/stock/stock.py:2122 code:addons/stock/stock.py:2125
+#: code:addons/stock/stock.py:2128 code:addons/stock/stock.py:2131
+#: code:addons/stock/stock.py:2445
 #: code:addons/stock/wizard/stock_fill_inventory.py:47
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
 msgid "Error!"
-msgstr "¡Error!"
-
-#. module: stock
-#: code:addons/stock/stock.py:2021
-#, python-format
-msgid ""
-"There is no inventory variation account defined on the product category: "
-"\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de variación de inventario en la categoría del "
-"producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories?"
-msgstr "¿Desea fusionar estos inventarios?"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Confirmed Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
 msgid "Picking"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
-msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr "Este albarán no requiere facturación."
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr "Recepción mercancías"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_location_type:0
@@ -3424,36 +3205,39 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
-"Determina si esta ubicación está encadenada a otra, por ejemplo cualquier "
-"producto que entre en esta ubicación debe ir a la siguiente ubicación "
-"encadenada. La ubicación encadenada se determina en función del tipo: \n"
-"*Ninguna: No se encadena con ninguna.\n"
-"*Cliente: Se utiliza la ubicación encadenada definida en el campo Ubicación "
-"del cliente del formulario del cliente especificado en el albarán de los "
-"productos entrantes.\n"
-"*Ubicación fija: Se utiliza la ubicación encadenada del siguiente campo: "
-"Ubicación encadenada si fija."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#: code:addons/stock/wizard/stock_partial_picking.py:159
 #, python-format
 msgid "Warning"
-msgstr "Advertencia"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:1348
 #, python-format
 msgid "is done."
-msgstr "está realizado."
+msgstr ""
 
 #. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 #: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree view:stock.picking:0
 msgid "Delivery Orders"
-msgstr "Albaranes de salida"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders already processed"
+msgstr ""
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3461,126 +3245,126 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
-"Esta ubicación de stock será utilizada, en lugar de la ubicación por "
-"defecto, como la ubicación de destino para enviar mercancías a esta empresa"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
 #: view:stock.picking:0
-#: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr "Confirmado"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
 
 #. module: stock
-#: help:stock.location,icon:0
-msgid "Icon show in  hierarchical tree view"
-msgstr "Icono mostrado en la vista de árbol jerárquica."
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge Inventories"
-msgstr "Fusionar inventarios"
+msgstr ""
 
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr "Recepción:"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
-"Marque esta opción para permitir utilizar esta ubicación para poner "
-"mercancías desechadas/defectuosas."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "Albarán relacionado"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Year Planned"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr "Cantidad de salida total"
+msgstr ""
 
 #. module: stock
-#: field:stock.picking,backorder_id:0
-msgid "Back Order of"
-msgstr "Albarán pendiente de"
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "New"
+msgstr ""
 
 #. module: stock
-#: help:stock.move.memory.in,cost:0
-#: help:stock.move.memory.out,cost:0
+#: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
 msgid "Unit Cost for this product line"
-msgstr "Coste unidad para esta línea de producto"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_categ_id:0
-#: view:report.stock.move:0
+#: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:88
-#, python-format
-msgid "INV: %s"
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "Informe"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1313
+#: code:addons/stock/stock.py:1343
 #, python-format
 msgid " for the "
-msgstr " para el "
+msgstr ""
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to Leave in the Current Pack"
-msgstr "Cantidad a dejar en el paquete actual"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock available to be delivered"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 #: view:stock.invoice.onshipping:0
 msgid "Create invoice"
-msgstr "Crear factura"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
-msgstr "Configuración"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr "Lotes existentes"
+msgstr ""
 
 #. module: stock
-#: field:product.product,location_id:0
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "Ubicación de stock"
+msgstr ""
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -3591,105 +3375,94 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
-"Si el precio de coste se incrementa, la cuenta la variación de existencias "
-"irá al debe y la cuenta de salida de stock irá al haber con el valor = "
-"(diferencia de cantidad * cantidad disponible).\n"
-"Si el precio de coste se reduce, la cuenta la variación de existencias irá "
-"al haber y la cuenta de entrada de stock irá al debe."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr "Diario encadenamiento"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr "No suficiente stock, no ha sido posible reservar los productos."
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
-msgstr "Clientes"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1317
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Waiting Availability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1347
 #, python-format
 msgid "is cancelled."
-msgstr "está cancelado."
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
-msgstr "Líneas regularización de inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
-#, python-format
-msgid "Process Document"
-msgstr "Procesar documento"
+#: view:stock.move:0
+msgid "Waiting "
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:368
+#: code:addons/stock/product.py:427
 #, python-format
 msgid "Future Deliveries"
-msgstr "Entregas futuras"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr "Información adicional"
-
-#. module: stock
-#: view:stock.move:0
-#: field:stock.move,tracking_id:0
-msgid "Pack"
-msgstr "Paquete"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Date Expected"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree4
-msgid ""
-"The Incoming Shipments is the list of all orders you will receive from your "
-"supplier. An incoming shipment contains a list of products to be received "
-"according to the original purchase order. You can validate the shipment "
-"totally or partially."
 msgstr ""
-"Los albaranes de entrada son la lista de todos los pedidos que va a recibir "
-"de su proveedor. Un albarán de entrada contiene la lista de productos a "
-"recibir en función del pedido de compra original. Puede validar el envío "
-"totalmente o parcialmente."
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "Auto validar"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr "Plantilla producto"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr "Diciembre"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3698,19 +3471,16 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
-"Este menú le da la trazabilidad completa de las operaciones de inventario "
-"sobre un producto específico. Puede filtrar sobre el producto para ver todos "
-"los movimientos pasados o futuros para el producto."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr "Devolver productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr "Validar inventario"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3718,69 +3488,62 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
-"Campo técnico utilizado para registrar la moneda elegida por el usuario "
-"durante una confirmación de albarán (cuando se utiliza el método de precio "
-"medio de coste)."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Stock Inventory is already Validated."
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr "Movimientos de productos"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: stock
-#: field:stock.move,address_id:0
-msgid "Destination Address"
-msgstr "Dirección destino"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr "Fecha prevista máx."
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr "Auto-Albarán"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr "Tienda 2"
+msgstr ""
 
 #. module: stock
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,type:0
-#: view:stock.location:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: selection:report.stock.move,type:0 view:stock.location:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Internal"
-msgstr "Interno"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr "Inventario stock"
+msgstr ""
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3791,27 +3554,17 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'Confirmado'.\n"
-" Si está reservado en stock se establece como 'Reservado'.\n"
-" Cuando el albarán se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
 
 #. module: stock
-#: view:board.board:0
-msgid "Outgoing Products Delay"
-msgstr "Retraso albaranes salida"
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.split.lines,use_exist:0
-msgid "Existing Lot"
-msgstr "Lote existente"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr "¡Introduzca por lo menos una cantidad que no sea cero!"
+msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3819,65 +3572,66 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la por defecto, como la ubicación de origen para los movimientos de stock "
-"generados por los abastecimientos."
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1346
 #, python-format
 msgid "is ready to process."
-msgstr "preparado para procesar."
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr "Referencia del documento que ha generado este albarán."
+msgstr ""
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
 msgid "Set to zero"
-msgstr "Inicializar a cero"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: model:res.groups,name:stock.group_stock_user
+msgid "User"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr "Ninguno de estos albaranes requiere facturación."
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr "Noviembre"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
+#: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido un diario en la categoría de producto: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:382
+#: code:addons/stock/product.py:441
 #, python-format
 msgid "Unplanned Qty"
-msgstr "Ctdad no planificada"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr "Compañía encadenada"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Check Availability"
-msgstr "Comprobar disponibilidad"
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr "Enero"
+msgstr ""
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3885,43 +3639,35 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
-"Fuerza a introducir un lote de producción para todos los movimientos que "
-"contiene este producto y procedente de una ubicación de proveedores."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr "Movimientos de stock futuros"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr "Historial movimientos (mov. padres)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:364
+#: code:addons/stock/product.py:423
 #, python-format
 msgid "Future Stock"
-msgstr "Stock futuro"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:512
-#: code:addons/stock/stock.py:1120
-#: code:addons/stock/stock.py:1128
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
+#: code:addons/stock/stock.py:1157
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "Error"
-msgstr "Error"
-
-#. module: stock
-#: field:stock.ups.final,xmlfile:0
-msgid "XML File"
-msgstr "Fichero XML"
+msgstr ""
 
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr "Seleccionar cantidad"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3930,54 +3676,48 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
-"Esta es la estructura de los almacenes y ubicaciones de su compañía. Puede "
-"pulsar sobre una ubicación para obtener la lista de los productos y su nivel "
-"de stock en esta ubicación específica y todos sus hijas."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
 #: field:stock.change.product.qty,prodlot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
-#: report:stock.inventory.move:0
-#: field:stock.move,prodlot_id:0
-#: field:stock.move.memory.in,prodlot_id:0
-#: field:stock.move.memory.out,prodlot_id:0
-#: field:stock.move.split.lines.exist,prodlot_id:0
-#: view:stock.production.lot:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: report:stock.inventory.move:0 field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0 view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 msgid "Production Lot"
-msgstr "Lote de producción"
+msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_traceability
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
+#: model:ir.ui.menu,name:stock.menu_traceability view:stock.move:0
+#: view:stock.picking:0 view:stock.production.lot:0 view:stock.tracking:0
 msgid "Traceability"
-msgstr "Trazabilidad"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
-#: model:ir.ui.menu,name:stock.menu_action_location_form
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_location_form view:stock.picking:0
 msgid "Locations"
-msgstr "Ubicaciones"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "General Information"
-msgstr "Información general"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr "Prefijo"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3986,1088 +3726,259 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
-"Cantidad total después de que la división exceda la cantidad para dividir "
-"para este producto: \"%s\" (id: %d)"
 
 #. module: stock
-#: view:stock.move:0
-#: field:stock.partial.move,product_moves_in:0
-#: field:stock.partial.move,product_moves_out:0
-#: field:stock.partial.picking,product_moves_in:0
-#: field:stock.partial.picking,product_moves_out:0
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. When not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,move_ids:0
+#: field:stock.return.picking,product_return_moves:0
 msgid "Moves"
-msgstr "Movimientos"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_dest_id:0
+#: view:report.stock.move:0 field:report.stock.move,location_dest_id:0
+#: field:stock.partial.move.line,location_dest_id:0
+#: field:stock.partial.picking.line,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr "Ubicación destino"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
 msgstr ""
-"Indica los atributos del empaquetado como el tipo, la cantidad de paquetes, "
-"etc."
-
-#. module: stock
-#: code:addons/stock/stock.py:2386
-#, python-format
-msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2595
-#, python-format
-msgid "Inventory '%s' is done."
-msgstr ""
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr "Previsto"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
-msgstr "Producción"
+msgstr ""
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr "Dividir movimiento"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:92
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
-"¡No hay productos para devolver (sólo las líneas en estado Realizado y "
-"todavía no devueltas totalmente pueden ser devueltas)!"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Future Stock-Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
 msgid "Split in Production lots"
-msgstr "Dividir en lotes de producción"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid "Processing Error"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr "Real"
+msgstr ""
 
 #. module: stock
-#: report:stock.picking.list:0
-#: view:stock.production.lot.revision:0
+#: report:stock.picking.list:0 view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr "Mayo"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:133
-#, python-format
-msgid "Deliver"
-msgstr "Enviar"
-
-#. module: stock
-#: help:product.template,property_stock_account_output:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"outgoing stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de salida se creará "
-"en esta cuenta. Si no se indica en el producto, se utilizará la cuenta de la "
-"categoría del producto."
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
-#: view:stock.tracking:0
+#: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
 msgid "Upstream traceability"
-msgstr "Trazabilidad hacia arriba"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr "Contenido ubicación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:388
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Produced Qty"
-msgstr "Ctdad producida"
+msgstr ""
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 #: field:stock.change.standard.price,stock_account_output:0
-#: field:stock.location,valuation_out_account_id:0
 msgid "Stock Output Account"
-msgstr "Cuenta salida stock"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr "Tipo ubicaciones encadenadas"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr "Reporte de inventario por lotes de producción"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: selection:stock.location,chained_location_type:0
+#: view:stock.location:0 selection:stock.location,chained_location_type:0
 #: view:stock.move:0
 msgid "Customer"
-msgstr "Cliente"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr "Febrero"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr "Identificación lote de producción"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,scrap_location:0
-#: view:stock.move.scrap:0
+#: model:stock.location,name:stock.location_refrigerator_small
+msgid "Small Refrigerator"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_convenience_shop
+msgid "Convenient Store"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "Ubicación desecho"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr "Abril"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
+#: view:report.stock.inventory:0 view:stock.move:0
 msgid "Future"
-msgstr "Futuro"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
 msgid "Invoiced date"
-msgstr "Fecha facturado"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:732
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#: code:addons/stock/wizard/stock_return_picking.py:92
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/stock.py:738
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Warning !"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr "Salida"
+msgstr ""
 
 #. module: stock
-#: selection:stock.move.split.lines,action:0
-msgid "Keep in one lot"
-msgstr "Mantener en un lote"
+#: help:stock.tracking,name:0
+msgid ""
+"By default, the pack reference is generated following the sscc standard. "
+"(Serial number + 1 check digit)"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-msgid "Cost Price:"
-msgstr "Precio coste:"
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid ""
+"The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
+"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
+"accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid ""
+"Production lot quantity %d of %s is larger than available quantity (%d) !"
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr "Opcional: Siguiente movimiento de stock cuando se encadenan."
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,year:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,year:0
+#: view:report.stock.move:0 field:report.stock.move,year:0
 msgid "Year"
-msgstr "Año"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr "Ubicaciones físicas"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_partial_move
-msgid "Partial Move"
-msgstr "Movimiento parcial"
+#: view:stock.picking:0 selection:stock.picking,state:0
+msgid "Ready to Process"
+msgstr ""
 
 #. module: stock
-#: help:stock.location,posx:0
-#: help:stock.location,posy:0
+#: help:stock.location,posx:0 help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr "Detalles de ubicación opcionales, sólo para fines de información."
-
-#~ msgid "Sub Products"
-#~ msgstr "Sub productos"
-
-#~ msgid "STOCK_SAVE"
-#~ msgstr "STOCK_SAVE"
-
-#~ msgid "STOCK_QUIT"
-#~ msgstr "STOCK_QUIT"
-
-#~ msgid "STOCK_CANCEL"
-#~ msgstr "STOCK_CANCEL"
-
-#~ msgid "STOCK_NEW"
-#~ msgstr "STOCK_NEW"
-
-#~ msgid "STOCK_UNDERLINE"
-#~ msgstr "STOCK_UNDERLINE"
-
-#~ msgid "STOCK_PREFERENCES"
-#~ msgstr "STOCK_PREFERENCES"
-
-#~ msgid "LIFO"
-#~ msgstr "LIFO"
-
-#~ msgid "terp-account"
-#~ msgstr "terp-account"
-
-#~ msgid "STOCK_SORT_ASCENDING"
-#~ msgstr "STOCK_SORT_ASCENDING"
-
-#~ msgid "Revision"
-#~ msgstr "Revisión"
-
-#~ msgid "STOCK_MEDIA_FORWARD"
-#~ msgstr "STOCK_MEDIA_FORWARD"
-
-#~ msgid "STOCK_ZOOM_100"
-#~ msgstr "STOCK_ZOOM_100"
-
-#~ msgid "Return packing"
-#~ msgstr "Devolución de paquete"
-
-#~ msgid "Fill Inventory for specific location"
-#~ msgstr "Rellenar inventario para una determinada ubicación"
-
-#~ msgid "Amount"
-#~ msgstr "Cantidad"
-
-#~ msgid "Products Received"
-#~ msgstr "Productos recibidos"
-
-#~ msgid "Move History"
-#~ msgstr "Histórico movimientos"
-
-#~ msgid "Make Parcel"
-#~ msgstr "Hacer envíos parciales"
-
-#~ msgid "STOCK_GOTO_TOP"
-#~ msgstr "STOCK_GOTO_TOP"
-
-#~ msgid "STOCK_ABOUT"
-#~ msgstr "STOCK_ABOUT"
-
-#~ msgid "terp-hr"
-#~ msgstr "terp-hr"
-
-#~ msgid "terp-purchase"
-#~ msgstr "terp-purchase"
-
-#~ msgid "STOCK_DND"
-#~ msgstr "STOCK_DND"
-
-#~ msgid "Products Sent"
-#~ msgstr "Productos enviados"
-
-#~ msgid "STOCK_GOTO_FIRST"
-#~ msgstr "STOCK_GOTO_FIRST"
-
-#~ msgid "Serial"
-#~ msgstr "Nº serie"
-
-#~ msgid "STOCK_FLOPPY"
-#~ msgstr "STOCK_FLOPPY"
-
-#~ msgid "Stock location"
-#~ msgstr "Ubicación de existencias"
-
-#~ msgid "Unreceived Products"
-#~ msgstr "Productos no recibidos"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Include all childs for the location"
-#~ msgstr "Incluir todos los descendientes de la ubicación"
-
-#~ msgid "Track line"
-#~ msgstr "Línea de seguimiento"
-
-#~ msgid "STOCK_BOLD"
-#~ msgstr "STOCK_BOLD"
-
-#~ msgid "terp-graph"
-#~ msgstr "terp-graph"
-
-#~ msgid "Stock Level 1"
-#~ msgstr "Nivel de Existencias 1"
-
-#~ msgid "STOCK_MEDIA_REWIND"
-#~ msgstr "STOCK_MEDIA_REWIND"
-
-#~ msgid "Stock Properties"
-#~ msgstr "Propiedades de stock"
-
-#~ msgid "Draft Moves"
-#~ msgstr "Movimientos borrador"
-
-#~ msgid "Product Id"
-#~ msgstr "Id producto"
-
-#~ msgid "Customer Invoice"
-#~ msgstr "Factura de cliente"
-
-#~ msgid "Force to use a Production Lot during production order"
-#~ msgstr ""
-#~ "Fuerza a utilizar un lote de producción durante la orden de producción"
-
-#~ msgid "STOCK_CUT"
-#~ msgstr "STOCK_CUT"
-
-#~ msgid ""
-#~ "For the current product (template), this stock location will be used, "
-#~ "instead of the default one, as the source location for stock moves generated "
-#~ "when you do an inventory"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de existencia se "
-#~ "utilizará, en lugar de la por defecto, como la ubicación origen para "
-#~ "movimientos de stock generados cuando realice un inventario"
-
-#~ msgid "This account will be used to value the output stock"
-#~ msgstr "Esta cuenta será utilizada para calcular las salidas de existencias"
-
-#~ msgid "STOCK_ZOOM_FIT"
-#~ msgstr "STOCK_ZOOM_FIT"
-
-#~ msgid ""
-#~ "This journal will be used for the accounting move generated by stock move"
-#~ msgstr ""
-#~ "Este diario será utilizado para contabilizar un movimiento generado por un "
-#~ "movimiento de Existencias"
-
-#~ msgid "Calendar of Deliveries"
-#~ msgstr "Calendario de entregas"
-
-#~ msgid "STOCK_SAVE_AS"
-#~ msgstr "STOCK_SAVE_AS"
-
-#~ msgid "STOCK_DIALOG_ERROR"
-#~ msgstr "STOCK_DIALOG_ERROR"
-
-#~ msgid "Latest Date of Inventory"
-#~ msgstr "Última fecha de inventario"
-
-#~ msgid "STOCK_INDEX"
-#~ msgstr "STOCK_INDEX"
-
-#~ msgid "STOCK_GOTO_BOTTOM"
-#~ msgstr "STOCK_GOTO_BOTTOM"
-
-#~ msgid "Tracking Lot"
-#~ msgstr "Lote de seguimiento"
-
-#~ msgid "STOCK_GO_FORWARD"
-#~ msgstr "STOCK_GO_FORWARD"
-
-#~ msgid "STOCK_UNDELETE"
-#~ msgstr "STOCK_UNDELETE"
-
-#~ msgid "STOCK_EXECUTE"
-#~ msgstr "STOCK_EXECUTE"
-
-#~ msgid "STOCK_DIALOG_QUESTION"
-#~ msgstr "STOCK_DIALOG_QUESTION"
-
-#~ msgid "Tracking/Serial"
-#~ msgstr "Seguimiento/Número de serie"
-
-#~ msgid "STOCK_SELECT_FONT"
-#~ msgstr "STOCK_SELECT_FONT"
-
-#~ msgid "STOCK_PASTE"
-#~ msgstr "STOCK_PASTE"
-
-#~ msgid ""
-#~ "Tracking lot is the code that will be put on the logistical unit/pallet"
-#~ msgstr ""
-#~ "Lote de seguimiento es el código que se colocará en la unidad/palet "
-#~ "logístico."
-
-#~ msgid "Tracking Number"
-#~ msgstr "Número seguimiento"
-
-#~ msgid "terp-stock"
-#~ msgstr "terp-stock"
-
-#~ msgid "Packing List:"
-#~ msgstr "Albarán:"
-
-#~ msgid "STOCK_MEDIA_RECORD"
-#~ msgstr "STOCK_MEDIA_RECORD"
-
-#~ msgid "Non Assigned Products:"
-#~ msgstr "Productos no asignados:"
-
-#~ msgid "terp-report"
-#~ msgstr "terp-report"
-
-#~ msgid "Location Content (With children)"
-#~ msgstr "Contenido ubicación (con hijos)"
-
-#~ msgid "STOCK_FILE"
-#~ msgstr "STOCK_FILE"
-
-#~ msgid "STOCK_EDIT"
-#~ msgstr "STOCK_EDIT"
-
-#~ msgid "STOCK_CONNECT"
-#~ msgstr "STOCK_CONNECT"
-
-#~ msgid "STOCK_GO_DOWN"
-#~ msgstr "STOCK_GO_DOWN"
-
-#~ msgid "STOCK_OK"
-#~ msgstr "STOCK_OK"
-
-#~ msgid "New Internal Packing"
-#~ msgstr "Nuevo albarán interno"
-
-#~ msgid "Finished products"
-#~ msgstr "Productos finalizados"
-
-#~ msgid "Date create"
-#~ msgstr "Fecha creación"
-
-#~ msgid "Set to Zero"
-#~ msgstr "Fijar a cero"
-
-#~ msgid "All Stock Moves"
-#~ msgstr "Todos los movimientos de stock"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "STOCK_HELP"
-#~ msgstr "STOCK_HELP"
-
-#~ msgid "This account will be used to value the input stock"
-#~ msgstr "Esta cuenta será utilizada para calcular el stock de entrada"
-
-#, python-format
-#~ msgid "Invoice state"
-#~ msgstr "Estado de la factura"
-
-#~ msgid "STOCK_UNDO"
-#~ msgstr "STOCK_UNDO"
-
-#~ msgid "Date Created"
-#~ msgstr "Fecha creación"
-
-#~ msgid "STOCK_GO_BACK"
-#~ msgstr "STOCK_GO_BACK"
-
-#~ msgid "STOCK_JUSTIFY_FILL"
-#~ msgstr "STOCK_JUSTIFY_FILL"
-
-#~ msgid "Allocation Method"
-#~ msgstr "Método asignación"
-
-#~ msgid "terp-administration"
-#~ msgstr "terp-administration"
-
-#~ msgid "STOCK_APPLY"
-#~ msgstr "STOCK_APPLY"
-
-#, python-format
-#~ msgid "Please select at least two inventories."
-#~ msgstr "Por favor, seleccione por lo menos dos inventarios."
-
-#~ msgid "Dest. Address"
-#~ msgstr "Dirección destinatario"
-
-#~ msgid "Periodical Inventory"
-#~ msgstr "Inventario periódico"
-
-#~ msgid "terp-crm"
-#~ msgstr "terp-crm"
-
-#~ msgid "STOCK_STRIKETHROUGH"
-#~ msgstr "STOCK_STRIKETHROUGH"
-
-#~ msgid "terp-partner"
-#~ msgstr "terp-partner"
-
-#~ msgid "Draft Periodical Inventories"
-#~ msgstr "Inventarios periódicos borrador"
-
-#~ msgid "STOCK_MISSING_IMAGE"
-#~ msgstr "STOCK_MISSING_IMAGE"
-
-#~ msgid "STOCK_SPELL_CHECK"
-#~ msgstr "STOCK_SPELL_CHECK"
-
-#~ msgid "Stock Tracking Lots"
-#~ msgstr "Lotes seguimiento de stock"
-
-#~ msgid "Origin Reference"
-#~ msgstr "Referencia origen"
-
-#~ msgid "Available Moves"
-#~ msgstr "Movimientos disponibles"
-
-#~ msgid "STOCK_HARDDISK"
-#~ msgstr "STOCK_HARDDISK"
-
-#~ msgid "Open Products"
-#~ msgstr "Abrir productos"
-
-#~ msgid "Input Packing List"
-#~ msgstr "Albaranes de entrada"
-
-#~ msgid "Packing List"
-#~ msgstr "Albarán"
-
-#~ msgid "STOCK_COPY"
-#~ msgstr "STOCK_COPY"
-
-#~ msgid "STOCK_CDROM"
-#~ msgstr "STOCK_CDROM"
-
-#~ msgid "Not from Packing"
-#~ msgstr "No a partir de albarán"
-
-#~ msgid "Internal Ref"
-#~ msgstr "Ref. interna"
-
-#~ msgid "STOCK_REFRESH"
-#~ msgstr "STOCK_REFRESH"
-
-#~ msgid "STOCK_STOP"
-#~ msgstr "STOCK_STOP"
-
-#~ msgid "STOCK_FIND_AND_REPLACE"
-#~ msgstr "STOCK_FIND_AND_REPLACE"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "STOCK_DIALOG_WARNING"
-#~ msgstr "STOCK_DIALOG_WARNING"
-
-#~ msgid "STOCK_ZOOM_IN"
-#~ msgstr "STOCK_ZOOM_IN"
-
-#~ msgid "STOCK_CONVERT"
-#~ msgstr "STOCK_CONVERT"
-
-#~ msgid "Move lines"
-#~ msgstr "Líneas de movimientos"
-
-#~ msgid "terp-calendar"
-#~ msgstr "terp-calendar"
-
-#~ msgid "STOCK_ITALIC"
-#~ msgstr "STOCK_ITALIC"
-
-#~ msgid "STOCK_YES"
-#~ msgstr "STOCK_YES"
-
-#~ msgid "Fill From Unreceived Products"
-#~ msgstr "Rellenar a partir de productos no recibidos"
-
-#~ msgid "Dest. Move"
-#~ msgstr "Mov. destino"
-
-#~ msgid "New Periodical Inventory"
-#~ msgstr "Nuevo inventario periódico"
-
-#~ msgid "FIFO"
-#~ msgstr "FIFO"
-
-#~ msgid "Delivery Orders to Process"
-#~ msgstr "Órdenes de entrega a procesar"
-
-#~ msgid "Invoice Status"
-#~ msgstr "Estado de facturación"
-
-#~ msgid "STOCK_JUSTIFY_LEFT"
-#~ msgstr "STOCK_JUSTIFY_LEFT"
-
-#~ msgid "Future Stock Forecast"
-#~ msgstr "Previsión de futuro stock"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Planned Date"
-#~ msgstr "Fecha prevista"
-
-#, python-format
-#~ msgid "No production sequence defined"
-#~ msgstr "No se ha definido una secuencia de producción"
-
-#~ msgid "STOCK_COLOR_PICKER"
-#~ msgstr "STOCK_COLOR_PICKER"
-
-#~ msgid "Lots by location"
-#~ msgstr "Lotes por ubicación"
-
-#~ msgid "STOCK_DELETE"
-#~ msgstr "STOCK_DELETE"
-
-#~ msgid "STOCK_CLEAR"
-#~ msgstr "STOCK_CLEAR"
-
-#~ msgid "Created Date"
-#~ msgstr "Fecha creación"
-
-#~ msgid "terp-mrp"
-#~ msgstr "terp-mrp"
-
-#~ msgid "STOCK_GO_UP"
-#~ msgstr "STOCK_GO_UP"
-
-#~ msgid "STOCK_SORT_DESCENDING"
-#~ msgstr "STOCK_SORT_DESCENDING"
-
-#~ msgid "Tracking Lots"
-#~ msgstr "Lotes seguimiento"
-
-#~ msgid "STOCK_HOME"
-#~ msgstr "STOCK_HOME"
-
-#~ msgid "STOCK_PROPERTIES"
-#~ msgstr "STOCK_PROPERTIES"
-
-#~ msgid "Create invoices"
-#~ msgstr "Crear facturas"
-
-#~ msgid "Set Stock to Zero"
-#~ msgstr "Fijar stock a cero"
-
-#~ msgid "STOCK_MEDIA_STOP"
-#~ msgstr "STOCK_MEDIA_STOP"
-
-#~ msgid "Make packing"
-#~ msgstr "Realizar albarán"
-
-#~ msgid "STOCK_DND_MULTIPLE"
-#~ msgstr "STOCK_DND_MULTIPLE"
-
-#~ msgid "STOCK_REMOVE"
-#~ msgstr "STOCK_REMOVE"
-
-#~ msgid "STOCK_DIALOG_AUTHENTICATION"
-#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
-
-#~ msgid "STOCK_ZOOM_OUT"
-#~ msgstr "STOCK_ZOOM_OUT"
-
-#~ msgid "Nearest"
-#~ msgstr "El más cercano"
-
-#~ msgid "STOCK_SELECT_COLOR"
-#~ msgstr "STOCK_SELECT_COLOR"
-
-#~ msgid "STOCK_PRINT"
-#~ msgstr "STOCK_PRINT"
-
-#~ msgid "STOCK_NO"
-#~ msgstr "STOCK_NO"
-
-#~ msgid "Workshop"
-#~ msgstr "Tienda"
-
-#~ msgid "STOCK_REDO"
-#~ msgstr "STOCK_REDO"
-
-#~ msgid "Tiny sprl"
-#~ msgstr "Tiny sprl"
-
-#~ msgid "STOCK_CLOSE"
-#~ msgstr "STOCK_CLOSE"
-
-#~ msgid "Force to use a Production Lot during deliveries"
-#~ msgstr "Fuerza a utilizar un lote de producción durante las entregas"
-
-#~ msgid "Split move lines in two"
-#~ msgstr "Dividir líneas de movimiento en dos"
-
-#~ msgid "Return"
-#~ msgstr "Devolver"
-
-#~ msgid "Auto-Packing"
-#~ msgstr "Auto-Empaquetado"
-
-#~ msgid "STOCK_JUMP_TO"
-#~ msgstr "STOCK_JUMP_TO"
-
-#~ msgid "terp-tools"
-#~ msgstr "terp-tools"
-
-#~ msgid "Location Overview"
-#~ msgstr "Vista general ubicaciones"
-
-#~ msgid "STOCK_DIALOG_INFO"
-#~ msgstr "STOCK_DIALOG_INFO"
-
-#~ msgid "Split move line"
-#~ msgstr "Partir línea de movimiento"
-
-#~ msgid "terp-sale"
-#~ msgstr "terp-sale"
-
-#~ msgid "STOCK_ADD"
-#~ msgstr "STOCK_ADD"
-
-#~ msgid "Chained Delay (days)"
-#~ msgstr "Retraso encadenado (días)"
-
-#~ msgid "STOCK_MEDIA_PAUSE"
-#~ msgstr "STOCK_MEDIA_PAUSE"
-
-#~ msgid "STOCK_PRINT_PREVIEW"
-#~ msgstr "STOCK_PRINT_PREVIEW"
-
-#~ msgid "STOCK_FIND"
-#~ msgstr "STOCK_FIND"
-
-#~ msgid "Tracking"
-#~ msgstr "Seguimiento"
-
-#~ msgid ""
-#~ "This account will be used, instead of the default one, to value input stock"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en lugar de la por defecto para valorar el stock de "
-#~ "entrada"
-
-#~ msgid "Components"
-#~ msgstr "Componentes"
-
-#~ msgid "Max. Planned Date"
-#~ msgstr "Fecha prevista máx."
-
-#~ msgid "STOCK_MEDIA_PLAY"
-#~ msgstr "STOCK_MEDIA_PLAY"
-
-#~ msgid "STOCK_OPEN"
-#~ msgstr "STOCK_OPEN"
-
-#~ msgid "STOCK_MEDIA_PREVIOUS"
-#~ msgstr "STOCK_MEDIA_PREVIOUS"
-
-#~ msgid "Stock Locations Structure"
-#~ msgstr "Estructura ubicaciones stock"
-
-#~ msgid "STOCK_DISCONNECT"
-#~ msgstr "STOCK_DISCONNECT"
-
-#~ msgid ""
-#~ "This account will be used, instead of the default one, to value output stock"
-#~ msgstr ""
-#~ "Esta cuenta será utilizada, en lugar de la por defecto, para calcular el "
-#~ "stock de salida"
-
-#~ msgid "Confirm (Do Not Process Now)"
-#~ msgstr "Confirmar (no procesar ahora)"
-
-#~ msgid "Moves Tracked"
-#~ msgstr "Seguimiento movimientos"
-
-#~ msgid "STOCK_NETWORK"
-#~ msgstr "STOCK_NETWORK"
-
-#~ msgid "terp-project"
-#~ msgstr "terp-project"
-
-#~ msgid "Stock by Lots"
-#~ msgstr "Stock por lotes"
-
-#~ msgid "STOCK_UNINDENT"
-#~ msgstr "STOCK_UNINDENT"
-
-#~ msgid "STOCK_GOTO_LAST"
-#~ msgstr "STOCK_GOTO_LAST"
-
-#~ msgid "STOCK_DIRECTORY"
-#~ msgstr "STOCK_DIRECTORY"
-
-#~ msgid ""
-#~ "For the current product (template), this stock location will be used, "
-#~ "instead of the default one, as the source location for stock moves generated "
-#~ "by production orders"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de stock se utilizará, "
-#~ "en lugar de la por defecto, como la ubicación origen para movimientos de "
-#~ "stock generados por órdenes de producción"
-
-#~ msgid "Add"
-#~ msgstr "Añadir"
-
-#~ msgid "STOCK_JUSTIFY_CENTER"
-#~ msgstr "STOCK_JUSTIFY_CENTER"
-
-#~ msgid "Set Stock to 0"
-#~ msgstr "Fijar stock a 0"
-
-#~ msgid "Localisation"
-#~ msgstr "Ubicación"
-
-#~ msgid "Do you want to set stocks to zero ?"
-#~ msgstr "¿Desea fijar stocks a cero?"
-
-#~ msgid "Direct Delivery"
-#~ msgstr "Entrega directa"
-
-#~ msgid "STOCK_REVERT_TO_SAVED"
-#~ msgstr "STOCK_REVERT_TO_SAVED"
-
-#~ msgid "Track Production Lots"
-#~ msgstr "Lotes seguimiento de producción"
-
-#~ msgid "Split in Two"
-#~ msgstr "Partir en dos"
-
-#~ msgid ""
-#~ "For the current product (template), this stock location will be used, "
-#~ "instead of the default one, as the source location for stock moves generated "
-#~ "by procurements"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de stock se utilizará, "
-#~ "en lugar de la por defecto, como la ubicación origen para movimientos de "
-#~ "stock generados por abastecimientos"
-
-#~ msgid "stock.picking.move.wizard"
-#~ msgstr "stock.picking.move.wizard"
-
-#~ msgid "Date Order"
-#~ msgstr "Fecha orden"
-
-#~ msgid "Supplier Invoice"
-#~ msgstr "Factura de proveedor"
-
-#, python-format
-#~ msgid "to be invoiced"
-#~ msgstr "Para facturar"
-
-#~ msgid "terp-product"
-#~ msgstr "terp-product"
-
-#~ msgid "Close"
-#~ msgstr "Cerrar"
-
-#~ msgid "Inventory Account"
-#~ msgstr "Cuenta inventario"
-
-#~ msgid "Set Stocks to Zero"
-#~ msgstr "Fijar stocks a cero"
-
-#~ msgid "Low Level"
-#~ msgstr "Nivel inferior"
-
-#~ msgid "STOCK_INDENT"
-#~ msgstr "STOCK_INDENT"
-
-#~ msgid "Delivery"
-#~ msgstr "Entrega"
-
-#~ msgid "Locations' Values"
-#~ msgstr "Valores ubicaciones"
-
-#~ msgid "STOCK_JUSTIFY_RIGHT"
-#~ msgstr "STOCK_JUSTIFY_RIGHT"
-
-#~ msgid "Inventory line"
-#~ msgstr "Línea de inventario"
-
-#~ msgid "Others info"
-#~ msgstr "Otras info."
-
-#~ msgid "STOCK_MEDIA_NEXT"
-#~ msgstr "STOCK_MEDIA_NEXT"
-
-#~ msgid "Move State"
-#~ msgstr "Estado de movimientos"
-
-#, python-format
-#~ msgid "Invoice is not created"
-#~ msgstr "No se ha creado factura"
-
-#, python-format
-#~ msgid "Invoice cannot be created from Packing."
-#~ msgstr "No se puede crear factura desde albaranes."
-
-#~ msgid "Future Delivery Orders"
-#~ msgstr "Órdenes de entrega futuras"
-
-#~ msgid ""
-#~ "This is used only if you selected a chained location type.\n"
-#~ "The 'Automatic Move' value will create a stock move after the current one "
-#~ "that will be validated automatically. With 'Manual Operation', the stock "
-#~ "move has to be validated by a worker. With 'Automatic No Step Added', the "
-#~ "location is replaced in the original move."
-#~ msgstr ""
-#~ "Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
-#~ "La opción 'Movimiento automático' creará un movimiento de stock después del "
-#~ "actual que se validará automáticamente. Con 'Operación manual', el "
-#~ "movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
-#~ "automático, paso no añadido', la ubicación se reemplaza en el movimiento "
-#~ "original."
-
-#~ msgid "Make Picking"
-#~ msgstr "Realizar albarán"
-
-#~ msgid "Packing result"
-#~ msgstr "Resultado albarán"
-
-#~ msgid "Available Packing"
-#~ msgstr "Albarán disponible"
-
-#~ msgid "Packing Done"
-#~ msgstr "Albarán realizado"
-
-#~ msgid "The packing has been successfully made !"
-#~ msgstr "¡El albarán ha sido realizado correctamente!"
-
-#~ msgid "Packing to Process"
-#~ msgstr "Albaranes a procesar"
-
-#~ msgid "Confirmed Packing Waiting Availability"
-#~ msgstr "Albarán confirmado esperando disponibilidad"
-
-#~ msgid "Partial packing"
-#~ msgstr "Albarán parcial"
-
-#~ msgid "Incoming Products"
-#~ msgstr "Albaranes de entrada"
-
-#~ msgid "Outgoing Products"
-#~ msgstr "Albaranes de salida"
-
-#~ msgid "Force to use a Production Lot during receptions"
-#~ msgstr "Fuerza a usar un lote de producción durante la recepción"
-
-#~ msgid "Print Item Labels"
-#~ msgstr "Imprimir etiquetas"
-
-#, python-format
-#~ msgid "Please select one and only one inventory !"
-#~ msgstr "¡ Por favor, seleccione un y sólo un inventario !"
-
-#, python-format
-#~ msgid "Invoice is already created."
-#~ msgstr "La factura ya está creada."
-
-#~ msgid "Units"
-#~ msgstr "Unidades"
-
-#~ msgid "Total :"
-#~ msgstr "Total:"
-
-#~ msgid ""
-#~ "Scheduled date for the movement of the products or real date if the move is "
-#~ "done."
-#~ msgstr ""
-#~ "Fecha programada para el movimiento de productos o fecha real si el "
-#~ "movimiento ha sido realizado."
-
-#~ msgid "New Reception Packing"
-#~ msgstr "Nuevo albarán de entrada"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Customer Refund"
-#~ msgstr "Factura rectificativa (abono) de cliente"
-
-#~ msgid "Move Lines"
-#~ msgstr "Líneas movimiento"
-
-#~ msgid "Supplier Refund"
-#~ msgstr "Factura rectificativa (abono) de proveedor"
-
-#~ msgid ""
-#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
-#~ "structured stock locations.\n"
-#~ "Thanks to the double entry management, the inventory controlling is powerful "
-#~ "and flexible:\n"
-#~ "* Moves history and planning,\n"
-#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
-#~ "* Stock valuation (standard or average price, ...)\n"
-#~ "* Robustness faced with Inventory differences\n"
-#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
-#~ "* Bar code supported\n"
-#~ "* Rapid detection of mistakes through double entry system\n"
-#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-#~ "    "
-#~ msgstr ""
-#~ "El módulo de inventario y logística de OpenERP puede gestionar multi-"
-#~ "almacenes y multi-ubicaciones jerárquicas de stock.\n"
-#~ "Gracias a la gestión de partida doble, el control de inventario es potente y "
-#~ "flexible:\n"
-#~ "* Historial de movimientos y planificación,\n"
-#~ "* Métodos de inventario diferentes (FIFO, LIFO ...)\n"
-#~ "* Valoración de existencias (estándar o precio medio ...)\n"
-#~ "* Robustez frente a las diferencias de inventario\n"
-#~ "* Reglas automáticas de abastecimiento (nivel de stock mínimo, JIT ...)\n"
-#~ "* Soporte a código de barras\n"
-#~ "* Detección rápida de errores a través de sistema de partida doble\n"
-#~ "* Trazabilidad (hacia arriba/abajo, lotes de producción, número de serie "
-#~ "...)\n"
-#~ "    "
-
-#, python-format
-#~ msgid "is consumed with"
-#~ msgstr "es consumido con"
-
-#, python-format
-#~ msgid "Product "
-#~ msgstr "Producto "
-
-#, python-format
-#~ msgid "is scheduled"
-#~ msgstr "está planificado"
-
-#, python-format
-#~ msgid "quantity."
-#~ msgstr "cantidad."
-
-#, python-format
-#~ msgid "INV: "
-#~ msgstr "INV: "
+msgstr ""
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 888488dc586..a4094cb9afc 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -46,7 +46,7 @@ class stock_config_settings(osv.osv_memory):
                 manage product manufacturing chains, manage default locations per product,
                 define routes within your warehouse according to business needs, etc.
                 This installs the module stock_location."""),
-        'group_uom': fields.boolean("Manage different units of measure per products",
+        'group_uom': fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
         'group_uos': fields.boolean("Invoice products in a different unit of measure than the sale order",
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2a03a7befc4..efd596684cb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -729,14 +729,16 @@ class stock_picking(osv.osv):
         """ Confirms picking.
         @return: True
         """
+        pickings = self.browse(cr, uid, ids, context=context)
+        for picking in pickings:
+            if picking.state <> 'confirmed':
+                self.confirm_send_note(cr, uid, [picking.id], context=context)
         self.write(cr, uid, ids, {'state': 'confirmed'})
         todo = []
-        for picking in self.browse(cr, uid, ids, context=context):
+        for picking in pickings:
             for r in picking.move_lines:
                 if r.state == 'draft':
                     todo.append(r.id)
-
-
         todo = self.action_explode(cr, uid, todo, context)
         if len(todo):
             self.pool.get('stock.move').action_confirm(cr, uid, todo, context=context)
@@ -1170,8 +1172,9 @@ class stock_picking(osv.osv):
                 return True
             for move in pick.move_lines:
                 if move.state == 'done':
-                    raise osv.except_osv(_('Error!'), _('You cannot cancel picking because stock move is in done state!'))
+                    raise osv.except_osv(_('Error!'), _('You cannot cancel the picking as some moves have been done. You should cancel the picking lines.'))
         return True
+
     def unlink(self, cr, uid, ids, context=None):
         move_obj = self.pool.get('stock.move')
         if context is None:
@@ -1385,17 +1388,21 @@ class stock_picking(osv.osv):
     # OpenChatter methods and notifications
     # -----------------------------------------
 
-    def _get_document_type(self, type):
+    def _get_document_type(self, cr, uid, obj, context=None):
         type_dict = {
-                'out': 'Delivery order',
-                'in': 'Shipment',
-                'internal': 'Internal picking',
+                'out': _('Delivery order'),
+                'in': _('Shipment'),
+                'internal': _('Internal picking'),
         }
-        return type_dict.get(type, 'Stock picking')
+        return type_dict.get(obj.type, _('Picking'))
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(cr, uid, obj, context=context)), context=context)
+
+    def confirm_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>confirmed</b>.") % (self._get_document_type(cr, uid, obj, context=context)), context=context)
 
     def scrap_send_note(self, cr, uid, ids, quantity, uom, name, context=None):
         return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
@@ -1405,16 +1412,16 @@ class stock_picking(osv.osv):
 
     def ship_done_send_note(self, cr, uid, ids, context=None):
         type_dict = {
-                'out': 'delivered',
-                'in': 'received',
-                'internal': 'moved',
+                'out': _("Products have been <b>delivered</b>."),
+                'in': _("Products have been <b>received</b>."),
+                'internal': _("Products have been <b>moved</b>."),
         }
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
+            self.message_post(cr, uid, [obj.id], body=type_dict.get(obj.type, _('Products have been moved.')), context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(cr, uid, obj, context=context)), context=context)
 
 
 stock_picking()
@@ -1501,7 +1508,7 @@ class stock_production_lot(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
         'date': fields.datetime('Creation Date', required=True),
         'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True,
-            help="Current quantity of products with this Production Lot Number available in company warehouses",
+            help="Current quantity of products with this Serial Number available in company warehouses",
             digits_compute=dp.get_precision('Product Unit of Measure')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
         'company_id': fields.many2one('res.company', 'Company', select=True),
@@ -1839,8 +1846,8 @@ class stock_move(osv.osv):
         warning = {}
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
-                'title': _('Insufficient Stock in Lot !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available in this lot.') % (product_qty, uom.name, amount_actual, uom.name)
+                'title': _('Insufficient Stock for Serial Number !'),
+                'message': _('You are moving %.2f %s but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 10d748624fc..a65afb377b3 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -21,7 +21,7 @@
         </record>
 
 
-        <act_window name="Create invoice"
+        <act_window name="Create Invoice"
             res_model="stock.invoice.onshipping"
             src_model="stock.picking.out"
             key2="client_action_multi"
@@ -30,5 +30,15 @@
             view_type="form"
             target="new"
             id="action_stock_invoice_onshipping"/>
+
+        <act_window name="Create Draft Invoices"
+            res_model="stock.invoice.onshipping"
+            src_model="stock.picking.in"
+            key2="client_action_multi"
+            multi="True"
+            view_mode="form"
+            view_type="form"
+            target="new"
+            id="action_stock_invoice_onshipping"/>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 3df336b5e30..5dc0d0d824c 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -109,7 +109,9 @@
                         </form>
                     </field>
                     <footer>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        <button name="split_lot" string="Split" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
                 </field>
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index 57b4f8e38bb..d6f8472a8c6 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -40,6 +40,5 @@ wizard if the delivery is to be invoiced.
     'test': ['test/stock_invoice_directly.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0081385081261',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 8cc1790e7de..9d5386863e6 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -107,7 +107,6 @@ You can use the demo data as follow:
         'test/stock_location_push_flow.yml',
     ],
     'auto_install': False,
-    'certificate': '0046505115101',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index d8fbb44d8bf..daae84252ad 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -41,6 +41,5 @@ routing of the assembly operation.
     'test': ['test/stock_no_autopicking.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0075124168925',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index 7e38019e3f3..ff626c63679 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -243,7 +243,6 @@ Remarks:
     'test': ['test/stock_planning.yml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00872589676639788061',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index d644daa15e6..416c691f043 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -42,7 +42,6 @@ e.g. To have an invoice generated automatically periodically:
     'demo': ['subscription_demo.xml',],
     'installable': True,
     'auto_install': False,
-    'certificate': '0029454782573',
     'images': ['images/subscription_document_fields.jpeg','images/subscriptions.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 40eb3073d61..acd76ba9a6b 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -58,7 +58,6 @@ user name and password for the invitation of the survey.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001131639736864143245',
     'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],   
     'css': ['static/src/css/survey.css','static/css/survey.css'],
 }
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index c03dc1ec488..e44b9624251 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -37,7 +37,6 @@ picking and invoice. The message is triggered by the form's onchange event.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0080334018749',
     'images': ['images/customers_warnings.jpeg','images/sale_order_warning.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index f04f97d6f8a..9e6c2a0a2b8 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -174,6 +174,60 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+# FIXME:(class stock_picking_in and stock_picking_out) this is a temporary workaround because of a framework bug (ref: lp:996816). 
+# It should be removed as soon as the bug is fixed
+class stock_picking_in(osv.osv):
+    _inherit = 'stock.picking.in'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
+class stock_picking_out(osv.osv):
+    _inherit = 'stock.picking.out'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
@@ -228,8 +282,8 @@ sale_order_line()
 
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
-    def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+    def onchange_product_id(self,cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, notes=False, context=None):
         warning = {}
         if not product:
@@ -247,8 +301,8 @@ class purchase_order_line(osv.osv):
             warning['title'] = title
             warning['message'] = message
 
-        result =  super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order, fiscal_position)
+        result =  super(purchase_order_line, self).onchange_product_id(cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order, fiscal_position_id)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']