From d824769b3cf3300732bee0bb4074d78d910217b9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 5 Sep 2014 11:44:20 +0200
Subject: [PATCH 01/30] [FIX] tools,mail: improve parsing of references from
 rev. 0bee015dd67cb809fd235215b43d331074824e42

Backport of 8.0 fix was not enough for 7.0, because it still fails for the legacy reference match (model+res_id), which is not used in 8.0
---
 addons/mail/mail_thread.py | 1 -
 openerp/tools/mail.py      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7ff1af038f0..c88cea7499c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -29,7 +29,6 @@ import re
 import socket
 import time
 import xmlrpclib
-import re
 from email.message import Message
 
 from openerp import tools
diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index fdcb44e040d..49ec5849b18 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -312,7 +312,7 @@ command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
 # Updated in 7.0 to match the model name as well
 # Typical form of references is <timestamp-openerp-record_id-model_name@domain>
 # group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain
-reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE)
+reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?[^>]*@([^>]*)>", re.UNICODE)
 
 def generate_tracking_message_id(res_id):
     """Returns a string that can be used in the Message-ID RFC822 header field

From f51dac038eafe3f80b6d30f49317fe741591f570 Mon Sep 17 00:00:00 2001
From: Rifakathusen Haradwala <rha@tinyerp.com>
Date: Mon, 1 Sep 2014 18:56:04 +0530
Subject: [PATCH 02/30] [FIX] mail: translate tracked fields name in chatter

Status tracking messages are not translated into user's language while updating any document with tracked fields (opw 612847)
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c88cea7499c..63cb3a845a1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -299,7 +299,7 @@ class mail_thread(osv.AbstractModel):
 
         if not context.get('mail_notrack'):
             # Perform the tracking
-            tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
+            tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=track_ctx)
         else:
             tracked_fields = None
         if tracked_fields:

From 085ad7fcc4d8a288e959ea98e8f74807aa6c5cf1 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 5 Sep 2014 14:57:20 +0200
Subject: [PATCH 03/30] [FIX] web: do not allow to access a database if not
 matching db-filter

---
 addons/web/controllers/main.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 584bb3e35b5..6bfc249cc9a 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -101,13 +101,13 @@ def db_redirect(req, match_first_only_if_unique):
     db = False
     redirect = False
 
+    dbs = db_list(req, True)
+
     # 1 try the db in the url
     db_url = req.params.get('db')
-    if db_url:
+    if db_url and db_url in dbs:
         return (db_url, False)
 
-    dbs = db_list(req, True)
-
     # 2 use the database from the cookie if it's listable and still listed
     cookie_db = req.httprequest.cookies.get('last_used_database')
     if cookie_db in dbs:
@@ -584,6 +584,8 @@ class Home(openerpweb.Controller):
 
     @openerpweb.httprequest
     def login(self, req, db, login, key):
+        if db not in db_list(req, True):
+            return werkzeug.utils.redirect('/', 303)
         return login_and_redirect(req, db, login, key)
 
 class WebClient(openerpweb.Controller):

From 31d2476c8640753c863d3d0df2c49dd13bd3320e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Bellier?= <lb@numerigraphe.com>
Date: Tue, 29 Jul 2014 18:48:26 +0200
Subject: [PATCH 04/30] [FIX] stock: show the UoS quantity on picking lines

The pickings already show the UoS, but not the associated quantity, which makes it useless.
---
 addons/stock/stock_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fcf7bad01cb..7c065df0b26 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1129,6 +1129,7 @@
                     <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <button name="%(stock.move_scrap)d"
                         string="Scrap Products" type="action"
@@ -1167,6 +1168,7 @@
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <field name="location_id" groups="stock.group_locations" invisible="1"/>
                     <field name="picking_id" invisible="1" />

From 25e4cd20ee86bcbe6202013ed6ddcf1f09af401c Mon Sep 17 00:00:00 2001
From: Mohammed Shekha <msh@openerp.com>
Date: Fri, 5 Sep 2014 16:39:06 +0200
Subject: [PATCH 05/30] [IMP] css: width of readonly list view field

readonly float fields in list view were not correctly placed when the focus was on the line (seen espacially if field was large, e.g. nb_register on registration)
---
 addons/web/static/src/css/base.css  | 16 ++++++++--------
 addons/web/static/src/css/base.sass |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 2b08a7c06f4..f024e906181 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -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;
@@ -1029,7 +1027,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 .oe_topbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1275,7 +1273,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1307,7 +1305,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgray;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2289,7 +2287,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -2856,7 +2854,9 @@
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float.oe_readonly, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer.oe_readonly {
   padding: 6px 0px 0px;
   text-align: right;
-  max-width: 100px;
+}
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer span {
+  padding: 0px 6px;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
   width: 100% !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index bdb358af6a0..bb699e0b374 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2248,7 +2248,8 @@ $sheet-padding: 16px
                 &.oe_readonly
                     padding: 6px 0px 0px
                     text-align: right
-                    max-width: 100px
+                span
+                    padding: 0px 6px
                 input
                     width: 100% !important
                     text-align: right

From 1e374b4ad7382a40c86214bf1f3a64f81fdbe505 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 8 Sep 2014 10:49:56 +0200
Subject: [PATCH 06/30] [FIX] ir_attachment: ignore if model uninstalled

if the model of an attachement no longer exists (the according module have been uninstalled, for instance), ignore the security check
---
 openerp/addons/base/ir/ir_attachment.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
index 2c0af45ee66..19c66635938 100644
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@ -205,6 +205,8 @@ class ir_attachment(osv.osv):
         for model, mids in res_ids.items():
             # ignore attachments that are not attached to a resource anymore when checking access rights
             # (resource was deleted but attachment was not)
+            if not self.pool.get(model):
+                continue
             mids = self.pool.get(model).exists(cr, uid, mids)
             ima.check(cr, uid, model, mode)
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)

From a210420582ef86b302387f49fee68947ed35f314 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Tue, 9 Sep 2014 11:52:44 +0200
Subject: [PATCH 07/30] [FIX] web: missing backport of rev df3c6b750249

[FIX] web: do not try to close a destroyed dialog. trigger "closing" signal on close by top-right "X" button
---
 addons/web/static/src/js/chrome.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 04f903ff9aa..a541fc6f3d1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -194,6 +194,8 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (options.height === 'auto' && options.max_height) {
             this.$el.css({ 'max-height': options.max_height, 'overflow-y': 'auto' });
         }
+        var self = this;
+        this.$el.on('dialogclose', function() { self.close(); });
         this.dialog_inited = true;
         var res = this.start();
         return res;
@@ -202,9 +204,11 @@ instance.web.Dialog = instance.web.Widget.extend({
         Closes the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
     */
     close: function(reason) {
-        if (this.dialog_inited && this.$el.is(":data(dialog)")) {
+        if (this.dialog_inited) {
             this.trigger("closing", reason);
-            this.$el.dialog('close');
+            if (this.$el.is(":data(dialog)")) {     // may have been destroyed by closing signal
+                this.$el.dialog('close');
+            }
         }
     },
     _closing: function() {

From 33e0910841e0a7e63054e28c50e881af1f16c771 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 9 Sep 2014 13:43:04 +0200
Subject: [PATCH 08/30] [FIX] hr_expense: tax included computation

When a tax included has a several childs, the source line should not be duplicated for each tax.
Without the patch, the actual product price (without taxes) would be (total - tax amount) for the last tax only (and not the sum of each tax). (opw 609104)
---
 addons/hr_expense/hr_expense.py | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index f2f12b06b23..54c411a6159 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -283,7 +283,6 @@ class hr_expense_expense(osv.osv):
             if not mres:
                 continue
             res.append(mres)
-            tax_code_found= False
             
             #Calculate tax according to default tax on product
             taxes = []
@@ -301,9 +300,9 @@ class hr_expense_expense(osv.osv):
                         a = product.categ_id.property_account_expense_categ.id
                     a = fpos_obj.map_account(cr, uid, fpos, a)
                     taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False
-                tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
             if not taxes:
                 continue
+            tax_l = []
             #Calculating tax on the line and creating move?
             for tax in tax_obj.compute_all(cr, uid, taxes,
                     line.unit_amount ,
@@ -311,15 +310,8 @@ class hr_expense_expense(osv.osv):
                     exp.user_id.partner_id)['taxes']:
                 tax_code_id = tax['base_code_id']
                 tax_amount = line.total_amount * tax['base_sign']
-                if tax_code_found:
-                    if not tax_code_id:
-                        continue
-                    res.append(self.move_line_get_item(cr, uid, line, context))
-                    res[-1]['price'] = 0.0
-                    res[-1]['account_analytic_id'] = False
-                elif not tax_code_id:
+                if not tax_code_id:
                     continue
-                tax_code_found = True
                 res[-1]['tax_code_id'] = tax_code_id
                 res[-1]['tax_amount'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, tax_amount, context={'date': exp.date_confirm})
                 ## 
@@ -337,7 +329,8 @@ class hr_expense_expense(osv.osv):
                              'tax_code_id': tax['tax_code_id'],
                              'tax_amount': tax['amount'] * tax['base_sign'],
                              }
-                res.append(assoc_tax)
+                tax_l.append(assoc_tax)
+            res += tax_l
         return res
 
     def move_line_get_item(self, cr, uid, line, context=None):

From 8dff24709692b6ba61d19a60815200220aad77fc Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 9 Sep 2014 16:45:42 +0200
Subject: [PATCH 09/30] [FIX] orm, read_group: read_group_fill_results handle
 no_leaf

---
 openerp/osv/orm.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 00093999bca..cd625bc2009 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2568,13 +2568,19 @@ class BaseModel(object):
         # same ordering, and can be merged in one pass.
         result = []
         known_values = {}
+
+        if len(groupby_list) < 2 and context.get('group_by_no_leaf'):
+            count_attr = '_'
+        else:
+            count_attr = groupby
+        count_attr += '_count'
+
         def append_left(left_side):
             grouped_value = left_side[groupby] and left_side[groupby][0]
             if not grouped_value in known_values:
                 result.append(left_side)
                 known_values[grouped_value] = left_side
             else:
-                count_attr = groupby + '_count'
                 known_values[grouped_value].update({count_attr: left_side[count_attr]})
         def append_right(right_side):
             grouped_value = right_side[0]

From 2266a96420bc008fb0c83858a4b5ae8dec0c84e8 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Tue, 9 Sep 2014 18:16:21 +0200
Subject: [PATCH 10/30] [FIX] ir_qweb: contact widget: properly pass the
 context when browsing the contact

As the context was not transferred, it was never translated.
---
 openerp/addons/base/ir/ir_qweb.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 8ce38a292d3..a6f4dd8dd5c 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -862,15 +862,18 @@ class Contact(orm.AbstractModel):
     _inherit = 'ir.qweb.field.many2one'
 
     def record_to_html(self, cr, uid, field_name, record, column, options=None, context=None):
+        if context is None:
+            context = {}
+
         if options is None:
             options = {}
         opf = options.get('fields') or ["name", "address", "phone", "mobile", "fax", "email"]
-
         if not getattr(record, field_name):
             return None
 
         id = getattr(record, field_name).id
-        field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context={"show_address": True})
+        context.update(show_address=True)
+        field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context=context)
         value = field_browse.name_get()[0][1]
 
         val = {

From 36d3979e0d4b20985141b147f36afa4aa6986e5d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 9 Sep 2014 19:00:58 +0200
Subject: [PATCH 11/30] [FIX] website_event_sale: take taxes from
 product_id_change into account

---
 addons/website_event_sale/controllers/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index cc9ddc0ad56..2a221d7a118 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -72,6 +72,8 @@ class website_event(website_event):
             _values = order_line_obj.product_id_change(
                 request.cr, SUPERUSER_ID, [], pricelist_id, ticket.product_id.id,
                 partner_id=partner_id, context=request.context)['value']
+            if 'tax_id' in _values:
+                _values['tax_id'] = [(6, 0, _values['tax_id'])]
             _values.update(values)
 
             order_line_id = order_line_obj.create(request.cr, SUPERUSER_ID, _values, context=request.context)

From 0aa92fdb03c624e116ad27740c3c73a99fa10792 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 9 Sep 2014 19:17:23 +0200
Subject: [PATCH 12/30] [FIX] email_template: a tag link rendering, do not
 process if no href

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

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 4c569fe50c1..d8b0f61f868 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -145,7 +145,7 @@ class email_template(osv.osv):
         # - img src -> check URL
         # - a href -> check URL
         for node in root.iter():
-            if node.tag == 'a':
+            if node.tag == 'a' and node.get('href'):
                 node.set('href', _process_link(node.get('href')))
             elif node.tag == 'img' and not node.get('src', 'data').startswith('data'):
                 node.set('src', _process_link(node.get('src')))

From 8ef044616a7f8fe06a6bf053fda9746a678a607d Mon Sep 17 00:00:00 2001
From: Bhavik Bagdiya <bba@openerp.com>
Date: Fri, 22 Aug 2014 14:59:39 +0530
Subject: [PATCH 13/30] [FIX] web: stages positioned properly when there is no
 sheet

Fixes #271
Closes #2004
---
 addons/web/static/src/css/base.css  | 8 ++++----
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6f841fde15a..35521d9827f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2024,17 +2024,17 @@
 .openerp .oe_application .oe_form_sheet .oe_notebook_page {
   padding: 0 16px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header {
+.openerp .oe_form > :not(.oe_form_nosheet) header, .openerp .oe_form > .oe_form_nosheet header {
   padding-left: 2px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header ul {
+.openerp .oe_form > :not(.oe_form_nosheet) header ul, .openerp .oe_form > .oe_form_nosheet header ul {
   display: inline-block;
   float: right;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button {
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button, .openerp .oe_form > .oe_form_nosheet header .oe_button {
   margin: 3px 2px 1px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child {
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child, .openerp .oe_form > .oe_form_nosheet header .oe_button:first-child {
   margin-left: 6px;
 }
 .openerp .oe_form header {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e0a5efd4fd0..af2d1913918 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1642,7 +1642,7 @@ $sheet-padding: 16px
                 padding: 0 16px
     // }}}
     // FormView.header {{{
-    .oe_form > :not(.oe_form_nosheet) header
+    .oe_form > :not(.oe_form_nosheet) header, .oe_form > .oe_form_nosheet header
         padding-left: 2px
         ul
             display: inline-block

From 2459cd5dd14282b485f9e6e39df857c3b8cfa636 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 10 Sep 2014 12:18:14 +0200
Subject: [PATCH 14/30] [FIX] ir_attachment: attachements removed on record
 unlink

---
 openerp/osv/orm.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index cd625bc2009..9bf10df39d6 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4050,6 +4050,7 @@ class BaseModel(object):
         self.check_access_rights(cr, uid, 'unlink')
 
         ir_property = self.pool.get('ir.property')
+        ir_attachment_obj = self.pool.get('ir.attachment')
 
         # Check if the records are used as default properties.
         domain = [('res_id', '=', False),
@@ -4088,6 +4089,13 @@ class BaseModel(object):
             if ir_value_ids:
                 ir_values_obj.unlink(cr, uid, ir_value_ids, context=context)
 
+            # For the same reason, removing the record relevant to ir_attachment
+            # The search is performed with sql as the search method of ir_attachment is overridden to hide attachments of deleted records
+            cr.execute('select id from ir_attachment where res_model = %s and res_id in %s', (self._name, sub_ids))
+            ir_attachment_ids = [ir_attachment[0] for ir_attachment in cr.fetchall()]
+            if ir_attachment_ids:
+                ir_attachment_obj.unlink(cr, uid, ir_attachment_ids, context=context)
+
         for order, object, store_ids, fields in result_store:
             if object == self._name:
                 effective_store_ids = list(set(store_ids) - set(ids))

From 3f5f76f246798072a26d6567e346d45a5f24cae2 Mon Sep 17 00:00:00 2001
From: Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Date: Wed, 10 Sep 2014 13:39:50 +0200
Subject: [PATCH 15/30] [FIX] point_of_sale: fix some image chaching issues
 with the receipt logo. Using a random url at each fetch ensures that we don't
 get cached results

---
 addons/point_of_sale/static/src/js/models.js | 2 +-
 addons/web/controllers/main.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 4c39c8234ad..2a9450f11ea 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -285,7 +285,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     self.company_logo.onerror = function(){
                         logo_loaded.reject();
                     };
-                    self.company_logo.src = window.location.origin + '/web/binary/company_logo';
+                    self.company_logo.src = window.location.origin + '/web/binary/company_logo'+'?_'+Math.random();
 
                     return logo_loaded;
                 });
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f2d63c3b677..35be5189c0e 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1472,7 +1472,7 @@ class Binary(http.Controller):
         '/logo',
         '/logo.png',
     ], type='http', auth="none")
-    def company_logo(self, dbname=None):
+    def company_logo(self, dbname=None, **kw):
         # TODO add etag, refactor to use /image code for etag
         uid = None
         if request.session.db:

From c3c8276b0fa5bf980347c77a8eac73d613e25ee0 Mon Sep 17 00:00:00 2001
From: Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Date: Wed, 10 Sep 2014 14:30:43 +0200
Subject: [PATCH 16/30] [FIX] point_of_sale: chrome was dropping the cookie
 when loading the company logo, resulting in an incorrect logo in multi-db
 setups.

---
 addons/point_of_sale/static/src/js/models.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 2a9450f11ea..774f0bc036a 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -257,7 +257,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     // Load the company Logo
 
                     self.company_logo = new Image();
-                    self.company_logo.crossOrigin = 'anonymous';
                     var  logo_loaded = new $.Deferred();
                     self.company_logo.onload = function(){
                         var img = self.company_logo;
@@ -279,13 +278,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                             ctx.drawImage(self.company_logo,0,0, width, height);
                         
                         self.company_logo_base64 = c.toDataURL();
-                        window.logo64 = self.company_logo_base64;
                         logo_loaded.resolve();
                     };
                     self.company_logo.onerror = function(){
                         logo_loaded.reject();
                     };
-                    self.company_logo.src = window.location.origin + '/web/binary/company_logo'+'?_'+Math.random();
+                    self.company_logo.src = '/web/binary/company_logo'+'?_'+Math.random();
 
                     return logo_loaded;
                 });

From d3ba8a840d986a224281a2844ccabcbc8c41ffd4 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 10 Sep 2014 15:07:06 +0200
Subject: [PATCH 17/30] [FIX] website_sale: the order of the attribute list
 doesn't matter

---
 addons/website_sale/static/src/js/website_sale.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 4ca9aa34e8b..c497e0751d9 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -87,7 +87,7 @@ $(document).ready(function () {
         });
         var available = false;
         for (var k in variant_ids) {
-            if (_.isEqual(variant_ids[k][1], values)) {
+            if (_.isEmpty(_.difference(variant_ids[k][1], values))) {
                 var dec = variant_ids[k][2] % 1;
                 $('input[name="product_id"]').val(variant_ids[k][0]);
                 $price.html(variant_ids[k][2] + (dec < 0.01 ? ".00" : (dec < 1 ? "0" : "") ));

From 2684b7de4c883ff2ed05f60b083e4a539e08d5db Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 10 Sep 2014 17:25:56 +0200
Subject: [PATCH 18/30] [FIX] mail: alias domain should be fetch as superuser

as ir.config.parameter has limited access
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 1da986e9cd5..0538ad7b7f8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -105,7 +105,7 @@ class mail_thread(osv.AbstractModel):
         model = context.get('empty_list_help_model')
         res_id = context.get('empty_list_help_id')
         ir_config_parameter = self.pool.get("ir.config_parameter")
-        catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
+        catchall_domain = ir_config_parameter.get_param(cr, SUPERUSER_ID, "mail.catchall.domain", context=context)
         document_name = context.get('empty_list_help_document_name', _('document'))
         alias = None
 

From f2cf6ced17d3477b8858e3a8f955a42cc8a629ff Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Sep 2014 17:35:44 +0200
Subject: [PATCH 19/30] [FIX] mail: encoding of sender name with unicode

When sending an email, both formats 'Name <email>' or '"Name" <email>' can be used for fields 'From', 'To' and others. If the name contains unicode characters, a regex only matching '"Name" <email>' was used to encode the name with RFC2047. That meant that the name was not encoded and eventually dropped, using only the email part.
Instead of using a limited regex, use the parseaddr method from email library.
Fixes lp:1272610, opw 607683
---
 openerp/addons/base/ir/ir_mail_server.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index ec5b12fc10d..7851d700133 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -24,7 +24,7 @@ from email.MIMEBase import MIMEBase
 from email.MIMEMultipart import MIMEMultipart
 from email.Charset import Charset
 from email.Header import Header
-from email.Utils import formatdate, make_msgid, COMMASPACE
+from email.Utils import formatdate, make_msgid, COMMASPACE, parseaddr
 from email import Encoders
 import logging
 import re
@@ -118,6 +118,7 @@ def encode_header_param(param_text):
     return param_text_ascii if param_text_ascii\
          else Charset('utf8').header_encode(param_text_utf8)
 
+# TODO master, remove me, no longer used internaly
 name_with_email_pattern = re.compile(r'("[^<@>]+")\s*<([^ ,<@]+@[^> ,]+)>')
 address_pattern = re.compile(r'([^ ,<@]+@[^> ,]+)')
 
@@ -141,15 +142,16 @@ def encode_rfc2822_address_header(header_text):
     header_text_ascii = try_coerce_ascii(header_text_utf8)
     if header_text_ascii:
         return header_text_ascii
+
+    name, email = parseaddr(header_text_utf8)
+    if not name:
+      return email
+
     # non-ASCII characters are present, attempt to
     # replace all "Name" patterns with the RFC2047-
     # encoded version
-    def replace(match_obj):
-        name, email = match_obj.group(1), match_obj.group(2)
-        name_encoded = str(Header(name, 'utf-8'))
-        return "%s <%s>" % (name_encoded, email)
-    header_text_utf8 = name_with_email_pattern.sub(replace,
-                                                   header_text_utf8)
+    name_encoded = str(Header(name, 'utf-8'))
+    header_text_utf8 = "%s <%s>" % (name_encoded, email)
     # try again after encoding
     header_text_ascii = try_coerce_ascii(header_text_utf8)
     if header_text_ascii:

From 948c554a830b803fd72839190efe42b2faa5f02c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 11 Sep 2014 09:58:38 +0200
Subject: [PATCH 20/30] [FIX] web: *.openerp.com to *.odoo.com

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

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index a541fc6f3d1..d0f14a63804 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1129,7 +1129,7 @@ instance.web.UserMenu =  instance.web.Widget.extend({
         this.update_promise = this.update_promise.then(fct, fct);
     },
     on_menu_help: function() {
-        window.open('http://help.openerp.com', '_blank');
+        window.open('http://help.odoo.com', '_blank');
     },
     on_menu_logout: function() {
         this.trigger('user_logout');
@@ -1158,10 +1158,10 @@ instance.web.UserMenu =  instance.web.Widget.extend({
                     state: JSON.stringify(state),
                     scope: 'userinfo',
                 };
-                instance.web.redirect('https://accounts.openerp.com/oauth2/auth?'+$.param(params));
+                instance.web.redirect('https://accounts.odoo.com/oauth2/auth?'+$.param(params));
             }).fail(function(result, ev){
                 ev.preventDefault();
-                instance.web.redirect('https://accounts.openerp.com/web');
+                instance.web.redirect('https://accounts.odoo.com/web');
             });
         }
     },

From bf9a3723c0cc9b7139a627e43eb7219ca75f064b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Sep 2014 18:06:38 +0200
Subject: [PATCH 21/30] [FIX] hr_expense: tax amount computation

The tax_amount field should contain the basic amount (without tax) for base tax code. (opw 613470)
---
 addons/hr_expense/hr_expense.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 54c411a6159..17547a57ce0 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -309,16 +309,19 @@ class hr_expense_expense(osv.osv):
                     line.unit_quantity, line.product_id,
                     exp.user_id.partner_id)['taxes']:
                 tax_code_id = tax['base_code_id']
-                tax_amount = line.total_amount * tax['base_sign']
                 if not tax_code_id:
                     continue
                 res[-1]['tax_code_id'] = tax_code_id
-                res[-1]['tax_amount'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, tax_amount, context={'date': exp.date_confirm})
                 ## 
                 is_price_include = tax_obj.read(cr,uid,tax['id'],['price_include'],context)['price_include']
                 if is_price_include:
                     ## We need to deduce the price for the tax
                     res[-1]['price'] = res[-1]['price']  - (tax['amount'] * tax['base_sign'] or 0.0)
+                    # tax amount countains base amount without the tax
+                    tax_amount = (line.total_amount - tax['amount']) * tax['base_sign']
+                else:
+                    tax_amount = line.total_amount * tax['base_sign']
+                res[-1]['tax_amount'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, tax_amount, context={'date': exp.date_confirm})
                 assoc_tax = {
                              'type':'tax',
                              'name':tax['name'],

From 3911468d72b6cd9214e1d5948878620d3969b706 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 11 Sep 2014 17:00:45 +0200
Subject: [PATCH 22/30] [FIX] web_graph: pivot_table, use _.isEmpty to check if
 value_lookup is False

---
 addons/web_graph/static/src/js/pivot_table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js
index 770519e52c2..7de629a95c2 100644
--- a/addons/web_graph/static/src/js/pivot_table.js
+++ b/addons/web_graph/static/src/js/pivot_table.js
@@ -404,7 +404,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
         } else if (grouped_on && this.fields[grouped_on].type === 'selection') {
             var selection = this.fields[grouped_on].selection,
                 value_lookup = _.where(selection, {0:value}); 
-            group.attributes.value = value_lookup ? value_lookup[0][1] : _t('Undefined');
+            group.attributes.value = !_.isEmpty(value_lookup) ? value_lookup[0][1] : _t('Undefined');
         } else if (value instanceof Array) {
             group.attributes.value = value[1];
         }

From 386174cf0eee7a378c3dc0ccfa557a858ae7f300 Mon Sep 17 00:00:00 2001
From: Dharti Ratani <dhr@openerp.com>
Date: Thu, 11 Sep 2014 17:01:03 +0200
Subject: [PATCH 23/30] [FIX] survey: access rights error when editing

The wizard 'Edit Survey' > 'Add Question' was trowing an access rights error as the id was passed as a string instead of a real id. opw 607854
---
 addons/survey/wizard/survey_answer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index c87a87c3e77..fad82663469 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -157,7 +157,7 @@ class survey_question_wiz(osv.osv_memory):
                         title = sur_rec.title
                     xml_form = etree.Element('form', {'string': tools.ustr(title)})
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
-                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
+                        context.update({'page_id' : p_id,'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
                         xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
                         etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
                         etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})

From 8c3924165176571120cb416bb7d9e0dcfe9afb91 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 11 Sep 2014 17:20:27 +0200
Subject: [PATCH 24/30] [FIX] stock: return picking, pass serial number value
 when returning

---
 addons/stock/wizard/stock_return_picking.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 2b920676b28..8e30fc01bd8 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -206,6 +206,7 @@ class stock_return_picking(osv.osv_memory):
                                             'location_id': new_location, 
                                             'location_dest_id': move.location_id.id,
                                             'date': date_cur,
+                                            'prodlot_id': data_get.prodlot_id.id,
                 })
                 move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]}, context=context)
         if not returned_lines:

From 875d7ed38ec05daa5d91229cd0a085023b47810d Mon Sep 17 00:00:00 2001
From: fka-odoo <fka@openerp.com>
Date: Wed, 2 Jul 2014 14:08:41 +0530
Subject: [PATCH 25/30] [FIX] web: sort with undefined value

In this awesome programming language called javascript, undefined is neither bigger nor smaller than a string. Previous code was then considering undefined values equal to any string.
This fix allows to sort in a column of a o2m field and group the undefined values together. opw 607704
---
 addons/web/static/src/js/data.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 6ae69fbe67b..5553572a12e 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -898,6 +898,8 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
                             sign = -1;
                             field = field.slice(1);
                         }
+                        if(!a[field] && a[field] !== 0){ return sign}
+                        if(!b[field] && b[field] !== 0){ return (sign == -1) ? 1 : -1}
                         //m2o should be searched based on value[1] not based whole value(i.e. [id, value])
                         if(_.isArray(a[field]) && a[field].length == 2 && _.isString(a[field][1])){
                             return sign * compare(a[field][1], b[field][1]);

From abba7aa2122f846f92cc31dceab3a2eb037d4de3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 11 Sep 2014 17:54:58 +0200
Subject: [PATCH 26/30] [FIX] product: can be sold as default filter for
 templates

---
 addons/product/product_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c547a611cd4..4a17e851c54 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -964,6 +964,7 @@
             <field name="view_mode">kanban,tree,form</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="product_template_kanban_view"/>
+            <field name="context">{"search_default_filter_to_sell":1}</field>
         </record>
 
         <menuitem action="product_template_action"

From 5f9682c35304af14a58b9160ec15ccfd44c96c67 Mon Sep 17 00:00:00 2001
From: Fekete Mihai <feketemihai@gmail.com>
Date: Fri, 12 Sep 2014 16:04:22 +0200
Subject: [PATCH 27/30] [FIX] l10n_ro: backport of fix done in res_partner.py
 from aa76885

PR #720
---
 addons/l10n_ro/res_partner.py | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index 4835f75bb40..103a5d616d0 100644
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -28,26 +28,15 @@ class res_partner(osv.osv):
         'nrc' : fields.char('NRC', size=16, help='Registration number at the Registry of Commerce'),
     }
 
-    # The SQL constraints are no-ops but present only to display the right error message to the
-    # user when the partial unique indexes defined below raise errors/  
-    # The real constraints need to be implemented with PARTIAL UNIQUE INDEXES (see auto_init),
-    # due to the way accounting data is delegated by contacts to their companies in OpenERP 7.0.
-    _sql_constraints = [
-       ('vat_uniq', 'unique (id)', 'The vat of the partner must be unique !'),
-       ('nrc_uniq', 'unique (id)', 'The code of the partner must be unique !')
-    ]
-
     def _auto_init(self, cr, context=None):
         result = super(res_partner, self)._auto_init(cr, context=context)
-        # Real implementation of the vat/nrc constraints: only "commercial entities" need to have
-        # unique numbers, and the condition for being a commercial entity is "is_company or parent_id IS NULL".
-        # Contacts inside a company automatically have a copy of the company's commercial fields
-        # (see _commercial_fields()), so they are automatically consistent.
+        # Remove constrains for vat, nrc on "commercial entities" because is not mandatory by legislation
+        # Even that VAT numbers are unique, the NRC field is not unique, and there are certain entities that
+        # doesn't have a NRC number plus the formatting was changed few times, so we cannot have a base rule for
+        # checking if available and emmited by the Ministry of Finance, only online on their website.
         cr.execute("""
             DROP INDEX IF EXISTS res_partner_vat_uniq_for_companies;
             DROP INDEX IF EXISTS res_partner_nrc_uniq_for_companies;
-            CREATE UNIQUE INDEX res_partner_vat_uniq_for_companies ON res_partner (vat) WHERE is_company OR parent_id IS NULL;
-            CREATE UNIQUE INDEX res_partner_nrc_uniq_for_companies ON res_partner (nrc) WHERE is_company OR parent_id IS NULL;
         """)
         return result
 

From 9b1cdea223b8b5bcc0decd3e55512b391e16673d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 12 Sep 2014 16:25:48 +0200
Subject: [PATCH 28/30] [FIX] mrp_repair: invoice the actual invoice partner id

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

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 9132094bf97..74085debad7 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -395,7 +395,7 @@ class mrp_repair(osv.osv):
                         'origin':repair.name,
                         'type': 'out_invoice',
                         'account_id': account_id,
-                        'partner_id': repair.partner_id.id,
+                        'partner_id': repair.partner_invoice_id.id or repair.partner_id.id,
                         'currency_id': repair.pricelist_id.currency_id.id,
                         'comment': repair.quotation_notes,
                         'fiscal_position': repair.partner_id.property_account_position.id

From a3cf66def1264905dd0d010d34ff42de64b58f9b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Sat, 13 Sep 2014 17:00:51 +0200
Subject: [PATCH 29/30] [FIX] website_event_sale: remove invalid code chunk
 introduced during previous forward-port (56f2b7ae0f6)

---
 addons/website_event_sale/controllers/main.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index ff697b1cf16..973b2f265d2 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -43,8 +43,6 @@ class website_event(website_event):
             ticket = ticket_obj.browse(cr, SUPERUSER_ID, ticket_id, context=context)
             request.website.sale_get_order(force_create=1)._cart_update(
                 product_id=ticket.product_id.id, add_qty=quantity, context=dict(context, event_ticket_id=ticket.id))
-            if 'tax_id' in _values:
-                _values['tax_id'] = [(6, 0, _values['tax_id'])]
 
         if not sale:
             return request.redirect("/event/%s" % event_id)

From 7eab880660da4a1a9cc25619f2314bdde5062091 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Mon, 15 Sep 2014 12:09:35 +0200
Subject: [PATCH 30/30] [FIX] orm: correct read_group() on models with
 `_group_by_full` (introduced by previous forward-port)

also add tests of `_group_by_full` functionality
---
 openerp/addons/test_converter/models.py       | 15 +++++++++++
 .../addons/test_converter/tests/__init__.py   |  5 ++--
 .../addons/test_converter/tests/test_gbf.py   | 25 +++++++++++++++++++
 openerp/osv/orm.py                            | 16 +++++-------
 4 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 openerp/addons/test_converter/tests/test_gbf.py

diff --git a/openerp/addons/test_converter/models.py b/openerp/addons/test_converter/models.py
index 9074ba8178f..9dd2f486af0 100644
--- a/openerp/addons/test_converter/models.py
+++ b/openerp/addons/test_converter/models.py
@@ -30,6 +30,21 @@ class test_model(orm.Model):
         'text': fields.text(),
     }
 
+    # `base` module does not contains any model that implement the `_group_by_full` functionality
+    # test this feature here...
+
+    def _gbf_m2o(self, cr, uid, ids, domain, read_group_order, access_rights_uid, context):
+        Sub = self.pool['test_converter.test_model.sub']
+        all_ids = Sub._search(cr, uid, [], access_rights_uid=access_rights_uid, context=context)
+        result = Sub.name_get(cr, access_rights_uid or uid, all_ids, context=context)
+        folds = {i: i not in ids for i, _ in result}
+        return result, folds
+
+    _group_by_full = {
+        'many2one': _gbf_m2o,
+    }
+
+
 class test_model_sub(orm.Model):
     _name = 'test_converter.test_model.sub'
 
diff --git a/openerp/addons/test_converter/tests/__init__.py b/openerp/addons/test_converter/tests/__init__.py
index 493b164d44a..16946f57713 100644
--- a/openerp/addons/test_converter/tests/__init__.py
+++ b/openerp/addons/test_converter/tests/__init__.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from . import test_html
+from . import test_html, test_gbf
 
 fast_suite = [
 ]
 
 checks = [
-    test_html
+    test_html,
+    test_gbf,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/test_converter/tests/test_gbf.py b/openerp/addons/test_converter/tests/test_gbf.py
new file mode 100644
index 00000000000..5c97f9c8609
--- /dev/null
+++ b/openerp/addons/test_converter/tests/test_gbf.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from openerp.tests import common
+
+class TestGBF(common.TransactionCase):
+
+    def test_group_by_full(self):
+
+        Subs = self.registry('test_converter.test_model.sub')
+        TM = self.registry('test_converter.test_model')
+
+        # remove all existing subs (no need to panic, it will be rollbacked...)
+        all_subs = Subs.search(self.cr, self.uid, [])
+        if all_subs:
+            Subs.unlink(self.cr, self.uid, all_subs)
+
+        subs_ids = [Subs.create(self.cr, self.uid, {'name': 'sub%d' % i}) for i in range(5)]
+        tm_ids = [TM.create(self.cr, self.uid, {'many2one': subs_ids[i]}) for i in range(3)]
+
+        domain = [('id', 'in', tuple(tm_ids))]
+
+        rg = TM.read_group(self.cr, self.uid, domain, fields=['many2one'], groupby=['many2one'])
+
+        self.assertEqual(len(rg), len(subs_ids))
+        rg_subs = sorted(g['many2one'][0] for g in rg)
+        self.assertListEqual(rg_subs, sorted(subs_ids))
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 2ea51704b7e..853ec4c600c 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2153,7 +2153,8 @@ class BaseModel(object):
             pass
 
 
-    def _read_group_fill_results(self, cr, uid, domain, groupby, remaining_groupbys, aggregated_fields,
+    def _read_group_fill_results(self, cr, uid, domain, groupby, remaining_groupbys,
+                                 aggregated_fields, count_field,
                                  read_group_result, read_group_order=None, context=None):
         """Helper method for filling in empty groups for all possible values of
            the field being grouped by"""
@@ -2182,19 +2183,13 @@ class BaseModel(object):
         result = []
         known_values = {}
 
-        if len(groupby_list) < 2 and context.get('group_by_no_leaf'):
-            count_attr = '_'
-        else:
-            count_attr = groupby
-        count_attr += '_count'
-
         def append_left(left_side):
             grouped_value = left_side[groupby] and left_side[groupby][0]
             if not grouped_value in known_values:
                 result.append(left_side)
                 known_values[grouped_value] = left_side
             else:
-                known_values[grouped_value].update({count_attr: left_side[count_attr]})
+                known_values[grouped_value].update({count_field: left_side[count_field]})
         def append_right(right_side):
             grouped_value = right_side[0]
             if not grouped_value in known_values:
@@ -2438,12 +2433,13 @@ class BaseModel(object):
             count_field = groupby_fields[0] if len(groupby_fields) >= 1 else '_'
         else:
             count_field = '_'
+        count_field += '_count'
 
         prefix_terms = lambda prefix, terms: (prefix + " " + ",".join(terms)) if terms else ''
         prefix_term = lambda prefix, term: ('%s %s' % (prefix, term)) if term else ''
 
         query = """
-            SELECT min(%(table)s.id) AS id, count(%(table)s.id) AS %(count_field)s_count %(extra_fields)s
+            SELECT min(%(table)s.id) AS id, count(%(table)s.id) AS %(count_field)s %(extra_fields)s
             FROM %(from)s
             %(where)s
             %(groupby)s
@@ -2483,7 +2479,7 @@ class BaseModel(object):
             # method _read_group_fill_results need to be completely reimplemented
             # in a sane way 
             result = self._read_group_fill_results(cr, uid, domain, groupby_fields[0], groupby[len(annotated_groupbys):],
-                                                       aggregated_fields, result, read_group_order=order,
+                                                       aggregated_fields, count_field, result, read_group_order=order,
                                                        context=context)
         return result