From 29d16f756c4d8e738c781684c10a2a9139b7cf83 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 4 Aug 2014 17:52:02 +0200
Subject: [PATCH 01/41] [FIX] calendar: avoid double 'Attendees' field in
 search view

The partner_ids fields represents attendees but it's confusing to have twice the same field in search view (opw 607275)
---
 addons/calendar/calendar.py       | 2 +-
 addons/calendar/calendar_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index d66b7f769bc..a34916a36ef 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -851,7 +851,7 @@ class calendar_event(osv.Model):
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event alarm information without removing it."),
         'categ_ids': fields.many2many('calendar.event.type', 'meeting_category_rel', 'event_id', 'type_id', 'Tags'),
         'attendee_ids': fields.one2many('calendar.attendee', 'event_id', 'Attendees', ondelete='cascade'),
-        'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
+        'partner_ids': fields.many2many('res.partner', string='Invitations', states={'done': [('readonly', True)]}),
         'alarm_ids': fields.many2many('calendar.alarm', string='Reminders', ondelete="restrict"),
 
     }
diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index 7e1b6a55039..d733b5dc452 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -41,7 +41,7 @@
                         <h1>
                             <field name="name"/>
                         </h1>
-                        <label for="partner_ids" class="oe_edit_only"/>
+                        <label for="partner_ids" string="Attendees" class="oe_edit_only"/>
                         <h2>
                             <field name="partner_ids" widget="many2manyattendee"
                                 context="{'force_email':True}"

From 05f9b45ef131f0bc316cd4dfdd8e5d0fc1ad136d Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 5 Aug 2014 10:26:03 +0200
Subject: [PATCH 02/41] [FIX] slug: fallback to positive ID when slug appears
 to contain a missing negative ID

Cherry-pick from dcac4cc0dfd4412e1139399fb17ec7ba6118aad4
---
 addons/website/models/ir_http.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index b38ceb478d9..1f204d69b0b 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -202,8 +202,13 @@ class ModelConverter(ir.ir_http.ModelConverter):
     def to_python(self, value):
         m = re.match(self.regex, value)
         _uid = RequestUID(value=value, match=m, converter=self)
+        record_id = int(m.group(2))
+        if record_id < 0:
+            # limited support for negative IDs due to our slug pattern, assume abs() if not found
+            if not request.registry[self.model].exists(request.cr, _uid, [record_id]):
+                record_id = abs(record_id)
         return request.registry[self.model].browse(
-            request.cr, _uid, int(m.group(2)), context=request.context)
+            request.cr, _uid, record_id, context=request.context)
 
     def generate(self, cr, uid, query=None, args=None, context=None):
         obj = request.registry[self.model]

From f09e11f55b663da8f8bab41c5fc784b8ab694b05 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Mon, 4 Aug 2014 17:24:56 +0200
Subject: [PATCH 03/41] [FIX] sale: quote character in company name is
 converted to html entity

Avoid to get company names such as "L'abc" to be transformed as "L&#39;abc" opw 607221
---
 addons/account/edi/invoice_action_data.xml         | 2 +-
 addons/portal_sale/portal_sale_data.xml            | 4 ++--
 addons/purchase/edi/purchase_order_action_data.xml | 2 +-
 addons/sale/edi/sale_order_action_data.xml         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 013d259e874..2dbeb707009 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -23,7 +23,7 @@
         <record id="email_template_edi_invoice" model="email.template">
             <field name="name">Invoice - Send by Email</field>
             <field name="email_from">${(object.user_id.email or object.company_id.email or 'noreply@localhost')|safe}</field>
-            <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field>
+            <field name="subject">${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a'})</field>
             <field name="email_recipients">${object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index f313e774fe0..3aed0beb2ae 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -7,7 +7,7 @@
         <record id="email_template_edi_sale" model="email.template">
             <field name="name">Sales Order - Send by Email (Portal)</field>
             <field name="email_from">${(object.user_id.email or '')|safe}</field>
-            <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
+            <field name="subject">${object.company_id.name|safe} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
             <field name="email_recipients">${object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>
@@ -97,7 +97,7 @@
         <record id="email_template_edi_invoice" model="email.template">
             <field name="name">Invoice - Send by Email (Portal)</field>
             <field name="email_from">${(object.user_id.email or object.company_id.email or 'noreply@localhost')|safe}</field>
-            <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
+            <field name="subject">${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a' })</field>
             <field name="email_recipients">${object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index ab2b652bf4e..c9aae5a9317 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -20,7 +20,7 @@
         <record id="email_template_edi_purchase" model="email.template">
             <field name="name">Purchase Order - Send by mail</field>
             <field name="email_from">${(object.validator.email or '')|safe}</field>
-            <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
+            <field name="subject">${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })</field>
             <field name="email_recipients">${object.partner_id.id}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="auto_delete" eval="True"/>
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 0d388a1896a..4fedfd7da09 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -21,7 +21,7 @@
         <record id="email_template_edi_sale" model="email.template">
             <field name="name">Sales Order - Send by Email</field>
             <field name="email_from">${(object.user_id.email or '')|safe}</field>
-            <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
+            <field name="subject">${object.company_id.name|safe} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
             <field name="email_recipients">${object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>

From 70b246c3c7d6c7b197f1d36cf6c86aeed896d077 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 5 Aug 2014 17:01:23 +0200
Subject: [PATCH 04/41] [FIX] analytic: name_search on accounts

The name_search was hardcoding ilike operator while it could be different. This means that a name_search "name != Agrolait" would return accounts with agrolait.
A side effect of this was the impossibility to import account_analytic_account whose parent is a substring of another - opw 607315
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5a77b86f14f..5c91caad3a5 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -301,7 +301,7 @@ class account_analytic_account(osv.osv):
                 dom = []
                 for name2 in name.split('/'):
                     name = name2.strip()
-                    account_ids = self.search(cr, uid, dom + [('name', 'ilike', name)] + args, limit=limit, context=context)
+                    account_ids = self.search(cr, uid, dom + [('name', operator, name)] + args, limit=limit, context=context)
                     if not account_ids: break
                     dom = [('parent_id','in',account_ids)]
         else:

From bc4217ced23288f8ab2a67659903b89625584e68 Mon Sep 17 00:00:00 2001
From: Rifakat Husen <rha@openerp.com>
Date: Tue, 5 Aug 2014 17:15:06 +0200
Subject: [PATCH 05/41] [FIX] stock: onchange method should take the
 description

The onchange_product_id method used to only change the description if the stock.move is not saved yet. That does not make much sense.
opw 607347, bug lp:1314700
---
 addons/stock/stock.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 64284f7c0c2..e3e7d539771 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1939,14 +1939,13 @@ class stock_move(osv.osv):
         product = self.pool.get('product.product').browse(cr, uid, [prod_id], context=ctx)[0]
         uos_id  = product.uos_id and product.uos_id.id or False
         result = {
+            'name': product.partner_ref,
             'product_uom': product.uom_id.id,
             'product_uos': uos_id,
             'product_qty': 1.00,
             'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty'],
             'prodlot_id' : False,
         }
-        if not ids:
-            result['name'] = product.partner_ref
         if loc_id:
             result['location_id'] = loc_id
         if loc_dest_id:

From c45c2eb58eef5f62e32a7987a8b9a71c134a2a24 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 Aug 2014 11:17:39 +0200
Subject: [PATCH 06/41] [FIX] website_quote: add description sale to quote line
 description

---
 addons/website_quote/models/order.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index c031baf7632..6b5d365e203 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -64,11 +64,14 @@ class sale_quote_line(osv.osv):
     def on_change_product_id(self, cr, uid, ids, product, context=None):
         vals = {}
         product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
+        name = product_obj.name
+        if product_obj.description_sale:
+            name += '\n' + product_obj.description_sale
         vals.update({
             'price_unit': product_obj.list_price,
             'product_uom_id': product_obj.uom_id.id,
             'website_description': product_obj.website_description,
-            'name': product_obj.name,
+            'name': name,
         })
         return {'value': vals}
 

From 3bb6136055d582c1db53f750bfdaea827acfb6ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paulius=20Sladkevi=C4=8Dius?= <komsas@gmail.com>
Date: Mon, 4 Aug 2014 13:37:50 +0300
Subject: [PATCH 07/41] [FIX] point_of_sale: clear tag in pos order sheet
 layout

Without clear tag total amounts breaks sheet layout.
---
 addons/point_of_sale/point_of_sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b2a2d4ad002..716dd7d4570 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -64,6 +64,7 @@
                                 </div>
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
                             </group>
+                            <div class="oe_clear"/>
                         </page>
                         <page string="Payments">
                             <field name="statement_ids" colspan="4" nolabel="1">

From 095be21ab17f7f731877d61c99b48b51119ff39a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 Aug 2014 12:47:40 +0200
Subject: [PATCH 08/41] [FIX] crm_claim: allow to create claim as portal user

It wasn't possible to create claims as a portal user when the portal user had a parent_id
---
 addons/portal_claim/__init__.py     |  1 +
 addons/portal_claim/portal_claim.py | 39 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 addons/portal_claim/portal_claim.py

diff --git a/addons/portal_claim/__init__.py b/addons/portal_claim/__init__.py
index 26c654db9dd..dbd07a05428 100644
--- a/addons/portal_claim/__init__.py
+++ b/addons/portal_claim/__init__.py
@@ -19,3 +19,4 @@
 #
 ##############################################################################
 
+import portal_claim
\ No newline at end of file
diff --git a/addons/portal_claim/portal_claim.py b/addons/portal_claim/portal_claim.py
new file mode 100644
index 00000000000..d7c9c1af6ca
--- /dev/null
+++ b/addons/portal_claim/portal_claim.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.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 import SUPERUSER_ID
+from openerp.addons.base_status.base_stage import base_stage
+from openerp.osv import osv
+
+
+class crm_claim(base_stage, osv.osv):
+    _inherit = "crm.claim"
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(crm_claim, self).default_get(cr, uid, fields, context=context)
+        if isinstance(res.get('partner_id'), (int, long)):
+            # Special case for portal users, as they are not allowed to call name_get on res.partner
+            # We save this call for the web client by returning it in default get
+            res['partner_id'] = self.pool['res.partner'].name_get(
+                cr, SUPERUSER_ID, [res['partner_id']], context=context)[0]
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 5666c219ad35bfc5ff550a1ef056b1e8ab8e8353 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 Aug 2014 13:06:46 +0200
Subject: [PATCH 09/41] [FIX] crm_claim: set options no_create, no_open instead
 of selection

To avoid access denied errors for portal users
---
 addons/crm_claim/crm_claim_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index e7724cb3b6d..b608be8acaa 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -124,7 +124,7 @@
                                 <group colspan="2" col="2" groups="base.group_user">
                                     <separator colspan="2" string="Responsibilities"/>
                                     <field name="user_fault"/>
-                                    <field name="categ_id" widget="selection"
+                                    <field name="categ_id" options="{'no_create': True, 'no_open': True}"
                                         domain="[('object_id.model', '=', 'crm.claim')]"/>
                                     <field name="ref"/>
                                 </group>

From 63dffd5e79e69f8377d13abba02b0a41781cd9d0 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 Aug 2014 13:50:35 +0200
Subject: [PATCH 10/41] [FIX] portal_sale: inadvertence during the forward port
 978fd47261d3a6cb6e39053892fb291bf61b511c

---
 addons/portal_sale/portal_sale_data.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 49f7c172e27..dc015777288 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -97,13 +97,8 @@
         <record id="email_template_edi_invoice" model="email.template">
             <field name="name">Invoice - Send by Email (Portal)</field>
             <field name="email_from">${(object.user_id.email or object.company_id.email or 'noreply@localhost')|safe}</field>
-<<<<<<< HEAD
-            <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
-            <field name="partner_to">${object.partner_id.id}</field>
-=======
             <field name="subject">${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
->>>>>>> 7.0
+            <field name="partner_to">${object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="account.account_invoices"/>

From d909f763b8d6c57c23f71b14e66fbb3e8fe79044 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 Aug 2014 14:18:57 +0200
Subject: [PATCH 11/41] [FIX] mail: add tooltip to send a message and log a
 note links

---
 addons/mail/static/src/xml/mail.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e718a42c813..1e52105c739 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -50,9 +50,10 @@
             <t t-if="!widget.options.view_mailbox">
                 <div class="field_text oe_compact oe_compact_record">
                     <a class="oe_compose_post" t-if="widget.options.compose_placeholder"><t t-raw="widget.options.compose_placeholder"/></a>
-                    <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Send a message</a>
+                    <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox"
+                        title="Send a message to all followers of the document">Send a message</a>
                     <span class="oe_grey oe_sep_word">or</span>
-                    <a class="oe_compose_log">Log a note</a>
+                    <a class="oe_compose_log" title="Log a note for this document. No notification will be sent">Log a note</a>
                 </div>
             </t>
         </div>

From f2cb8702b231621abf34d343b49ae8a711f776d1 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 6 Aug 2014 16:20:22 +0200
Subject: [PATCH 12/41] [FIX] website: correct image resizing

---
 addons/website/controllers/main.py | 13 +++++++++----
 addons/website/models/website.py   |  6 ++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 0ba7c3224c9..7810f179af8 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -399,10 +399,15 @@ class Website(openerp.addons.web.controllers.main.Home):
         The requested field is assumed to be base64-encoded image data in
         all cases.
         """
-        response = werkzeug.wrappers.Response()
-        return request.registry['website']._image(
-                    request.cr, request.uid, model, id, field, response, max_width, max_height)
-
+        try:
+            response = werkzeug.wrappers.Response()
+            return request.registry['website']._image(
+                request.cr, request.uid, model, id, field, response, max_width, max_height)
+        except Exception:
+            logger.exception("Cannot render image field %r of record %s[%s] at size(%s,%s)",
+                             field, model, id, max_width, max_height)
+            response = werkzeug.wrappers.Response()
+            return self.placeholder(response)
 
     #------------------------------------------------------
     # Server actions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 5921e6cfca4..6eb72b9cd5a 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -554,10 +554,8 @@ class website(osv.osv):
         response.mimetype = Image.MIME[image.format]
 
         w, h = image.size
-        try:
-            max_w, max_h = int(max_width), int(max_height)
-        except:
-            max_w, max_h = (maxint, maxint)
+        max_w = int(max_width) if max_width else maxint
+        max_h = int(max_height) if max_height else maxint
 
         if w < max_w and h < max_h:
             response.data = data

From 02f0caf1b8adf3a56931dc4e5feb0f9abc32e0df Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Aug 2014 14:51:48 +0200
Subject: [PATCH 13/41] [FIX] account_voucher: validation of refund in
 multicurrency

Fixing several issues for refunds in multicurrency mode that prevented the moves to be balanced.
The amount_currency needs to use the absolute value, as a refund will have a negative amount.
The sign for currency_rate_difference needs to use the line instead of the voucher as they can have different value. e.g. a voucher of 1000$ with invoice of 1200$ and refund of 200$ will have two lines and their currency_rate_difference should have different signs.
Avoids doubling the value in foreign_currency_diff
Fixes #1490, opw 607118 & 611580
---
 addons/account_voucher/account_voucher.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index a7c7646f6e1..ce6a35adb32 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1055,7 +1055,8 @@ class account_voucher(osv.osv):
                 'period_id': voucher.period_id.id,
                 'partner_id': voucher.partner_id.id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and sign * voucher.amount or 0.0,
+                'amount_currency': (sign * abs(voucher.amount) # amount < 0 for refunds
+                    if company_currency != current_currency else 0.0),
                 'date': voucher.date,
                 'date_maturity': voucher.date_due
             }
@@ -1217,7 +1218,7 @@ class account_voucher(osv.osv):
             if line.amount == line.amount_unreconciled:
                 if not line.move_line_id:
                     raise osv.except_osv(_('Wrong voucher line'),_("The invoice you are willing to pay is not valid anymore."))
-                sign = voucher.type in ('payment', 'purchase') and -1 or 1
+                sign = line.type =='dr' and -1 or 1
                 currency_rate_difference = sign * (line.move_line_id.amount_residual - amount)
             else:
                 currency_rate_difference = 0.0
@@ -1275,8 +1276,7 @@ class account_voucher(osv.osv):
                         # otherwise we use the rates of the system
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
                 if line.amount == line.amount_unreconciled:
-                    sign = voucher.type in ('payment', 'purchase') and -1 or 1
-                    foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency
+                    foreign_currency_diff = line.move_line_id.amount_residual_currency - abs(amount_currency)
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)

From 518649c371bf6a2ec528e4e5eb66dc266ba3b64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?=
 <stephane.bidoul@acsone.eu>
Date: Thu, 17 Jul 2014 17:43:02 +0200
Subject: [PATCH 14/41] [FIX] l10n_be: spelling error in financial reports

---
 addons/l10n_be/account_financial_report.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_be/account_financial_report.xml b/addons/l10n_be/account_financial_report.xml
index ccc118d30ae..2abfce472f7 100644
--- a/addons/l10n_be/account_financial_report.xml
+++ b/addons/l10n_be/account_financial_report.xml
@@ -640,7 +640,7 @@
             <field name="style_overwrite" eval="2"/>
         </record>
         <record id="account_financial_report_bnficepertedelexcerciceavantimpts1" model="account.financial.report">
-            <field name="name">Bénéfice (Perte) de l'excercice avant impôts</field>
+            <field name="name">Bénéfice (Perte) de l'exercice avant impôts</field>
             <field eval="8" name="sequence"/>
             <field name="parent_id" ref="account_financial_report_belgiumpl0"/>
             <field name="display_detail">no_detail</field>
@@ -674,7 +674,7 @@
             <field name="style_overwrite" eval="2"/>
         </record>
         <record id="account_financial_report_bnficepertedelexcercice1" model="account.financial.report">
-            <field name="name">Bénéfice (Perte) de l'excercice</field>
+            <field name="name">Bénéfice (Perte) de l'exercice</field>
             <field eval="12" name="sequence"/>
             <field name="parent_id" ref="account_financial_report_belgiumpl0"/>
             <field name="display_detail">no_detail</field>

From 629e3709d019cb570cdae08e02dd5b416c526b5e Mon Sep 17 00:00:00 2001
From: Humberto Arocha <hbto@vauxoo.com>
Date: Thu, 10 Jul 2014 01:23:51 -0430
Subject: [PATCH 15/41] [FIX] Account: Consolidation Account should not be
 carried to next fiscalyear

---
 addons/account/wizard/account_fiscalyear_close.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 28ddf39cd7f..5b6881f6ae1 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -132,7 +132,7 @@ class account_fiscalyear_close(osv.osv_memory):
             FROM account_account a
             LEFT JOIN account_account_type t ON (a.user_type = t.id)
             WHERE a.active
-              AND a.type != 'view'
+              AND a.type not in ('view', 'consolidation')
               AND a.company_id = %s
               AND t.close_method = %s''', (company_id, 'unreconciled', ))
         account_ids = map(lambda x: x[0], cr.fetchall())
@@ -182,7 +182,7 @@ class account_fiscalyear_close(osv.osv_memory):
             FROM account_account a
             LEFT JOIN account_account_type t ON (a.user_type = t.id)
             WHERE a.active
-              AND a.type != 'view'
+              AND a.type not in ('view', 'consolidation')
               AND a.company_id = %s
               AND t.close_method = %s''', (company_id, 'detail', ))
         account_ids = map(lambda x: x[0], cr.fetchall())
@@ -211,7 +211,7 @@ class account_fiscalyear_close(osv.osv_memory):
             FROM account_account a
             LEFT JOIN account_account_type t ON (a.user_type = t.id)
             WHERE a.active
-              AND a.type != 'view'
+              AND a.type not in ('view', 'consolidation')
               AND a.company_id = %s
               AND t.close_method = %s''', (company_id, 'balance', ))
         account_ids = map(lambda x: x[0], cr.fetchall())

From 5ca6b09375ce018e8e44e7e3cb5d0107c5a3a835 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 Aug 2014 19:00:01 +0200
Subject: [PATCH 16/41] [FIX] account: payment_ids should list payments of same
 account than the invoice account

---
 addons/account/account_invoice.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index afd0077bbc8..00d0b0d57a0 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -177,6 +177,8 @@ class account_invoice(osv.osv):
             lines = []
             if invoice.move_id:
                 for m in invoice.move_id.line_id:
+                    if m.account_id != invoice.account_id:
+                        continue
                     temp_lines = []
                     if m.reconcile_id:
                         temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)

From ed79bc203fdcbb4e7c3b6b6b68bd73ef0bb15bad Mon Sep 17 00:00:00 2001
From: fka-odoo <fka@openerp.com>
Date: Wed, 23 Jul 2014 17:27:25 +0530
Subject: [PATCH 17/41] [FIX] account: child_of operator in invoice analysis
 report

When displaying invoice analysis of a company, include the invoices of the members of this company (opw 611084)
---
 addons/account/report/account_invoice_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index dad70f695dc..93c80708253 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -61,7 +61,7 @@
                 <separator/>
                 <filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" help="Customer And Supplier Invoices"/>
                 <filter icon="terp-dolar_ok!" string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" help="Customer And Supplier Refunds"/>
-                <field name="partner_id"/>
+                <field name="partner_id" operator="child_of"/>
                 <field name="user_id" />
                 <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 <group expand="1" string="Group By...">

From 1826f6d4eca499754a1f4bbe7179987eab473a55 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 7 Aug 2014 11:41:18 +0200
Subject: [PATCH 18/41] [FIX] payment_paypal: use the validate url according to
 the acquirer env

---
 addons/payment_paypal/controllers/main.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/payment_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py
index 967059e59ae..909f6a34843 100644
--- a/addons/payment_paypal/controllers/main.py
+++ b/addons/payment_paypal/controllers/main.py
@@ -40,12 +40,20 @@ class PaypalController(http.Controller):
         Once data is validated, process it. """
         res = False
         new_post = dict(post, cmd='_notify-validate')
-        urequest = urllib2.Request("https://www.sandbox.paypal.com/cgi-bin/webscr", werkzeug.url_encode(new_post))
+        cr, uid, context = request.cr, request.uid, request.context
+        reference = post.get('item_number')
+        tx = None
+        if reference:
+            tx_ids = request.registry['payment.transaction'].search(cr, uid, [('reference', '=', reference)], context=context)
+            if tx_ids:
+                tx = request.registry['payment.transaction'].browse(cr, uid, tx_ids[0], context=context)
+        paypal_urls = request.registry['payment.acquirer']._get_paypal_urls(cr, uid, tx and tx.acquirer_id and tx.acquirer_id.env or 'prod', context=context)
+        validate_url = paypal_urls['paypal_form_url']
+        urequest = urllib2.Request(validate_url, werkzeug.url_encode(new_post))
         uopen = urllib2.urlopen(urequest)
         resp = uopen.read()
         if resp == 'VERIFIED':
             _logger.info('Paypal: validated data')
-            cr, uid, context = request.cr, SUPERUSER_ID, request.context
             res = request.registry['payment.transaction'].form_feedback(cr, uid, post, 'paypal', context=context)
         elif resp == 'INVALID':
             _logger.warning('Paypal: answered INVALID on data verification')

From b0b9153cf765b027080b26905d571caf80bb9d26 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 7 Aug 2014 11:54:30 +0200
Subject: [PATCH 19/41] [FIX] payment_paypal: SUPERUSER_ID removed by
 inadvertence in 1826f6d4eca499754a1f4bbe7179987eab473a55

---
 addons/payment_paypal/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/payment_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py
index 909f6a34843..e07fa3d738f 100644
--- a/addons/payment_paypal/controllers/main.py
+++ b/addons/payment_paypal/controllers/main.py
@@ -54,7 +54,7 @@ class PaypalController(http.Controller):
         resp = uopen.read()
         if resp == 'VERIFIED':
             _logger.info('Paypal: validated data')
-            res = request.registry['payment.transaction'].form_feedback(cr, uid, post, 'paypal', context=context)
+            res = request.registry['payment.transaction'].form_feedback(cr, SUPERUSER_ID, post, 'paypal', context=context)
         elif resp == 'INVALID':
             _logger.warning('Paypal: answered INVALID on data verification')
         else:

From 6655a020c3b3fdc3cfcb6336203afc0027892ca1 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Thu, 7 Aug 2014 13:02:59 +0200
Subject: [PATCH 20/41] [FIX] calendar/crm: Add active_id (if in model
 partner_id) in defaults values from partner_ids when we creates a new
 meeting.

Bug was that when you click on meeting button from a res_partner form (Customers in menu), the button overwrites the context to use the active partner as a default in the calendar meeting. By consequence, the context overwritte the default partner who are the creator. Now the context could be removed from action and that is in get_default for partner_ids (from model calendar_event) that we add the creator AND the active_id if from a model res_partner.
---
 addons/calendar/calendar.py     | 11 ++++++++++-
 addons/crm/res_partner_view.xml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index 34a348c5b25..5420f67acc0 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -855,6 +855,15 @@ class calendar_event(osv.Model):
         'alarm_ids': fields.many2many('calendar.alarm', string='Reminders', ondelete="restrict"),
 
     }
+
+    def _get_default_partners(self, cr, uid, ctx=None):
+        ret = [self.pool['res.users'].browse(cr, uid, uid, context=ctx).partner_id.id]
+        active_id = ctx.get('active_id')
+        if ctx.get('active_model') == 'res.partner' and active_id:
+            if active_id not in ret:
+                ret.append(active_id)
+        return ret
+
     _defaults = {
         'end_type': 'count',
         'count': 1,
@@ -866,7 +875,7 @@ class calendar_event(osv.Model):
         'interval': 1,
         'active': 1,
         'user_id': lambda self, cr, uid, ctx: uid,
-        'partner_ids': lambda self, cr, uid, ctx: [self.pool['res.users'].browse(cr, uid, [uid], context=ctx)[0].partner_id.id]
+        'partner_ids': _get_default_partners,
     }
 
     def _check_closing_date(self, cr, uid, ids, context=None):
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 7613c2161fc..ad7cee3a27e 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -97,7 +97,7 @@
                         <button class="oe_inline" type="action"
                             string="Meetings"
                             name="%(calendar.action_calendar_event)d"
-                            context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
+                            context="{'search_default_partner_ids': active_id}"/>
                         <button class="oe_inline" type="action" string="Calls" 
                             name="%(crm.crm_case_categ_phone_incoming0)d" 
                             context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />

From ea05a21938daad8eba97644264f8b8dcbf553178 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 7 Aug 2014 14:50:14 +0200
Subject: [PATCH 21/41] [FIX] report: allow using 0 decimal precision in rml
 reports

---
 openerp/report/report_sxw.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/report/report_sxw.py b/openerp/report/report_sxw.py
index 493d0b6b37e..bde915b8919 100644
--- a/openerp/report/report_sxw.py
+++ b/openerp/report/report_sxw.py
@@ -265,7 +265,9 @@ class rml_parse(object):
         elif (hasattr(obj, '_field') and\
                 isinstance(obj._field, (float_field, function_field)) and\
                 obj._field.digits):
-                d = obj._field.digits[1] or DEFAULT_DIGITS
+                d = obj._field.digits[1]
+                if not d and d is not 0:
+                    d = DEFAULT_DIGITS
         return d
 
     def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False, currency_obj=False):

From 007a2f2a24869ec5bc803f2ac35d220d95853380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Thu, 7 Aug 2014 16:00:19 +0200
Subject: [PATCH 22/41] [FIX] web_graph : display the correct label for
 Selection fields in view graph

---
 addons/web_graph/static/src/js/pivot_table.js | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js
index 48ae9ec3830..086e7205990 100644
--- a/addons/web_graph/static/src/js/pivot_table.js
+++ b/addons/web_graph/static/src/js/pivot_table.js
@@ -28,7 +28,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
 	// ----------------------------------------------------------------------
     // this.measures: list of measure [measure], measure = {field: _, string: _, type: _}
     // this.rows.groupby, this.cols.groupby : list of groupbys used for describing rows (...),
-    //      a groupby is also {field:_, string:_, type:_} 
+    //      a groupby is also {field:_, string:_, type:_}
     //      If its type is date/datetime, field can have the corresponding interval in its description,
     //      for example 'create_date:week'.
 	set_measures: function (measures) {
@@ -65,7 +65,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
         }
         var row_gb_changed = !_.isEqual(row_groupby, this.rows.groupby),
             col_gb_changed = !_.isEqual(col_groupby, this.cols.groupby);
-        
+
         this.domain = domain;
         this.rows.groupby = row_groupby;
         this.cols.groupby = col_groupby;
@@ -80,7 +80,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
 	// Cells manipulation methods
 	// ----------------------------------------------------------------------
     // cells are objects {x:_, y:_, values:_} where x < y and values is an array
-    //       of values (one for each measure).  The condition x < y might look 
+    //       of values (one for each measure).  The condition x < y might look
     //       unnecessary, but it makes the rest of the code simpler: headers
     //       don't krow if they are rows or cols, they just know their id, so
     //       it is useful that a call get_values(id1, id2) is the same as get_values(id2, id1)
@@ -103,9 +103,9 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
 	// ----------------------------------------------------------------------
 	// Headers/Rows/Cols manipulation methods
 	// ----------------------------------------------------------------------
-    // this.rows.headers, this.cols.headers = [header] describe the tree structure 
+    // this.rows.headers, this.cols.headers = [header] describe the tree structure
     //      of rows/cols.  Headers are objects
-    //      { 
+    //      {
     //          id:_,               (unique id obviously)
     //          path: [...],        (array of all parents title, with its own title at the end)
     //          title:_,            (name of the row/col)
@@ -150,12 +150,12 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
 	get_rows_leaves: function () {
 		return _.where(this.rows.headers, {expanded:false});
 	},
-	
+
 	// return all non expanded cols
 	get_cols_leaves: function () {
 		return _.where(this.cols.headers, {expanded:false});
 	},
-	
+
     get_ancestors: function (header) {
         var self = this;
         if (!header.children) return [];
@@ -181,7 +181,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
 	},
 
     main_row: function () { return this.rows.headers[0]; },
-    
+
     main_col: function () { return this.cols.headers[0]; },
 
 	// ----------------------------------------------------------------------
@@ -255,7 +255,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
 	// Data updating methods
 	// ----------------------------------------------------------------------
     // update_data will try to preserve the expand/not expanded status of each
-    // column/row.  If you want to expand all, then set this.cols.headers/this.rows.headers 
+    // column/row.  If you want to expand all, then set this.cols.headers/this.rows.headers
     // to null before calling update_data.
     update_data: function () {
         var self = this;
@@ -289,7 +289,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
         data_pts.forEach(function (data_pt) {
             var row_value = (prefix || []).concat(data_pt.attributes.value.slice(0,index));
             var col_value = data_pt.attributes.value.slice(index);
-            
+
             if (expand && !_.find(col_headers, function (hdr) {return self.isEqual(col_value, hdr.path);})) {
                 return;
             }
@@ -427,6 +427,10 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
                             return _t('Undefined');
                         } else if (attrs.value[i] instanceof Array) {
                             return attrs.value[i][1];
+                        }else if (grouped_on && self.fields[grouped_on].type === 'selection'){
+                            var selection = self.fields[grouped_on].selection;
+                            var value_lookup = _.where(selection, {0:attrs.value[i]});
+                            return value_lookup ? value_lookup[0][1] : _t('Undefined');
                         }
                         return attrs.value[i];
                     });
@@ -445,8 +449,8 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
     isEqual: function (path1, path2) {
         if (path1.length !== path2.length) { return false; }
         for (var i = 0; i < path1.length; i++) {
-            if (path1[i] !== path2[i]) { 
-                return false; 
+            if (path1[i] !== path2[i]) {
+                return false;
             }
         }
         return true;

From b9c4bb6b6c4320880e21122ac2db8c2c519fcbc3 Mon Sep 17 00:00:00 2001
From: Somesh Khare <skh@openerp.com>
Date: Thu, 7 Aug 2014 16:57:23 +0200
Subject: [PATCH 23/41] [FIX] account_voucher: fix typo in journal_id type

---
 addons/account_voucher/wizard/account_statement_from_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 289a110fdbd..4644bdee62d 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -82,7 +82,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
             if line.journal_id.type in ('sale', 'sale_refund'):
                 type = 'customer'
                 ttype = 'receipt'
-            elif line.journal_id.type in ('purchase', 'purhcase_refund'):
+            elif line.journal_id.type in ('purchase', 'purchase_refund'):
                 type = 'supplier'
                 ttype = 'payment'
                 sign = -1

From 581275a63c7cf054efe57a150d44f00bbf92d379 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Thu, 7 Aug 2014 17:38:01 +0200
Subject: [PATCH 24/41] [IMP] email_template: add a lambda function to allow a
 user to format a date from a template mail into a specific timezone, and/or
 in a specific format.

Eg: ${format_tz(object.name, object.employee_id.address_id.tz,'%m/%d/%Y %H:%M')}
---
 addons/email_template/email_template.py | 28 ++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 826346aaaad..4c569fe50c1 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -34,9 +34,34 @@ from openerp import tools
 from openerp.tools.translate import _
 from urllib import urlencode, quote as quote
 
-
 _logger = logging.getLogger(__name__)
 
+
+def format_tz(pool, cr, uid, dt, tz=False, format=False, context=None):
+    context = dict(context or {})
+    if tz:
+        context['tz'] = tz or pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz'] or "UTC"
+    timestamp = datetime.datetime.strptime(dt, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+
+    ts = fields.datetime.context_timestamp(cr, uid, timestamp, context)
+
+    if format:
+        return ts.strftime(format)
+    else:
+        lang = context.get("lang")
+        lang_params = {}
+        if lang:
+            res_lang = pool.get('res.lang')
+            ids = res_lang.search(cr, uid, [("code", "=", lang)])
+            if ids:
+                lang_params = res_lang.read(cr, uid, ids[0], ["date_format", "time_format"])
+        format_date = lang_params.get("date_format", '%B-%d-%Y')
+        format_time = lang_params.get("time_format", '%I-%M %p')
+
+        fdate = ts.strftime(format_date)
+        ftime = ts.strftime(format_time)
+        return "%s %s (%s)" % (fdate, ftime, tz)
+
 try:
     # We use a jinja2 sandboxed environment to render mako templates.
     # Note that the rendering does not cover all the mako syntax, in particular
@@ -164,6 +189,7 @@ class email_template(osv.osv):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         records = self.pool[model].browse(cr, uid, res_ids, context=context) or [None]
         variables = {
+            'format_tz': lambda dt, tz=False, format=False: format_tz(self.pool, cr, uid, dt, tz, format, context),
             'user': user,
             'ctx': context,  # context kw would clash with mako internals
         }

From a86dfb803592fd77e87b9aabc047781e25ba1daf Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 7 Aug 2014 18:04:13 +0200
Subject: [PATCH 25/41] [FIX] web_kanban: in non-grouped kanban, on switch to
 form, display first record

in view_form.js, in do_show method, if the dataset index is not set, the on_button_new method is triggered, opening a new record
In regular kanbans (non-grouped kanban), the dataset index wasn't set, and, therefore, when switching to the view mode, it opened a form for a new record instead of opening the first record of the list, like this is the case for the view list and the grouped kanban
---
 addons/web_kanban/static/src/js/kanban.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index de263d381d9..b7cc68fbb82 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -288,6 +288,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             self.do_clear_groups();
             self.dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).done(function(records) {
                 var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
+                if (!_.isEmpty(self.dataset.ids) && (self.dataset.index === null || self.dataset.index >= self.dataset.ids.length)) {
+                    self.dataset.index = 0;
+                }
                 self.do_add_groups([kgroup]).done(function() {
                     if (_.isEmpty(records)) {
                         self.no_result();

From e4c0940e9fbb2d2d60de08c76b3d74caef794781 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Aug 2014 18:15:37 +0200
Subject: [PATCH 26/41] [FIX] website_sale: avoid displaying inactive products
 in shops

The domains in the form ('o2m_field', operator, False) do not use the orm but convert the domain to ('id', 'invert operator', [list of ids]). This means that the orm is not used and implicit filter (active=True) or access rights are not checked.
A proper fix in master should be done to use the orm instead of an SQL query.
This patch force a search to be made on product.product and then exclude the products where active=False (opw 607602).
---
 addons/website_sale/models/website.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index b471935f2f0..d969d2a9211 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -219,4 +219,8 @@ class Website(orm.Model):
         return super(Website, self).preprocess_request(cr, uid, ids, request, context=None)
 
     def ecommerce_get_product_domain(self):
-        return [("sale_ok", "=", True),("product_variant_ids","!=",False)]
+        return [
+            ("sale_ok", "=", True),
+            # force search on product.product to use the orm (exclude active, acl,..)
+            ("product_variant_ids.id", "!=", False),
+        ]

From 54857ec409d2cd2a565ad73b069a8641046aedac Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Aug 2014 16:50:38 +0200
Subject: [PATCH 27/41] [IMP] crm: clean after partner merge

When trying to merge partners, an sql error may be violated (e.g. unique constraints).
In this case, catch the error and delete the problematic record as it will no longer be relevant with the old partner and left unconsistant data in the database.
---
 addons/crm/base_partner_merge.py | 42 +++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py
index 11cacc57ce6..72a9e12435a 100644
--- a/addons/crm/base_partner_merge.py
+++ b/addons/crm/base_partner_merge.py
@@ -6,6 +6,7 @@ import htmlentitydefs
 import itertools
 import logging
 import operator
+import psycopg2
 import re
 from ast import literal_eval
 from openerp.tools import mute_logger
@@ -186,28 +187,29 @@ class MergePartnerAutomatic(osv.TransientModel):
                 for partner_id in partner_ids:
                     cr.execute(query, (dst_partner.id, partner_id, dst_partner.id))
             else:
-                cr.execute("SAVEPOINT recursive_partner_savepoint")
                 try:
-                    query = 'UPDATE "%(table)s" SET %(column)s = %%s WHERE %(column)s IN %%s' % query_dic
-                    cr.execute(query, (dst_partner.id, partner_ids,))
+                    with mute_logger('openerp.sql_db'), cr.savepoint():
+                        query = 'UPDATE "%(table)s" SET %(column)s = %%s WHERE %(column)s IN %%s' % query_dic
+                        cr.execute(query, (dst_partner.id, partner_ids,))
 
-                    if column == proxy._parent_name and table == 'res_partner':
-                        query = """
-                            WITH RECURSIVE cycle(id, parent_id) AS (
-                                    SELECT id, parent_id FROM res_partner
-                                UNION
-                                    SELECT  cycle.id, res_partner.parent_id
-                                    FROM    res_partner, cycle
-                                    WHERE   res_partner.id = cycle.parent_id AND
-                                            cycle.id != cycle.parent_id
-                            )
-                            SELECT id FROM cycle WHERE id = parent_id AND id = %s
-                        """
-                        cr.execute(query, (dst_partner.id,))
-                        if cr.fetchall():
-                            cr.execute("ROLLBACK TO SAVEPOINT recursive_partner_savepoint")
-                finally:
-                    cr.execute("RELEASE SAVEPOINT recursive_partner_savepoint")
+                        if column == proxy._parent_name and table == 'res_partner':
+                            query = """
+                                WITH RECURSIVE cycle(id, parent_id) AS (
+                                        SELECT id, parent_id FROM res_partner
+                                    UNION
+                                        SELECT  cycle.id, res_partner.parent_id
+                                        FROM    res_partner, cycle
+                                        WHERE   res_partner.id = cycle.parent_id AND
+                                                cycle.id != cycle.parent_id
+                                )
+                                SELECT id FROM cycle WHERE id = parent_id AND id = %s
+                            """
+                            cr.execute(query, (dst_partner.id,))
+                except psycopg2.Error:
+                    # updating fails, most likely due to a violated unique constraint
+                    # keeping record with nonexistent partner_id is useless, better delete it
+                    query = 'DELETE FROM %(table)s WHERE %(column)s = %%s' % query_dic
+                    cr.execute(query, (partner_id,))
 
     def _update_reference_fields(self, cr, uid, src_partners, dst_partner, context=None):
         _logger.debug('_update_reference_fields for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))

From 2a74666bb00842ec4f1f79a238e27b356599701c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Aug 2014 16:51:46 +0200
Subject: [PATCH 28/41] [FIX] mail: avoid duplication followers when merging
 partners

---
 addons/mail/mail_followers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 0059df90530..7816c3c9044 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -48,6 +48,7 @@ class mail_followers(osv.Model):
             help="Message subtypes followed, meaning subtypes that will be pushed onto the user's Wall."),
     }
 
+    _sql_constraints = [('mail_followers_res_partner_res_model_id_uniq','unique(res_model,res_id,partner_id)','Error, a partner cannot follow twice the same object.')]
 
 class mail_notification(osv.Model):
     """ Class holding notifications pushed to partners. Followers and partners

From 418e06e88f0cc1a0cd7054af9263bb0529cf8870 Mon Sep 17 00:00:00 2001
From: dhr-odoo <dhr@tinyerp.com>
Date: Fri, 18 Jul 2014 16:14:28 +0530
Subject: [PATCH 29/41] [FIX] project_timesheet: test used fields added not in
 dependencies

The fields procure_method and supply_method are not present if we just install project_timesheet which makes the tests fail (opw 610590).
---
 .../test/worktask_entry_to_timesheetline_entry.yml              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 3efd133ffb6..8cfc8803021 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -16,9 +16,7 @@
     cost_method: standard
     mes_type: fixed
     name: HR Manger
-    procure_method: make_to_stock
     standard_price: 1.0
-    supply_method: buy
     type: service
     uom_id: product.product_uom_hour
     uom_po_id: product.product_uom_hour

From e9e376a6de83abc18d21711b1f85572703be1e46 Mon Sep 17 00:00:00 2001
From: Hardik Ansodariya <han@openerp.com>
Date: Tue, 15 Jul 2014 11:33:49 +0530
Subject: [PATCH 30/41] [FIX] account_analytic_plan: correctly check context

The id of the journal is passed in the context. Avoid trying to browse on jounral_id=False
Fixes #821
---
 addons/account_analytic_plans/account_analytic_plans.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 2948ac1c19c..0db70291ea5 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -213,7 +213,7 @@ class account_analytic_plan_instance(osv.osv):
         ana_plan_instance_obj = self.pool.get('account.analytic.plan.instance')
         acct_anal_acct = self.pool.get('account.analytic.account')
         acct_anal_plan_line_obj = self.pool.get('account.analytic.plan.line')
-        if context and 'journal_id' in context:
+        if context and context.get('journal_id'):
             journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
 
             pids = ana_plan_instance_obj.search(cr, uid, [('name','=',vals['name']), ('code','=',vals['code']), ('plan_id','<>',False)], context=context)

From d31faceb67fd87acaca00365dcfc28925b08a37f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 8 Aug 2014 11:40:30 +0200
Subject: [PATCH 31/41] [FIX] yaml tests: extra key in on_change result isn't
 that bad.

In the return result of an on_change, having keys which are not ine the view is not that bad, it is not an actual problem.

Display warning instead of asserting all the keys are in the views.
---
 openerp/tools/yaml_import.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 3172caac1f4..8f98573c413 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -449,10 +449,13 @@ class YamlInterpreter(object):
                     args = map(lambda x: eval(x, ctx), match.group(2).split(','))
                     result = getattr(model, match.group(1))(self.cr, SUPERUSER_ID, [], *args)
                     for key, val in (result or {}).get('value', {}).items():
-                        assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist either on the object '%s', either in the view '%s' used for the creation" % (key, match.group(1), model._name, view_info['name'])
-                        record_dict[key] = process_val(key, val)
-                        #if (key in fields) and record_dict[key] == process_val(key, val):
-                        #    print '*** You can remove these lines:', key, val
+                        if key in fg:
+                            record_dict[key] = process_val(key, val)
+                        else:
+                            _logger.warning("The returning field '%s' from your on_change call '%s'"
+                                            " does not exist either on the object '%s', either in"
+                                            " the view '%s'",
+                                            key, match.group(1), model._name, view_info['name'])
                 else:
                     nodes = list(el) + nodes
         else:

From 1d826a6051e86796949c3ea725cee1d914e9d741 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 8 Aug 2014 12:29:47 +0200
Subject: [PATCH 32/41] [FIX] account_anglo_savon: round prices according to
 account precision to avoid getting unbalanced move

The standard move_line_get from account.invoice returns prices rounded (price_subtotal field as account precision) while the anglo-saxon module could return dict with non-rounded prices.
With amounts with bigger precision, we could get a difference of a few cents when comparing the debit/credits and then not be able to balance the invoice (opw 597208).
---
 addons/account_anglo_saxon/invoice.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index b486ff71ad9..0530abf1386 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -22,6 +22,7 @@
 ##############################################################################
 
 from openerp.osv import osv
+from openerp.tools.float_utils import float_round as round
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
@@ -32,11 +33,12 @@ class account_invoice_line(osv.osv):
         company_currency = inv.company_id.currency_id.id
         def get_price(cr, uid, inv, company_currency,i_line):
             cur_obj = self.pool.get('res.currency')
+            decimal_precision = self.pool.get('decimal.precision')
             if inv.currency_id.id != company_currency:
                 price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, i_line.product_id.standard_price * i_line.quantity, context={'date': inv.date_invoice})
             else:
                 price = i_line.product_id.standard_price * i_line.quantity
-            return price
+            return round(price, decimal_precision.precision_get(cr, uid, 'Account'))
 
         if inv.type in ('out_invoice','out_refund'):
             for i_line in inv.invoice_line:
@@ -113,6 +115,8 @@ class account_invoice_line(osv.osv):
                             fpos = i_line.invoice_id.fiscal_position or False
                             a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
                         diff_res = []
+                        decimal_precision = self.pool.get('decimal.precision')
+                        account_prec = decimal_precision.precision_get(cr, uid, 'Account')
                         # calculate and write down the possible price difference between invoice price and product price
                         for line in res:
                             if a == line['account_id'] and i_line.product_id.id == line['product_id']:
@@ -121,14 +125,14 @@ class account_invoice_line(osv.osv):
                                 if inv.currency_id.id != company_currency:
                                     standard_price = self.pool.get('res.currency').compute(cr, uid, company_currency, inv.currency_id.id, standard_price, context={'date': inv.date_invoice})
                                 if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
-                                    price_diff = i_line.price_unit - standard_price
-                                    line.update({'price':standard_price * line['quantity']})
+                                    price_diff = round(i_line.price_unit - standard_price, account_prec)
+                                    line.update({'price': round(standard_price * line['quantity'], account_prec)})
                                     diff_res.append({
                                         'type':'src',
                                         'name': i_line.name[:64],
                                         'price_unit':price_diff,
                                         'quantity':line['quantity'],
-                                        'price': price_diff * line['quantity'],
+                                        'price': round(price_diff * line['quantity'], account_prec),
                                         'account_id':acc,
                                         'product_id':line['product_id'],
                                         'uos_id':line['uos_id'],

From 8286d4306a2f29e6ba1d65ed35eac3cacf03dbf5 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 8 Aug 2014 15:51:35 +0200
Subject: [PATCH 33/41] [FIX] wesbite: update google analytics snippet
 according to google recommandation

---
 addons/website/views/website_templates.xml | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 3dae521bf26..82ceb57f7e8 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -87,6 +87,19 @@
             <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
 
             <t t-raw="head or ''" name='layout_head'/>
+
+             <t t-if="website.google_analytics_key">
+               <script>
+                    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+                    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+                    ga('create',_.str.trim('<t t-esc="website.google_analytics_key"/>'));
+                    ga('send','pageview');
+                </script>
+
+            </t>
         </head>
         <body>
             <div id="wrapwrap">
@@ -202,17 +215,6 @@
                     </div>
                 </footer>
             </div>
-            <t t-if="website.google_analytics_key">
-                <script>
-                    (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
-                    function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
-                    e=o.createElement(i);r=o.getElementsByTagName(i)[0];
-                    e.src='//www.google-analytics.com/analytics.js';
-                    r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
-                    ga('create',_.str.trim('<t t-esc="website.google_analytics_key"/>'));
-                    ga('send','pageview');
-                </script>
-            </t>
         </body>
     </html>
 </template>
@@ -663,7 +665,6 @@
                     <div class="oe_structure">
                         <h1 class="container mt32"><t t-esc="status_code"/>: <t t-esc="status_message"/></h1>
                     </div>
-
                     <div class="container" t-if="views">
                         <div class="alert alert-danger" t-if="qweb_exception and editable">
                             <h4>Template fallback</h4>

From 5f696ba86c5acdde11199ff4e7a41b9d7ace815f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 8 Aug 2014 16:05:32 +0200
Subject: [PATCH 34/41] [FIX] pos: display cashier name on receipt, not the
 user

---
 addons/point_of_sale/static/src/xml/pos.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 9fcf20819cb..c4501253828 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -561,7 +561,7 @@
             <br />
             <t t-esc="widget.company.name"/><br />
             Phone: <t t-esc="widget.company.phone || ''"/><br />
-            User: <t t-esc="widget.user.name"/><br />
+            User: <t t-esc="widget.pos.get('cashier') and widget.pos.get('cashier').name or widget.user.name"/><br />
             Shop: <t t-esc="widget.shop_obj.name"/><br />
             <br />
             <table>

From c16884364b61cd5bf88790a0818aad52ac1715d1 Mon Sep 17 00:00:00 2001
From: Samus CTO <cto@openerp.com>
Date: Fri, 8 Aug 2014 11:46:41 +0200
Subject: [PATCH 35/41] [FIX] Calculate date interval using super user time
 zone

When you set the date of a cron the July 1st at midnight, if the user
time zone has a positive offset, then the converted UTC date is the
June 30th and adding 1 month will end up on July 30th translating to
July 31th instead of September 1st.

To solve this issue we use the super user time zone for the date
calculation.
---
 openerp/addons/base/ir/ir_cron.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
index 77c9835d9be..cfabd97fb16 100644
--- a/openerp/addons/base/ir/ir_cron.py
+++ b/openerp/addons/base/ir/ir_cron.py
@@ -24,9 +24,10 @@ import time
 import psycopg2
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+import pytz
 
 import openerp
-from openerp import netsvc
+from openerp import netsvc, SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval as eval
@@ -149,8 +150,8 @@ class ir_cron(osv.osv):
             must not be committed/rolled back!
         """
         try:
-            now = datetime.now() 
-            nextcall = datetime.strptime(job['nextcall'], DEFAULT_SERVER_DATETIME_FORMAT)
+            now = fields.datetime.context_timestamp(job_cr, SUPERUSER_ID, datetime.now())
+            nextcall = fields.datetime.context_timestamp(job_cr, SUPERUSER_ID, datetime.strptime(job['nextcall'], DEFAULT_SERVER_DATETIME_FORMAT))
             numbercall = job['numbercall']
 
             ok = False
@@ -166,7 +167,7 @@ class ir_cron(osv.osv):
             if not numbercall:
                 addsql = ', active=False'
             cron_cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s",
-                       (nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
+                       (nextcall.astimezone(pytz.UTC).strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
 
         finally:
             job_cr.commit()

From e4c2da59f8f6f848ad1713c5b039bc251ab63fc9 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 4 Aug 2014 12:25:59 +0200
Subject: [PATCH 36/41] [FIX] website: use internal route for SEO suggest
 keyword, old server is down

---
 addons/website/controllers/main.py          | 11 +++++++++++
 addons/website/static/src/js/website.seo.js |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 4f2a2a3da4a..2ab001317ba 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -3,6 +3,8 @@ import cStringIO
 import contextlib
 import hashlib
 import json
+import xml.etree.ElementTree as ET
+
 import logging
 import os
 import datetime
@@ -13,6 +15,7 @@ import psycopg2
 import werkzeug
 import werkzeug.exceptions
 import werkzeug.utils
+import urllib2
 import werkzeug.wrappers
 from PIL import Image
 
@@ -301,6 +304,14 @@ class Website(openerp.addons.web.controllers.main.Home):
         obj = _object.browse(request.cr, request.uid, _id)
         return bool(obj.website_published)
 
+    @http.route(['/website/seo_suggest/<keywords>'], type='http', auth="public", website=True)
+    def seo_suggest(self, keywords):
+        url = "http://google.com/complete/search?ie=utf8&oe=utf8&output=toolbar&q="
+        req = urllib2.Request("%s?%s" % (url, keywords))
+        request = urllib2.urlopen(req)
+        xmlroot = ET.fromstring(request.read())
+        return json.dumps([sugg[0].attrib['data'] for sugg in xmlroot if len(sugg) and sugg[0].attrib['data']])
+
     #------------------------------------------------------
     # Helpers
     #------------------------------------------------------
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 8588b7a3765..4a285409bdf 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -95,7 +95,7 @@
                     }
                 });
             }
-            $.getJSON("http://suggest.hp.af.cm/suggest/"+encodeURIComponent(this.root + " "), addSuggestions);
+            $.getJSON("/website/seo_suggest/" + encodeURIComponent(this.root + " "), addSuggestions);
         },
     });
 

From c7fb787c70973c009d2902ea0468b32487a00a3c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 11 Aug 2014 10:32:08 +0200
Subject: [PATCH 37/41] [FIX] website: seo, url encode params, + handle
 connection breaks

---
 addons/website/controllers/main.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 2ab001317ba..97962d41bf9 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -306,9 +306,13 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route(['/website/seo_suggest/<keywords>'], type='http', auth="public", website=True)
     def seo_suggest(self, keywords):
-        url = "http://google.com/complete/search?ie=utf8&oe=utf8&output=toolbar&q="
-        req = urllib2.Request("%s?%s" % (url, keywords))
-        request = urllib2.urlopen(req)
+        url = "http://google.com/complete/search"
+        try:
+            req = urllib2.Request("%s?%s" % (url, werkzeug.url_encode({
+                'ie': 'utf8', 'oe': 'utf8', 'output': 'toolbar', 'q': keywords})))
+            request = urllib2.urlopen(req)
+        except (urllib2.HTTPError, urllib2.URLError):
+            return []
         xmlroot = ET.fromstring(request.read())
         return json.dumps([sugg[0].attrib['data'] for sugg in xmlroot if len(sugg) and sugg[0].attrib['data']])
 

From 2da233d89d69b7afaff0da7baaa197f4b30ba84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Mon, 11 Aug 2014 11:00:31 +0200
Subject: [PATCH 38/41] [FIX] web_kanban : resequence column and content by
 drag and dropping

---
 addons/web_kanban/static/src/js/kanban.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index b7cc68fbb82..91bbf9ceeed 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -387,8 +387,8 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                     stop: function(event, ui) {
                         var stop_index = ui.item.index();
                         if (start_index !== stop_index) {
-                            var $start_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(start_index);
-                            var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index);
+                            var $start_column = self.$('.oe_kanban_groups_records .oe_kanban_column').eq(start_index);
+                            var $stop_column = self.$('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index);
                             var method = (start_index > stop_index) ? 'insertBefore' : 'insertAfter';
                             $start_column[method]($stop_column);
                             var tmp_group = self.groups.splice(start_index, 1)[0];
@@ -1029,7 +1029,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
  */
 instance.web_kanban.QuickCreate = instance.web.Widget.extend({
     template: 'KanbanView.quick_create',
-    
+
     /**
      * close_btn: If true, the widget will display a "Close" button able to trigger
      * a "close" event.

From 2b0487113aa4218655b039289b0657c4723ded3f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 11 Aug 2014 11:11:36 +0200
Subject: [PATCH 39/41] [FIX] yaml tests: Set on_change keys not in view logger
 as debug instead of warning

This is related to commit d31faceb67fd87acaca00365dcfc28925b08a37f
(This is to avoid the runbot being yellow if on_change methods have extra keys in the returned value, this is not wrong, the web client will simply ignore them).
---
 openerp/tools/yaml_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 8f98573c413..b065294f7d7 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -452,7 +452,7 @@ class YamlInterpreter(object):
                         if key in fg:
                             record_dict[key] = process_val(key, val)
                         else:
-                            _logger.warning("The returning field '%s' from your on_change call '%s'"
+                            _logger.debug("The returning field '%s' from your on_change call '%s'"
                                             " does not exist either on the object '%s', either in"
                                             " the view '%s'",
                                             key, match.group(1), model._name, view_info['name'])

From 576e3c776a74d6b807d60a612c643cbddcee97b3 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Fri, 8 Aug 2014 14:09:44 +0200
Subject: [PATCH 40/41] [FIX] css: add display table rule to oe_popup_form
 class

To correct the display of the "add contact" wizard in modal (buttons not well placed)
---
 addons/web/static/src/css/base.css  | 8 ++++----
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 9fb53aab8e9..6831c419010 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -8,7 +8,6 @@
   font-weight: normal;
   font-style: normal;
 }
-
 @font-face {
   font-family: "EntypoRegular";
   src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
@@ -19,7 +18,6 @@
   font-weight: normal;
   font-style: normal;
 }
-
 .openerp {
   padding: 0;
   margin: 0;
@@ -809,7 +807,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, #800000);
+  background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
 .openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1353,6 +1351,9 @@
 .openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header {
   display: none;
 }
+.openerp .oe_popup_form {
+  display: table;
+}
 .openerp .oe_popup_form .oe_formview .oe_form_pager {
   display: none !important;
 }
@@ -3074,7 +3075,6 @@
     top: 0px;
   }
 }
-
 .kitten-mode-activated {
   background-size: cover;
   background-attachment: fixed;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6c1ba2d80ef..fedefd2b58a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1134,6 +1134,7 @@ $sheet-padding: 16px
     // }}}
     // FormPopup {{{
     .oe_popup_form 
+        display: table
         .oe_formview .oe_form_pager
             display: none !important
         // Customize label weight for popup wizard appear from another wizard according bootstrap3

From 3632949cffb24180832e18a3f19a6d02bd8e8729 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 11 Aug 2014 14:39:50 +0200
Subject: [PATCH 41/41] [FIX] web: image fields re-render on next/previous

By default, on binary images read, the server returns the binary size
This is possible that two images have the exact same size
Therefore we trigger the change in case the image value hasn't changed
So the image is re-rendered correctly
---
 addons/web/static/src/js/view_form.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e91955e0a4e..08050c7d686 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5194,6 +5194,20 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
         this._super.apply(this, arguments);
         this.render_value();
         this.set_filename('');
+    },
+    set_value: function(value_){
+        var changed = value_ !== this.get_value();
+        this._super.apply(this, arguments);
+        // By default, on binary images read, the server returns the binary size
+        // This is possible that two images have the exact same size
+        // Therefore we trigger the change in case the image value hasn't changed
+        // So the image is re-rendered correctly
+        if (!changed){
+            this.trigger("change:value", this, {
+                oldValue: value_,
+                newValue: value_
+            });
+        }
     }
 });