From 767aaeb8cc7845d868cb2e5d9dda20e7454a8c41 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Tue, 3 Dec 2013 10:24:33 +0100
Subject: [PATCH 1/6] [FIX] Wrong error message when data cannot be loaded at
 module loading

bzr revid: cto@openerp.com-20131203092433-uu1brp5csqvvd8yh
---
 openerp/tools/convert.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index a64aabf2df6..4598e2e384a 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -927,7 +927,7 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init',
     result, rows, warning_msg, dummy = pool.get(model).import_data(cr, uid, fields, datas,mode, module, noupdate, filename=fname_partial)
     if result < 0:
         # Report failed import and abort module install
-        raise Exception(_('Module loading failed: file %s/%s could not be processed:\n %s') % (module, fname, warning_msg))
+        raise Exception(_('Module loading %s failed: file %s could not be processed:\n %s') % (module, fname, warning_msg))
     if config.get('import_partial'):
         data = pickle.load(file(config.get('import_partial')))
         data[fname_partial] = 0

From 0721a21966739a0068f9440c8f2ef85b99bbcb75 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 4 Dec 2013 15:59:23 +0100
Subject: [PATCH 2/6] [FIX] base: allow all users (including portals) to change
 their avatar

Force readonly="0" on field image in preferences view, otherwise the readonly can be set by access rights.
Preferences are written with the UID 1, if the fields are in the WRITEABLE FIELDS list of the object res_users.
This is why any users can edit their preferences even if they do not have the rights to write on res.users.
Forcing readonly="0" to make fields editable in the form.

bzr revid: dle@openerp.com-20131204145923-f7jwoah722q188d7
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 7e83b43179f..81dd5feffa8 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -246,7 +246,7 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Users" version="7.0">
-                    <field name="image" widget='image' class="oe_right oe_avatar" options='{"preview_image": "image_small"}'/>
+                    <field name="image" readonly="0" widget='image' class="oe_right oe_avatar" options='{"preview_image": "image_small"}'/>
                     <h1>
                         <field name="name" readonly="1" class="oe_inline"/>
                         (<field name="login" readonly="1" class="oe_inline"/>)

From 3a6953c1d0251108798f876aef7c6dc12c906879 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 5 Dec 2013 06:10:10 +0000
Subject: [PATCH 3/6] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131205061010-2jn37v8w04xqksgg
---
 openerp/addons/base/i18n/nl.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index d65f74d3070..625fa7cb7c4 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2013-11-22 11:54+0000\n"
-"Last-Translator: Jan Jurkus (GCE CAD-Service) <ict@gcecad-service.nl>\n"
+"PO-Revision-Date: 2013-12-04 13:01+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS 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-11-23 06:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-05 06:10+0000\n"
+"X-Generator: Launchpad (build 16863)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -11123,7 +11123,7 @@ msgstr "Bankrekeningen gerelateerd aan dit bedrijf"
 #: model:ir.ui.menu,name:base.menu_sales
 #: model:ir.ui.menu,name:base.next_id_64
 msgid "Sales"
-msgstr "Verkoop"
+msgstr "Verkopen"
 
 #. module: base
 #: field:ir.actions.server,child_ids:0

From 9652fb0013a2345cc0d20c2ed831fb130cb1e754 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 5 Dec 2013 12:32:54 +0100
Subject: [PATCH 4/6] [IMP] orm: force checking ir.rules on read when accessing
 only to _classic_write fields (o2m, m2m, function) More consistent behaviour.
 Was not able to access unauthorized data (retrieving data on x2m field would
 trigger security rules) but make sure it raises an exception instead of
 silently retrieve no data. Move construct domain inside if clause as no
 needed before

bzr revid: mat@openerp.com-20131205113254-j3j4bb0p6ed23oht
---
 openerp/osv/orm.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 9e6ee64d87f..7ecf4afc6cd 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -3636,11 +3636,6 @@ class BaseModel(object):
         if fields_to_read is None:
             fields_to_read = self._columns.keys()
 
-        # Construct a clause for the security rules.
-        # 'tables' hold the list of tables necessary for the SELECT including the ir.rule clauses,
-        # or will at least contain self._table.
-        rule_clause, rule_params, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context)
-
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = [f for f in fields_to_read if
                            f == self.CONCURRENCY_CHECK_FIELD
@@ -3661,6 +3656,11 @@ class BaseModel(object):
                     return 'length(%s) as "%s"' % (f_qual, f)
                 return f_qual
 
+            # Construct a clause for the security rules.
+            # 'tables' hold the list of tables necessary for the SELECT including the ir.rule clauses,
+            # or will at least contain self._table.
+            rule_clause, rule_params, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context)
+
             fields_pre2 = map(convert_field, fields_pre)
             order_by = self._parent_order or self._order
             select_fields = ','.join(fields_pre2 + ['%s.id' % self._table])
@@ -3675,6 +3675,7 @@ class BaseModel(object):
                 self._check_record_rules_result_count(cr, user, sub_ids, result_ids, 'read', context=context)
                 res.extend(results)
         else:
+            self.check_access_rule(cr, user, ids, 'read', context=context)
             res = map(lambda x: {'id': x}, ids)
 
         if context.get('lang'):

From 03e9e188c3b9724a6f63b76816c63664cf8cb8bd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 6 Dec 2013 06:24:20 +0000
Subject: [PATCH 5/6] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131205061031-0rg3zuhu9bm4ygcx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131206062420-e5igkn86w68za9sv
---
 addons/account/i18n/ro.po         | 40 +++++++++++++++----------------
 addons/account_voucher/i18n/ro.po | 14 +++++------
 addons/hr_payroll/i18n/sl.po      |  8 +++----
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 89853a5d560..1018487c0cb 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.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-12-03 15:00+0000\n"
+"PO-Revision-Date: 2013-12-05 19:37+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@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-12-04 05:56+0000\n"
-"X-Generator: Launchpad (build 16861)\n"
+"X-Launchpad-Export-Date: 2013-12-06 06:24+0000\n"
+"X-Generator: Launchpad (build 16863)\n"
 
 #. module: account
 #: model:email.template,body_html:account.email_template_edi_invoice
@@ -363,7 +363,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a adauga o perioada fiscala.\n"
 "              </p><p>\n"
 "                O perioada contabila este o luna sau un trimestru. De\n"
@@ -496,7 +496,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a crea o rambursare pentru client. \n"
 "              </p><p>\n"
 "                O rambursare este un document care atribuie o factura "
@@ -1421,7 +1421,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a adauga un cont.\n"
 "              </p><p>\n"
 "                Atunci cand efectuati tranzactii cu valute multiple, puteti "
@@ -1529,7 +1529,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a crea un registru de numerar nou.\n"
 "              </p><p>\n"
 "                O casa de marcat va permite sa gestionati intrarile de "
@@ -2097,7 +2097,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a defini un nou tip de cont.\n"
 "              </p><p>\n"
 "                Tipul de cont este folosit pentru a determina modul in care "
@@ -2425,7 +2425,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a inregistra o noua factura a "
 "furnizorului.\n"
 "              </p><p>\n"
@@ -2498,7 +2498,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a inregistra un extras de cont.\n"
 "              </p><p>\n"
 "                Un extras de cont este un rezumat al tuturor tranzactiilor "
@@ -3370,7 +3370,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a incepe un nou an fiscal.\n"
 "              </p><p>\n"
 "                Definiti anul fiscal al companiei dumneavoastra in functie "
@@ -4245,7 +4245,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a crea o factura a clientului.\n"
 "              </p><p>\n"
 "                Facturarea electronica a lui OpenERP permite usurarea si "
@@ -4957,7 +4957,7 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "            Dati click pentru a seta un nou cont bancar. \n"
 "          </p><p>\n"
 "            Configurati contul bancar al companiei dumneavoastra si "
@@ -6414,7 +6414,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a crea o inregistrare in registru.\n"
 "              </p><p>\n"
 "                O inregistrare in registru consta din mai multe elemente ale "
@@ -6735,7 +6735,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Dati click pentru a adauga un cont.\n"
 "              </p><p>\n"
 "                Un cont este o parte a unui registru de contabilitate care "
@@ -7024,7 +7024,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a inregistra o rambursare primita de la "
 "un furnizor.\n"
 "              </p><p>\n"
@@ -9448,7 +9448,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Dati click pentru a adauga un registru.\n"
 "              </p><p>\n"
 "                Un registru este utilizat pentru a inregistra tranzactii cu "
@@ -9678,7 +9678,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Dati click pentru a defini o noua inregistrare recurenta.\n"
 "              </p><p>\n"
 "                O inregistrare recurenta are loc pe o baza recurenta dintr-o "
@@ -11600,7 +11600,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Dati click pentru a defini un nou cod fiscal.\n"
 "              </p><p>\n"
 "                In functie de tara, un cod fiscal este de obicei o celula "
@@ -11638,7 +11638,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Selectati perioada si registrul pe care doriti sa il "
 "completati.\n"
 "              </p><p>\n"
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index cc6f0d112eb..c417a485982 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.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-11-30 22:59+0000\n"
+"PO-Revision-Date: 2013-12-05 19:29+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@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-12-01 05:45+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-06 06:24+0000\n"
+"X-Generator: Launchpad (build 16863)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -175,7 +175,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinu_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a inregistra o chitanta de cumparare. \n"
 "              </p><p>\n"
 "                Atunci cand este confirmata o chitanta de cumparare, puteti "
@@ -300,7 +300,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a crea o chitanta de vanzari.\n"
 "              </p><p>\n"
 "                Atunci cand o chitanta de vanzari este confirmata, puteti "
@@ -500,7 +500,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a crea o noua plata a furnizorului.\n"
 "              </p><p>\n"
 "                OpenERP va ajuta sa urmariti cu usurinta platile pe care le "
@@ -626,7 +626,7 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
+"<p class=\"oe_view_nocontent_create\">\n"
 "                Faceti click pentru a inregistra o plata noua. \n"
 "              </p><p>\n"
 "                Introduceti clientul si metoda de plata, iar apoi sau\n"
diff --git a/addons/hr_payroll/i18n/sl.po b/addons/hr_payroll/i18n/sl.po
index 86c72c19645..0887fec1a69 100644
--- a/addons/hr_payroll/i18n/sl.po
+++ b/addons/hr_payroll/i18n/sl.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-11-20 22:05+0000\n"
+"PO-Revision-Date: 2013-12-04 11:06+0000\n"
 "Last-Translator: Darja Zorman <darja.zorman@mentis.si>\n"
 "Language-Team: Slovenian <sl@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-11-21 06:12+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-05 06:10+0000\n"
+"X-Generator: Launchpad (build 16863)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -578,7 +578,7 @@ msgstr ""
 #: report:payslip:0
 #: field:payslip.lines.contribution.register,date_to:0
 msgid "Date To"
-msgstr ""
+msgstr "Datum do"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,condition_select:0

From ac0e22bd6c60a262dfacf565af67c8dedf581898 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 6 Dec 2013 12:13:36 +0100
Subject: [PATCH 6/6] [FIX] sale_stock,stock: change model to stock.picking.out
 of deliveries to invoice view in sales

Deliveries to invoice in sales menu should display delivery order only (no incoming shipment). This was already the case thanks to the domain [('type','=','out')], but since the refactor of the module stock, and the division of stock.picking to stock.picking.in and stock.picking.out, the model of this view should be stock.picking.out instead of stock.picking (for instance, to get the actions binding (ir.values) of stock.picking.out model).
+ typo fix in action binding

bzr revid: dle@openerp.com-20131206111336-dg01y92jvjnxy5oi
---
 addons/sale_stock/stock_view.xml                      | 2 +-
 addons/stock/wizard/stock_invoice_onshipping_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index d06526902fd..d4bf4fc4629 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -63,7 +63,7 @@
         <!--  Add menu: Billing - Deliveries to invoice -->
         <record id="outgoing_picking_list_to_invoice" model="ir.actions.act_window">
             <field name="name">Deliveries to Invoice</field>
-            <field name="res_model">stock.picking</field>
+            <field name="res_model">stock.picking.out</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index a65afb377b3..975c5aa2848 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -21,7 +21,7 @@
         </record>
 
 
-        <act_window name="Create Invoice"
+        <act_window name="Create Draft Invoices"
             res_model="stock.invoice.onshipping"
             src_model="stock.picking.out"
             key2="client_action_multi"