From ff4fe2c05e35ccbf435583474a942512363b4cb5 Mon Sep 17 00:00:00 2001
From: Pariket Trivedi <ptr@openerp.com>
Date: Wed, 21 May 2014 16:34:34 +0530
Subject: [PATCH 01/44] [FIX]: change correct label and fields in Event
 Analysis.

---
 addons/event/report/report_event_registration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 595d3947687..1ce3591a105 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -37,7 +37,7 @@ class report_event_registration(osv.osv):
         'draft_state': fields.integer(' # No of Draft Registrations', size=20),
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
         'register_max': fields.integer('Maximum Registrations'),
-        'nbevent': fields.integer('Number Of Events'),
+        'nbevent': fields.integer('Number of Registrations in Events'),
         'event_type': fields.many2one('event.type', 'Event Type'),
         'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Attended'), ('cancel', 'Cancelled')], 'Registration State', readonly=True, required=True),
         'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Event State', readonly=True, required=True),
@@ -68,7 +68,7 @@ class report_event_registration(osv.osv):
                 to_char(e.date_begin, 'YYYY-MM-DD') AS event_date,
                 to_char(e.date_begin, 'YYYY') AS year,
                 to_char(e.date_begin, 'MM') AS month,
-                count(e.id) AS nbevent,
+                count(r.id) AS nbevent,
                 CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state,
                 CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
                 e.type AS event_type,

From a77123fcccff56c5745abf1737122cb846fd711c Mon Sep 17 00:00:00 2001
From: Pariket Trivedi <ptr@openerp.com>
Date: Thu, 22 May 2014 11:49:09 +0530
Subject: [PATCH 02/44] [FIX]: Bad display in kanban view with a group by in
 Event.

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

diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index ff5bfaba19b..53c03cc03f0 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -1,7 +1,7 @@
 .oe_event_date{
   border-top-left-radius:3px;
   border-top-right-radius:3px;
-  font-size: 48px;
+  font-size: 36px;
   height: auto;
   font-weight: bold;
   text-align: center;

From 6d65ff1f99f14cdbc32f2f0a31a9930ea9f1a086 Mon Sep 17 00:00:00 2001
From: Pariket Trivedi <ptr@openerp.com>
Date: Thu, 22 May 2014 11:56:28 +0530
Subject: [PATCH 03/44] [FIX]:IE9 Kanban: The 'show more' button is not display
 correctly.

---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8c2da02d969..d7c40480e11 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3392,6 +3392,9 @@ body.oe_single_form .oe_single_form_container {
 .openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8');
 }
+.openerp_ie .oe_webclient {
+  height: auto !important;
+}
 
 @media print {
   .openerp {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b18e4fc65d8..090cf3de0fe 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2736,6 +2736,8 @@ body.oe_single_form
     // jquery ui for ie
     .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
         filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8')
+    .oe_webclient
+        height: auto !important
 // }}}
 
 // @media print {{{

From 74eb6624207758f565842b1d5ee1c621b85105dc Mon Sep 17 00:00:00 2001
From: fka-odoo <fka@openerp.com>
Date: Tue, 3 Jun 2014 19:04:07 +0530
Subject: [PATCH 04/44] [FIX] display_name is not compute for non-active
 partner

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

diff --git a/addons/account_report_company/account_report_company.py b/addons/account_report_company/account_report_company.py
index 6915657ba84..fe5d237adf2 100644
--- a/addons/account_report_company/account_report_company.py
+++ b/addons/account_report_company/account_report_company.py
@@ -31,7 +31,7 @@ class res_partner(osv.Model):
         return dict(self.name_get(cr, uid, ids, context=context))
 
     _display_name_store_triggers = {
-        'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
+        'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)], context=dict(active_test=False)),
                         ['parent_id', 'is_company', 'name'], 10)
     }
 

From 8796e07afcecfccfe5b09cf0f9cb79e93024f1e6 Mon Sep 17 00:00:00 2001
From: Ravi Gohil <rgo@tinyerp.com>
Date: Mon, 9 Jun 2014 18:20:02 +0530
Subject: [PATCH 05/44] [FIX] mail: Speep improvement when sending email using
 'Send by Email' wizard. (Maintenance Case: 606994)

---
 addons/mail/mail_message.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4280983f288..3f491df82b7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -881,9 +881,11 @@ class mail_message(osv.Model):
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
                 ('res_model', '=', message.model),
                 ('res_id', '=', message.res_id),
-                ('subtype_ids', 'in', message.subtype_id.id)
                 ], context=context)
-            partners_to_notify |= set(fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
+            partners_to_notify |= set(
+                fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
+                if message.subtype_id.id in [st.id for st in fo.subtype_ids]
+            )
         # remove me from notified partners, unless the message is written on my own wall
         if message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
             partners_to_notify |= set([message.author_id])

From 0b4921e4d6c075ff47dbe3356433b698b61008b3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Jun 2014 12:24:48 +0200
Subject: [PATCH 06/44] parse_value: interger != float

Wwhen parsing a integer field, do not accept float values. '1' or '1.0' is ok but not '1.1'. (opw 608544)
---
 addons/web/static/src/js/formats.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 3280b9f4f75..0c3577b2671 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -228,7 +228,8 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
                 value = value.replace(instance.web._t.database.parameters.thousands_sep, "");
             } while(tmp !== value);
             tmp = Number(value);
-            if (isNaN(tmp))
+            // do not accept not numbers or float values
+            if (isNaN(tmp) || tmp % 1)
                 throw new Error(_.str.sprintf(_t("'%s' is not a correct integer"), value));
             return tmp;
         case 'float':

From 86acc1a62ffd1bdbbf79a6d315287baf5a5cea2b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Jun 2014 16:14:41 +0200
Subject: [PATCH 07/44] [FIX] orm: avoir errors reading twice a field

_read_flat: remove duplicated fields in read call
get many2one: as False is instance of int, check the value of x first to avoid calling a name_get with a list of False

When we were reading twice a m2o field where at least one result is null, the first call to name_get would set the value to False instead of None and then accepted by the filter 'isinstance(x, (int,long))'
---
 openerp/osv/fields.py | 2 +-
 openerp/osv/orm.py    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 18aa3aad8c2..49421365852 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -464,7 +464,7 @@ class many2one(_column):
         # we use uid=1 because the visibility of a many2one field value (just id and name)
         # must be the access right of the parent form and not the linked object itself.
         records = dict(obj.name_get(cr, SUPERUSER_ID,
-                                    list(set([x for x in res.values() if isinstance(x, (int,long))])),
+                                    list(set([x for x in res.values() if x and isinstance(x, (int,long))])),
                                     context=context))
         for id in res:
             if res[id] in records:
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 6e91ba46721..1dbac53511f 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -3694,6 +3694,8 @@ class BaseModel(object):
             return []
         if fields_to_read is None:
             fields_to_read = self._columns.keys()
+        else:
+            fields_to_read = list(set(fields_to_read))
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = [f for f in fields_to_read if

From e95545dcf020982604214ea44217ce5cda5d7185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jun 2014 17:32:32 +0200
Subject: [PATCH 08/44] [FIX] hr: typo in a field definition

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

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 0b1da11dd18..dbb20cc8b76 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -196,7 +196,7 @@ class hr_employee(osv.osv):
                  "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
-            string="Smal-sized photo", type="binary", multi="_get_image",
+            string="Small-sized photo", type="binary", multi="_get_image",
             store = {
                 'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },

From 28ff7e38b909a7b020c51168b2ee1c4a9230667a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jun 2014 17:35:41 +0200
Subject: [PATCH 09/44] [FIX] portal: typos in portal wall actions.

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

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 5c7fa14ce2a..ebaaa3f8424 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -39,7 +39,7 @@
             }"/>
             <field name="help" type="html">
                 <p>
-                    Youd don't have unread company's news.
+                    You don't have unread company's news.
                 </p>
             </field>
         </record>
@@ -71,7 +71,7 @@
             }"/>
             <field name="help" type="html">
                 <p>
-                    Youd don't have unread job offers.
+                    You don't have unread job offers.
                 </p>
             </field>
         </record>

From 4a508885ac043b25465aa5741955082aa66ce949 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 12 Jun 2014 20:03:50 +0200
Subject: [PATCH 10/44] [FIX] web: view_list_editable, on add an item, focus on
 the first cell of new row

Before, the focus was set on the first row, and, thererefore, if the list was enough long, it jumped out and the actual new row was hidden
---
 .../web/static/src/js/view_list_editable.js   | 40 +++----------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index c4aac5565ab..b97aef19815 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -127,15 +127,7 @@ openerp.web.list_editable = function (instance) {
             if (this.editable()) {
                 this.$el.find('table:first').show();
                 this.$el.find('.oe_view_nocontent').remove();
-                this.start_edition().then(function(){
-                    var fields = self.editor.form.fields;
-                    self.editor.form.fields_order.some(function(field){
-                        if (fields[field].$el.is(':visible')){
-                            fields[field].$el.find("input").select();
-                            return true;
-                        }
-                    });
-                });
+                this.start_edition();
             } else {
                 this._super();
             }
@@ -240,6 +232,7 @@ openerp.web.list_editable = function (instance) {
             return this.ensure_saved().then(function () {
                 var $recordRow = self.groups.get_row_for(record);
                 var cells = self.get_cells_for($recordRow);
+                var fields = {};
                 self.fields_for_resize.splice(0, self.fields_for_resize.length);
                 return self.with_event('edit', {
                     record: record.attributes,
@@ -253,10 +246,13 @@ openerp.web.list_editable = function (instance) {
 
                         // FIXME: need better way to get the field back from bubbling (delegated) DOM events somehow
                         field.$el.attr('data-fieldname', field_name);
+                        fields[field_name] = field;
                         self.fields_for_resize.push({field: field, cell: cell});
                     }, options).then(function () {
                         $recordRow.addClass('oe_edition');
                         self.resize_fields();
+                        var focus_field = options && options.focus_field ? options.focus_field : (self.visible_columns.length ? self.visible_columns[0].name : undefined);
+                        if (focus_field) fields[focus_field].$el.find('input').select();
                         return record.attributes;
                     });
                 }).fail(function () {
@@ -750,31 +746,6 @@ openerp.web.list_editable = function (instance) {
             throw new Error("is_editing's state filter must be either `new` or" +
                             " `edit` if provided");
         },
-        _focus_setup: function (focus_field) {
-            var form = this.form;
-
-            var field;
-            // If a field to focus was specified
-            if (focus_field
-                    // Is actually in the form
-                    && (field = form.fields[focus_field])
-                    // And is visible
-                    && field.$el.is(':visible')) {
-                // focus it
-                field.focus();
-                return;
-            }
-
-            _(form.fields_order).detect(function (name) {
-                // look for first visible field in fields_order, focus it
-                var field = form.fields[name];
-                if (!field.$el.is(':visible')) {
-                    return false;
-                }
-                // Stop as soon as a field got focused
-                return field.focus() !== false;
-            });
-        },
         edit: function (record, configureField, options) {
             // TODO: specify sequence of edit calls
             var self = this;
@@ -789,7 +760,6 @@ openerp.web.list_editable = function (instance) {
                 _(form.fields).each(function (field, name) {
                     configureField(name, field);
                 });
-                self._focus_setup(options && options.focus_field);
                 return form;
             });
         },

From 4e0559ef97dcb3422223b5a68ca8cbf9d8de79ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jun 2014 17:50:19 +0200
Subject: [PATCH 11/44] [FIX] hr_holidays: display float for leaves remaining /
 leaves taken in holiday type name get

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

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 07d4995998a..6a55403e960 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -104,7 +104,7 @@ class hr_holidays_status(osv.osv):
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
             if not record.limit:
-                name = name + ('  (%d/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
+                name = name + ('  (%g/%g)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
             res.append((record.id, name))
         return res
 

From f9fc9fdf1c1ac429d2a1d217b3e3b0689e285248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jun 2014 09:07:28 +0200
Subject: [PATCH 12/44] [FIX] hr: working and home adresses should not be
 customers by default, only 'normal' adresses.

---
 addons/hr/hr_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 3e79c0ca7d6..0d90d5d4dc7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -35,7 +35,9 @@
                             <page string="Public Information">
                                 <group>
                                     <group string="Contact Information">
-                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                        <field name="address_id" on_change="onchange_address_id(address_id)"
+                                            context="{'show_address': 1, 'default_customer': False}"
+                                            options='{"always_reload": True, "highlight_first_line": True}'/>
                                         <field name="work_email" widget="email"/>
                                         <field name="work_phone"/>
                                         <field name="mobile_phone"/>
@@ -64,7 +66,9 @@
                                         <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
                                     <group string="Contact Information">
-                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                        <field name="address_home_id"
+                                            context="{'show_address': 1, 'default_customer': False}"
+                                            options='{"always_reload": True, "highlight_first_line": True}'/>
                                     </group>
                                     <group string="Status">
                                         <field name="gender"/>

From 2f43cf041de34b23f15974d09d9cb2b7b515fcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jun 2014 09:25:48 +0200
Subject: [PATCH 13/44] [FIX] hr_holidays: date_from, date_to required in form
 view only for leave requests, not for allocation requests

---
 addons/hr_holidays/hr_holidays_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c39adcb3182..7c5db338bdb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -63,13 +63,16 @@
                 <sheet string="Leave Request">
                     <group>
                         <group>
+                            <field name="type" invisible="1"/>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration" help="The default duration interval between the start date and the end date is 8 hours.  Feel free to adapt it to your needs."/>
                             <div>
                                 <group col="3">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
-                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)"
+                                        attrs="{'required': [('type', '=', 'remove')]}" class="oe_inline"/><label string="-" class="oe_inline"/>
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)"
+                                        attrs="{'required': [('type', '=', 'remove')]}" class="oe_inline"/>
                                 </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days

From 390c811db87ab7404db420f9cd4e3b4e8db9e048 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 13 Jun 2014 12:03:48 +0200
Subject: [PATCH 14/44] [FIX] event: improve name from previous merge

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

diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 1ce3591a105..e29565f01d2 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -37,7 +37,7 @@ class report_event_registration(osv.osv):
         'draft_state': fields.integer(' # No of Draft Registrations', size=20),
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
         'register_max': fields.integer('Maximum Registrations'),
-        'nbevent': fields.integer('Number of Registrations in Events'),
+        'nbevent': fields.integer('Number of Registrations'),
         'event_type': fields.many2one('event.type', 'Event Type'),
         'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Attended'), ('cancel', 'Cancelled')], 'Registration State', readonly=True, required=True),
         'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Event State', readonly=True, required=True),

From 0c627438ccd327a2750ce44424fcbc1c809ce193 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Jun 2014 17:57:01 +0200
Subject: [PATCH 15/44] [FIX] Google Calendar - Split the last underscore
 because Google uses sometimes '_' in their own google_id. Retrieve the parent
 event_id to exclude when the exlusion has been done in google

---
 addons/google_calendar/google_calendar.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index f36062b6be2..b8b60141e97 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -530,7 +530,7 @@ class google_calendar(osv.AbstractModel):
         for att in att_obj.browse(cr, uid, my_att_ids, context=context):
             event = att.event_id
 
-            base_event_id = att.google_internal_event_id.split('_')[0]
+            base_event_id = att.google_internal_event_id.rsplit('_', 1)[0]
 
             if base_event_id not in event_to_synchronize:
                 event_to_synchronize[base_event_id] = {}
@@ -552,7 +552,7 @@ class google_calendar(osv.AbstractModel):
 
         for event in all_event_from_google.values():
             event_id = event.get('id')
-            base_event_id = event_id.split('_')[0]
+            base_event_id = event_id.rsplit('_', 1)[0]
 
             if base_event_id not in event_to_synchronize:
                 event_to_synchronize[base_event_id] = {}
@@ -615,7 +615,7 @@ class google_calendar(osv.AbstractModel):
                     if actSrc == 'OE':
                         self.delete_an_event(cr, uid, current_event[0], context=context)
                     elif actSrc == 'GG':
-                            new_google_event_id = event.GG.event['id'].split('_')[1]
+                            new_google_event_id = event.GG.event['id'].rsplit('_', 1)[1]
                             if 'T' in new_google_event_id:
                                 new_google_event_id = new_google_event_id.replace('T', '')[:-1]
                             else:
@@ -623,7 +623,11 @@ class google_calendar(osv.AbstractModel):
 
                                 if event.GG.status:
                                     parent_event = {}
-                                    parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id, new_google_event_id)
+                                    if event_to_synchronize[base_event][0][1].OE.event_id:
+                                        parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id, new_google_event_id)
+                                    else:
+                                        main_ev = att_obj.search_read(cr, uid, [('google_internal_event_id', '=', event.GG.event['id'].rsplit('_', 1)[0])], fields=['event_id'], context=context)
+                                        parent_event['id'] = "%s-%s" % (main_ev[0].get('event_id')[0], new_google_event_id)
                                     res = self.update_from_google(cr, uid, parent_event, event.GG.event, "copy", context)
                                 else:
                                     if event_to_synchronize[base_event][0][1].OE.event_id:

From eb42616b98bcc9e236706790a05069682ef5f2d0 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 13 Jun 2014 18:07:57 +0200
Subject: [PATCH 16/44] [FIX] website_forum: tag pager url

When browsing a tag, the pager url was not matching the route of the controller
---
 addons/website_forum/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index b838795b076..e98af2f21ac 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -120,7 +120,7 @@ class WebsiteForum(http.Controller):
 
         question_count = Post.search(cr, uid, domain, count=True, context=context)
         if tag:
-            url = "/forum/%s/%s/questions" % (slug(forum), slug(tag))
+            url = "/forum/%s/tag/%s/questions" % (slug(forum), slug(tag))
         else:
             url = "/forum/%s" % slug(forum)
 

From 0507ca5f31e3a5cf71e73da065cd625422994b0b Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 16 Jun 2014 10:22:38 +0200
Subject: [PATCH 17/44] [IMP] Calendar - Add an explicit /web in url from
 invitation mail since it required to works

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

diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index eed958e20d9..37669840818 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -102,7 +102,7 @@ openerp.calendar = function(instance) {
             var self = this;
             var action_url = '';
 
-            action_url = _.str.sprintf('/?db=%s#id=%s&view_type=form&model=calendar.event', db, meeting_id);
+            action_url = _.str.sprintf('/web?db=%s#id=%s&view_type=form&model=calendar.event', db, meeting_id);
             
             var reload_page = function(){
                 return location.replace(action_url);

From 7107b646f65242c139baaa0febef6185edc8d774 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 16 Jun 2014 11:31:21 +0200
Subject: [PATCH 18/44] [IMP] Website Sale - ribbon - html class from
 product.style is not required, so we need to display it as empty in website
 to avoid an internal 500

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

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 8035903f061..5d888714b19 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -98,7 +98,7 @@ class table_compute(object):
                     self.table[(pos/PPR)+y2][(pos%PPR)+x2] = False
             self.table[pos/PPR][pos%PPR] = {
                 'product': p, 'x':x, 'y': y,
-                'class': " ".join(map(lambda x: x.html_class, p.website_style_ids))
+                'class': " ".join(map(lambda x: x.html_class or '', p.website_style_ids))
             }
             if index<=PPG:
                 maxy=max(maxy,y+(pos/PPR))

From 63ea0df73ffd6bf659b2ef29cdc3d3387bec92ac Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 16:55:58 +0200
Subject: [PATCH 19/44] [FIX] account: default domain on journal_id field for
 invoices

Prior to this fix, the domain was set in the onchange methods onchange_company_id. Therefore, if the onchange was not triggered, the domain wasnt apply (e.g. while editing an existing invoice).
---
 addons/account/account_invoice.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 55ba1058d58..afd0077bbc8 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -298,7 +298,8 @@ class account_invoice(osv.osv):
             },
             multi='all'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]},
+                                      domain="[('type', 'in', {'out_invoice': ['sale'], 'out_refund': ['sale_refund'], 'in_refund': ['purchase_refund'], 'in_invoice': ['purchase']}.get(type, [])), ('company_id', '=', company_id)]"),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
         'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',

From 6b0025759512cab81e90219fd55d3ceef37bffc4 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 17:44:15 +0200
Subject: [PATCH 20/44] [FIX] account_analytic_analysis: product_id_change,
 variable price referenced before assignment in some cases

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

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 4409d99dd1a..af8f77b9566 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -73,6 +73,7 @@ class account_analytic_invoice_line(osv.osv):
 
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=local_context)
+        price = False
         if price_unit is not False:
             price = price_unit
         elif pricelist_id:

From 98bf37f6e1a7726e0bdb0d997adc8086578ec66f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 18:07:10 +0200
Subject: [PATCH 21/44] [FIX] mail: missing .id during forward port
 3c0292645fcb9604e3c4f08a37b7e8702d464065

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

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 84f0062cf5d..3517c1a47a3 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -977,7 +977,7 @@ class mail_message(osv.Model):
                     ('res_id', '=', message.res_id),
                 ], context=context)
             partners_to_notify |= set(
-                fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
+                fo.partner_id.id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
                 if message.subtype_id.id in [st.id for st in fo.subtype_ids]
             )
         # remove me from notified partners, unless the message is written on my own wall

From 2db6a0080f9eeac7030d6d2d856574f2192d8aa5 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 22:40:31 +0200
Subject: [PATCH 22/44] [FIX] auth_oauth: quote redirect url in state

Otherwise, Firefox is splitting the state at the first &, which can potentially be located in the redict param of the state
---
 addons/auth_oauth/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 08319b982fd..e3bd6c13580 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -70,7 +70,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
         return dict(
             d=request.session.db,
             p=provider['id'],
-            r=request.httprequest.full_path
+            r=werkzeug.url_quote_plus(request.httprequest.full_path)
         )
 
     @http.route()

From a3cfe1728d048ee23d8c7a41c0f1df8a70f0aeec Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 22:52:50 +0200
Subject: [PATCH 23/44] [FIX] auth_oauth: unquote redirect url from state

This is related to 2db6a0080f9eeac7030d6d2d856574f2192d8aa5. Looks like Firefox auto unquote, but not Chrome
---
 addons/auth_oauth/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index e3bd6c13580..6743cf17e7b 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -116,7 +116,7 @@ class OAuthController(http.Controller):
                 cr.commit()
                 action = state.get('a')
                 menu = state.get('m')
-                redirect = state.get('r')
+                redirect = werkzeug.url_unquote_plus(state.get('r'))
                 url = '/web'
                 if redirect and not redirect.startswith('/auth_oauth/signin') and \
                 (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query):

From b58703857012d42f9a39363611894014c2166a8e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Jun 2014 09:26:20 +0200
Subject: [PATCH 24/44] [FIX] auth_oauth: url_unquote_plus does not handle
 boolean

If the redirect param 'r' is not in the state, do no try to unquote it
---
 addons/auth_oauth/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 6743cf17e7b..214fdefe1fb 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -116,7 +116,7 @@ class OAuthController(http.Controller):
                 cr.commit()
                 action = state.get('a')
                 menu = state.get('m')
-                redirect = werkzeug.url_unquote_plus(state.get('r'))
+                redirect = werkzeug.url_unquote_plus(state['r']) if state.get('r') else False
                 url = '/web'
                 if redirect and not redirect.startswith('/auth_oauth/signin') and \
                 (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query):

From a32e989fbadab7691191d8872e69970d4763b8fe Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Jun 2014 12:56:13 +0200
Subject: [PATCH 25/44] [FIX] web: save date(time) field value on key enter in
 editable list

In editable list, on keypress enter, the _next method is called, saving the current line and starting the edition of the next one
The _next is triggered before the date(time) field change event, and, therefore, the saved value of the date(time) field is the old one
---
 addons/web/static/src/js/view_form.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e9f195b892a..fec7ce10607 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2422,6 +2422,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
     type_of_date: "datetime",
     events: {
         'change .oe_datepicker_master': 'change_datetime',
+        'keypress .oe_datepicker_master': 'change_datetime',
     },
     init: function(parent) {
         this._super(parent);
@@ -2540,8 +2541,8 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
     format_client: function(v) {
         return instance.web.format_value(v, {"widget": this.type_of_date});
     },
-    change_datetime: function() {
-        if (this.is_valid_()) {
+    change_datetime: function(e) {
+        if ((e.type !== "keypress" || e.which === 13) && this.is_valid_()) {
             this.set_value_from_ui_();
             this.trigger("datetime_changed");
         }

From 58c13d28b2b907366da3c803e92698d37ea0f947 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Jun 2014 13:47:15 +0200
Subject: [PATCH 26/44] [FIX] account: report agedpartnerbalance, copy paste
 error

The t-foreach save the iterazied item as not_partner, not as partner
---
 addons/account/views/report_agedpartnerbalance.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/views/report_agedpartnerbalance.xml b/addons/account/views/report_agedpartnerbalance.xml
index 019f32a35de..c1f9047e330 100644
--- a/addons/account/views/report_agedpartnerbalance.xml
+++ b/addons/account/views/report_agedpartnerbalance.xml
@@ -99,7 +99,7 @@
                         </tr>
                         <tr t-foreach="get_lines_with_out_partner(data['form'])" t-as="not_partner">
                             <td>
-                                <span t-esc="partner['name']"/>
+                                <span t-esc="not_partner['name']"/>
                             </td>
                             <td class="text-right">
                                 <span t-esc="formatLang(not_partner['direction'], currency_obj=res_company.currency_id)"/>

From 9bb0abd641dea21da67c496b994f70ce1954ed1e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@openerp.com>
Date: Tue, 17 Jun 2014 14:22:59 +0530
Subject: [PATCH 27/44] [FIX] GAMIFICATION: Fixed the Attribute Error     '
 'str' object has no attribute 'strftime' '

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

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 222e5cca49e..817f1566323 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -57,7 +57,7 @@ def start_end_date_for_period(period, default_start_date=False, default_end_date
         end_date = default_end_date
 
     if start_date and end_date:
-        return (start_date.strftime(DF), end_date.strftime(DF))
+        return (datetime.strftime(start_date, DF), datetime.strftime(end_date, DF))
     else:
         return (start_date, end_date)
 

From 481c64e077132c37acc0bb8c83dba6e937588032 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 17 Jun 2014 15:17:14 +0200
Subject: [PATCH 28/44] [IMP] Ir Action Server - Fix the domain for the field
 'Link Using field'.

---
 openerp/addons/base/ir/ir_actions.py  | 7 +++++++
 openerp/addons/base/ir/ir_actions.xml | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 748e209bb54..21ad57f5d03 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -462,6 +462,8 @@ class ir_actions_server(osv.osv):
                                    "based on the sequence. Low number means high priority."),
         'model_id': fields.many2one('ir.model', 'Base Model', required=True, ondelete='cascade',
                                     help="Base model on which the server action runs."),
+        'model_name': fields.related('model_id', 'model', type='char',
+                                     string='Model Name', readonly=True),
         'menu_ir_values_id': fields.many2one('ir.values', 'More Menu entry', readonly=True,
                                              help='More menu entry.'),
         # Client Action
@@ -620,6 +622,10 @@ class ir_actions_server(osv.osv):
             'wkf_field_id': False,
             'crud_model_id': model_id,
         }
+
+        if model_id:
+            values['model_name'] = self.pool.get('ir.model').browse(cr, uid, model_id, context).model
+
         return {'value': values}
 
     def on_change_wkf_wonfig(self, cr, uid, ids, use_relational_model, wkf_field_id, wkf_model_id, model_id, context=None):
@@ -723,6 +729,7 @@ class ir_actions_server(osv.osv):
         crud_model_name = False
         if crud_model_id:
             crud_model_name = self.pool.get('ir.model').browse(cr, uid, crud_model_id, context).model
+        
         values = {'link_field_id': False, 'crud_model_name': crud_model_name}
         return {'value': values}
 
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 7ac0252da80..c99975549c4 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -351,8 +351,9 @@
                                             Check to attach the newly created record to the record on which the server action runs.
                                         </p>
                                         <group>
+                                            <field name="model_name" invisible="1"/>
                                             <field name="link_field_id"
-                                                    domain="[('model_id', '=', model_id), ('relation', '=', crud_model_name), ('ttype', 'in', ['many2one'])]"
+                                                    domain="[('model_id', '=', crud_model_id), ('relation', '=', model_name), ('ttype', 'in', ['many2one'])]"
                                                     attrs="{'required': [('state', '=', 'object_create'), ('link_new_record', '=', True)],
                                                             'invisible': ['|', ('state', '!=', 'object_create'), ('link_new_record', '=', False)]}"/>
                                         </group>

From 86b80cf95eb658dad45f96bbf5238e7edb777d78 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 18 Jun 2014 11:12:27 +0200
Subject: [PATCH 29/44] [FIX] web: allow using dates and datetimes without
 leading zeros

---
 addons/web/static/src/js/formats.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 0c3577b2671..cf53d9fb3f0 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -264,6 +264,11 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
         case 'datetime':
             var datetime = Date.parseExact(
                     value, (date_pattern + ' ' + time_pattern));
+            if (datetime !== null)
+                return instance.web.datetime_to_str(datetime);
+            datetime = Date.parseExact(value.replace(/\d+/g, function(m){
+                return m.length === 1 ? "0" + m : m ;
+            }), (date_pattern + ' ' + time_pattern));
             if (datetime !== null)
                 return instance.web.datetime_to_str(datetime);
             datetime = Date.parse(value);
@@ -272,6 +277,11 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             throw new Error(_.str.sprintf(_t("'%s' is not a correct datetime"), value));
         case 'date':
             var date = Date.parseExact(value, date_pattern);
+            if (date !== null)
+                return instance.web.date_to_str(date);
+            date = Date.parseExact(value.replace(/\d+/g, function(m){
+                return m.length === 1 ? "0" + m : m ;
+            }), date_pattern);
             if (date !== null)
                 return instance.web.date_to_str(date);
             date = Date.parse(value);

From d1e9633c46a755d3c758fb19860509acc355845d Mon Sep 17 00:00:00 2001
From: Ravi Gohil <rgo@tinyerp.com>
Date: Wed, 18 Jun 2014 15:49:38 +0530
Subject: [PATCH 30/44] [FIX] l10n_be_invoice_bba: Fixed the length of random
 generated code to ensure it generates 10 digit code so that it allows
 validation of invoice. (Maintenance Case: 608485)

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

diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 854593a87cc..499e6e6c4ac 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -141,7 +141,7 @@ class account_invoice(osv.osv):
                 elif algorithm == 'random':
                     if not self.check_bbacomm(reference):
                         base = random.randint(1, 9999999999)
-                        bbacomm = str(base).rjust(7, '0')
+                        bbacomm = str(base).rjust(10, '0')
                         base = int(bbacomm)
                         mod = base % 97 or 97
                         mod = str(mod).rjust(2, '0')

From 8d282f3b4fa0494cc26f3c10535f17b0feb2b1cd Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 18 Jun 2014 13:02:00 +0200
Subject: [PATCH 31/44] [FIX] account_analytic_analysis: force company of
 contract when creating recurring invoices

When creating the recurring invoices of the contracts, the invoices accounts(ir.property) must be set according to the company of the contract, not according to the company of the user creating the invoices
---
 .../account_analytic_analysis.py              | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 736a531cc66..a03329ddf65 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -22,7 +22,6 @@ from dateutil.relativedelta import relativedelta
 import datetime
 import logging
 import time
-import traceback
 
 from openerp.osv import osv, fields
 from openerp.osv.orm import intersect, except_orm
@@ -746,29 +745,31 @@ class account_analytic_account(osv.osv):
             contract_ids = ids
         else:
             contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True), ('type', '=', 'contract')])
-        for contract in self.browse(cr, uid, contract_ids, context=context):
-            try:
-                invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
-                invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
-                next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
-                interval = contract.recurring_interval
-                if contract.recurring_rule_type == 'daily':
-                    new_date = next_date+relativedelta(days=+interval)
-                elif contract.recurring_rule_type == 'weekly':
-                    new_date = next_date+relativedelta(weeks=+interval)
-                elif contract.recurring_rule_type == 'yearly':
-                    new_date = next_date+relativedelta(years=+interval)
-                else:
-                    new_date = next_date+relativedelta(months=+interval)
-                self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
-                if automatic:
-                    cr.commit()
-            except Exception:
-                if automatic:
-                    cr.rollback()
-                    _logger.error(traceback.format_exc())
-                else:
-                    raise
+        cr.execute('SELECT company_id, array_agg(id) as ids FROM account_analytic_account WHERE id IN %s GROUP BY company_id', (tuple(contract_ids),))
+        for company_id, ids in cr.fetchall():
+            for contract in self.browse(cr, uid, ids, context=dict(context, company_id=company_id, force_company=company_id)):
+                try:
+                    invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
+                    invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
+                    next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
+                    interval = contract.recurring_interval
+                    if contract.recurring_rule_type == 'daily':
+                        new_date = next_date+relativedelta(days=+interval)
+                    elif contract.recurring_rule_type == 'weekly':
+                        new_date = next_date+relativedelta(weeks=+interval)
+                    elif contract.recurring_rule_type == 'yearly':
+                        new_date = next_date+relativedelta(years=+interval)
+                    else:
+                        new_date = next_date+relativedelta(months=+interval)
+                    self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
+                    if automatic:
+                        cr.commit()
+                except Exception:
+                    if automatic:
+                        cr.rollback()
+                        _logger.exception('Fail to create recurring invoice for contract %s', contract.code)
+                    else:
+                        raise
         return invoice_ids
 
 class account_analytic_account_summary_user(osv.osv):

From 4bad513d29596abf2c614834a7592758186f0851 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@odoo.com>
Date: Wed, 18 Jun 2014 14:33:35 +0200
Subject: [PATCH 32/44] [FIX] mail: more robust parsing of
 In-Reply-To/References (OPW 608919)

When parsing incoming messages, ignore white-space around
In-Reply-To headers, and extract message-id items inside
the References header using a regex.
This actually serves as a workaround for broken MTAs
mangling References (such as outlook.com nesting past ones
with commas, violating RFC2822).

Closes #516 as a manual rebase.
---
 addons/mail/mail_thread.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a264d58df7e..8324b608c71 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -33,6 +33,7 @@ import pytz
 import socket
 import time
 import xmlrpclib
+import re
 from email.message import Message
 
 from openerp import tools
@@ -46,6 +47,8 @@ from openerp.tools.translate import _
 _logger = logging.getLogger(__name__)
 
 
+mail_header_msgid_re = re.compile('<[^<>]+>')
+
 def decode_header(message, header, separator=' '):
     return separator.join(map(decode, filter(None, message.get_all(header, []))))
 
@@ -1259,13 +1262,13 @@ class mail_thread(osv.AbstractModel):
             msg_dict['date'] = stored_date.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
 
         if message.get('In-Reply-To'):
-            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To']))])
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To'].strip()))])
             if parent_ids:
                 msg_dict['parent_id'] = parent_ids[0]
 
         if message.get('References') and 'parent_id' not in msg_dict:
-            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in',
-                                                                         [x.strip() for x in decode(message['References']).split()])])
+            msg_list =  mail_header_msgid_re.findall(decode(message['References']))
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in', [x.strip() for x in msg_list])])
             if parent_ids:
                 msg_dict['parent_id'] = parent_ids[0]
 

From f29ff5ef70fdf5035bee05ddb9e2bea33454fa0b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 18 Jun 2014 15:22:44 +0200
Subject: [PATCH 33/44] [FIX] auth_crypt: encrypt all passwords at installation

When `base_crypt` was updated for v7, the auto-encryption
at installation was dropped, with user passwords only
encrypted on-demand whenever the user would connect.

It is important to encrypt all passwords immediately to
prevent password compromission for user who do not
login often or even for deactivated users who are not
allowed to login anymore.

Fixes https://bugs.launchpad.net/openobject-addons/+bug/1280152

Based on LP merge proposal by Nicolas Bessi (Camptocamp):
https://code.launchpad.net/~camptocamp/openobject-addons/improve_auth_crypt_3_please_launchpad_work-nbi/+merge/206476
---
 addons/auth_crypt/auth_crypt.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 4651d27fe7d..c5bd5799017 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -117,10 +117,22 @@ def sh256crypt(cls, password, salt, magic=magic_sha256):
 class res_users(osv.osv):
     _inherit = "res.users"
 
+    def init(self, cr):
+        """Encrypt all passwords at module installation"""
+        cr.execute("SELECT id, password FROM res_users WHERE password IS NOT NULL and password != ''")
+        for user in cr.fetchall():
+            self._set_encrypted_password(cr, user[0], user[1])
+
+    def _set_encrypted_password(self, cr, uid, plain_password):
+        """Set an encrypted password for a given user"""
+        salt = gen_salt()
+        stored_password_crypt = md5crypt(plain_password, salt)
+        cr.execute("UPDATE res_users SET password = '', password_crypt = %s WHERE id = %s",
+                   (stored_password_crypt, uid))
+
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
-            encrypted = md5crypt(value, gen_salt())
-            cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
+            self._set_encrypted_password(cr, id, value)
         del value
 
     def get_pw( self, cr, uid, ids, name, args, context ):
@@ -144,9 +156,7 @@ class res_users(osv.osv):
         if cr.rowcount:
             stored_password, stored_password_crypt = cr.fetchone()
             if stored_password and not stored_password_crypt:
-                salt = gen_salt()
-                stored_password_crypt = md5crypt(stored_password, salt)
-                cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
+                self._set_encrypted_password(cr, uid, stored_password)
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:

From db40033a39f047e67e53d2db5ae8245bbae37669 Mon Sep 17 00:00:00 2001
From: dhr-odoo <dhr@tinyerp.com>
Date: Fri, 13 Jun 2014 16:08:12 +0530
Subject: [PATCH 34/44] Removed widge=selection from account_id field in line
 in Purchase Receipt, as it only displays limited records(100) from the limit
 set in the name_search

---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 97f96f75901..2dd53832529 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -248,7 +248,7 @@
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>

From b07b8a5b1fc0773d4dbbaf13dba4ed0d4a3ae3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jun 2014 09:33:36 +0200
Subject: [PATCH 35/44] [FIX] website_mail: restored follow JS code that was
 wrongly merged with the mail group follow snippet. Now both widget animation
 exists, the second being more complex and therefore requiring a different
 animation.

---
 addons/website_mail/controllers/main.py       |  3 +-
 addons/website_mail/static/src/js/follow.js   | 68 +++++++++++++++++++
 addons/website_mail/views/website_mail.xml    |  1 +
 .../src/js/website_mail_group.snippet.js      |  8 +--
 addons/website_mail_group/views/snippets.xml  |  4 +-
 5 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 addons/website_mail/static/src/js/follow.js

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 081ba93b8b4..c5896ecd16c 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -94,9 +94,8 @@ class WebsiteMail(http.Controller):
                 values['is_follower'] = len(
                     request.registry['mail.followers'].search(
                         cr, SUPERUSER_ID, [
-                            ('res_model', '=', 'mail.group'),
+                            ('res_model', '=', model),
                             ('res_id', '=', obj_ids[0]),
                             ('partner_id', '=', partner_id.id)
                         ], context=context)) == 1
-
         return values
diff --git a/addons/website_mail/static/src/js/follow.js b/addons/website_mail/static/src/js/follow.js
new file mode 100644
index 00000000000..18c36378328
--- /dev/null
+++ b/addons/website_mail/static/src/js/follow.js
@@ -0,0 +1,68 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
+        selector: ".js_follow",
+        start: function (editable_mode) {
+            var self = this;
+            this.is_user = false;
+
+            openerp.jsonRpc('/website_mail/is_follower', 'call', {
+                model: this.$target.data('object'),
+                id: this.$target.data('id'),
+            }).always(function (data) {
+                self.is_user = data.is_user;
+                self.email = data.email;
+                self.toggle_subscription(data.is_follower, data.email);
+                self.$target.removeClass("hidden");
+            });
+
+            // not if editable mode to allow designer to edit alert field
+            if (!editable_mode) {
+                $('.js_follow > .alert').addClass("hidden");
+                $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+                this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) {
+                    event.preventDefault();
+                    self.on_click();
+                });
+            }
+            return;
+        },
+        on_click: function () {
+            var self = this;
+            var $email = this.$target.find(".js_follow_email");
+
+            if ($email.length && !$email.val().match(/.+@.+/)) {
+                this.$target.addClass('has-error');
+                return false;
+            }
+            this.$target.removeClass('has-error');
+
+            openerp.jsonRpc('/website_mail/follow', 'call', {
+                'id': +this.$target.data('id'),
+                'object': this.$target.data('object'),
+                'message_is_follower': this.$target.attr("data-follow") || "off",
+                'email': $email.length ? $email.val() : false,
+            }).then(function (follow) {
+                self.toggle_subscription(follow, self.email);
+            });
+        },
+        toggle_subscription: function(follow, email) {
+            console.log(follow, email);
+            if (follow) {
+                this.$target.find(".js_follow_btn").addClass("hidden");
+                this.$target.find(".js_unfollow_btn").removeClass("hidden");
+            }
+            else {
+                this.$target.find(".js_follow_btn").removeClass("hidden");
+                this.$target.find(".js_unfollow_btn").addClass("hidden");
+            }
+            this.$target.find('input.js_follow_email')
+                .val(email ? email : "")
+                .attr("disabled", follow || (email.length && this.is_user) ? "disabled" : false);
+            this.$target.attr("data-follow", follow ? 'on' : 'off');
+        },
+    });
+})();
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 6202e00342b..3b6d1bb96d6 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -21,6 +21,7 @@
 
 <template id="head" inherit_id="website.layout" name="Mail customization">
     <xpath expr="//head" position="inside">
+        <script type="text/javascript" src="/website_mail/static/src/js/follow.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
index fd6a2d38cfa..8ad4f9ba796 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
@@ -3,8 +3,8 @@
 
     var website = openerp.website;
 
-    website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
-        selector: ".js_follow",
+    website.snippet.animationRegistry.follow_alias = website.snippet.Animation.extend({
+        selector: ".js_follow_alias",
         start: function (editable_mode) {
             var self = this;
             this.is_user = false;
@@ -23,8 +23,8 @@
 
             // not if editable mode to allow designer to edit alert field
             if (!editable_mode) {
-                $('.js_follow > .alert').addClass("hidden");
-                $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+                $('.js_follow_alias > .alert').addClass("hidden");
+                $('.js_follow_alias > .input-group-btn.hidden').removeClass("hidden");
                 this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) {
                     event.preventDefault();
                     self.on_click();
diff --git a/addons/website_mail_group/views/snippets.xml b/addons/website_mail_group/views/snippets.xml
index 56ba81d81b3..e3adb6a14cd 100644
--- a/addons/website_mail_group/views/snippets.xml
+++ b/addons/website_mail_group/views/snippets.xml
@@ -11,7 +11,7 @@
                 <span class="oe_snippet_thumbnail_title">Discussion Group</span>
             </div>
 
-            <div class="oe_snippet_body js_follow"
+            <div class="oe_snippet_body js_follow_alias"
                       data-id="0"
                       data-object="mail.group"
                       data-follow="off">
@@ -38,7 +38,7 @@
 
     <xpath expr="//div[@id='snippet_options']" position="inside">
         <div data-snippet-option-id='subscribe'
-            data-selector=".js_follow"
+            data-selector=".js_follow_alias"
             data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
            >
             <li>

From 766cc9c00c4b4e8d37538b00e6e860b47bb53cec Mon Sep 17 00:00:00 2001
From: dreispt <dreis.pt@gmail.com>
Date: Wed, 18 Jun 2014 16:41:51 +0100
Subject: [PATCH 36/44] Fix wrong partner_id refs in Project demo data

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

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index ff225c46e10..bb09e682943 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -50,8 +50,8 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="message_follower_ids" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
+                    ref('base.partner_root'),
+                    ref('base.partner_demo')])]"/>
         </record>
 
         <!-- We assign after so that default values applies -->

From c8be66739db47e406b69db86613a7e035264a18a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 19 Jun 2014 10:55:17 +0200
Subject: [PATCH 37/44] [FIX] account_analytic_analysis:
 recurring_create_invoice

If no contract found, just pass, to avoid making the sql request
---
 .../account_analytic_analysis.py              | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a03329ddf65..dcb078b102f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -745,31 +745,32 @@ class account_analytic_account(osv.osv):
             contract_ids = ids
         else:
             contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True), ('type', '=', 'contract')])
-        cr.execute('SELECT company_id, array_agg(id) as ids FROM account_analytic_account WHERE id IN %s GROUP BY company_id', (tuple(contract_ids),))
-        for company_id, ids in cr.fetchall():
-            for contract in self.browse(cr, uid, ids, context=dict(context, company_id=company_id, force_company=company_id)):
-                try:
-                    invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
-                    invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
-                    next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
-                    interval = contract.recurring_interval
-                    if contract.recurring_rule_type == 'daily':
-                        new_date = next_date+relativedelta(days=+interval)
-                    elif contract.recurring_rule_type == 'weekly':
-                        new_date = next_date+relativedelta(weeks=+interval)
-                    elif contract.recurring_rule_type == 'yearly':
-                        new_date = next_date+relativedelta(years=+interval)
-                    else:
-                        new_date = next_date+relativedelta(months=+interval)
-                    self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
-                    if automatic:
-                        cr.commit()
-                except Exception:
-                    if automatic:
-                        cr.rollback()
-                        _logger.exception('Fail to create recurring invoice for contract %s', contract.code)
-                    else:
-                        raise
+        if contract_ids:
+            cr.execute('SELECT company_id, array_agg(id) as ids FROM account_analytic_account WHERE id IN %s GROUP BY company_id', (tuple(contract_ids),))
+            for company_id, ids in cr.fetchall():
+                for contract in self.browse(cr, uid, ids, context=dict(context, company_id=company_id, force_company=company_id)):
+                    try:
+                        invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
+                        invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
+                        next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
+                        interval = contract.recurring_interval
+                        if contract.recurring_rule_type == 'daily':
+                            new_date = next_date+relativedelta(days=+interval)
+                        elif contract.recurring_rule_type == 'weekly':
+                            new_date = next_date+relativedelta(weeks=+interval)
+                        elif contract.recurring_rule_type == 'yearly':
+                            new_date = next_date+relativedelta(years=+interval)
+                        else:
+                            new_date = next_date+relativedelta(months=+interval)
+                        self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
+                        if automatic:
+                            cr.commit()
+                    except Exception:
+                        if automatic:
+                            cr.rollback()
+                            _logger.exception('Fail to create recurring invoice for contract %s', contract.code)
+                        else:
+                            raise
         return invoice_ids
 
 class account_analytic_account_summary_user(osv.osv):

From 3dcdd2180a044792cfb00a49809abc913266473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jun 2014 12:26:24 +0200
Subject: [PATCH 38/44] [FIX] web_calendar: check for edit access rights + use
 correct display mode (view or edit) when going into a document form view from
 the calendar.

---
 addons/web_calendar/static/src/js/web_calendar.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 6db2d97cfeb..ad49ff9a9b1 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -212,7 +212,12 @@ openerp.web_calendar = function(instance) {
                 this.info_fields.push(fv.arch.children[fld].attrs.name);
             }
 
-            return (new instance.web.Model(this.dataset.model))
+            var edit_check = new instance.web.Model(this.dataset.model)
+                .call("check_access_rights", ["write", false])
+                .then(function (write_right) {
+                    self.write_right = write_right;
+                });
+            var init = new instance.web.Model(this.dataset.model)
                 .call("check_access_rights", ["create", false])
                 .then(function (create_right) {
                     self.create_right = create_right;
@@ -222,6 +227,7 @@ openerp.web_calendar = function(instance) {
                         self.ready.resolve();
                     });
                 });
+            return $.when(edit_check, init);
         },
 
         get_fc_init_options: function () {
@@ -834,7 +840,11 @@ openerp.web_calendar = function(instance) {
             if (! this.open_popup_action) {
                 var index = this.dataset.get_id_index(id);
                 this.dataset.index = index;
-                this.do_switch_view('form', null, { mode: "edit" });
+                if (this.write_right) {
+                    this.do_switch_view('form', null, { mode: "edit" });
+                } else {
+                    this.do_switch_view('form', null, { mode: "view" });
+                }
             }
             else {
                 var pop = new instance.web.form.FormOpenPopup(this);

From 3d43f9d454346d11ce9439ce57ec747dc26a8330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 19 Jun 2014 12:43:25 +0200
Subject: [PATCH 39/44] [FIX] fixes searchbar navigation (web client)

the code handling the keydown events was moved, but the variable this
was not adjusted accordingly, resulting in a broken navigation.

It is now possible to press LEFT and RIGHT again to move the focus
between facets.
---
 addons/web/static/src/js/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 1f616202c3f..30b381d8738 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -331,11 +331,11 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         'keydown .oe_searchview_input, .oe_searchview_facet': function (e) {
             switch(e.which) {
             case $.ui.keyCode.LEFT:
-                this.focusPreceding(this);
+                this.focusPreceding(e.target);
                 e.preventDefault();
                 break;
             case $.ui.keyCode.RIGHT:
-                this.focusFollowing(this);
+                this.focusFollowing(e.target);
                 e.preventDefault();
                 break;
             }

From cb7d43864a4c04af118f934b98f398e1f56cabb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jun 2014 12:56:46 +0200
Subject: [PATCH 40/44] [FIX] Fix attach icon that was under the upload label.

---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index d7c40480e11..5f9ecc5e783 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2440,7 +2440,7 @@
 }
 .openerp .oe_fileupload .oe_add button.oe_attach .oe_e {
   position: relative;
-  top: -1px;
+  top: -10px;
   left: -9px;
 }
 .openerp .oe_fileupload .oe_add input.oe_form_binary_file {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 090cf3de0fe..e63092f6eec 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1984,7 +1984,7 @@ $sheet-padding: 16px
                 text-shadow: none
                 .oe_e
                     position: relative
-                    top: -1px
+                    top: -10px
                     left: -9px                    
             input.oe_form_binary_file
                 display: inline-block

From 5023816c5577b312b06f04355365f1243ed2cdc9 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@openerp.com>
Date: Thu, 19 Jun 2014 14:45:56 +0200
Subject: [PATCH 41/44] [FIX] website: correct selector

The selector to toggle the theme was triggered too often (on almost each button) but had no effect because no view-id was present.
Patch fix #627
---
 addons/website/static/src/js/website.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 7151987143e..e741b805566 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -436,7 +436,7 @@
                     }
                 );
             });
-            menu.on('click', 'a[data-action!=ace]', function (event) {
+            menu.on('click', 'a[data-view-id]', function (event) {
                 var view_id = $(event.currentTarget).data('view-id');
                 openerp.jsonRpc('/website/customize_template_toggle', 'call', {
                     'view_id': view_id

From e7285c6e1d7aa6df8efeb46dbe508265f8c3669f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Najla=C3=A2=20El=20Khayat?= <nel@odoo.com>
Date: Thu, 19 Jun 2014 14:51:32 +0200
Subject: [PATCH 42/44] Production : Source location of the BOM

Use the source location defined on the current MO's routing not directly on the BOM
---
 addons/mrp/mrp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2b5d68177f1..e8e1887caf8 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1037,8 +1037,8 @@ class mrp_production(osv.osv):
 
             # Take routing location as a Source Location.
             source_location_id = production.location_src_id.id
-            if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
-                source_location_id = production.bom_id.routing_id.location_id.id
+            if production.routing_id and production.routing_id.location_id:
+                source_location_id = production.routing_id.location_id.id
 
             for line in production.product_lines:
                 consume_move_id = self._make_production_consume_line(cr, uid, line, produce_move_id, source_location_id=source_location_id, context=context)

From 893e4aae9fd6bb1be29b7ee036d608102cef4cb6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 19 Jun 2014 14:58:44 +0200
Subject: [PATCH 43/44] [FIX] web: focused field in view editable list

When adding an item to the editable list, the focused field was no longer the first visible field
This is related to revision 4a508885ac043b25465aa5741955082aa66ce949
visible_columns list is not ordered
---
 addons/web/static/src/js/view_list_editable.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index b97aef19815..7d2e44263ce 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -251,7 +251,10 @@ openerp.web.list_editable = function (instance) {
                     }, options).then(function () {
                         $recordRow.addClass('oe_edition');
                         self.resize_fields();
-                        var focus_field = options && options.focus_field ? options.focus_field : (self.visible_columns.length ? self.visible_columns[0].name : undefined);
+                        var focus_field = options && options.focus_field ? options.focus_field : undefined;
+                        if (!focus_field){
+                            focus_field = _.find(self.editor.form.fields_order, function(field){ return fields[field] && fields[field].$el.is(':visible:has(input)'); });
+                        }
                         if (focus_field) fields[focus_field].$el.find('input').select();
                         return record.attributes;
                     });

From e59077b0f9b5dfcba4eb9da273c2656f4da29a75 Mon Sep 17 00:00:00 2001
From: Niels Huylebroeck <niels@bubbles-it.be>
Date: Thu, 19 Jun 2014 11:36:59 +0200
Subject: [PATCH 44/44] Fix displaying of minKarma requirements

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

diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 0b45d4311c1..3284121d27b 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -153,7 +153,7 @@ function IsKarmaValid(eventNumber,minKarma){
         CKEDITOR.tools.callFunction(eventNumber,this);
         return false;
     } else {
-        alert("Sorry you need more than 30 Karma.");
+        alert("Sorry you need more than " + minKarma + " Karma.");
     }
 }