diff --git a/addons/account/account.py b/addons/account/account.py
index c2e75e889f0..cbbaa15a5c5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -137,16 +137,27 @@ class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
 
-    def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
+    def _get_financial_report_ref(self, cr, uid, context=None):
         obj_data = self.pool.get('ir.model.data')
         obj_financial_report = self.pool.get('account.financial.report')
+        financial_report_ref = {}
+        for key, financial_report in [
+                    ('asset','account_financial_report_assets0'),
+                    ('liability','account_financial_report_liability0'),
+                    ('income','account_financial_report_income0'),
+                    ('expense','account_financial_report_expense0'),
+                ]:
+            try:
+                financial_report_ref[key] = obj_financial_report.browse(cr, uid,
+                    obj_data.get_object_reference(cr, uid, 'account', financial_report)[1],
+                    context=context)
+            except ValueError:
+                pass
+        return financial_report_ref
+
+    def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        financial_report_ref = {
-            'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
-            'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
-            'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
-            'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
-        }
+        financial_report_ref = self._get_financial_report_ref(cr, uid, context=context)
         for record in self.browse(cr, uid, ids, context=context):
             res[record.id] = 'none'
             for key, financial_report in financial_report_ref.items():
@@ -157,15 +168,9 @@ class account_account_type(osv.osv):
 
     def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
         field_value = field_value or 'none'
-        obj_data = self.pool.get('ir.model.data')
         obj_financial_report = self.pool.get('account.financial.report')
         #unlink if it exists somewhere in the financial reports related to BS or PL
-        financial_report_ref = {
-            'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
-            'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
-            'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
-            'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
-        }
+        financial_report_ref = self._get_financial_report_ref(cr, uid, context=context)
         for key, financial_report in financial_report_ref.items():
             list_ids = [x.id for x in financial_report.account_type_ids]
             if account_type_id in list_ids:
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index e68a60b6488..ca3b5a499d9 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-07-13 21:37+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2013-08-29 15:17+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-14 05:58+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16750)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -6089,7 +6088,7 @@ msgstr "Contrôle des ecritures"
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr "(Laisser vide pour consulter la situation courrante)"
+msgstr "(Laisser vide pour consulter la situation courante)"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 1ff1fe49f15..3adcc7a56cb 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-08-16 14:15+0000\n"
+"PO-Revision-Date: 2013-08-22 11:02+0000\n"
 "Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
 "Language-Team: Hungarian <hu@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: 2013-08-17 06:16+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -9765,7 +9765,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
-msgstr ""
+msgstr "Időszakos feldolgozás"
 
 #. module: account
 #: view:account.invoice.report:0
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index b85c3963cdd..fe3905d726e 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-08-16 12:50+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2013-08-24 15:09+0000\n"
+"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-17 06:16+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-25 05:19+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -11854,7 +11854,7 @@ msgstr "Dagboek samenvatting"
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr "Vervaldatum"
+msgstr "Vervallen"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index d0dae16fdd3..06739854344 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-08-13 08:09+0000\n"
+"PO-Revision-Date: 2013-08-22 11:30+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-08-14 06:11+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10549,7 +10549,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Всего (проверка)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index d62fd331774..37ab5f18af8 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -159,8 +159,8 @@ class account_invoice_refund(osv.osv_memory):
                     for line in movelines:
                         if line.account_id.id == inv.account_id.id:
                             to_reconcile_ids[line.account_id.id] = [line.id]
-                        if type(line.reconcile_id) != osv.orm.browse_null:
-                            reconcile_obj.unlink(cr, uid, line.reconcile_id.id)
+                        if line.reconcile_id:
+                            line.reconcile_id.unlink()
                     wf_service.trg_validate(uid, 'account.invoice', \
                                         refund.id, 'invoice_open', cr)
                     refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index d9395adca5d..a2a36db0fb2 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-03-20 23:19+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-08-26 17:35+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@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: 2013-07-11 05:46+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:02+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -102,6 +101,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie hier, um ein Angebot zu erstellen, das in einen "
+"Auftrag umgewandelt\n"
+"                werden kann.\n"
+"              </p><p>\n"
+"                Verwenden Sie Aufträge, um diejenigen Positionen zu "
+"verfolgen, die innerhalb\n"
+"                eines Vertrages zu einem Festpreis abgerechnet werden "
+"sollen.\n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
diff --git a/addons/account_asset/i18n/hu.po b/addons/account_asset/i18n/hu.po
new file mode 100644
index 00000000000..135bc865d73
--- /dev/null
+++ b/addons/account_asset/i18n/hu.po
@@ -0,0 +1,758 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-08-22 11:22+0000\n"
+"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
+"Language-Team: Hungarian <hu@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: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Csoportosítás"
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Bruttó összeg"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
+#: field:account.move.line,asset_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Eszköz"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Lineáris"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Vállalat"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Módosítás"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Folyamatban lévő"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Beállítás tervezetnek"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Eszközök elemzése"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Indoklás"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Eszköz kategóriák"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Tételek"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Értékcsökkénés sorai"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Értékcsökkenés dátuma"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Eszközök"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
+msgid "Notes"
+msgstr "Megjegyzések"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/account_asset.py:82
+#, python-format
+msgid "Error!"
+msgstr "Hiba!"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# értékcsökkenési sorok száma"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr "Hónapok száma az időszakban"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Hivatkozás"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Időszak hossza"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Tervezet"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Gyűjtőkód"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Számítási módszer"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Eszköz kategória"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr "hónapok"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Számlasor"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr "vagy"
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Jegyzet"
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Lezárt"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr "Státusz"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Felhasználó"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Kiterjesztett szűrők…"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Kiszámítás"
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr "Eszköz történet"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktív"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "Eszköz státusza"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Előzmény"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Időszak"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Általános"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Számla"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Lezár"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Könyvelési tételsorok"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Vásárlás dátuma"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "Degresszív"
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Jelenlegi"
+
+#. module: account_asset
+#: code:addons/account_asset/account_asset.py:82
+#, python-format
+msgid "You cannot delete an asset that contains posted depreciation lines."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Pénznem"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Napló"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Könyvelt"
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview on all depreciation. "
+"The\n"
+"            tool search can also be used to personalise your Assets reports "
+"and\n"
+"            so, match this analysis to your needs;\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr "Bruttó érték"
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Név"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Év"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Eszköz kategória"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:50
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Add an internal note here..."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Dátum"
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_budget/i18n/en_GB.po b/addons/account_budget/i18n/en_GB.po
index 492068c4cd6..d15f95654e7 100644
--- a/addons/account_budget/i18n/en_GB.po
+++ b/addons/account_budget/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-02-06 14:30+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
+"PO-Revision-Date: 2013-08-23 16:42+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2013-07-11 05:47+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -147,6 +147,26 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new budget.\n"
+"              </p><p>\n"
+"                A budget is a forecast of your company's income and/or "
+"expenses\n"
+"                expected for a period in the future. A budget is defined on "
+"some\n"
+"                financial accounts and/or analytic accounts (that may "
+"represent\n"
+"                projects, departments, categories of products, etc.)\n"
+"              </p><p>\n"
+"                By keeping track of where your money goes, you may be less\n"
+"                likely to overspend, and more likely to meet your financial\n"
+"                goals. Forecast a budget by detailing the expected revenue "
+"per\n"
+"                analytic account and monitor its evolution based on the "
+"actuals\n"
+"                realised during that period.\n"
+"              </p>\n"
+"            "
 
 #. module: account_budget
 #: report:account.budget:0
@@ -369,7 +389,7 @@ msgstr "or"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Cancel Budget"
-msgstr ""
+msgstr "Cancel Budget"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_cancel/i18n/en_GB.po b/addons/account_cancel/i18n/en_GB.po
index 841c76a6411..74dbbfd404d 100644
--- a/addons/account_cancel/i18n/en_GB.po
+++ b/addons/account_cancel/i18n/en_GB.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-23 16:41+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2013-07-11 05:47+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Cancel Invoice"
 
 #~ msgid "Cancel"
 #~ msgstr "Cancel"
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 15f5b905bd6..2cd6af64c76 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-01 11:05+0000\n"
+"PO-Revision-Date: 2013-08-23 13:00+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-08-02 05:58+0000\n"
-"X-Generator: Launchpad (build 16718)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -1378,7 +1378,7 @@ msgstr " brieven in rapporten"
 #: model:ir.actions.act_window,name:account_followup.action_customer_my_followup
 #: model:ir.ui.menu,name:account_followup.menu_sale_followup
 msgid "My Follow-Ups"
-msgstr "Mijn betaalheinnneringen"
+msgstr "Mijn betaalherinnneringen"
 
 #. module: account_followup
 #: view:res.partner:0
diff --git a/addons/account_payment/i18n/en_GB.po b/addons/account_payment/i18n/en_GB.po
index 9c1cc5d78b2..7aeccfb3f91 100644
--- a/addons/account_payment/i18n/en_GB.po
+++ b/addons/account_payment/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-02-07 19:01+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
+"PO-Revision-Date: 2013-08-23 16:42+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2013-07-11 05:49+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -671,7 +671,7 @@ msgstr "Order"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Cancel Payments"
-msgstr ""
+msgstr "Cancel Payments"
 
 #. module: account_payment
 #: field:payment.order,total:0
@@ -682,7 +682,7 @@ msgstr "Total"
 #: code:addons/account_payment/wizard/account_payment_order.py:112
 #, python-format
 msgid "Entry Lines"
-msgstr ""
+msgstr "Entry Lines"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -693,7 +693,7 @@ msgstr "Make Payment"
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
 msgid "The amount which should be paid at the current date. "
-msgstr ""
+msgstr "The amount which should be paid at the current date. "
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 4175906b114..36367a2adf5 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-21 12:13+0000\n"
+"Last-Translator: Justas <keshukas@gmail.com>\n"
 "Language-Team: Lithuanian <lt@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: 2013-07-11 05:48+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16734)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -177,7 +177,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.line:0
 msgid "Amount Total"
-msgstr ""
+msgstr "Viso"
 
 #. module: account_payment
 #: help:payment.order,state:0
diff --git a/addons/account_report_company/i18n/de.po b/addons/account_report_company/i18n/de.po
index c4cef648957..75f47927b12 100644
--- a/addons/account_report_company/i18n/de.po
+++ b/addons/account_report_company/i18n/de.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-18 16:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-26 17:21+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@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: 2013-08-19 04:57+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:03+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account_report_company
 #: field:res.partner,display_name:0
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #. module: account_report_company
 #: field:account.invoice,commercial_partner_id:0
@@ -31,19 +31,19 @@ msgstr ""
 #. module: account_report_company
 #: field:account.invoice.report,commercial_partner_id:0
 msgid "Partner Company"
-msgstr ""
+msgstr "Partner-Unternehmen"
 
 #. module: account_report_company
 #: model:ir.model,name:account_report_company.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Rechnung"
 
 #. module: account_report_company
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: model:ir.model,name:account_report_company.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account_report_company
 #: model:ir.model,name:account_report_company.model_account_invoice_report
diff --git a/addons/account_report_company/i18n/en_GB.po b/addons/account_report_company/i18n/en_GB.po
new file mode 100644
index 00000000000..db800a8ad67
--- /dev/null
+++ b/addons/account_report_company/i18n/en_GB.po
@@ -0,0 +1,63 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-08-23 16:42+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: account_report_company
+#: field:res.partner,display_name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: account_report_company
+#: field:account.invoice,commercial_partner_id:0
+#: help:account.invoice.report,commercial_partner_id:0
+msgid "Commercial Entity"
+msgstr "Commercial Entity"
+
+#. module: account_report_company
+#: field:account.invoice.report,commercial_partner_id:0
+msgid "Partner Company"
+msgstr "Partner Company"
+
+#. module: account_report_company
+#: model:ir.model,name:account_report_company.model_account_invoice
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: account_report_company
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:ir.model,name:account_report_company.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_report_company
+#: model:ir.model,name:account_report_company.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Invoices Statistics"
+
+#. module: account_report_company
+#: view:res.partner:0
+msgid "True"
+msgstr "True"
+
+#. module: account_report_company
+#: help:account.invoice,commercial_partner_id:0
+msgid ""
+"The commercial entity that will be used on Journal Entries for this invoice"
+msgstr ""
+"The commercial entity that will be used on Journal Entries for this invoice"
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 8f815af0bc9..faf4c85274b 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-03-20 23:34+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-08-26 09:58+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@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: 2013-07-11 05:49+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:02+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -636,7 +635,7 @@ msgstr ""
 #: field:account.config.settings,expense_currency_exchange_account_id:0
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Loss Exchange Rate Account"
-msgstr "Kursverlust Konto"
+msgstr "Konto für Kursaufwendungen"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1244,7 +1243,7 @@ msgstr "Jahr"
 #: field:account.config.settings,income_currency_exchange_account_id:0
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Gain Exchange Rate Account"
-msgstr "Kursverlust Konto"
+msgstr "Konto für Kurserträge"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index ce79c4d5ffb..a7b3406a289 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -295,10 +295,6 @@ class account_analytic_account(osv.osv):
             args=[]
         if context is None:
             context={}
-        if context.get('current_model') == 'project.project':
-            project_obj = self.pool.get("account.analytic.account")
-            project_ids = project_obj.search(cr, uid, args)
-            return self.name_get(cr, uid, project_ids, context=context)
         if name:
             account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
             if not account_ids:
diff --git a/addons/analytic_contract_hr_expense/i18n/en_GB.po b/addons/analytic_contract_hr_expense/i18n/en_GB.po
index 7222bb23711..bfde40953cc 100644
--- a/addons/analytic_contract_hr_expense/i18n/en_GB.po
+++ b/addons/analytic_contract_hr_expense/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-02-07 18:38+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
+"PO-Revision-Date: 2013-08-23 16:42+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2013-07-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -28,6 +28,8 @@ msgid ""
 "{'required': "
 "['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
 msgstr ""
+"{'required': "
+"['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -66,7 +68,7 @@ msgstr "Expenses of %s"
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
 msgid "Expenses and Timesheet Invoicing Ratio"
-msgstr ""
+msgstr "Expenses and Timesheet Invoicing Ratio"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -74,6 +76,8 @@ msgid ""
 "{'invisible': "
 "[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
 msgstr ""
+"{'invisible': "
+"[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
 
 #. module: analytic_contract_hr_expense
 #: field:account.analytic.account,est_expenses:0
diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po
index 9c2c4592993..e0f397e77da 100644
--- a/addons/auth_signup/i18n/de.po
+++ b/addons/auth_signup/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-03-20 23:58+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-08-26 17:58+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@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: 2013-07-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:02+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -24,6 +23,8 @@ msgid ""
 "A password reset has been requested for this user. An email containing the "
 "following link has been sent:"
 msgstr ""
+"Für diesen Benutzer wurde eine Passwortzurücksetzung beantragt. Eine E-Mail "
+"mit dem folgenden Link wurde gesendet:"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -50,12 +51,12 @@ msgstr "Falls leer, dürfen nur eingeladene Benutzer einloggen"
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send an invitation email"
-msgstr ""
+msgstr "Sende Einladungs-E-Mail"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Activated"
-msgstr ""
+msgstr "Aktiviert"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
@@ -96,7 +97,7 @@ msgstr "Bitte ein Passwort eintragen und bestätigen"
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send reset password link by email"
-msgstr ""
+msgstr "Sende E-Mail zur Passwortzurücksetzung"
 
 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.reset_password_email
@@ -124,7 +125,7 @@ msgstr ""
 #: view:res.users:0
 msgid ""
 "An invitation email containing the following subscription link has been sent:"
-msgstr ""
+msgstr "Eine Einladungs-E-Mail mit dem folgenden Link wurde gesendet:"
 
 #. module: auth_signup
 #: field:res.users,state:0
@@ -334,7 +335,7 @@ msgstr "Erlaube Passwort zurücksetzen von der Login-Seite"
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.set_password_email
 msgid "${object.company_id.name} invitation to connect on OpenERP"
-msgstr "${object.company_id.name} Einladung zur OpenERP Anbidnung"
+msgstr "${object.company_id.name} Einladung zur OpenERP Anbindung"
 
 #. module: auth_signup
 #. openerp-web
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index c20bca4e097..af25daf3545 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-28 13:08+0000\n"
+"PO-Revision-Date: 2013-08-22 07:32+0000\n"
 "Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-29 05:54+0000\n"
-"X-Generator: Launchpad (build 16700)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -302,12 +302,12 @@ msgstr "Courriel à"
 #. module: base_calendar
 #: field:crm.meeting,name:0
 msgid "Meeting Subject"
-msgstr ""
+msgstr "Titre de l'évènement"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of Recurrence"
-msgstr ""
+msgstr "Fin de la récurrence"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -328,7 +328,7 @@ msgstr "Choisir le jour où répéter le rendez-vous"
 #: view:crm.meeting:0
 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
 msgid "Meetings"
-msgstr ""
+msgstr "Évènements"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id_date:0
@@ -589,7 +589,7 @@ msgstr "Jeu"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Meeting Details"
-msgstr ""
+msgstr "Détails de l'évènement"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
@@ -850,7 +850,7 @@ msgstr "Nombre de répétitions"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Réunion interne"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -928,7 +928,7 @@ msgstr "Date de l'événement"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Invitations"
-msgstr ""
+msgstr "Invitations"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1103,7 +1103,7 @@ msgstr "Défini l'action à exécuter lorsque l'alarme se déclenche"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Starting at"
-msgstr ""
+msgstr "Heure de début"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
@@ -1132,12 +1132,12 @@ msgstr ""
 #: field:calendar.todo,end_type:0
 #: field:crm.meeting,end_type:0
 msgid "Recurrence Termination"
-msgstr ""
+msgstr "Fin de la récurrence"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Until"
-msgstr ""
+msgstr "Jusqu'à"
 
 #. module: base_calendar
 #: view:res.alarm:0
@@ -1204,7 +1204,7 @@ msgstr "Responsable"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Select Weekdays"
-msgstr ""
+msgstr "Sélectionner les jours de la semaine"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1521
@@ -1564,7 +1564,7 @@ msgstr "Samedi"
 #: field:calendar.todo,interval:0
 #: field:crm.meeting,interval:0
 msgid "Repeat Every"
-msgstr ""
+msgstr "Répéter tous les"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index b974edf4980..3b0e17a65c5 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -8,40 +8,40 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-24 09:02+0000\n"
+"Last-Translator: Jan B. Krejčí <Unknown>\n"
 "Language-Team: Czech <cs@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: 2013-07-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-25 05:19+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Emails Integration"
-msgstr ""
+msgstr "Integrace e-mailů"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Host"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakty"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+msgstr "Použít externí poskytovatele přihlášení (Google, Facebook...)"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,88 +55,93 @@ msgid ""
 "OpenERP using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"OpenERP umožňuje automaticky vytvářet leady (nebo jiné dokumenty) z "
+"příchozích e-mailů.\n"
+"E-maily můžete s OpenERP synchronizovat automaticky z běžných POP3/IMAP "
+"účtů, pomocí skriptu pro přímou integraci s e-mailovým serverem, nebo "
+"manuálně s použitím plug-inu pro vašeho e-mailového klienta."
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
 msgid "SALE"
-msgstr ""
+msgstr "PRODEJ"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Člen"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Přístup k portálu"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "Autentizace"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Nabídky a přijaté objednávky"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "Obecná nastavení"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Dárce"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "Pacient"
 
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Umožnit uživatelům import z CSV"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "Spravovat více firem"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
-msgstr ""
+msgstr "V e-mailovém klientovi"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+msgstr "--db-filter=VAŠE_DATABÁZE"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Získat kontakty automaticky z LinkedIn"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
 msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Povolit Thunderbird plug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -146,22 +151,22 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "Zákaznické funkce"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "Prodejní funkce"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
 msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Povolit Outlook plug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -169,21 +174,23 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Tohoto průvodce můžete použít pro úpravu terminologie na míru zákazníka v "
+"celé aplikaci."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Instance/zákazník (\"tenant\")"
 
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Sdílet nebo vložit kteroukoli obrazovku OpenERP"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "Zákazník"
 
 #. module: base_setup
 #: help:sale.config.settings,module_web_linkedin:0
@@ -191,6 +198,8 @@ msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Budete moci k novým kontaktům (osobám nebo firmám) automaticky doplnit "
+"kontaktní informace (fotografie, adresy atd.) z LinkedIn."
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -199,6 +208,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Pracujte v prostředí více firem, s příslušným řízením přístupu k jednotlivým "
+"firmám.\n"
+"Bude nainstalován modul multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -207,6 +219,9 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Veřejný portál je přístupný, pokud pracujete s jedinou databází.\n"
+"                                     Můžete spustit OpenERP server s "
+"parametrem"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -214,16 +229,18 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"Více nastavení najdete v detailech společnosti: adresa do záhlaví a zápatí, "
+"texty upomínek atd."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Jak nazýváte zákazníka"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -237,21 +254,24 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Když pošlete dokument zákazníkovi (nabídku, fakturu), bude se moci "
+"zaregistrovat a získat přístup ke všem svým dokumentům, čtení firemních "
+"novinek, kontrole svých projektů atd."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "base.setup.terminology"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Klient"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "Povolit veřejný web OpenERP."
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -264,22 +284,26 @@ msgid ""
 "                Partner from the selected emails.\n"
 "                This installs the module plugin_thunderbird."
 msgstr ""
+"Plug-in umožňuje připojit e-maily a jejich přílohy k objektům v OpenERP "
+"(partnerům nebo leadům).\n"
+"Z vybraných e-mailů můžete vytvářet nové partnery a leady.\n"
+"Bude nainstalován modul plugin_thunderbird."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Použijte jiný výraz pro \"zákazník\""
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Konfigurovat prodej"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -292,16 +316,20 @@ msgid ""
 "                email into an OpenERP mail message with attachments.\n"
 "                This installs the module plugin_outlook."
 msgstr ""
+"Plug-in umožňuje připojit e-maily a jejich přílohy k objektům v OpenERP "
+"(partnerům nebo leadům).\n"
+"Z vybraných e-mailů můžete vytvářet nové partnery a leady.\n"
+"Bude nainstalován modul plugin_outlook."
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Možnosti"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer portal"
-msgstr ""
+msgstr "Aktivovat zákaznický portál"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -310,36 +338,38 @@ msgid ""
 "                                    Once activated, the login page will be "
 "replaced by the public website."
 msgstr ""
+"Pokud toto aktivujete, přihlašovací stránka OpenERP bude nahrazena veřejným "
+"webem."
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Povolit sdílení dokumentů"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+msgstr "(firemní novinky, pracovní příležitosti, kontaktní formulář atd.)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Aktivovat veřejný portál"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Konfigurovat odchozí e-mailové servery"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Integrace sociální sítě"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Dejte svým zákazníkům přístup k jejich dokumentům."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -351,20 +381,20 @@ msgstr "Storno"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Použít"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Určete svou terminologii"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "nebo"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Nastavte data své společnosti"
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 1374638434a..33175afc48f 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-13 21:43+0000\n"
-"Last-Translator: Gilles Major (OpenERP) <gim@openerp.com>\n"
+"PO-Revision-Date: 2013-08-22 07:33+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-14 05:58+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -134,7 +134,7 @@ msgstr "Sur le client de messagerie"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+msgstr "--db-filter=VOTRE_BASE_DE_DONNEES"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
diff --git a/addons/base_vat/i18n/en_GB.po b/addons/base_vat/i18n/en_GB.po
index 25a87751557..1c4f0879f02 100644
--- a/addons/base_vat/i18n/en_GB.po
+++ b/addons/base_vat/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-02-06 14:32+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
+"PO-Revision-Date: 2013-08-23 16:41+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2013-07-11 05:53+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: base_vat
 #: view:res.partner:0
@@ -51,7 +51,7 @@ msgstr "Error!"
 #. module: base_vat
 #: view:res.partner:0
 msgid "e.g. BE0477472701"
-msgstr ""
+msgstr "e.g. BE0477472701"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index df6d5e12b66..5953500dcec 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -125,7 +125,7 @@ class crm_case_section(osv.osv):
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16,2 )),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="The email address associated with this team. New emails received will automatically "
                                          "create new leads assigned to the team."),
     }
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 07369c02bb2..69996663dab 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -662,7 +662,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         # Merge notifications about loss of information
         opportunities = [highest]
         opportunities.extend(opportunities_rest)
-        self._merge_notify(cr, uid, highest, opportunities, context=context)
+        self._merge_notify(cr, uid, highest.id, opportunities, context=context)
         # Check if the stage is in the stages of the sales team. If not, assign the stage with the lowest sequence
         if merged_data.get('section_id'):
             section_stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('section_ids', 'in', merged_data['section_id']), ('type', '=', merged_data.get('type'))], order='sequence', context=context)
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 730940e8308..a3f76d40af6 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-03 15:44+0000\n"
-"Last-Translator: Coignat <coignat.claude@orange.fr>\n"
+"PO-Revision-Date: 2013-08-22 07:34+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16718)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -461,7 +461,7 @@ msgstr "Chef d'équipe"
 #: code:addons/crm/crm_lead.py:1052
 #, python-format
 msgid "%s a call for %s.%s"
-msgstr ""
+msgstr "%s un appel pour %s. %s"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 8312257deb2..79ddb2d135b 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-16 13:48+0000\n"
-"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
+"PO-Revision-Date: 2013-08-21 13:44+0000\n"
+"Last-Translator: Eimis <eimislap@gmail.com>\n"
 "Language-Team: Lithuanian <lt@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: 2013-07-11 05:54+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16734)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -87,7 +87,7 @@ msgstr "Delsimas užverti"
 #. module: crm
 #: view:crm.lead:0
 msgid "Available for mass mailing"
-msgstr ""
+msgstr "Galimas masiniams siuntimams"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -155,7 +155,7 @@ msgstr "Taisyklės pavadinimas"
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "Konvertuoti įmanoma tik vieną telefono skambutį vienu metu."
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -237,12 +237,12 @@ msgstr "Man priskirtos pardavimų galimybės"
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "# Susitikimai"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Priminimas vartotojui"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -559,7 +559,7 @@ msgstr "Planuojamos pajamos"
 #: code:addons/crm/crm_lead.py:988
 #, python-format
 msgid "Customer Email"
-msgstr ""
+msgstr "Kliento el. pašto adresas"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -782,7 +782,7 @@ msgstr "Konvertuoti į pardavimų galimybes"
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -792,7 +792,7 @@ msgstr "Stabdyti procesą"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alternatyvus vardas"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1345,7 +1345,7 @@ msgstr "Data"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Online palaikymas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1379,7 +1379,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Pardavimų rinkodaros skyrius"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:585
@@ -1428,7 +1428,7 @@ msgstr "Kodas"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Požymiai"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -2070,7 +2070,7 @@ msgstr "El. laiškai - Paslaugos"
 #: selection:crm.lead.report,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Pending"
-msgstr "Laukianti"
+msgstr "Laukiama"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2167,7 +2167,7 @@ msgstr "Įvairūs"
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
 msgid "Open"
-msgstr "Atidaryta"
+msgstr "Atvira"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2382,7 +2382,7 @@ msgstr "Įmonė"
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "Veikiantis"
+msgstr "Vykdomas"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 0cc59310a58..adcdc7c5617 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-12 05:39+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-08-24 08:57+0000\n"
+"Last-Translator: youring <youring@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2013-08-13 06:06+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-25 05:19+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -189,7 +189,7 @@ msgstr "预计结束月份"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr "保留复杂的摘要(消息数量,……等)。这一摘要直接是是HTML格式，以便插入到看板视图。"
+msgstr "显示Chatter中的消息摘要（包括消息个数等）。此摘要格式为html，可直接在看板视图中显示。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:640
@@ -218,7 +218,7 @@ msgstr "业务伙伴"
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr "安排其它电话访问"
+msgstr "安排其它电话拜访"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:209
@@ -230,7 +230,7 @@ msgstr "电话访问"
 #. module: crm
 #: field:crm.lead,opt_out:0
 msgid "Opt-Out"
-msgstr "退订"
+msgstr "不参与（自动订阅邮件）"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1105,7 +1105,7 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails for mass "
 "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
 "users to filter the leads when performing mass mailing."
-msgstr "如果　“不参加” 被选中，这个联系人将拒绝接收群发邮件和营销活动。当进行群发邮件时，过滤器“可用于群发邮件”允许用户过滤线索"
+msgstr "如果选中”不参与“，则此联系人将不会接收到群发邮件，如市场营销广告等。当进行邮件群发时，可根据此字段筛选出允许接受群发的对象。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:715
diff --git a/addons/document_page/i18n/fr.po b/addons/document_page/i18n/fr.po
index 03de7d19b70..11ddd4675fa 100644
--- a/addons/document_page/i18n/fr.po
+++ b/addons/document_page/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-22 15:40+0000\n"
-"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
+"PO-Revision-Date: 2013-08-22 07:35+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:57+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -231,6 +231,10 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Cliquez pour créer une nouvelle page Web.\n"
+"              </p>\n"
+"            "
 
 #. module: document_page
 #: view:document.page.create.menu:0
diff --git a/addons/edi/i18n/en_GB.po b/addons/edi/i18n/en_GB.po
new file mode 100644
index 00000000000..267f836811d
--- /dev/null
+++ b/addons/edi/i18n/en_GB.po
@@ -0,0 +1,90 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:43+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr "Reason:"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:60
+#, python-format
+msgid "The document has been successfully imported!"
+msgstr "The document has been successfully imported!"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:65
+#, python-format
+msgid "Sorry, the document could not be imported."
+msgstr "Sorry, the document could not be imported."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Companies"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Currency"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:71
+#, python-format
+msgid "Document Import Notification"
+msgstr "Document Import Notification"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:130
+#, python-format
+msgid "Missing application."
+msgstr "Missing application."
+
+#. module: edi
+#: code:addons/edi/models/edi.py:131
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+
+#. module: edi
+#: code:addons/edi/models/edi.py:47
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "'%s' is an invalid external ID"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr "EDI Subsystem"
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index d3f5ef62f99..0a626eb843a 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-07-28 13:34+0000\n"
+"PO-Revision-Date: 2013-08-22 07:36+0000\n"
 "Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-29 05:54+0000\n"
-"X-Generator: Launchpad (build 16700)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -28,6 +28,7 @@ msgstr "De"
 msgid ""
 "Partners that did not ask not to be included in mass mailing campaigns"
 msgstr ""
+"Partenaires qui n'ont pas demandé à être exclus des campagnes de prospection"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
@@ -43,7 +44,7 @@ msgstr "Retirer des campagnes marketing"
 #. module: email_template
 #: view:email.template:0
 msgid "Email contents (in raw HTML format)"
-msgstr ""
+msgstr "Contenu du courriel (au format HTML)"
 
 #. module: email_template
 #: help:email.template,email_from:0
@@ -90,7 +91,7 @@ msgstr "Nom du fichier du rapport"
 #: field:email.template,email_to:0
 #: field:email_template.preview,email_to:0
 msgid "To (Emails)"
-msgstr ""
+msgstr "Pour (courriels)"
 
 #. module: email_template
 #: view:email.template:0
@@ -382,7 +383,7 @@ msgstr ""
 #: field:email.template,email_recipients:0
 #: field:email_template.preview,email_recipients:0
 msgid "To (Partners)"
-msgstr ""
+msgstr "Pour (partenaires)"
 
 #. module: email_template
 #: field:email.template,auto_delete:0
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index 2a3a6a63509..510853c526c 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-07-13 22:02+0000\n"
-"Last-Translator: Gilles Major (OpenERP) <gim@openerp.com>\n"
+"PO-Revision-Date: 2013-08-26 08:29+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-14 05:58+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:02+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: event
 #: view:event.event:0
@@ -252,7 +252,7 @@ msgstr "tickets"
 #. module: event
 #: view:event.event:0
 msgid "Street..."
-msgstr ""
+msgstr "Rue..."
 
 #. module: event
 #: view:res.partner:0
diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po
index 31b1562af15..19cc8a41626 100644
--- a/addons/fleet/i18n/de.po
+++ b/addons/fleet/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-06-10 09:57+0000\n"
+"PO-Revision-Date: 2013-08-26 09:39+0000\n"
 "Last-Translator: Armin GREGOR <armin.gregor@gmail.com>\n"
 "Language-Team: German <de@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: 2013-07-11 05:58+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:02+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -74,7 +74,7 @@ msgstr "Diesel"
 #: code:addons/fleet/fleet.py:421
 #, python-format
 msgid "License Plate: from '%s' to '%s'"
-msgstr "Nummernschild: von #%s' bis '%s'"
+msgstr "Nummernschild: von '%s' bis '%s'"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_38
@@ -95,7 +95,7 @@ msgstr "Ersatz Ölpumpe"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_18
 msgid "Engine Belt Inspection"
-msgstr "Keilriemen Inspektion"
+msgstr "Zahnriemen Inspektion"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
@@ -674,7 +674,7 @@ msgstr "Anzahl Sitze"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
 msgid "Convertible"
-msgstr "Kabriot"
+msgstr "Kabrio"
 
 #. module: fleet
 #: model:ir.ui.menu,name:fleet.fleet_configuration
@@ -1222,6 +1222,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken um neuen Fahrtenbucheintrag zu machen. \n"
+"              </p>\n"
+"              <p>\n"
+"                Hier können Sie für alle Fahrzeuge verschiedene "
+"Fahrtenbucheinträge hinzufügen.\n"
+"                Sie können sich ebenfalls den Kilometerstand für einzelne "
+"Fahrzeuge anzeigen lassen, \n"
+"                indem sie die Suchfunktion nutzen.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1359,7 +1370,7 @@ msgstr "Vertrag"
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
 msgid "Model brand of Vehicle"
-msgstr "Fahrzeugmodell Marke"
+msgstr "Markenlogo"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_10
@@ -1510,7 +1521,7 @@ msgstr "Wöchentlich"
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.odometer:0
 msgid "Odometer Logs"
-msgstr "Tachometer Auswertung"
+msgstr "Fahrtenbücher"
 
 #. module: fleet
 #: field:fleet.vehicle,acquisition_date:0
@@ -1520,7 +1531,7 @@ msgstr "Kaufdatum"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_odometer
 msgid "Odometer log for a vehicle"
-msgstr "Tachometer Auswertung für ein Fahrzeug"
+msgstr "Fahrtenbuch für ein Fahrzeug"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,cost_type:0
@@ -1715,7 +1726,7 @@ msgstr "Zusatzeigenschaften"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_state
 msgid "fleet.vehicle.state"
-msgstr "Navigationssystem"
+msgstr "fleet.vehicle.state"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -1731,7 +1742,7 @@ msgstr "Fahrzeug Verträge"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_48
 msgid "Transmission Fluid Replacement"
-msgstr "Ersatz Getriebeölwanne"
+msgstr "Austausch Getriebeöl"
 
 #. module: fleet
 #: field:fleet.vehicle.model.brand,name:0
@@ -1741,7 +1752,7 @@ msgstr "Markenname"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_36
 msgid "Power Steering Pump Replacement"
-msgstr "Ersatz Lenkhelfpumpe"
+msgstr "Ersatz Servopumpe"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,contract_id:0
diff --git a/addons/google_base_account/i18n/fr.po b/addons/google_base_account/i18n/fr.po
index ffd64174d30..8008c8629b9 100644
--- a/addons/google_base_account/i18n/fr.po
+++ b/addons/google_base_account/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-03 13:43+0000\n"
-"Last-Translator: Florian Hatat <Unknown>\n"
+"PO-Revision-Date: 2013-08-26 08:39+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:59+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:02+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -79,7 +79,7 @@ msgstr ""
 #. module: google_base_account
 #: view:google.login:0
 msgid "e.g. user@gmail.com"
-msgstr ""
+msgstr "ex: utilisateur@gmail.com"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 800036e93bb..e4f24b10171 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-04-10 03:02+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2013-08-23 14:52+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 05:59+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -815,6 +814,7 @@ msgstr ""
 #, python-format
 msgid "Welcome to %s! Please help him/her take the first steps with OpenERP!"
 msgstr ""
+"Bienvenue à %s ! Merci de l'aider à faire ses premiers pas avec OpenERP !"
 
 #. module: hr
 #: view:hr.employee.category:0
diff --git a/addons/hr_contract/i18n/en_GB.po b/addons/hr_contract/i18n/en_GB.po
index 4adf7ac7e1d..766445e7058 100644
--- a/addons/hr_contract/i18n/en_GB.po
+++ b/addons/hr_contract/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-02-07 19:52+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
+"PO-Revision-Date: 2013-08-23 16:41+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2013-07-11 06:00+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -45,7 +45,7 @@ msgstr "Group By..."
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Advantages..."
-msgstr ""
+msgstr "Advantages..."
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index 53048f31086..18794231bff 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-03-10 20:41+0000\n"
-"Last-Translator: krnkris <Unknown>\n"
+"PO-Revision-Date: 2013-08-22 11:00+0000\n"
+"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
 "Language-Team: Hungarian <hu@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: 2013-07-11 06:00+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -888,7 +888,7 @@ msgstr "Elutasított"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can be Expensed"
-msgstr "Készpénzessé tehető"
+msgstr "Költségként elszámolható"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
diff --git a/addons/hr_payroll/i18n/id.po b/addons/hr_payroll/i18n/id.po
index 1b84c322862..e86629626cd 100644
--- a/addons/hr_payroll/i18n/id.po
+++ b/addons/hr_payroll/i18n/id.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-27 10:42+0000\n"
+"Last-Translator: xpinx2pin <Unknown>\n"
 "Language-Team: Indonesian <id@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: 2013-07-11 06:02+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-28 05:37+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -26,7 +26,7 @@ msgstr ""
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
 msgid "Monthly"
-msgstr ""
+msgstr "Bulanan"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,rate:0
@@ -43,7 +43,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip.worked_days,number_of_days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Jumlah Hari"
 
 #. module: hr_payroll
 #: help:hr.salary.rule.category,parent_id:0
@@ -62,14 +62,14 @@ msgstr "Dikelompokan berdasarkan ..."
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "States"
-msgstr "Status"
+msgstr "Propinsi"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,input_ids:0
 #: view:hr.salary.rule:0
 #: field:hr.salary.rule,input_ids:0
 msgid "Inputs"
-msgstr ""
+msgstr "Masukkan"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,parent_rule_id:0
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 6dfc0869947..d97a6ee80ec 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -496,7 +496,7 @@ class hr_job(osv.osv):
     _inherits = {'mail.alias': 'alias_id'}
     _columns = {
         'survey_id': fields.many2one('survey', 'Interview Form', help="Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
     }
diff --git a/addons/l10n_bo/i18n/en_GB.po b/addons/l10n_bo/i18n/en_GB.po
new file mode 100644
index 00000000000..85a3be2d380
--- /dev/null
+++ b/addons/l10n_bo/i18n/en_GB.po
@@ -0,0 +1,53 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2013-08-23 16:45+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: l10n_ar
+#: model:ir.module.module,description:l10n_ar.module_meta_information
+msgid ""
+"\n"
+"    Argentinian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Argentinian Accounting : chart of Account\n"
+"    "
+
+#. module: l10n_ar
+#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information
+msgid "Argentinian Chart of Account"
+msgstr "Argentinian Chart of Account"
+
+#. module: l10n_ar
+#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
diff --git a/addons/l10n_nl/i18n/en_GB.po b/addons/l10n_nl/i18n/en_GB.po
new file mode 100644
index 00000000000..341cf79b6a5
--- /dev/null
+++ b/addons/l10n_nl/i18n/en_GB.po
@@ -0,0 +1,28 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2013-08-23 16:44+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: l10n_nl
+#: model:account.account.type,name:l10n_nl.user_type_equity
+msgid "Eigen Vermogen"
+msgstr "Eigen Vermogen"
+
+#. module: l10n_nl
+#: model:account.account.type,name:l10n_nl.user_type_tax
+msgid "BTW"
+msgstr "BTW"
diff --git a/addons/l10n_th/i18n/en_GB.po b/addons/l10n_th/i18n/en_GB.po
new file mode 100644
index 00000000000..07b34b24bcd
--- /dev/null
+++ b/addons/l10n_th/i18n/en_GB.po
@@ -0,0 +1,33 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2013-08-23 16:46+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_reconciled
+msgid "Reconciled"
+msgstr "Reconciled"
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_other
+msgid "Other"
+msgstr "Other"
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_view
+msgid "View"
+msgstr "View"
diff --git a/addons/lunch/i18n/ru.po b/addons/lunch/i18n/ru.po
index 9213a86a3e5..59c331deb2a 100644
--- a/addons/lunch/i18n/ru.po
+++ b/addons/lunch/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-26 09:08+0000\n"
-"Last-Translator: Olga <chikiro.spam@gmail.com>\n"
+"PO-Revision-Date: 2013-08-22 12:16+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-07-11 06:07+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -625,7 +625,7 @@ msgstr "Дата заказа"
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Cancel Orders"
-msgstr ""
+msgstr "Отмена заказов"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_alert
@@ -860,7 +860,7 @@ msgstr ""
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "cancel order lines"
-msgstr ""
+msgstr "Отмена позиций заказа"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product_category
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 02cfd626768..8af808e77c7 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -40,6 +40,11 @@
             <field name="args">()</field>
         </record>
 
+        <!-- Admin should not receivve emails at creation -->
+        <record id="base.partner_root" model="res.partner">
+            <field name="notification_email_send">none</field>
+        </record>
+
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index f814527b96b..1e615c90c1e 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-04-21 19:15+0000\n"
-"Last-Translator: Robert Farr <service@computergalerie.com>\n"
+"PO-Revision-Date: 2013-08-27 10:08+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@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: 2013-07-11 06:08+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-28 05:38+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -26,7 +26,7 @@ msgstr "Follower Formular"
 #: code:addons/mail/mail_thread.py:246
 #, python-format
 msgid "%s created"
-msgstr ""
+msgstr "%s erstellt"
 
 #. module: mail
 #: field:mail.compose.message,author_id:0
@@ -145,7 +145,7 @@ msgstr "E-Mail Assistent"
 #: code:addons/mail/static/src/xml/mail.xml:268
 #, python-format
 msgid "updated document"
-msgstr ""
+msgstr "Aktualisiertes Dokument"
 
 #. module: mail
 #. openerp-web
@@ -389,7 +389,7 @@ msgstr "Antwort an"
 #: code:addons/mail/wizard/invite.py:37
 #, python-format
 msgid "<div>You have been invited to follow %s.</div>"
-msgstr "<div>Sie wurden eingeladen %s. zu folgen</div>"
+msgstr "<div>Sie wurden eingeladen, %s zu folgen.</div>"
 
 #. module: mail
 #. openerp-web
@@ -746,7 +746,7 @@ msgstr "Absender, aus den Benutzereinstellungen"
 #: code:addons/mail/static/src/js/mail.js:978
 #, python-format
 msgid "read more"
-msgstr ""
+msgstr "Weiterlesen"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:40
@@ -764,7 +764,7 @@ msgstr "Übergeordnete Nachricht"
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "All Messages (discussions, emails, followed system notifications)"
-msgstr ""
+msgstr "Alle Nachrichten (Diskussionen, E-Mails, System-Benachrichtigungen)"
 
 #. module: mail
 #. openerp-web
@@ -1302,7 +1302,7 @@ msgstr "Erweiterte Filter..."
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Incoming Emails only"
-msgstr ""
+msgstr "Nur Eingehende E-Mails"
 
 #. module: mail
 #. openerp-web
@@ -1551,7 +1551,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Show already read messages"
-msgstr ""
+msgstr "Zeige bereits gelesene Nachrichten"
 
 #. module: mail
 #: view:mail.message:0
@@ -1722,12 +1722,12 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:279
 #, python-format
 msgid "nobody"
-msgstr ""
+msgstr "Niemand"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Incoming Emails and Discussions"
-msgstr ""
+msgstr "Nur eingehende E-Mails und Diskussionen"
 
 #. module: mail
 #: field:mail.group,name:0
@@ -1737,7 +1737,7 @@ msgstr "Name"
 #. module: mail
 #: constraint:res.partner:0
 msgid "You cannot create recursive Partner hierarchies."
-msgstr ""
+msgstr "Sie können keine rekursiven Partner-Hierarchien erstellen."
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1799,7 +1799,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:149
 #, python-format
 msgid "(no email address)"
-msgstr ""
+msgstr "(keine E-Mail-Adresse)"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_feeds
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 93ecd890258..8b97cfc0ed7 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-05-10 05:45+0000\n"
-"Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\n"
+"PO-Revision-Date: 2013-08-21 12:36+0000\n"
+"Last-Translator: Eimis <eimislap@gmail.com>\n"
 "Language-Team: Lithuanian <lt@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: 2013-07-11 06:08+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-22 05:39+0000\n"
+"X-Generator: Launchpad (build 16734)\n"
 
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
-msgstr ""
+msgstr "Sekėjų forma"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:246
 #, python-format
 msgid "%s created"
-msgstr ""
+msgstr "%s sukurta"
 
 #. module: mail
 #: field:mail.compose.message,author_id:0
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 977608f487e..481109a8ebe 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -76,7 +76,7 @@ class mail_group(osv.Model):
             help="Small-sized photo of the group. It is automatically "\
                  "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
             help="The email address associated with this group. New emails received will automatically "
                  "create new topics."),
     }
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ff8c5cd500e..b6754c27ef2 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -748,8 +748,10 @@ class mail_thread(osv.AbstractModel):
                 # text/plain -> <pre/>
                 body = tools.append_content_to_html(u'', body, preserve=True)
         else:
-            alternative = (message.get_content_type() == 'multipart/alternative')
+            alternative = False
             for part in message.walk():
+                if part.get_content_type() == 'multipart/alternative':
+                    alternative = True
                 if part.get_content_maintype() == 'multipart':
                     continue  # skip container
                 filename = part.get_filename()  # None if normal part
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index f7c91939b98..c6a935a62b7 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -34,7 +34,7 @@ class res_users(osv.Model):
     _inherits = {'mail.alias': 'alias_id'}
 
     _columns = {
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
             help="Email address internally associated with this user. Incoming "\
                  "emails will appear in the user's notifications."),
     }
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index e1bef837010..ef6e54d1a40 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -234,7 +234,7 @@ class test_mail(TestMailBase):
         # Data creation
         # --------------------------------------------------
         # 0 - Update existing users-partners
-        self.res_users.write(cr, uid, [uid], {'email': 'a@a'})
+        self.res_users.write(cr, uid, [uid], {'email': 'a@a', 'notification_email_send': 'comment'})
         self.res_users.write(cr, uid, [self.user_raoul_id], {'email': 'r@r'})
         # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
         p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index e4269d59d8b..8b10afe82f5 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -80,6 +80,67 @@ Please call me as soon as possible this afternoon!
 Sylvie
 """
 
+MAIL_MULTIPART_MIXED = """Return-Path: <ignasse.carambar@gmail.com>
+X-Original-To: raoul@grosbedon.fr
+Delivered-To: raoul@grosbedon.fr
+Received: by mail1.grosbedon.com (Postfix, from userid 10002)
+    id E8166BFACA; Fri, 23 Aug 2013 13:18:01 +0200 (CEST)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail1.grosbedon.com
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
+    HTML_MESSAGE,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1
+Received: from mail-ie0-f173.google.com (mail-ie0-f173.google.com [209.85.223.173])
+    by mail1.grosbedon.com (Postfix) with ESMTPS id 9BBD7BFAAA
+    for <raoul@openerp.fr>; Fri, 23 Aug 2013 13:17:55 +0200 (CEST)
+Received: by mail-ie0-f173.google.com with SMTP id qd12so575130ieb.4
+        for <raoul@grosbedon.fr>; Fri, 23 Aug 2013 04:17:54 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=gmail.com; s=20120113;
+        h=mime-version:date:message-id:subject:from:to:content-type;
+        bh=dMNHV52EC7GAa7+9a9tqwT9joy9z+1950J/3A6/M/hU=;
+        b=DGuv0VjegdSrEe36ADC8XZ9Inrb3Iu+3/52Bm+caltddXFH9yewTr0JkCRQaJgMwG9
+         qXTQgP8qu/VFEbCh6scu5ZgU1hknzlNCYr3LT+Ih7dAZVUEHUJdwjzUU1LFV95G2RaCd
+         /Lwff6CibuUvrA+0CBO7IRKW0Sn5j0mukYu8dbaKsm6ou6HqS8Nuj85fcXJfHSHp6Y9u
+         dmE8jBh3fHCHF/nAvU+8aBNSIzl1FGfiBYb2jCoapIuVFitKR4q5cuoodpkH9XqqtOdH
+         DG+YjEyi8L7uvdOfN16eMr7hfUkQei1yQgvGu9/5kXoHg9+Gx6VsZIycn4zoaXTV3Nhn
+         nu4g==
+MIME-Version: 1.0
+X-Received: by 10.50.124.65 with SMTP id mg1mr1144467igb.43.1377256674216;
+ Fri, 23 Aug 2013 04:17:54 -0700 (PDT)
+Received: by 10.43.99.71 with HTTP; Fri, 23 Aug 2013 04:17:54 -0700 (PDT)
+Date: Fri, 23 Aug 2013 13:17:54 +0200
+Message-ID: <CAP76m_V4BY2F7DWHzwfjteyhW8L2LJswVshtmtVym+LUJ=rASQ@mail.gmail.com>
+Subject: Test mail multipart/mixed
+From: =?ISO-8859-1?Q?Raoul Grosbedon=E9e?= <ignasse.carambar@gmail.com>
+To: Followers of ASUSTeK-Joseph-Walters <raoul@grosbedon.fr>
+Content-Type: multipart/mixed; boundary=089e01536c4ed4d17204e49b8e96
+
+--089e01536c4ed4d17204e49b8e96
+Content-Type: multipart/alternative; boundary=089e01536c4ed4d16d04e49b8e94
+
+--089e01536c4ed4d16d04e49b8e94
+Content-Type: text/plain; charset=ISO-8859-1
+
+Should create a multipart/mixed: from gmail, *bold*, with attachment.
+
+-- 
+Marcel Boitempoils.
+
+--089e01536c4ed4d16d04e49b8e94
+Content-Type: text/html; charset=ISO-8859-1
+
+<div dir="ltr">Should create a multipart/mixed: from gmail, <b>bold</b>, with attachment.<br clear="all"><div><br></div>-- <br>Marcel Boitempoils.</div>
+
+--089e01536c4ed4d16d04e49b8e94--
+--089e01536c4ed4d17204e49b8e96
+Content-Type: text/plain; charset=US-ASCII; name="test.txt"
+Content-Disposition: attachment; filename="test.txt"
+Content-Transfer-Encoding: base64
+X-Attachment-Id: f_hkpb27k00
+
+dGVzdAo=
+--089e01536c4ed4d17204e49b8e96--"""
+
 
 class TestMailgateway(TestMailBase):
 
@@ -123,6 +184,24 @@ class TestMailgateway(TestMailBase):
         self.assertEqual(partner_info['partner_id'], p_b_id,
                         'mail_thread: message_find_partner_from_emails wrong partner found')
 
+    def test_09_message_parse(self):
+        """ Testing incoming emails parsing """
+        cr, uid = self.cr, self.uid
+
+        res = self.mail_thread.message_parse(cr, uid, MAIL_TEMPLATE_PLAINTEXT)
+        self.assertIn('Please call me as soon as possible this afternoon!', res.get('body', ''),
+                      'message_parse: missing text in text/plain body after parsing')
+
+        res = self.mail_thread.message_parse(cr, uid, MAIL_TEMPLATE)
+        self.assertIn('<p>Please call me as soon as possible this afternoon!</p>', res.get('body', ''),
+                      'message_parse: missing html in multipart/alternative body after parsing')
+
+        res = self.mail_thread.message_parse(cr, uid, MAIL_MULTIPART_MIXED)
+        self.assertNotIn('Should create a multipart/mixed: from gmail, *bold*, with attachment', res.get('body', ''),
+                         'message_parse: text version should not be in body after parsing multipart/mixed')
+        self.assertIn('<div dir="ltr">Should create a multipart/mixed: from gmail, <b>bold</b>, with attachment.<br clear="all"><div><br></div>', res.get('body', ''),
+                      'message_parse: html version should be in body after parsing multipart/mixed')
+
     def test_10_message_process(self):
         """ Testing incoming emails processing. """
         cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
@@ -362,7 +441,7 @@ class TestMailgateway(TestMailBase):
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         msg = frog_group.message_ids[0]
         # Test: plain text content should be wrapped and stored as html
-        self.assertEqual(msg.body, '<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>',
+        self.assertIn('<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>', msg.body,
                             'message_process: plaintext incoming email incorrectly parsed')
 
     def test_20_thread_parent_resolution(self):
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 84ab1e19b2f..147f9bf513f 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-04-30 16:27+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"PO-Revision-Date: 2013-08-21 13:03+0000\n"
+"Last-Translator: Eimis <eimislap@gmail.com>\n"
 "Language-Team: Lithuanian <lt@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: 2013-07-11 06:10+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-22 05:40+0000\n"
+"X-Generator: Launchpad (build 16734)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -68,7 +68,7 @@ msgstr ""
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Hourly Cost"
-msgstr ""
+msgstr "Valandinė kaina"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -78,7 +78,7 @@ msgstr "Nurašyti produktus"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Mrp Workcenter"
-msgstr ""
+msgstr "Mrp darbo centras"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -115,7 +115,7 @@ msgstr ""
 #. module: mrp
 #: view:product.product:0
 msgid "False"
-msgstr ""
+msgstr "Ne"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -149,7 +149,7 @@ msgstr ""
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr ""
+msgstr "Pirkti"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -159,7 +159,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Produktai Baigti"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -191,7 +191,7 @@ msgstr "Matavimo vienetas"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr ""
+msgstr "Įsigytoms medžiagos"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
@@ -201,13 +201,13 @@ msgstr "Užsakymų planavimas"
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
-msgstr ""
+msgstr "Leisti darbų užsakymų išsamius planus"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Negalite atšaukti gamybos užsakymo!"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -218,7 +218,7 @@ msgstr "Ciklinių kaštų sąskaita"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Work Cost"
-msgstr ""
+msgstr "Darbų išlaidos"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
@@ -279,7 +279,7 @@ msgstr "Produktų duomenys"
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_byproduct:0
 msgid "Produce several products from one manufacturing order"
-msgstr ""
+msgstr "Gaminti keletą produktų iš vieno gamybos užsakymo"
 
 #. module: mrp
 #: help:mrp.config.settings,group_mrp_properties:0
@@ -331,22 +331,22 @@ msgstr ""
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_routings
 msgid "Manage Routings"
-msgstr ""
+msgstr "Valdyti maršrutus"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Produkto gamyba"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti grįžtamojo BoM."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "Darbo centro naudojimas"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -386,7 +386,7 @@ msgstr ""
 #. module: mrp
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Nuoroda turi būti unikali kiekvienai įmonei!"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -520,7 +520,7 @@ msgstr "Suplanuota data"
 #: code:addons/mrp/procurement.py:129
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
-msgstr ""
+msgstr "Gamybos užsakymas <em>%s</em> sukurtas."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -552,7 +552,7 @@ msgstr "KS struktūra"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
+msgstr "Produkto tipas yra paslauga"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
@@ -562,12 +562,12 @@ msgstr "Įveskite darbo centro patiriamus kaštus per ciklą."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Gamybos skaidymas"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
+msgstr "Už paslaugas."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
@@ -626,7 +626,7 @@ msgstr "Produkto KS struktūra"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr ""
+msgstr "Gamybos paieška"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
@@ -637,12 +637,12 @@ msgstr "Eilės tvarka, pagal kurią išdėstomas darbo centrų operacijų sąra
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "BoM hierarchija"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "Gaminti"
 
 #. module: mrp
 #: help:mrp.config.settings,module_stock_no_autopicking:0
@@ -774,7 +774,7 @@ msgstr ""
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "BoM produktų linija neturėtų būti tokia pati kaip BoM produktas."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -880,12 +880,12 @@ msgstr "Spausdinimo data"
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr ""
+msgstr "RFQ"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Pirkimų taisyklės"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
@@ -937,6 +937,8 @@ msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
 "product form."
 msgstr ""
+"Produkto matavimo vienetas, kurį pasirinkote, priklauso kitai kategorijai "
+"nei esantis produktų formoje."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -959,6 +961,9 @@ msgid ""
 "You should install the mrp_byproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Visas produktų kiekis turi būti didesnis už 0.\n"
+"Jūs turite įdiegti mrp_byproduct modulį, jei norite valdyti papildomus  BoM "
+"produktus!"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1034,7 +1039,7 @@ msgstr "Paieška"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr ""
+msgstr "Produkto struktūra"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
@@ -1053,7 +1058,7 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Minimalūs ištekliai"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:160
@@ -1073,7 +1078,7 @@ msgstr "Sandėliuojamas produktas"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Work Center name"
-msgstr ""
+msgstr "Darbo centro pavadinimas"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -1098,7 +1103,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr ""
+msgstr "Gamybos planas."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1149,7 +1154,7 @@ msgstr "Gamybos užsakymai"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Awaiting Raw Materials"
-msgstr ""
+msgstr "Laukiama Žaliavos"
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -1221,12 +1226,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr ""
+msgstr "Vykdomi gamybos užsakymai"
 
 #. module: mrp
 #: model:ir.actions.client,name:mrp.action_client_mrp_menu
 msgid "Open MRP Menu"
-msgstr ""
+msgstr "Atidarykite MRP meniu"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1381,7 +1386,7 @@ msgstr ""
 #: code:addons/mrp/report/price.py:187
 #, python-format
 msgid "Components Cost of %s %s"
-msgstr ""
+msgstr "Komponentų savikaina %s %s"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1417,13 +1422,13 @@ msgstr "%s (kopija)"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Planuojama produkto gamyba"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:204
 #, python-format
 msgid "Work Cost of %s %s"
-msgstr ""
+msgstr "Darbo sąnaudos %s %s"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1440,7 +1445,7 @@ msgstr "Iš atsargų"
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "Užsakymo kiekis negali būti neigiamas arba lygus nuliui!"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
@@ -1448,6 +1453,8 @@ msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
 msgstr ""
+"Tuo atveju, jei tiekimo metodas šiems produktams yra Pirkti, sistema sukuria "
+"pirkimo pavedimą."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1457,7 +1464,7 @@ msgstr "Planinis užsakymas"
 #. module: mrp
 #: field:mrp.config.settings,module_product_manufacturer:0
 msgid "Define manufacturers on products "
-msgstr ""
+msgstr "Nustatykite produktų gamintojus "
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
@@ -1474,12 +1481,12 @@ msgstr "Komponentų tiekėjai"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Gamybos darbo centrai"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Ieškoti MRP darbo centro"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1568,7 +1575,7 @@ msgstr "Papildoma informacija"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Pakeisti produktų kiekį"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
@@ -1594,7 +1601,7 @@ msgstr "Pardavimo užsakymo numeris"
 #: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
-msgstr ""
+msgstr "Negalima ištrinti gamybos užsakymo būklės '%s'."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1723,7 +1730,7 @@ msgstr "Pardavimo matai"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Plataus vartojimo prekės"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
@@ -2209,7 +2216,7 @@ msgstr "Pavėluotai pradėta gamyba"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Gamybos etapai."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:146
@@ -2344,12 +2351,12 @@ msgstr "Neįvykdyti planiniai užsakymai"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Produkto kaina"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Pakeisti kiekį"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2373,7 +2380,7 @@ msgstr ""
 #: code:addons/mrp/wizard/change_production_qty.py:68
 #, python-format
 msgid "Active Id not found"
-msgstr ""
+msgstr "Aktyvus ID nerastas"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -2515,7 +2522,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_config_settings
 msgid "mrp.config.settings"
-msgstr ""
+msgstr "mrp.config.settings"
 
 #. module: mrp
 #: view:mrp.production:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2cba9f14e1b..c3e17563ec4 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -322,9 +322,10 @@ class mrp_bom(osv.osv):
         """
         routing_obj = self.pool.get('mrp.routing')
         factor = factor / (bom.product_efficiency or 1.0)
-        factor = rounding(factor, bom.product_rounding)
-        if factor < bom.product_rounding:
-            factor = bom.product_rounding
+        max_rounding = max(bom.product_rounding, bom.product_uom.rounding)
+        factor = rounding(factor, max_rounding)
+        if factor < max_rounding:
+            factor = max_rounding
         result = []
         result2 = []
         phantom = False
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 16d7bae8cce..35308888504 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -189,7 +189,7 @@
                                     <field name="time_stop" widget="float_time"/>
                                 </group>
                                 <group string="Costing Information">
-                                    <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                    <field name="product_id" on_change="on_change_product_cost(product_id)" context="{'default_supply_method':'produce'}"/>
                                     <field name="costs_hour"/>
                                     <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="costs_cycle"/>
@@ -248,7 +248,7 @@
             <field name="model">mrp.routing.workcenter</field>
             <field name="arch" type="xml">
                 <form string="Routing Work Centers" version="7.0">
-                    <group col="4" string="General Information">
+                    <group col="4">
                         <field colspan="4" name="name"/>
                         <field name="sequence"/>
                         <field name="workcenter_id"/>
@@ -280,7 +280,7 @@
                     </group>
                     <notebook>
                         <page string="Work Center Operations">
-                            <field name="workcenter_lines"/>
+                            <field name="workcenter_lines" string="Operation"/>
                         </page>
                         <page string="Notes">
                             <field name="note"/>
@@ -422,6 +422,7 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <field name="bom_lines" string="Components"/>
                     <field name="product_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
@@ -513,7 +514,18 @@
               </p>
             </field>
         </record>
-        
+        <record id="product_search_form_view_procurment" model="ir.ui.view">
+             <field name="name">product.search.bom</field>
+             <field name="model">product.product</field>
+             <field name="inherit_id" ref="product.product_search_form_view"/>
+             <field name="arch" type="xml">
+                 <xpath expr="//filter[@string='Consumable']" position="after">
+                     <separator/>
+                    <filter string="Components" name="components" icon="terp-accessories-archiver" domain="[('bom_ids','not in',[]),('bom_ids.bom_id','!=',False)]" invisible="not context.get('search_default_filter_supply_method_produce', False)"/>
+                 </xpath>
+             </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>
@@ -537,15 +549,15 @@
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
             parent="menu_mrp_configuration"
-            groups="base.group_no_one"
             sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Bill of Materials Structure</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
-            <field name="domain">[('bom_id', '=',active_ids)]</field>
+            <field name="domain">[('id', 'in', active_ids)]</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
+            <field name="view_type">tree</field>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
             <field eval="'client_action_multi'" name="key2"/>
@@ -994,7 +1006,7 @@
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
-            <field name="name">Work Center</field>
+            <field name="name">Work Centers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.workcenter</field>
             <field name="view_type">form</field>
@@ -1031,6 +1043,7 @@
             <field name="name">Bill of Materials</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="res_model">mrp.bom</field>
+            <field name="view_type">form</field>
         </record>
 
         <record model="ir.ui.view" id="product_form_view_bom_button">
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index c780576099c..cb5c35a3b0d 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -37,7 +37,7 @@ class mrp_config_settings(osv.osv_memory):
                     * Repair quotation report
                     * Notes for the technician and for the final customer.
                 This installs the module mrp_repair."""),
-        'module_mrp_operations': fields.boolean("Allow detailed planning of work order",
+        'module_mrp_operations': fields.boolean("Allow detailed planning of work orders",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
         'module_mrp_byproduct': fields.boolean("Produce several products from one manufacturing order",
@@ -61,7 +61,7 @@ class mrp_config_settings(osv.osv_memory):
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
                 within your work centers in order to produce a product. They are attached to bills of materials
                 that will define the required raw materials."""),
-        'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties",
+        'group_mrp_properties': fields.boolean("Allow several bill of materials per product using properties",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the properties specified on the sales order and the Bill of Material."""),
         'module_product_manufacturer': fields.boolean("Define manufacturers on products ",
diff --git a/addons/mrp/tests/__init__.py b/addons/mrp/tests/__init__.py
new file mode 100644
index 00000000000..39ebd5e451f
--- /dev/null
+++ b/addons/mrp/tests/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_multicompany
+
+checks = [
+    test_multicompany,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py
new file mode 100644
index 00000000000..f38a31a70de
--- /dev/null
+++ b/addons/mrp/tests/test_multicompany.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class TestMrpMulticompany(common.TransactionCase):
+
+    def setUp(self):
+        super(TestMrpMulticompany, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.ir_model_data = self.registry('ir.model.data')
+        self.res_users = self.registry('res.users')
+        self.stock_location = self.registry('stock.location')
+
+        model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager')
+        model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_2')
+        self.multicompany_user_id = self.res_users.create(cr, uid,
+            {'name': 'multicomp', 'login': 'multicomp',
+             'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])],
+             'company_id': company_2_id, 'company_ids': [(6,0,[company_2_id])]})
+
+
+    def test_00_multicompany_user(self):
+        """check no error on getting default mrp.production values in multicompany setting"""
+        cr, uid, context = self.cr, self.multicompany_user_id, {}
+        fields = ['location_src_id', 'location_dest_id']
+        defaults = self.stock_location.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
+        for field in fields:
+            print field, uid, defaults
+            if defaults.get(field):
+                try:
+                    self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
+                except Exception, exc:
+                    assert False, "unreadable location %s: %s" % (field, exc)
diff --git a/addons/mrp_byproduct/i18n/lt.po b/addons/mrp_byproduct/i18n/lt.po
index 6f91209bbea..c775e3dc5b5 100644
--- a/addons/mrp_byproduct/i18n/lt.po
+++ b/addons/mrp_byproduct/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-26 06:33+0000\n"
+"Last-Translator: Eimis <eimislap@gmail.com>\n"
 "Language-Team: Lithuanian <lt@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: 2013-07-11 06:10+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:03+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -32,22 +32,22 @@ msgstr ""
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produktas"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Matavimo vienetas"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Gamybos užsakymas"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Pakeisti produktų kiekį"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
@@ -63,18 +63,18 @@ msgstr ""
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Komplektavimo specifikacija"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Produkto kiekis"
 
 #. module: mrp_byproduct
 #: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Įspėjimas"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,bom_id:0
@@ -84,12 +84,12 @@ msgstr ""
 #. module: mrp_byproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Variable"
-msgstr ""
+msgstr "Kintamasis"
 
 #. module: mrp_byproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Fiksuotas"
 
 #. module: mrp_byproduct
 #: code:addons/mrp_byproduct/mrp_byproduct.py:63
@@ -98,6 +98,8 @@ msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
 "product form."
 msgstr ""
+"Produkto matavimo vienetas, kurį pasirinkote, priklauso kitai kategorijai "
+"nei esantis produktų formoje."
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
diff --git a/addons/mrp_jit/i18n/en_GB.po b/addons/mrp_jit/i18n/en_GB.po
new file mode 100644
index 00000000000..35ed595c96d
--- /dev/null
+++ b/addons/mrp_jit/i18n/en_GB.po
@@ -0,0 +1,70 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2013-08-23 16:44+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: mrp_jit
+#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
+msgid "MRP JIT"
+msgstr "MRP JIT"
+
+#. module: mrp_jit
+#: model:ir.module.module,description:mrp_jit.module_meta_information
+msgid ""
+"\n"
+"    This module allows Just In Time computation of procurement orders.\n"
+"\n"
+"    If you install this module, you will not have to run the regular "
+"procurement \n"
+"    scheduler anymore (but you still need to run the minimum order point "
+"rule \n"
+"    scheduler, or for example let it run daily.)\n"
+"    All procurement orders will be processed immediately, which could in "
+"some\n"
+"    cases entail a small performance impact.\n"
+"\n"
+"    It may also increase your stock size because products are reserved as "
+"soon\n"
+"    as possible and the scheduler time range is not taken into account "
+"anymore. \n"
+"    In that case, you can not use priorities any more on the different "
+"picking.\n"
+"    \n"
+"    \n"
+"    "
+msgstr ""
+"\n"
+"    This module allows Just In Time computation of procurement orders.\n"
+"\n"
+"    If you install this module, you will not have to run the regular "
+"procurement \n"
+"    scheduler anymore (but you still need to run the minimum order point "
+"rule \n"
+"    scheduler, or for example let it run daily.)\n"
+"    All procurement orders will be processed immediately, which could in "
+"some\n"
+"    cases entail a small performance impact.\n"
+"\n"
+"    It may also increase your stock size because products are reserved as "
+"soon\n"
+"    as possible and the scheduler time range is not taken into account "
+"anymore. \n"
+"    In that case, you can not use priorities any more on the different "
+"picking.\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index d5a52970cd7..b4bc687501c 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-22 12:16+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-07-11 06:11+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -113,7 +113,7 @@ msgstr "День"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Отменить заказ"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index a4526b5b581..b7a667ce308 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -31,7 +31,7 @@
                    <button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                    <button name="action_repair_end" states="under_repair" string="End Repair" class="oe_highlight"/>
-                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
+                   <button name="action_invoice_create" states="2binvoiced" string="Create Invoice" class="oe_highlight"/>
                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                    <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
                    <button name="action_cancel" string="Cancel Repair" type="object" attrs="{'invisible':['|',('invoice_method','!=','none'), ('state', 'not in',('confirmed','2binvoiced','ready','under_repair', 'invoice_except'))]}"/>
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 21d71064901..9c14728bc05 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -21,7 +21,7 @@
             </field>
         </record>
 
-        <act_window name="Make Invoice"            
+        <act_window name="Create Invoice"            
             res_model="mrp.repair.make_invoice"
             src_model="mrp.repair"
             view_mode="form"
diff --git a/addons/note_pad/i18n/en_GB.po b/addons/note_pad/i18n/en_GB.po
new file mode 100644
index 00000000000..f295d707d3b
--- /dev/null
+++ b/addons/note_pad/i18n/en_GB.po
@@ -0,0 +1,28 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:44+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Note"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Pad URL"
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 60097db0db1..11a4c8d4bf4 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-04-21 21:38+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-08-27 10:21+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@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: 2013-07-11 06:12+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-28 05:38+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -478,7 +477,7 @@ msgstr "Gesamt Menge"
 #: code:addons/point_of_sale/static/src/js/screens.js:874
 #, python-format
 msgid "Back"
-msgstr ""
+msgstr "Zurück"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 31d92a8df44..eec43c88fc8 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -469,6 +469,11 @@ class pos_session(osv.osv):
             context = {}
         if not ids:
             return {}
+        for session in self.browse(cr, uid, ids, context=context):
+            if session.user_id.id != uid:
+                raise osv.except_osv(
+                        _('Error!'),
+                        _("You cannot use the session of another users. This session is owned by %s. Please first close this one to use this point of sale." % session.user_id.name))
         context.update({'active_id': ids[0]})
         return {
             'type' : 'ir.actions.client',
@@ -793,9 +798,18 @@ class pos_order(osv.osv):
         """Create a copy of order  for refund order"""
         clone_list = []
         line_obj = self.pool.get('pos.order.line')
+        
         for order in self.browse(cr, uid, ids, context=context):
+            current_session_ids = self.pool.get('pos.session').search(cr, uid, [
+                ('state', '!=', 'closed'),
+                ('user_id', '=', uid)], context=context)
+            if not current_session_ids:
+                raise osv.except_osv(_('Error!'), _('To return product(s), you need to open a session that will be used to register the refund.'))
+
             clone_id = self.copy(cr, uid, order.id, {
-                'name': order.name + ' REFUND',
+                'name': order.name + ' REFUND', # not used, name forced by create
+                'session_id': current_session_ids[0],
+                'date_order': time.strftime('%Y-%m-%d %H:%M:%S'),
             }, context=context)
             clone_list.append(clone_id)
 
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index c05189fd2ab..361e4270c63 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -8,6 +8,7 @@
             <field name="email">demo@portal.example.com</field>
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
+            <field name="notification_email_send">none</field>
         </record>
         <record id="demo_user0" model="res.users">
             <field name="partner_id" ref="partner_demo_portal"/>
diff --git a/addons/portal_anonymous/i18n/en_GB.po b/addons/portal_anonymous/i18n/en_GB.po
new file mode 100644
index 00000000000..89cf2ad0fca
--- /dev/null
+++ b/addons/portal_anonymous/i18n/en_GB.po
@@ -0,0 +1,25 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:44+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Login"
diff --git a/addons/portal_claim/i18n/en_GB.po b/addons/portal_claim/i18n/en_GB.po
new file mode 100644
index 00000000000..7b8eb952a2c
--- /dev/null
+++ b/addons/portal_claim/i18n/en_GB.po
@@ -0,0 +1,43 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:44+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: portal_claim
+#: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new claim. \n"
+"              </p><p>\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new claim. \n"
+"              </p><p>\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+
+#. module: portal_claim
+#: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
+msgid "Claims"
+msgstr "Claims"
diff --git a/addons/portal_project_issue/i18n/en_GB.po b/addons/portal_project_issue/i18n/en_GB.po
new file mode 100644
index 00000000000..10e094ad2fd
--- /dev/null
+++ b/addons/portal_project_issue/i18n/en_GB.po
@@ -0,0 +1,47 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:46+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr "Creation:"
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+msgid "Issues"
+msgstr "Issues"
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 04d41322b02..095a12f1235 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-06-20 05:14+0000\n"
+"PO-Revision-Date: 2013-08-26 09:47+0000\n"
 "Last-Translator: Armin GREGOR <armin.gregor@gmail.com>\n"
 "Language-Team: German <de@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: 2013-07-11 06:15+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:03+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -25,7 +25,7 @@ msgstr "Anzahl Ebenen"
 #. module: product
 #: view:res.partner:0
 msgid "the parent company"
-msgstr ""
+msgstr "der Mutterkonzern"
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -80,7 +80,7 @@ msgstr "Fest"
 #. module: product
 #: model:product.template,name:product.product_product_10_product_template
 msgid "Mouse, Optical"
-msgstr ""
+msgstr "Maus, optisch"
 
 #. module: product
 #: view:product.template:0
@@ -220,7 +220,7 @@ msgstr "Oberkategorie"
 #. module: product
 #: model:product.template,description:product.product_product_33_product_template
 msgid "Headset for laptop PC with USB connector."
-msgstr ""
+msgstr "Kopfhörer für Notebooks mit USB Anschluss"
 
 #. module: product
 #: model:product.category,name:product.product_category_all
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
index f15b35a5a78..2dd17f40cae 100644
--- a/addons/product_manufacturer/i18n/de.po
+++ b/addons/product_manufacturer/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-08-26 09:27+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@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: 2013-07-11 06:16+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:03+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
@@ -31,7 +31,7 @@ msgstr "Produkt"
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
-msgstr "Produkt Vorlage Name"
+msgstr "Produkt Vorlagenname"
 
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 88f528693df..fb4aac965d6 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <group name="procurement" position="inside">
                     <group string="Manufacturer">
-                        <field name="manufacturer" />
+                        <field name="manufacturer" context="{'default_supplier':True, 'default_customer':False}"/>
                         <field name="manufacturer_pname"/>
                         <field name="manufacturer_pref"/>
                     </group>
diff --git a/addons/project/project.py b/addons/project/project.py
index 933b3c2d8fc..0a6c62fe784 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -79,6 +79,13 @@ class project(osv.osv):
                  "mail.alias": "alias_id"}
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
+    def _auto_init(self, cr, context=None):
+        """ Installation hook: aliases, project.project """
+        # create aliases for all projects and avoid constraint errors
+        alias_context = dict(context, alias_model_name='project.task')
+        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(project, self)._auto_init,
+            self._columns['alias_id'], 'id', alias_prefix='project+', alias_defaults={'project_id':'id'}, context=alias_context)
+
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
             return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
@@ -274,7 +281,7 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="Internal email associated with this project. Incoming emails are automatically synchronized"
                                          "with Tasks (or optionally Issues if the Issue Tracker module is installed)."),
         'alias_model': fields.selection(_alias_models, "Alias Model", select=True, required=True,
@@ -1335,6 +1342,18 @@ class account_analytic_account(osv.osv):
             raise osv.except_osv(_('Warning!'), _('Please delete the project linked with this account first.'))
         return super(account_analytic_account, self).unlink(cr, uid, ids, *args, **kwargs)
 
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
+        if args is None:
+            args = []
+        if context is None:
+            context={}
+        if context.get('current_model') == 'project.project':
+            project_ids = self.search(cr, uid, args + [('name', operator, name)], limit=limit, context=context)
+            return self.name_get(cr, uid, project_ids, context=context)
+
+        return super(account_analytic_account, self).name_search(cr, uid, name, args=args, operator=operator, context=context, limit=limit)
+
+
 class project_project(osv.osv):
     _inherit = 'project.project'
     _defaults = {
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 1b365f227b2..862dd683e93 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-24 10:58+0000\n"
+"PO-Revision-Date: 2013-08-22 12:14+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-07-25 05:44+0000\n"
-"X-Generator: Launchpad (build 16700)\n"
+"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
+"X-Generator: Launchpad (build 16737)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -69,7 +69,7 @@ msgstr "День"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Отменить заказ"
 
 #. module: purchase
 #: view:purchase.report:0
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index e05f6b9c9c6..30a877ef9d1 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -41,7 +41,7 @@ class res_partner(osv.osv):
 
         default.update({'purchase_order_ids': []})
 
-        super(res_partner, self).copy(cr, uid, id, default=default, context=context)
+        return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
 
     def _commercial_fields(self, cr, uid, context=None):
         return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist_purchase']
diff --git a/addons/purchase_analytic_plans/i18n/en_GB.po b/addons/purchase_analytic_plans/i18n/en_GB.po
new file mode 100644
index 00000000000..dfa35966f17
--- /dev/null
+++ b/addons/purchase_analytic_plans/i18n/en_GB.po
@@ -0,0 +1,33 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:46+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: purchase_analytic_plans
+#: field:purchase.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Analytic Distribution"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Purchase Order Line"
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
+msgstr "Purchase Order"
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index cdb757f91ab..df34a83b183 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/i18n/de.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-04-21 21:47+0000\n"
+"PO-Revision-Date: 2013-08-26 09:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2013-07-11 06:20+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:03+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -391,7 +391,7 @@ msgstr "Benachrichtigung erfordert handeln"
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Purchase for Requisitions"
-msgstr "Bedarfsmeldung für Beschaffung"
+msgstr "Bestellmeldung für Beschaffung"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index f95613ef1d8..ad27d8e0b8e 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-14 01:36+0000\n"
-"Last-Translator: Gilles Major (OpenERP) <gim@openerp.com>\n"
+"PO-Revision-Date: 2013-08-23 14:49+0000\n"
+"Last-Translator: Xsias <sven.boudesseul@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-15 05:13+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -41,7 +41,7 @@ msgstr "Vendeur"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr "liste de prix du bon de commandes actuel"
+msgstr "Liste de prix du bon de commande actuel"
 
 #. module: sale
 #: view:sale.report:0
@@ -1191,6 +1191,8 @@ msgstr "Total taxes incluses"
 #, python-format
 msgid "You cannot create invoice when sales order is not confirmed."
 msgstr ""
+"Vous ne pouvez pas créer une facture tant que la commande de vente n'est pas "
+"confirmée."
 
 #. module: sale
 #: view:sale.report:0
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 9fb7787bd4f..b43e758e607 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-07 05:53+0000\n"
+"PO-Revision-Date: 2013-08-30 04:29+0000\n"
 "Last-Translator: Yoshi Tashiro <yostashiro@gmail.com>\n"
 "Language-Team: Japanese <ja@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: 2013-08-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16750)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -36,7 +36,7 @@ msgstr "販売単位"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "営業担当者"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -141,7 +141,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Invoice the whole sales order"
-msgstr ""
+msgstr "販売オーダ全体を請求"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -178,7 +178,7 @@ msgstr "合計価格"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sales order lines"
-msgstr ""
+msgstr "販売オーダ明細に基づき顧客請求書を生成"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -227,7 +227,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "販売オーダ完了"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -282,7 +282,7 @@ msgstr "店名"
 #: code:addons/sale/sale.py:598
 #, python-format
 msgid "You cannot confirm a sales order which has no line."
-msgstr ""
+msgstr "明細のない販売オーダは確定できません。"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -337,17 +337,17 @@ msgstr "8月"
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sales orders"
-msgstr ""
+msgstr "販売オーダより自動で出荷オーダを生成"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr "受注オーダーの統計値"
+msgstr "販売オーダ統計"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr "受注オーダーに関連した分析アカウント"
+msgstr "販売オーダに紐づく分析アカウント"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -619,7 +619,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "受注オーダー行"
+msgstr "販売オーダ明細"
 
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
@@ -645,7 +645,7 @@ msgstr "オーダー行"
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
 msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "販売管理にて複数分析アカウントを使用"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -664,7 +664,7 @@ msgstr "作成日"
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sales Orders"
-msgstr ""
+msgstr "販売オーダ内のアドレス"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -815,7 +815,7 @@ msgstr ""
 #: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
-msgstr "受注"
+msgstr "販売オーダ"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -888,7 +888,7 @@ msgstr "適切な価格リスト行が見つかりません："
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr ""
+msgstr "販売オーダにマージンを表示"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1057,7 +1057,7 @@ msgstr ""
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered date of the sales order"
-msgstr "受注オーダーのオーダー日"
+msgstr "販売オーダの注文日"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1124,7 +1124,7 @@ msgstr "税金"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order ready to be invoiced"
-msgstr "請求準備のできた受注オーダー"
+msgstr "請求可能な販売オーダ"
 
 #. module: sale
 #: help:sale.config.settings,module_analytic_user_function:0
@@ -1259,7 +1259,7 @@ msgstr "会計士によってレビューされます。"
 #. module: sale
 #: view:sale.order:0
 msgid "My Sales Orders"
-msgstr ""
+msgstr "マイ販売オーダ"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1308,7 +1308,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sales order lines"
-msgstr ""
+msgstr "販売オーダ行での値引入力を可能にする"
 
 #. module: sale
 #: field:sale.order,paypal_url:0
@@ -1331,7 +1331,7 @@ msgstr ""
 #, python-format
 msgid ""
 "In order to delete a confirmed sales order, you must cancel it before !"
-msgstr ""
+msgstr "確定した販売オーダを削除するには、はじめに取り消してください。"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.open_board_sales
@@ -1389,7 +1389,7 @@ msgstr "ToDo"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sales Order"
-msgstr ""
+msgstr "販売オーダを請求登録"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1554,7 +1554,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr "受注オーダーから"
+msgstr "販売オーダより"
 
 #. module: sale
 #: view:sale.order:0
@@ -1609,7 +1609,7 @@ msgstr ""
 #. module: sale
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr "受注ダッシュボード"
+msgstr "販売ダッシュボード"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1639,13 +1639,13 @@ msgstr ""
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr "受注オーダー確認日"
+msgstr "販売オーダ確定日"
 
 #. module: sale
 #: code:addons/sale/sale.py:565
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "始めにこの販売オーダに紐づく全ての請求書を取り消してください。"
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1790,7 +1790,7 @@ msgstr ""
 #: selection:sale.order,state:0
 #, python-format
 msgid "Sales Order"
-msgstr "受注オーダー"
+msgstr "販売オーダ"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -1833,7 +1833,7 @@ msgstr "請求書行"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr "受注オーダー行"
+msgstr "販売オーダ明細"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -1843,7 +1843,7 @@ msgstr ""
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "販売の分析会計"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -1880,9 +1880,9 @@ msgid ""
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
-"請求書は次の何れかの理由により、この受注オーダー行のために作成されません。\n"
-"1. この受注オーダー行の状態はドラフトまたはキャンセルの何れかである。\n"
-"2. 受注オーダー行は請求されている。"
+"請求書は次の何れかの理由により、この販売オーダ行のために作成されません。\n"
+"1. この販売オーダ明細の状態は「ドラフト」または「取消済」の何れかである。\n"
+"2. 販売オーダ明細は請求されている。"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1923,7 +1923,7 @@ msgstr "非課税金額"
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "販売の分析会計"
 
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index 4c82e0e3077..8431302f24c 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/i18n/th.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-19 13:42+0000\n"
-"Last-Translator: Panupong <kengz47547@yahoo.com>\n"
+"PO-Revision-Date: 2013-08-30 03:11+0000\n"
+"Last-Translator: Sumonchai ( เหลา ) <sumonchai@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-11 06:21+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16750)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -85,7 +85,7 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "ภาษี"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -217,7 +217,7 @@ msgstr "ข้อมูลอื่นๆ"
 #: code:addons/sale/wizard/sale_make_invoice.py:55
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "คำเตือน!"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -327,7 +327,7 @@ msgstr ""
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "Status"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -381,7 +381,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "สรุป"
 
 #. module: sale
 #: view:sale.order:0
@@ -485,7 +485,7 @@ msgstr "ที่อยู่ใบแจ้งหนี้สำหรับใ
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -522,7 +522,7 @@ msgstr ""
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "หรือ"
 
 #. module: sale
 #: model:mail.message.subtype,description:sale.mt_order_sent
@@ -631,7 +631,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "พิมพ์"
 
 #. module: sale
 #: report:sale.order:0
@@ -716,7 +716,7 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "การตั้งค่าผิดพลาด"
 
 #. module: sale
 #: help:sale.order,invoice_exists:0
@@ -726,13 +726,13 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "ส่งทางอีเมล์"
 
 #. module: sale
 #: code:addons/sale/res_config.py:97
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "ชั่วโมง"
 
 #. module: sale
 #: view:sale.order:0
@@ -815,7 +815,7 @@ msgstr ""
 #: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
-msgstr ""
+msgstr "คำสั่งขาย / Sales Order"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -844,7 +844,7 @@ msgstr "เป็นผู้ติดตาม"
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "วันที่"
 
 #. module: sale
 #: view:sale.report:0
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 941b9a5b6c6..a3ffd6a8967 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-11 15:42+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-08-29 00:53+0000\n"
+"Last-Translator: youring <youring@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2013-08-12 05:06+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16750)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -1081,7 +1081,7 @@ msgstr "消息和通信历史"
 #. module: sale
 #: view:sale.order:0
 msgid "New Copy of Quotation"
-msgstr "新的报价单副本"
+msgstr "复制此报价单"
 
 #. module: sale
 #: field:res.partner,sale_order_count:0
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 49bd0e8716b..c025cd6c6cf 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -36,6 +36,7 @@
 
     <record id="group_mrp_properties" model="res.groups">
         <field name="name">Properties on lines</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
diff --git a/addons/sale_analytic_plans/i18n/en_GB.po b/addons/sale_analytic_plans/i18n/en_GB.po
new file mode 100644
index 00000000000..d19450ae6c4
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/en_GB.po
@@ -0,0 +1,33 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:45+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Analytic Distribution"
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order
+msgid "Sales Order"
+msgstr "Sales Order"
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Sales Order Line"
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 1cf6f87f4b0..39fdfe27c92 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -306,6 +306,7 @@ class sale_order(osv.osv):
             'move_id': move_id,
             'company_id': order.company_id.id,
             'note': line.name,
+            'property_ids': [(6, 0, [x.id for x in line.property_ids])],
         }
 
     def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 2a6fddeca21..1efb9a83978 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-19 11:21+0000\n"
+"PO-Revision-Date: 2013-08-26 11:41+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@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: 2013-07-11 06:24+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:03+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1565,7 +1565,7 @@ msgstr "Identificación paquete"
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr "Lotes seguimiento de fabricación"
+msgstr "Seguimiento de lotes de fabricación"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -2702,7 +2702,7 @@ msgstr "Desechado"
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr "Lotes de seguimiento de entrada"
+msgstr "Seguimiento de lotes entrantes"
 
 #. module: stock
 #: view:stock.location:0
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index fec514eaf2a..b914dc56951 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-14 02:11+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2013-08-23 14:50+0000\n"
+"Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-15 05:13+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -996,7 +995,7 @@ msgstr "Poids"
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "Emplacement d'Entrée"
+msgstr "Emplacement d'entrée"
 
 #. module: stock
 #: help:stock.partial.move,hide_tracking:0
@@ -2186,7 +2185,7 @@ msgstr "Filtres étendus..."
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "Emplacement de Stock"
+msgstr "Emplacement de stock"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:97
@@ -2380,7 +2379,7 @@ msgstr ""
 #. module: stock
 #: field:stock.warehouse,partner_id:0
 msgid "Owner Address"
-msgstr "Adresses du propriétaire"
+msgstr "Adresse du propriétaire"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -2780,7 +2779,7 @@ msgstr "Valeur"
 #: field:stock.picking.in,type:0
 #: field:stock.picking.out,type:0
 msgid "Shipping Type"
-msgstr "Type de Livraison"
+msgstr "Type de livraison"
 
 #. module: stock
 #: view:stock.move:0
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 68ecb4077ba..7dfaa811c02 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-12 05:34+0000\n"
+"PO-Revision-Date: 2013-08-26 06:35+0000\n"
 "Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2013-08-13 06:06+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-08-27 05:03+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -3000,7 +3000,7 @@ msgstr "完成日期"
 #: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
-msgstr "您不能移动产品%s，因为它来自一个视图类型的库位 %s."
+msgstr "您不能把产品%s 从视图类型的库位 %s 中移出。"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index a33ec28cb35..603e815fc10 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -21,21 +21,23 @@
 
 import time
 from openerp.report import report_sxw
-from openerp.osv import osv
-from openerp import pooler
 
 class picking(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-            'get_product_desc':self.get_product_desc
+            'get_product_desc': self.get_product_desc,
         })
-    def get_product_desc(self,move_line):
+    def get_product_desc(self, move_line):
         desc = move_line.product_id.name
         if move_line.product_id.default_code:
             desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc
         return desc
 
-report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
+for suffix in ['', '.in', '.out']:
+    report_sxw.report_sxw('report.stock.picking.list' + suffix,
+                          'stock.picking' + suffix,
+                          'addons/stock/report/picking.rml',
+                          parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 23edf443760..031fb721e4b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2945,12 +2945,22 @@ class stock_warehouse(osv.osv):
     }
 
     def _default_lot_input_stock_id(self, cr, uid, context=None):
-        lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
-        return lot_input_stock.id
+        try:
+            lot_input_stock_model, lot_input_stock_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [lot_input_stock_id], 'read', context=context)
+        except (ValueError, orm.except_orm):
+            # the user does not have read access on the location or it does not exists
+            lot_input_stock_id = False
+        return lot_input_stock_id
 
     def _default_lot_output_id(self, cr, uid, context=None):
-        lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output')
-        return lot_output.id
+        try:
+            lot_input_stock_model, lot_input_stock_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_output')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [lot_input_stock_id], 'read', context=context)
+        except (ValueError, orm.except_orm):
+            # the user does not have read access on the location or it does not exists
+            lot_output_id = False
+        return lot_output_id
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
@@ -2995,6 +3005,10 @@ class stock_picking_in(osv.osv):
         #instead of it's own workflow (which is not existing)
         return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
 
+    def message_post(self, *args, **kwargs):
+        """Post the message on stock.picking to be able to see it in the form view when using the chatter"""
+        return self.pool.get('stock.picking').message_post(*args, **kwargs)
+
     _columns = {
         'backorder_id': fields.many2one('stock.picking.in', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
@@ -3046,6 +3060,10 @@ class stock_picking_out(osv.osv):
         #instead of it's own workflow (which is not existing)
         return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
 
+    def message_post(self, *args, **kwargs):
+        """Post the message on stock.picking to be able to see it in the form view when using the chatter"""
+        return self.pool.get('stock.picking').message_post(*args, **kwargs)
+
     _columns = {
         'backorder_id': fields.many2one('stock.picking.out', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 540e6a8f902..53b89dcf41f 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,8 +3,8 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking Slip" rml="stock/report/picking.rml"/>
-        <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list" string="Receipt Slip" rml="stock/report/picking.rml"/>
-        <report id="report_picking_list_out" model="stock.picking.out" name="stock.picking.list" string="Delivery Slip" rml="stock/report/picking.rml"/>
+        <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list.in" string="Receipt Slip" rml="stock/report/picking.rml"/>
+        <report id="report_picking_list_out" model="stock.picking.out" name="stock.picking.list.out" string="Delivery Slip" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Inventory Overview" rml="stock/report/lot_overview.rml"/>
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content" rml="stock/report/lot_overview_all.rml"/>
diff --git a/addons/stock/tests/__init__.py b/addons/stock/tests/__init__.py
new file mode 100644
index 00000000000..39ebd5e451f
--- /dev/null
+++ b/addons/stock/tests/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_multicompany
+
+checks = [
+    test_multicompany,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/tests/test_multicompany.py b/addons/stock/tests/test_multicompany.py
new file mode 100644
index 00000000000..fb840a846ea
--- /dev/null
+++ b/addons/stock/tests/test_multicompany.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class TestStockMulticompany(common.TransactionCase):
+
+    def setUp(self):
+        super(TestStockMulticompany, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.ir_model_data = self.registry('ir.model.data')
+        self.res_users = self.registry('res.users')
+        self.stock_location = self.registry('stock.location')
+        self.stock_move = self.registry('stock.move')
+        self.stock_fill_inventory = self.registry('stock.fill.inventory')
+        self.stock_warehouse = self.registry('stock.warehouse')
+
+        model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager')
+        model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_2')
+        self.multicompany_user_id = self.res_users.create(cr, uid,
+            {'name': 'multicomp', 'login': 'multicomp',
+             'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])],
+             'company_id': company_2_id, 'company_ids': [(6,0,[company_2_id])]})
+
+    def test_00_multicompany_default_stock_move(self):
+        """check no error on getting default stock.move values in multicompany setting"""
+        cr, uid, context = self.cr, self.multicompany_user_id, {}
+        fields = ['location_id', 'location_dest_id']
+        for type in ('in', 'internal', 'out'):
+            context['picking_type'] = type
+            defaults = self.stock_move.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
+            for field in fields:
+                if defaults.get(field):
+                    try:
+                        self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
+                    except Exception, exc:
+                        assert False, "unreadable location %s: %s" % (field, exc)
+            self.assertEqual(defaults['type'], type, "wrong move type")
+
+
+    def test_10_multicompany_onchange_move_type(self):
+        """check onchange_move_type does not return unreadable in multicompany setting"""
+        cr, uid, context = self.cr, self.multicompany_user_id, {}
+        fields = ['location_id', 'location_dest_id']
+        for type in ('in', 'internal', 'out'):
+            result = self.stock_move.onchange_move_type(cr, uid, [], type, context)['value']
+            for field in fields:
+                if result.get(field):
+                    try:
+                        self.stock_location.check_access_rule(cr, uid, [result[field]], 'read', context)
+                    except Exception, exc:
+                        assert False, "unreadable location %s: %s" % (field, exc)
+
+
+    def test_20_multicompany_default_stock_fill_inventory(self):
+        """check default location readability for stock_fill_inventory in multicompany setting"""
+        cr, uid, context = self.cr, self.multicompany_user_id, {}
+        defaults = self.stock_fill_inventory.default_get(cr, uid, ['location_id'], context)
+        if defaults.get('location_id'):
+            try:
+                self.stock_location.check_access_rule(cr, uid, [defaults['location_id']], 'read', context)
+            except Exception, exc:
+                assert False, "unreadable source location: %s" % exc
+
+
+    def test_30_multicompany_default_warehouse_location(self):
+        """check default locations for warehouse in multicompany setting"""
+        cr, uid, context = self.cr, self.multicompany_user_id, {}
+        fields = ['lot_input_id', 'lot_stock_id', 'lot_output_id']
+        defaults = self.stock_warehouse.default_get(cr, uid, fields, context)
+        for field in fields:
+            if defaults.get(field):
+                try:
+                    self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
+                except Exception, exc:
+                    assert False, "unreadable default %s: %s" % (field, exc)
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 237033bb7b0..07dcb3965d7 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 class stock_fill_inventory(osv.osv_memory):
@@ -28,8 +28,10 @@ class stock_fill_inventory(osv.osv_memory):
 
     def _default_location(self, cr, uid, ids, context=None):
         try:
-            loc_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
-        except ValueError, e:
+            location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
+            location.check_access_rule('read', context=context)
+            location_id = location.id
+        except (ValueError, orm.except_orm), e:
             return False
         return location_id or False
 
diff --git a/addons/stock_invoice_directly/i18n/en_GB.po b/addons/stock_invoice_directly/i18n/en_GB.po
new file mode 100644
index 00000000000..7aa7c01fa12
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/en_GB.po
@@ -0,0 +1,23 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:45+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr "Partial Picking Processing Wizard"
diff --git a/addons/web_shortcuts/i18n/en_GB.po b/addons/web_shortcuts/i18n/en_GB.po
new file mode 100644
index 00000000000..91534b01ea8
--- /dev/null
+++ b/addons/web_shortcuts/i18n/en_GB.po
@@ -0,0 +1,25 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-08-23 16:45+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@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: 2013-08-24 05:35+0000\n"
+"X-Generator: Launchpad (build 16738)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Add / Remove Shortcut..."