From 82f492bc2c5bbca8b02168075b5d5356f1b35951 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Mar 2012 16:29:38 +0100
Subject: [PATCH 01/28] [FIX] related fields: fix and simplify search (was
 wrong with a single indirection)

bzr revid: rco@openerp.com-20120309152938-n467ap8hnw406rau
---
 openerp/osv/fields.py        | 18 +++--------
 openerp/tests/__init__.py    |  2 ++
 openerp/tests/test_fields.py | 59 ++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 openerp/tests/test_fields.py

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 7c1761a4aec..fdbd6a6f7cc 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1153,20 +1153,10 @@ class related(function):
     """
 
     def _fnct_search(self, tobj, cr, uid, obj=None, name=None, domain=None, context=None):
-        self._field_get2(cr, uid, obj, context)
-        i = len(self._arg)-1
-        sarg = name
-        while i>0:
-            if type(sarg) in [type([]), type( (1,) )]:
-                where = [(self._arg[i], 'in', sarg)]
-            else:
-                where = [(self._arg[i], '=', sarg)]
-            if domain:
-                where = map(lambda x: (self._arg[i],x[1], x[2]), domain)
-                domain = []
-            sarg = obj.pool.get(self._relations[i]['object']).search(cr, uid, where, context=context)
-            i -= 1
-        return [(self._arg[0], 'in', sarg)]
+        # assume self._arg = ('foo', 'bar', 'baz')
+        # domain = [(name, op, val)]   =>   search [('foo.bar.baz', op, val)]
+        field = '.'.join(self._arg)
+        return map(lambda x: (field, x[1], x[2]), domain)
 
     def _fnct_write(self,obj,cr, uid, ids, field_name, values, args, context=None):
         self._field_get2(cr, uid, obj, context=context)
diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index 5fccb07a082..e02a7d7042c 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -11,6 +11,7 @@ See the :ref:`test-framework` section in the :ref:`features` list.
 import test_expression
 import test_ir_sequence
 import test_orm
+import test_fields
 
 fast_suite = [
     test_ir_sequence,
@@ -19,6 +20,7 @@ fast_suite = [
 checks = [
     test_expression,
     test_orm,
+    test_fields,
     ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/test_fields.py b/openerp/tests/test_fields.py
new file mode 100644
index 00000000000..c049a43fc97
--- /dev/null
+++ b/openerp/tests/test_fields.py
@@ -0,0 +1,59 @@
+#
+# test cases for fields access, etc.
+#
+
+import unittest2
+import common
+
+import openerp
+from openerp.osv import fields
+
+class TestRelatedField(common.TransactionCase):
+
+    def setUp(self):
+        super(TestRelatedField, self).setUp()
+        self.partner = self.registry('res.partner')
+
+    def do_test_company_field(self, field):
+        # get a partner with a non-null company_id
+        ids = self.partner.search(self.cr, self.uid, [('company_id', '!=', False)], limit=1)
+        partner = self.partner.browse(self.cr, self.uid, ids[0])
+
+        # check reading related field
+        self.assertEqual(partner[field], partner.company_id)
+
+        # check that search on related field is equivalent to original field
+        ids1 = self.partner.search(self.cr, self.uid, [('company_id', '=', partner.company_id.id)])
+        ids2 = self.partner.search(self.cr, self.uid, [(field, '=', partner.company_id.id)])
+        self.assertEqual(ids1, ids2)
+
+    def test_1_single_related(self):
+        """ test a related field with a single indirection like fields.related('foo') """
+        # add a related field test_related_company_id on res.partner
+        old_columns = self.partner._columns
+        self.partner._columns = dict(old_columns)
+        self.partner._columns.update({
+            'single_related_company_id': fields.related('company_id', type='many2one', obj='res.company'),
+        })
+
+        self.do_test_company_field('single_related_company_id')
+
+        # restore res.partner fields
+        self.partner._columns = old_columns
+
+    def test_2_related_related(self):
+        """ test a related field referring to a related field """
+        # add a related field on a related field on res.partner
+        old_columns = self.partner._columns
+        self.partner._columns = dict(old_columns)
+        self.partner._columns.update({
+            'single_related_company_id': fields.related('company_id', type='many2one', obj='res.company'),
+            'related_related_company_id': fields.related('single_related_company_id', type='many2one', obj='res.company'),
+        })
+
+        self.do_test_company_field('related_related_company_id')
+
+        # restore res.partner fields
+        self.partner._columns = old_columns
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 8f8b5497d124fd553e6a44a21fca1eccca42d0f8 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Mar 2012 17:15:47 +0100
Subject: [PATCH 02/28] [IMP] tests: add test on related fields

bzr revid: rco@openerp.com-20120309161547-um53k5rqqts9flz6
---
 openerp/tests/test_fields.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/openerp/tests/test_fields.py b/openerp/tests/test_fields.py
index c049a43fc97..73f57ac8bbe 100644
--- a/openerp/tests/test_fields.py
+++ b/openerp/tests/test_fields.py
@@ -13,6 +13,29 @@ class TestRelatedField(common.TransactionCase):
     def setUp(self):
         super(TestRelatedField, self).setUp()
         self.partner = self.registry('res.partner')
+        self.company = self.registry('res.company')
+
+    def test_0_related(self):
+        """ test an usual related field """
+        # add a related field test_related_company_id on res.partner
+        old_columns = self.partner._columns
+        self.partner._columns = dict(old_columns)
+        self.partner._columns.update({
+            'related_company_partner_id': fields.related('company_id', 'partner_id', type='many2one', obj='res.partner'),
+        })
+
+        # find a company with a non-null partner_id
+        ids = self.company.search(self.cr, self.uid, [('partner_id', '!=', False)], limit=1)
+        id = ids[0]
+
+        # find partners that satisfy [('partner_id.company_id', '=', id)]
+        company_ids = self.company.search(self.cr, self.uid, [('partner_id', '=', id)])
+        partner_ids1 = self.partner.search(self.cr, self.uid, [('company_id', 'in', company_ids)])
+        partner_ids2 = self.partner.search(self.cr, self.uid, [('related_company_partner_id', '=', id)])
+        self.assertEqual(partner_ids1, partner_ids2)
+
+        # restore res.partner fields
+        self.partner._columns = old_columns
 
     def do_test_company_field(self, field):
         # get a partner with a non-null company_id

From 63702d6064d6dd457ccd82aa56ac44d375fe001c Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 14 Aug 2012 14:20:41 +0530
Subject: [PATCH 03/28] [IMP]minor fix to view editor.

bzr revid: vme@tinyerp.com-20120814085041-s0lkqzcnyks0ukdn
---
 addons/web_view_editor/static/src/css/view_editor.css | 4 ++++
 addons/web_view_editor/static/src/js/view_editor.js   | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web_view_editor/static/src/css/view_editor.css b/addons/web_view_editor/static/src/css/view_editor.css
index e80e15a4c17..2f2b5860cf6 100644
--- a/addons/web_view_editor/static/src/css/view_editor.css
+++ b/addons/web_view_editor/static/src/css/view_editor.css
@@ -19,3 +19,7 @@
 .openerp .oe_view_editor tr:hover {
   background-color: #ecebf2;
 }
+.openerp .oe_view_editor_field a{
+  font-size : 12px;
+  color : #404040;
+}
\ No newline at end of file
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index cfdd5d6bfea..770d32b2e56 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -73,8 +73,7 @@ instance.web_view_editor.ViewEditor =   instance.web.OldWidget.extend({
         $.when(this.action_manager.do_action(action)).then(function() {
             var viewmanager = self.action_manager.inner_widget,
                 controller = viewmanager.views[viewmanager.active_view].controller;
-            self.action_manager.appendTo(self.view_edit_dialog.$element);
-            self.action_manager.renderElement(self.view_edit_dialog);
+            self.action_manager.$element.appendTo(self.view_edit_dialog.$element);
             controller.on_loaded.add_last(function(){
                 $(controller.groups).bind({
                     'selected': function(e, ids, records) {

From 35e86bbe97f6c9ddc1d161bbbbcb3c3a770ec25f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 29 Oct 2012 11:56:15 +0530
Subject: [PATCH 04/28] [IMP] hr_expense: improved view of form for total
 amount

bzr revid: tpa@tinyerp.com-20121029062615-6yso6bkirdm1yjus
---
 addons/hr_expense/hr_expense_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1b8fd17dece..327a8ac3cd8 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -123,8 +123,8 @@
                                     <separator string="Notes"/>
                                     <field name="note" placeholder="Free Notes"/>
                                 </div>
-                                <group class="oe_subtotal_footer">
-                                    <field name="amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <group class="oe_subtotal_footer oe_right">
+                                    <field name="amount" widget="monetary" options="{'currency_field': 'currency_id'}" class="oe_subtotal_footer_separator"/>
                                 </group>
                             </group>
                         </page>

From ffc347d3aed24e8d88a33fdff940a42ef07b8812 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 29 Oct 2012 12:44:09 +0530
Subject: [PATCH 05/28] [IMP] hr_holidays: add onchange on employee_id field to
 change department also.

bzr revid: tpa@tinyerp.com-20121029071409-r8z0q8fko35gnsjy
---
 addons/hr_holidays/hr_holidays.py       | 7 +++++++
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 0977f3729b4..eb7b44b8a3d 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -182,6 +182,13 @@ class hr_holidays(osv.osv):
                 }
         return result
 
+    def onchange_employee(self, cr, uid, ids, employee_id):
+        result = {'value': {'department_id': False}}
+        if employee_id:
+            employee = self.pool.get('hr.employee').browse(cr, uid, employee_id)
+            result['value'] = {'department_id': employee.department_id.id}
+        return result
+
     # TODO: can be improved using resource calendar method
     def _get_number_of_days(self, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1808e216906..ea9a7fe3a66 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -115,7 +115,7 @@
                         </group>
                         <group>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>

From f95608ae892c1d17c99a05c10c87dd44fd7290ba Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 29 Oct 2012 14:04:14 +0530
Subject: [PATCH 06/28] [ADD]:Add onchange for contact from and leave request

bzr revid: aja@tinyerp.com-20121029083414-4bw6i8ii72wctevk
---
 addons/hr_holidays/hr_holidays.py             |  8 +++++++-
 addons/hr_holidays/hr_holidays_view.xml       |  4 ++--
 addons/hr_recruitment/hr_recruitment.py       | 11 +++++++++++
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 0977f3729b4..636ee6ea9b3 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -199,7 +199,13 @@ class hr_holidays(osv.osv):
                 raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
-    def onchange_date_from(self, cr, uid, ids, date_to, date_from):
+    def onchange_date_from(self, cr, uid, ids, date_from):
+        date_to = False
+        if date_from:
+            date_to = date_from
+        return {'value':{'date_to': date_to}}
+
+    def onchange_date_to(self, cr, uid, ids, date_to, date_from):
         result = {}
         if date_to and date_from:
             diff_day = self._get_number_of_days(date_from, date_to)
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1808e216906..89a526c9046 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -104,8 +104,8 @@
                             <label for="number_of_days_temp" string="Duration"/>
                             <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_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(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"/>
                                 </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 049cb93ca1e..765dc1d816a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -259,6 +259,17 @@ class hr_applicant(base_stage, osv.Model):
         stage_id = stage_ids and stage_ids[0] or False
         return {'value': {'stage_id': stage_id}}
 
+    def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+        data = {'partner_phone': False,
+                'partner_mobile': False,
+                'email_from': False}
+        if partner_id:
+            addr = self.pool.get('res.partner').browse(cr, uid, partner_id, context)
+            data.update({'partner_phone': addr.phone,
+                        'partner_mobile': addr.mobile,
+                        'email_from': addr.email})
+        return {'value': data}
+
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
         """ Override of the base.stage method
             Parameter of the stage search taken from the lead:
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 08484889cf1..1867b76ef40 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -135,7 +135,7 @@
                 <group>
                     <group>
                         <field name="partner_id"
-                                on_change="onchange_partner_id(partner_id, email_from)"/>
+                                on_change="onchange_partner_id(partner_id)"/>
                         <field name="email_from" widget="email"/>
                         <field name="partner_phone"/>
                         <field name="partner_mobile"/>

From 69ef2bc46ca314f2346f4098ac07b573477f24cf Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 29 Oct 2012 14:34:23 +0530
Subject: [PATCH 07/28] [IMP]: Improve onchange for leave request

bzr revid: aja@tinyerp.com-20121029090423-at3i0byeamhvgg1z
---
 addons/hr_holidays/hr_holidays.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 636ee6ea9b3..0b4d9ab4542 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -200,10 +200,11 @@ class hr_holidays(osv.osv):
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
     def onchange_date_from(self, cr, uid, ids, date_from):
+        DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
         date_to = False
         if date_from:
-            date_to = date_from
-        return {'value':{'date_to': date_to}}
+            date_to = datetime.datetime.strptime(date_from, DATETIME_FORMAT) + datetime.timedelta(hours=8)
+        return {'value':{'date_to': str(date_to)}}
 
     def onchange_date_to(self, cr, uid, ids, date_to, date_from):
         result = {}

From 7e7d877e17564366179c7e24439105da02d8e92e Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 29 Oct 2012 16:35:04 +0100
Subject: [PATCH 08/28] fields.related: simplify read and write methods

bzr revid: rco@openerp.com-20121029153504-157ss9948o86uv6z
---
 openerp/osv/fields.py        | 120 ++++++++++-------------------------
 openerp/tests/test_fields.py |  30 +++++++++
 2 files changed, 64 insertions(+), 86 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index c02adaee751..c67df5a70b4 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1158,80 +1158,44 @@ class related(function):
         return map(lambda x: (field, x[1], x[2]), domain)
 
     def _fnct_write(self,obj,cr, uid, ids, field_name, values, args, context=None):
-        self._field_get2(cr, uid, obj, context=context)
-        if type(ids) != type([]):
-            ids=[ids]
-        objlst = obj.browse(cr, uid, ids)
-        for data in objlst:
-            t_id = data.id
-            t_data = data
-            for i in range(len(self.arg)):
-                if not t_data: break
-                field_detail = self._relations[i]
-                if not t_data[self.arg[i]]:
-                    if self._type not in ('one2many', 'many2many'):
-                        t_id = t_data['id']
-                    t_data = False
-                elif field_detail['type'] in ('one2many', 'many2many'):
-                    if self._type != "many2one":
-                        t_id = t_data.id
-                        t_data = t_data[self.arg[i]][0]
-                    else:
-                        t_data = False
-                else:
-                    t_id = t_data['id']
-                    t_data = t_data[self.arg[i]]
-            else:
-                model = obj.pool.get(self._relations[-1]['object'])
-                model.write(cr, uid, [t_id], {args[-1]: values}, context=context)
+        for record in obj.browse(cr, uid, ids, context=context):
+            # traverse all fields except the last one
+            for field in self.arg[:-1]:
+                record = record[field] or False
+                if not record:
+                    break
+                elif isinstance(record, list):
+                    # record is the result of a one2many or many2many field
+                    record = record[0]
+            if record:
+                # write on the last field
+                record.write({self.arg[-1]: values})
 
     def _fnct_read(self, obj, cr, uid, ids, field_name, args, context=None):
-        self._field_get2(cr, uid, obj, context)
-        if not ids: return {}
-        relation = obj._name
-        if self._type in ('one2many', 'many2many'):
-            res = dict([(i, []) for i in ids])
-        else:
-            res = {}.fromkeys(ids, False)
-
-        objlst = obj.browse(cr, SUPERUSER_ID, ids, context=context)
-        for data in objlst:
-            if not data:
-                continue
-            t_data = data
-            relation = obj._name
-            for i in range(len(self.arg)):
-                field_detail = self._relations[i]
-                relation = field_detail['object']
-                try:
-                    if not t_data[self.arg[i]]:
-                        t_data = False
-                        break
-                except:
-                    t_data = False
+        res = {}
+        for record in obj.browse(cr, SUPERUSER_ID, ids, context=context):
+            value = record
+            for field in self.arg:
+                if isinstance(value, list):
+                    value = value[0]
+                value = value[field] or False
+                if not value:
                     break
-                if field_detail['type'] in ('one2many', 'many2many') and i != len(self.arg) - 1:
-                    t_data = t_data[self.arg[i]][0]
-                elif t_data:
-                    t_data = t_data[self.arg[i]]
-            if type(t_data) == type(objlst[0]):
-                res[data.id] = t_data.id
-            elif t_data:
-                res[data.id] = t_data
-        if self._type=='many2one':
-            ids = filter(None, res.values())
-            if ids:
-                # name_get as root, as seeing the name of a related
-                # object depends on access right of source document,
-                # not target, so user may not have access.
-                ng = dict(obj.pool.get(self._obj).name_get(cr, SUPERUSER_ID, ids, context=context))
-                for r in res:
-                    if res[r]:
-                        res[r] = (res[r], ng[res[r]])
+            res[record.id] = value
+
+        if self._type == 'many2one':
+            # res[id] is a browse_record or False; convert it to (id, name) or False
+            res = dict((id, value and value.id) for id, value in res.iteritems())
+            value_ids = filter(None, res.itervalues())
+            # name_get as root, as seeing the name of a related object depends on
+            # access right of source document, not target, so user may not have access.
+            value_name = dict(obj.pool.get(self._obj).name_get(cr, SUPERUSER_ID, value_ids, context=context))
+            res = dict((id, value_id and value_name[value_id]) for id, value_id in res.iteritems())
+
         elif self._type in ('one2many', 'many2many'):
-            for r in res:
-                if res[r]:
-                    res[r] = [x.id for x in res[r]]
+            # res[id] is a list of browse_record or False; convert it to a list of ids
+            res = dict((id, value and map(int, value) or []) for id, value in res.iteritems())
+
         return res
 
     def __init__(self, *arg, **args):
@@ -1242,22 +1206,6 @@ class related(function):
             # TODO: improve here to change self.store = {...} according to related objects
             pass
 
-    def _field_get2(self, cr, uid, obj, context=None):
-        if self._relations:
-            return
-        result = []
-        obj_name = obj._name
-        for i in range(len(self._arg)):
-            f = obj.pool.get(obj_name).fields_get(cr, uid, [self._arg[i]], context=context)[self._arg[i]]
-            result.append({
-                'object': obj_name,
-                'type': f['type']
-
-            })
-            if f.get('relation',False):
-                obj_name = f['relation']
-                result[-1]['relation'] = f['relation']
-        self._relations = result
 
 class sparse(function):   
 
diff --git a/openerp/tests/test_fields.py b/openerp/tests/test_fields.py
index 73f57ac8bbe..ae401e77032 100644
--- a/openerp/tests/test_fields.py
+++ b/openerp/tests/test_fields.py
@@ -79,4 +79,34 @@ class TestRelatedField(common.TransactionCase):
         # restore res.partner fields
         self.partner._columns = old_columns
 
+    def test_3_read_write(self):
+        """ write on a related field """
+        # add a related field test_related_company_id on res.partner
+        old_columns = self.partner._columns
+        self.partner._columns = dict(old_columns)
+        self.partner._columns.update({
+            'related_company_partner_id': fields.related('company_id', 'partner_id', type='many2one', obj='res.partner'),
+        })
+
+        # find a company with a non-null partner_id
+        company_ids = self.company.search(self.cr, self.uid, [('partner_id', '!=', False)], limit=1)
+        company = self.company.browse(self.cr, self.uid, company_ids[0])
+
+        # find partners that satisfy [('partner_id.company_id', '=', company.id)]
+        partner_ids = self.partner.search(self.cr, self.uid, [('related_company_partner_id', '=', company.id)])
+        partner = self.partner.browse(self.cr, self.uid, partner_ids[0])
+
+        # create a new partner, and assign it to company
+        new_partner_id = self.partner.create(self.cr, self.uid, {'name': 'Foo'})
+        partner.write({'related_company_partner_id': new_partner_id})
+
+        company = self.company.browse(self.cr, self.uid, company_ids[0])
+        self.assertEqual(company.partner_id.id, new_partner_id)
+
+        partner = self.partner.browse(self.cr, self.uid, partner_ids[0])
+        self.assertEqual(partner.related_company_partner_id.id, new_partner_id)
+
+        # restore res.partner fields
+        self.partner._columns = old_columns
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 18d2b635ad2b929455b70c9cc4a5e67a3ed94c81 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 30 Oct 2012 11:31:05 +0530
Subject: [PATCH 09/28] [IMP] improved sequence of hr modules.

bzr revid: tpa@tinyerp.com-20121030060105-9yzvak8mvz9ih4a6
---
 addons/hr/__openerp__.py             | 2 +-
 addons/hr_evaluation/__openerp__.py  | 1 +
 addons/hr_expense/__openerp__.py     | 2 +-
 addons/hr_holidays/__openerp__.py    | 2 +-
 addons/hr_recruitment/__openerp__.py | 2 +-
 addons/hr_timesheet/__openerp__.py   | 1 +
 addons/project_gtd/__openerp__.py    | 2 +-
 addons/project_issue/__openerp__.py  | 2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 0a93d844180..2f18f9b130f 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.1',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'sequence': 12,
+    'sequence': 21,
     'website': 'http://www.openerp.com',
     'summary': 'Jobs, Departments, Employees Details',
     'description': """
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index fb3d87f2bc1..fb303ff28e4 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -24,6 +24,7 @@
     'version': '0.1',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
+    'sequence': 31,
     'website': 'http://www.openerp.com',
     'summary': 'Periodical Evaluations, Appraisals, Surveys',
     'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg'],
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 4b273a9cc81..ec108b696bf 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Expense Management',
     'version': '1.0',
     'category': 'Human Resources',
-    'sequence': 30,
+    'sequence': 29,
     'summary': 'Expenses Validation, Invoicing',
     'description': """
 Manage expenses by Employees
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 3cf4a30a2e1..417748d874b 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.5',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'sequence': 28,
+    'sequence': 27,
     'summary': 'Holidays, Allocation and Leave Requests',
     'website': 'http://www.openerp.com',
     'description': """
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index a5a1ec310d5..63c1cf47ccb 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Recruitment Process',
     'version': '1.0',
     'category': 'Human Resources',
-    'sequence': 24,
+    'sequence': 25,
     'summary': 'Jobs, Recruitment, Applications, Job Interviews',
     'description': """
 Manage job positions and the recruitment process
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index c7af21ee0be..bff25e8e55d 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -24,6 +24,7 @@
     'name': 'Timesheets',
     'version': '1.0',
     'category': 'Human Resources',
+    'sequence': 23,
     'description': """
 This module implements a timesheet system.
 ==========================================
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index eb05cdfa848..441f8859dc6 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Todo Lists',
     'version': '1.0',
     'category': 'Project Management',
-    'sequence': 20,
+    'sequence': 9,
     'summary': 'Personal Tasks, Contexts, Timeboxes',
     'description': """
 Implement concepts of the "Getting Things Done" methodology 
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index f35ca0251d3..b2e9197cefd 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Issue Tracker',
     'version': '1.0',
     'category': 'Project Management',
-    'sequence': 22,
+    'sequence': 9,
     'summary': 'Support, Bug Tracker, Helpdesk',
     'description': """
 Track Issues/Bugs Management for Projects

From 614768508725c766e37702ff0fa3b47c411b680d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 30 Oct 2012 14:22:01 +0530
Subject: [PATCH 10/28] [IMP] hr_timesheet_sheet: change sequence.

bzr revid: tpa@tinyerp.com-20121030085201-b1r9bbi96imm5yt9
---
 addons/hr_timesheet_sheet/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index fd025491588..5f988439b50 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Timesheets',
     'version': '1.0',
     'category': 'Human Resources',
-    'sequence': 16,
+    'sequence': 24,
     'summary': 'Timesheets, Attendances, Activities',
     'description': """
 Record and validate timesheets and attendances easily

From d4295fa050c9b56422de0966ece50f0c0a042891 Mon Sep 17 00:00:00 2001
From: Giedrius Slavinskas <giedrius@inovera.lt>
Date: Tue, 30 Oct 2012 13:51:13 +0200
Subject: [PATCH 11/28] [FIX] escape returned report filename

lp bug: https://launchpad.net/bugs/1072803 fixed

bzr revid: giedrius@inovera.lt-20121030115113-1aooabkpzwy62wnq
---
 addons/web/controllers/main.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 72ffd9567f6..26ab732118f 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -575,6 +575,20 @@ def from_elementtree(el, preserve_whitespaces=False):
     res["children"] = kids
     return res
 
+
+def content_disposition(filename, req):
+    filename = filename.encode('utf8')
+    escaped = urllib2.quote(filename)
+    browser = req.httprequest.user_agent.browser
+    version = int((req.httprequest.user_agent.version or '0').split('.')[0])
+    if browser == 'msie' and version < 9:
+        return "attachment; filename=%s" % escaped
+    elif browser == 'safari':
+        return "attachment; filename=%s" % filename
+    else:
+        return "attachment; filename*=UTF-8''%s" % escaped
+
+
 #----------------------------------------------------------
 # OpenERP Web web Controllers
 #----------------------------------------------------------
@@ -1520,17 +1534,6 @@ class Binary(openerpweb.Controller):
     def placeholder(self, req):
         addons_path = openerpweb.addons_manifest['web']['addons_path']
         return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read()
-    def content_disposition(self, filename, req):
-        filename = filename.encode('utf8')
-        escaped = urllib2.quote(filename)
-        browser = req.httprequest.user_agent.browser
-        version = int((req.httprequest.user_agent.version or '0').split('.')[0])
-        if browser == 'msie' and version < 9:
-            return "attachment; filename=%s" % escaped
-        elif browser == 'safari':
-            return "attachment; filename=%s" % filename
-        else:
-            return "attachment; filename*=UTF-8''%s" % escaped
 
     @openerpweb.httprequest
     def saveas(self, req, model, field, id=None, filename_field=None, **kw):
@@ -1566,7 +1569,7 @@ class Binary(openerpweb.Controller):
                 filename = res.get(filename_field, '') or filename
             return req.make_response(filecontent,
                 [('Content-Type', 'application/octet-stream'),
-                 ('Content-Disposition', self.content_disposition(filename, req))])
+                 ('Content-Disposition', content_disposition(filename, req))])
 
     @openerpweb.httprequest
     def saveas_ajax(self, req, data, token):
@@ -1596,7 +1599,7 @@ class Binary(openerpweb.Controller):
                 filename = res.get(filename_field, '') or filename
             return req.make_response(filecontent,
                 headers=[('Content-Type', 'application/octet-stream'),
-                        ('Content-Disposition', self.content_disposition(filename, req))],
+                        ('Content-Disposition', content_disposition(filename, req))],
                 cookies={'fileToken': int(token)})
 
     @openerpweb.httprequest
@@ -1997,11 +2000,11 @@ class Reports(View):
                 file_name = reports.read(res_id[0], ['name'], context)['name']
             else:
                 file_name = action['report_name']
+        file_name = '%s.%s' % (file_name, report_struct['format'])
 
         return req.make_response(report,
              headers=[
-                 # maybe we should take of what characters can appear in a file name?
-                 ('Content-Disposition', 'attachment; filename="%s.%s"' % (file_name, report_struct['format'])),
+                 ('Content-Disposition', content_disposition(file_name, req)),
                  ('Content-Type', report_mimetype),
                  ('Content-Length', len(report))],
              cookies={'fileToken': int(token)})

From 22b33ccdca61a4cb5760da7edc72f1c45347b498 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 30 Oct 2012 18:03:10 +0100
Subject: [PATCH 12/28] [IMP] indentation and whitespaces

bzr revid: abo@openerp.com-20121030170310-8qyxz6zquam335zw
---
 addons/hr_holidays/hr_holidays_view.xml | 35 +++++++++++--------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ac255538572..81c13a5f042 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -13,9 +13,9 @@
         <record id="action_holidays_unread" model="ir.values">
             <field name="name">action_holidays_unread</field>
             <field name="action_id" ref="actions_server_holidays_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_unread'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_unread'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays" />
+            <field name="model_id" ref="model_hr_holidays"/>
             <field name="model">hr.holidays</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -31,9 +31,9 @@
         <record id="action_holidays_read" model="ir.values">
             <field name="name">action_holidays_read</field>
             <field name="action_id" ref="actions_server_holidays_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_read'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_read'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays" />
+            <field name="model_id" ref="model_hr_holidays"/>
             <field name="model">hr.holidays</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -83,7 +83,7 @@
             </field>
         </record>
 
-         <record model="ir.ui.view" id="edit_holiday_new">
+        <record id="edit_holiday_new" model="ir.ui.view">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
             <field name="priority">1</field>
@@ -93,7 +93,7 @@
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user" />
+                    <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request">
@@ -104,7 +104,7 @@
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
                                 <group col="3">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline" /> 
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(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"/>
                                 </group>
                                 <div>
@@ -138,7 +138,7 @@
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user" />
+                    <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
@@ -233,7 +233,6 @@
             </field>
         </record>
 
-
         <record model="ir.ui.view" id="view_holiday">
             <field name="name">hr.holidays.tree</field>
             <field name="model">hr.holidays</field>
@@ -251,7 +250,6 @@
                     <field name="holiday_status_id" invisible="1"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <!--field name="type"/-->
                 </tree>
             </field>
         </record>
@@ -268,7 +266,7 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a new leave request. 
+                Click to create a new leave request.
               </p><p>
                 Once you have recorded your leave request, it will be sent
                 to a manager for validation. Be sure to set the right leave
@@ -298,7 +296,7 @@
             <field name="view_id" ref="view_holiday_new_calendar"/>
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
-        
+
         <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">
@@ -392,7 +390,7 @@
 
         <menuitem name="Leaves Summary" parent="menu_open_ask_holidays" id="menu_open_company_allocation" action="open_company_allocation" sequence="40"/>
 
-        <!-- holidays status -->
+        <!-- Holidays status -->
         <record id="view_holidays_status_filter" model="ir.ui.view">
             <field name="name">hr.holidays.status.filter</field>
             <field name="model">hr.holidays.status</field>
@@ -443,6 +441,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_holiday_status_normal_tree">
             <field name="name">hr.holidays.status.normal.tree</field>
             <field name="model">hr.holidays.status</field>
@@ -477,9 +476,9 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10" />
+        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
 
-    <!-- holiday on resource leave -->
+        <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form.inherit</field>
             <field name="model">resource.calendar.leaves</field>
@@ -491,7 +490,7 @@
             </field>
         </record>
 
-    <!--  Shortcuts -->
+        <!-- Shortcuts -->
         <record id="act_hr_employee_holiday_request" model="ir.actions.act_window">
             <field name="name">Leaves</field>
             <field name="type">ir.actions.act_window</field>
@@ -504,8 +503,7 @@
             <field name="view_id" eval="view_holiday"/>
         </record>
 
-       <!--  Assing leave       -->
-
+       <!-- Assing leave -->
         <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
             <field name="name">hr.employee.leave.tree</field>
             <field name="model">hr.employee</field>
@@ -534,7 +532,6 @@
        </record>
 
         <!-- Hr employee inherit Legal Leaves -->
-
         <record id="view_employee_form_leave_inherit" model="ir.ui.view">
             <field name="name">hr.employee.leave.form.inherit</field>
             <field name="model">hr.employee</field>

From 1ba3225b94433311a9a10e71ec713f5c6b508f61 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 31 Oct 2012 12:35:17 +0530
Subject: [PATCH 13/28] [IMP]: Improve remaining changes to refector from
 mrpsubproduct to mrpbyproduct

bzr revid: aja@tinyerp.com-20121031070517-oql0a2ax490xr8ip
---
 addons/mrp/mrp.py                           | 6 +++---
 addons/mrp/mrp_view.xml                     | 2 +-
 addons/mrp/res_config.py                    | 6 +++---
 addons/mrp/res_config_view.xml              | 4 ++--
 addons/mrp_byproduct/test/mrp_byproduct.yml | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index f8b53583a8c..00324d4c870 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -196,8 +196,8 @@ class mrp_bom(osv.osv):
         'code': fields.char('Reference', size=16),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."),
         'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True,
-                                 help= "If a sub-product is used in several products, it can be useful to create its own BoM. "\
-                                 "Though if you don't want separated production orders for this sub-product, select Set/Phantom as BoM type. "\
+                                 help= "If a by-product is used in several products, it can be useful to create its own BoM. "\
+                                 "Though if you don't want separated production orders for this by-product, select Set/Phantom as BoM type. "\
                                  "If a Phantom BoM is used for a root product, it will be sold and shipped as a set of components, instead of being produced."),
         'method': fields.function(_compute_type, string='Method', type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
         'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
@@ -230,7 +230,7 @@ class mrp_bom(osv.osv):
     _parent_name = "bom_id"
     _sql_constraints = [
         ('bom_qty_zero', 'CHECK (product_qty>0)',  'All product quantities must be greater than 0.\n' \
-            'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
+            'You should install the mrp_byproduct module if you want to manage extra products on BoMs !'),
     ]
 
     def _check_recursion(self, cr, uid, ids, context=None):
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 42a6f6ca833..5593a103bab 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -507,7 +507,7 @@
               <p class="oe_view_nocontent_create">
                 Click to add a component to a bill of material.
               </p><p>
-                Bills of materials components are components and sub-products
+                Bills of materials components are components and by-products
                 used to create master bills of materials.  Use this menu to
                 search in which BoM a specific component is used.
               </p>
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 2cb9fd77f80..c1712b81a26 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -44,11 +44,11 @@ class mrp_config_settings(osv.osv_memory):
         'module_mrp_operations': fields.boolean("Allow detailed planning of work order",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
-        'module_mrp_subproduct': fields.boolean("Produce several products from one manufacturing order",
-            help="""You can configure sub-products in the bill of material.
+        'module_mrp_byproduct': fields.boolean("Produce several products from one manufacturing order",
+            help="""You can configure by-products in the bill of material.
                 Without this module: A + B + C -> D.
                 With this module: A + B + C -> D + E.
-                This installs the module mrp_subproduct."""),
+                This installs the module mrp_byproduct."""),
         'module_mrp_jit': fields.boolean("Generate procurement in real time",
             help="""This allows Just In Time computation of procurement orders.
                 All procurement orders will be processed immediately, which could in some
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 92b8abc92d1..6b4058fb7b4 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -28,8 +28,8 @@
                         <label for="id" string="Order"/>
                         <div>
                             <div>
-                                <field name="module_mrp_subproduct" class="oe_inline"/>
-                                <label for="module_mrp_subproduct"/>
+                                <field name="module_mrp_byproduct" class="oe_inline"/>
+                                <label for="module_mrp_byproduct"/>
                             </div>
                             <div>
                                 <field name="module_mrp_repair" class="oe_inline"/>
diff --git a/addons/mrp_byproduct/test/mrp_byproduct.yml b/addons/mrp_byproduct/test/mrp_byproduct.yml
index 99da9f22baf..9e97212aa55 100644
--- a/addons/mrp_byproduct/test/mrp_byproduct.yml
+++ b/addons/mrp_byproduct/test/mrp_byproduct.yml
@@ -1,6 +1,6 @@
 -
-  In order to test mrp_subproduct with OpenERP, I add subproduct in bill of material.
-  I make a production order, confirm it so stock moves for subproducts are generated.
+  In order to test mrp_byproduct with OpenERP, I add subproduct in bill of material.
+  I make a production order, confirm it so stock moves for byproducts are generated.
 -
   I add a sub product in Bill of material for product External Hard Disk.
 -
@@ -37,7 +37,7 @@
   !assert {model: mrp.production, id: mrp_production_mo0, severity: error, string: Production order should be in state confirmed}:
     - state == 'confirmed'
 -
-  Now I check the stock moves for the subproduct I created in the bill of material.
+  Now I check the stock moves for the byproduct I created in the bill of material.
   This move is created automatically when I confirmed the production order.
 -
   !python {model: stock.move}: |

From a2fa4e945175f2e3a013713539018cecc87cadb1 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 31 Oct 2012 12:44:48 +0530
Subject: [PATCH 14/28] [IMP]: Rename from subproduct to byproduct

bzr revid: aja@tinyerp.com-20121031071448-xu87umbt2uav00pi
---
 addons/mrp_byproduct/test/mrp_byproduct.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_byproduct/test/mrp_byproduct.yml b/addons/mrp_byproduct/test/mrp_byproduct.yml
index 9e97212aa55..2b5fc68406e 100644
--- a/addons/mrp_byproduct/test/mrp_byproduct.yml
+++ b/addons/mrp_byproduct/test/mrp_byproduct.yml
@@ -1,5 +1,5 @@
 -
-  In order to test mrp_byproduct with OpenERP, I add subproduct in bill of material.
+  In order to test mrp_byproduct with OpenERP, I add byproduct in bill of material.
   I make a production order, confirm it so stock moves for byproducts are generated.
 -
   I add a sub product in Bill of material for product External Hard Disk.

From 70cbf251f127998420c0ff18af51477d09fc95d2 Mon Sep 17 00:00:00 2001
From: Giedrius Slavinskas <giedrius@inovera.lt>
Date: Wed, 31 Oct 2012 17:53:10 +0200
Subject: [PATCH 15/28] [FIX] escape returned database backup and exported data
 filenames

bzr revid: giedrius@inovera.lt-20121031155310-htyh0qdvsxudnm59
---
 addons/web/controllers/main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 26ab732118f..ad8d91ed1dd 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -855,7 +855,7 @@ class Database(openerpweb.Controller):
             }
             return req.make_response(db_dump,
                [('Content-Type', 'application/octet-stream; charset=binary'),
-               ('Content-Disposition', 'attachment; filename="' + filename + '"')],
+               ('Content-Disposition', content_disposition(filename, req))],
                {'fileToken': int(token)}
             )
         except xmlrpclib.Fault, e:
@@ -1864,7 +1864,8 @@ class Export(View):
 
 
         return req.make_response(self.from_data(columns_headers, import_data),
-            headers=[('Content-Disposition', 'attachment; filename="%s"' % self.filename(model)),
+            headers=[('Content-Disposition',
+                            content_disposition(self.filename(model), req)),
                      ('Content-Type', self.content_type)],
             cookies={'fileToken': int(token)})
 

From 193882a19c6e1b7218aa2c857137963a520615cb Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 31 Oct 2012 18:32:55 +0100
Subject: [PATCH 16/28] [IMP] remove whitespaces

bzr revid: abo@openerp.com-20121031173255-zj5ewj0sqvj6qmca
---
 addons/hr_holidays/hr_holidays.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index f58e68ce7ed..4d84e70a065 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -150,7 +150,7 @@ class hr_holidays(osv.osv):
         ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
     ]
-    
+
     def _create_resource_leave(self, cr, uid, leaves, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -444,10 +444,10 @@ class hr_employee(osv.osv):
     def _get_remaining_days(self, cr, uid, ids, name, args, context=None):
         cr.execute("""SELECT
                 sum(h.number_of_days) as days,
-                h.employee_id 
+                h.employee_id
             from
                 hr_holidays h
-                join hr_holidays_status s on (s.id=h.holiday_status_id) 
+                join hr_holidays_status s on (s.id=h.holiday_status_id)
             where
                 h.state='validate' and
                 s.limit=False and
@@ -462,9 +462,9 @@ class hr_employee(osv.osv):
                 remaining[employee_id] = 0.0
         return remaining
 
-    def _get_leave_status(self, cr, uid, ids, name, args, context=None):       
+    def _get_leave_status(self, cr, uid, ids, name, args, context=None):
         holidays_obj = self.pool.get('hr.holidays')
-        holidays_id = holidays_obj.search(cr, uid, 
+        holidays_id = holidays_obj.search(cr, uid,
            [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')),
            ('date_to','>=',time.strftime('%Y-%m-%d 23:59:59')),('type','=','remove'),('state','not in',('cancel','refuse'))],
            context=context)
@@ -490,7 +490,7 @@ class hr_employee(osv.osv):
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]),
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
         'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
-        'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),        
+        'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),
     }
 
 hr_employee()

From d74d5d394927a8acc2cc3700cbff0cb27ef51f9d Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 31 Oct 2012 19:00:53 +0100
Subject: [PATCH 17/28] [WIP] better management of start and end dates

bzr revid: abo@openerp.com-20121031180053-vjxk5m6i4k66c0up
---
 addons/hr_holidays/hr_holidays.py       | 30 ++++++++++++++++---------
 addons/hr_holidays/hr_holidays_view.xml |  4 ++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 4d84e70a065..cad7fc30beb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -147,8 +147,8 @@ class hr_holidays(osv.osv):
     }
     _sql_constraints = [
         ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "The employee or employee category of this request is missing."),
-        ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
-        ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
+        ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be anterior to the end date."),
+        ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0."),
     ]
 
     def _create_resource_leave(self, cr, uid, leaves, context=None):
@@ -203,15 +203,22 @@ class hr_holidays(osv.osv):
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state not in ['draft', 'cancel', 'confirm']:
-                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state.')%(rec.state))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
-    def onchange_date_from(self, cr, uid, ids, date_from):
+    def onchange_date_from(self, cr, uid, ids, date_to, date_from):
+        result = {}
         DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
-        date_to = False
-        if date_from:
+
+        # No date_to set so far: automatically compute one 8 hours later
+        if date_from and not date_to:
             date_to = datetime.datetime.strptime(date_from, DATETIME_FORMAT) + datetime.timedelta(hours=8)
-        return {'value':{'date_to': str(date_to)}}
+            result['value'] = {'date_to': str(date_to)}
+        # date_from is greater than date_to: throw an exception
+        elif (date_from and date_to) and (date_from > date_to):
+            raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.'))
+
+        return result
 
     def onchange_date_to(self, cr, uid, ids, date_to, date_from):
         result = {}
@@ -220,10 +227,11 @@ class hr_holidays(osv.osv):
             result['value'] = {
                 'number_of_days_temp': round(math.floor(diff_day))+1
             }
-            return result
-        result['value'] = {
-            'number_of_days_temp': 0,
-        }
+        else:
+            result['value'] = {
+                'number_of_days_temp': 0,
+            }
+
         return result
 
     def set_to_draft(self, cr, uid, ids, context=None):
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 81c13a5f042..f9d6d7a36de 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -101,10 +101,10 @@
                         <group>
                             <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"/>
+                            <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_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
+                                    <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"/>
                                 </group>
                                 <div>

From 8152ff96099f4ef8d641f4460fdd93bfa1641261 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 1 Nov 2012 12:02:20 +0530
Subject: [PATCH 18/28] [IMP]Css cleanup and refactore code.

bzr revid: vme@tinyerp.com-20121101063220-jlppjre8vefpeezv
---
 .../static/src/css/view_editor.css               | 14 ++------------
 .../web_view_editor/static/src/js/view_editor.js | 16 ++--------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/addons/web_view_editor/static/src/css/view_editor.css b/addons/web_view_editor/static/src/css/view_editor.css
index 2f2b5860cf6..e48bf344629 100644
--- a/addons/web_view_editor/static/src/css/view_editor.css
+++ b/addons/web_view_editor/static/src/css/view_editor.css
@@ -1,25 +1,15 @@
 .openerp .oe_view_editor {
   width: 100%;
-  border-collapse: collapse;
   margin-left: -12px;
-  width: 100%;
-  background-color: white;
-  border-spacing: 0;
 }
 .openerp .oe_view_editor td {
-  text-align: center;
-  white-space: nowrap;
   border: 1px solid #d8d8d8;
   cursor: pointer;
-  font-size: 90%;
 }
-.openerp .oe_view_editor_field td {
+.openerp .oe_view_editor td *{
   border: 0px !important;
+  color : #404040;
 }
 .openerp .oe_view_editor tr:hover {
   background-color: #ecebf2;
 }
-.openerp .oe_view_editor_field a{
-  font-size : 12px;
-  color : #404040;
-}
\ No newline at end of file
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index dadf34b1247..e0a0df5ab53 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -18,11 +18,10 @@ instance.web.ViewManagerAction.include({
             return this._super.apply(this,arguments); 
         }
     }
-})
+});
 instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
-        this.element_id = element_id;
         this.parent = parent;
         this.dataset = new instance.web.DataSetSearch(this, 'ir.ui.view', null, null),
         this.model = dataset.model;
@@ -71,18 +70,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog.$el);
-        $.when(this.action_manager.do_action(action)).then(function() {
-
-            var viewmanager = self.action_manager.inner_widget;
-            var controller = viewmanager.views[viewmanager.active_view].controller;
-            controller.on('view_loaded', function(){
-                $(controller.groups).bind({
-                    'selected': function(e, ids, records) {
-                        self.main_view_id = ids[0];
-                    }
-                })
-            });
-        });
+        this.action_manager.do_action(action);
     },
     on_create_view: function() {
         var self = this;

From a5aa575356f21815780efe41a7454de3b2382f92 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 1 Nov 2012 12:34:18 +0530
Subject: [PATCH 19/28] [FIX]

bzr revid: vme@tinyerp.com-20121101070418-guunfniuhvgy8ot9
---
 addons/web_view_editor/static/src/js/view_editor.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index e0a0df5ab53..354feaeb28d 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -70,7 +70,17 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog.$el);
-        this.action_manager.do_action(action);
+        $.when(this.action_manager.do_action(action)).then(function() {
+            var viewmanager = self.action_manager.inner_widget;
+            var controller = viewmanager.views[viewmanager.active_view].controller;
+            controller.on('view_loaded', self, function(){
+                $(controller.groups).bind({
+                    'selected': function(e, ids, records) {
+                        self.main_view_id = ids[0];
+                        }
+                });
+            });
+        });
     },
     on_create_view: function() {
         var self = this;

From 011c9ca6c7bff235e0ea5b1637d940c74a9835c1 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 1 Nov 2012 12:38:28 +0530
Subject: [PATCH 20/28] [imp]indentation

bzr revid: vme@tinyerp.com-20121101070828-jiznujjiacg69zl1
---
 addons/web_view_editor/static/src/js/view_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 354feaeb28d..dcccd381009 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -77,7 +77,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
                 $(controller.groups).bind({
                     'selected': function(e, ids, records) {
                         self.main_view_id = ids[0];
-                        }
+                    }
                 });
             });
         });

From 958edad9656ccfda7578af0c9d52c1abd8a7fee3 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 5 Nov 2012 04:40:53 +0000
Subject: [PATCH 21/28] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121105044053-iwdfmabj0neffc9o
---
 openerp/addons/base/i18n/es_EC.po | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 70227777a1f..284b4de49c8 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2011-01-18 05:32+0000\n"
+"PO-Revision-Date: 2012-11-05 00:42+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-11-05 04:40+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -655,6 +655,26 @@ msgid ""
 "    Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
 "\n"
 msgstr ""
+"\n"
+"Modulo para automatizar cartas para facturas no pagadas, con recordatorios "
+"multi-nivel\n"
+"==========================================================================\n"
+"\n"
+"Pueden definirse múltiples niveles de recordatorios a través del menú:\n"
+"    Contabilidad/Configuración/Varios/Seguimientos\n"
+"\n"
+"Una vez definidos, pueden imprimirse automáticamente recordatorios cada día, "
+"simplemente haciendo clic en el menú: \n"
+"    Contabilidad/Procesamiento periódico/Facturación/Enviar seguimientos\n"
+"\n"
+"Se generará un PDF con todas las cartas de acuerdo con los diferentes \n"
+"niveles de recordatorio definidos. Se pueden definir diferentes políticas\n"
+"para las distintas compañías . También se puede enviar correo al cliente.\n"
+"\n"
+"Debe denotarse que si se quiere revisar el nivel de seguimiento de una "
+"empresa/cuenta determinada, se puede realizar en el menú:\n"
+"    Contabilidad/Informes/Informes genéricos/Empresas/Seguimientos enviados\n"
+"\n"
 
 #. module: base
 #: field:res.country,name:0

From db13e8591a5c622f25ea9adf65e9810a569f8915 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 5 Nov 2012 09:22:59 +0100
Subject: [PATCH 22/28] [FIX] fields.related._fnct_write: handle the case where
 ids is a single id

bzr revid: rco@openerp.com-20121105082259-rcmcjs5n1eimtcpl
---
 openerp/osv/fields.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index c67df5a70b4..56e7f790a9e 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1158,6 +1158,8 @@ class related(function):
         return map(lambda x: (field, x[1], x[2]), domain)
 
     def _fnct_write(self,obj,cr, uid, ids, field_name, values, args, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         for record in obj.browse(cr, uid, ids, context=context):
             # traverse all fields except the last one
             for field in self.arg[:-1]:

From 52c29ae1c0055621d39f8d46b288ace068841777 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 5 Nov 2012 10:49:29 +0100
Subject: [PATCH 23/28] [FIX] fields.related._fnct_read: fix handling of type
 many2one

bzr revid: rco@openerp.com-20121105094929-oz7trjzwlqw90499
---
 openerp/osv/fields.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 56e7f790a9e..3086e8925b4 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1186,13 +1186,12 @@ class related(function):
             res[record.id] = value
 
         if self._type == 'many2one':
-            # res[id] is a browse_record or False; convert it to (id, name) or False
-            res = dict((id, value and value.id) for id, value in res.iteritems())
-            value_ids = filter(None, res.itervalues())
-            # name_get as root, as seeing the name of a related object depends on
+            # res[id] is a browse_record or False; convert it to (id, name) or False.
+            # Perform name_get as root, as seeing the name of a related object depends on
             # access right of source document, not target, so user may not have access.
+            value_ids = [value.id for id, value in res.iteritems() if value]
             value_name = dict(obj.pool.get(self._obj).name_get(cr, SUPERUSER_ID, value_ids, context=context))
-            res = dict((id, value_id and value_name[value_id]) for id, value_id in res.iteritems())
+            res = dict((id, value and (value.id, value_name[value.id])) for id, value in res.iteritems())
 
         elif self._type in ('one2many', 'many2many'):
             # res[id] is a list of browse_record or False; convert it to a list of ids

From 6f57449dcd48714ff9df5ff37dfbc0882610020e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Nov 2012 14:00:53 +0100
Subject: [PATCH 24/28] [IMP] Client actions now takes the action as argument.
 Use action.params for options.

bzr revid: fme@openerp.com-20121105130053-6gdklt6ok4lst6ba
---
 addons/web/static/src/js/chrome.js | 13 +++++++------
 addons/web/static/src/js/views.js  |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 6cf35a14e92..08ef8c4f9bf 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -504,13 +504,13 @@ instance.web.Login =  instance.web.Widget.extend({
     template: "Login",
     remember_credentials: true,
 
-    init: function(parent, params) {
+    init: function(parent, action) {
         this._super(parent);
         this.has_local_storage = typeof(localStorage) != 'undefined';
         this.db_list = null;
         this.selected_db = null;
         this.selected_login = null;
-        this.params = params || {};
+        this.params = action.params || {};
 
         if (this.params.login_successful) {
             this.on('login_successful', this, this.params.login_successful);
@@ -616,8 +616,9 @@ instance.web.client_actions.add("login", "instance.web.Login");
  * Client action to reload the whole interface.
  * If params has an entry 'menu_id', it opens the given menu entry.
  */
-instance.web.Reload = function(parent, params) {
-    var menu_id = (params && params.menu_id) || false;
+instance.web.Reload = function(parent, action) {
+    var params = action.params || {};
+    var menu_id = params.menu_id || false;
     var l = window.location;
 
     var sobj = $.deparam(l.search.substr(1));
@@ -638,7 +639,7 @@ instance.web.client_actions.add("reload", "instance.web.Reload");
  * Client action to go back in breadcrumb history.
  * If can't go back in history stack, will go back to home.
  */
-instance.web.HistoryBack = function(parent, params) {
+instance.web.HistoryBack = function(parent) {
     if (!parent.history_back()) {
         window.location = '/' + (window.location.search || '');
     }
@@ -649,7 +650,7 @@ instance.web.client_actions.add("history_back", "instance.web.HistoryBack");
  * Client action to go back home.
  */
 instance.web.Home = instance.web.Widget.extend({
-    init: function(parent, params) {
+    init: function(parent) {
         window.location = '/' + (window.location.search || '');
     }
 });
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index ebc7c326724..a4fe86c516d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -247,7 +247,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             action_menu_id: null,
         });
         if (_.isString(action) && instance.web.client_actions.contains(action)) {
-            var action_client = { type: "ir.actions.client", tag: action };
+            var action_client = { type: "ir.actions.client", tag: action, params: {} };
             return this.do_action(action_client, options);
         } else if (_.isNumber(action) || _.isString(action)) {
             var self = this;
@@ -346,14 +346,14 @@ instance.web.ActionManager = instance.web.Widget.extend({
 
         if (!(ClientWidget.prototype instanceof instance.web.Widget)) {
             var next;
-            if (next = ClientWidget(this, action.params)) {
+            if (next = ClientWidget(this, action)) {
                 return this.do_action(next, options);
             }
             return $.when();
         }
 
         return this.ir_actions_common({
-            widget: function () { return new ClientWidget(self, action.params); },
+            widget: function () { return new ClientWidget(self, action); },
             action: action,
             klass: 'oe_act_client',
             post_process: function(widget) {

From cbbd4dcee3b3dc8500fe7b2887eb965978b75b5e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Nov 2012 14:01:30 +0100
Subject: [PATCH 25/28] [IMP] Client actions now takes the action as argument.
 Use action.params for options.

bzr revid: fme@openerp.com-20121105130130-dwkn8124zc6yq933
---
 addons/base_import/static/src/js/import.js |  4 ++--
 addons/mail/static/src/js/mail.js          | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 407d38dacd7..510afaaead8 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -123,10 +123,10 @@ openerp.base_import = function (instance) {
                 this.exit();
             }
         },
-        init: function (parent, params) {
+        init: function (parent, action) {
             var self = this;
             this._super.apply(this, arguments);
-            this.res_model = params.model;
+            this.res_model = action.params.model;
             // import object id
             this.id = null;
             this.Import = new instance.web.Model('base_import.import');
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9133e5de257..bfda31119f2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1385,7 +1385,8 @@ openerp.mail = function (session) {
          *      When you use this option, the domain is not used for the fetch root.
          *     @param {String} [no_message] Message to display when there are no message
          */
-        init: function (parent, options) {
+        init: function (parent, action) {
+            var options = action.params || {};
             this._super(parent);
             this.domain = options.domain || [];
             this.context = options.context || {};
@@ -1513,7 +1514,7 @@ openerp.mail = function (session) {
                 this.root.destroy();
             }
             // create and render Thread widget
-            this.root = new mail.Widget(this, {
+            this.root = new mail.Widget(this, { params: {
                 'domain' : domain,
                 'context' : this.options.context,
                 'typeof_thread': this.options.context['typeof_thread'] || 'other',
@@ -1524,7 +1525,7 @@ openerp.mail = function (session) {
                 'message_ids': message_ids,
                 'show_compact_message': true,
                 'no_message': this.node.attrs.help
-                }
+                }}
             );
 
             return this.root.replace(this.$('.oe_mail-placeholder'));
@@ -1552,9 +1553,10 @@ openerp.mail = function (session) {
          * @param {Object} [options.context] context, is an object. It should
          *      contain default_model, default_res_id, to give it to the threads.
          */
-        init: function (parent, options) {
+        init: function (parent, action) {
             this._super(parent);
-            this.options = options || {};
+            var options = action.params || {};
+            this.options = options;
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
@@ -1611,7 +1613,7 @@ openerp.mail = function (session) {
         message_render: function (search) {
             var domain = this.options.domain.concat(this.search_results['domain']);
             var context = _.extend(this.options.context, search&&search.search_results['context'] ? search.search_results['context'] : {});
-            this.root = new mail.Widget(this, {
+            this.root = new mail.Widget(this, { params: {
                 'domain' : domain,
                 'context' : context,
                 'typeof_thread': context['typeof_thread'] || 'other',
@@ -1620,7 +1622,7 @@ openerp.mail = function (session) {
                 'show_read_unread_button': 11,
                 'show_compose_message': true,
                 'show_compact_message': false,
-                }
+                }}
             );
 
             return this.root.replace(this.$('.oe_mail-placeholder'));

From 750ef9d931b19a184b4cb161ce44018d9f574b77 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 5 Nov 2012 14:17:12 +0100
Subject: [PATCH 26/28] [IMP] fields.related._fnct_read: small improvements

bzr revid: rco@openerp.com-20121105131712-sc70thn3wpyq6o7y
---
 openerp/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 3086e8925b4..2d51ad7d6db 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1189,7 +1189,7 @@ class related(function):
             # res[id] is a browse_record or False; convert it to (id, name) or False.
             # Perform name_get as root, as seeing the name of a related object depends on
             # access right of source document, not target, so user may not have access.
-            value_ids = [value.id for id, value in res.iteritems() if value]
+            value_ids = list(set(value.id for value in res.itervalues() if value))
             value_name = dict(obj.pool.get(self._obj).name_get(cr, SUPERUSER_ID, value_ids, context=context))
             res = dict((id, value and (value.id, value_name[value.id])) for id, value in res.iteritems())
 

From cf4f0a1021db1380022d37d9ed6035b14a65cda8 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 5 Nov 2012 14:32:29 +0100
Subject: [PATCH 27/28] [WIP] better management of start and end dates

bzr revid: abo@openerp.com-20121105133229-e3qge2pid9j6u4ck
---
 addons/hr_holidays/hr_holidays.py | 47 ++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index cad7fc30beb..7181f836bb5 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -207,30 +207,49 @@ class hr_holidays(osv.osv):
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):
-        result = {}
+        """
+        If there are no date set for date_to, automatically set one 8 hours later than
+        the date_from.
+        Also update the number_of_days.
+        """
+        # date_to has to be greater than date_from
+        if (date_from and date_to) and (date_from > date_to):
+            raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.'))
+
+        result = {'value': {}}
         DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
 
         # No date_to set so far: automatically compute one 8 hours later
         if date_from and not date_to:
-            date_to = datetime.datetime.strptime(date_from, DATETIME_FORMAT) + datetime.timedelta(hours=8)
-            result['value'] = {'date_to': str(date_to)}
-        # date_from is greater than date_to: throw an exception
-        elif (date_from and date_to) and (date_from > date_to):
-            raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.'))
+            date_to_with_delta = datetime.datetime.strptime(date_from, DATETIME_FORMAT) + datetime.timedelta(hours=8)
+            result['value']['date_to'] = str(date_to_with_delta)
+
+        # Compute and update the number of days
+        if (date_to and date_from) and (date_from <= date_to):
+            diff_day = self._get_number_of_days(date_from, date_to)
+            result['value']['number_of_days_temp'] = round(math.floor(diff_day))+1
+        else:
+            result['value']['number_of_days_temp'] = 0
 
         return result
 
     def onchange_date_to(self, cr, uid, ids, date_to, date_from):
-        result = {}
-        if date_to and date_from:
+        """
+        Update the number_of_days.
+        """
+
+        # date_to has to be greater than date_from
+        if (date_from and date_to) and (date_from > date_to):
+            raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.'))
+
+        result = {'value': {}}
+
+        # Compute and update the number of days
+        if (date_to and date_from) and (date_from <= date_to):
             diff_day = self._get_number_of_days(date_from, date_to)
-            result['value'] = {
-                'number_of_days_temp': round(math.floor(diff_day))+1
-            }
+            result['value']['number_of_days_temp'] = round(math.floor(diff_day))+1
         else:
-            result['value'] = {
-                'number_of_days_temp': 0,
-            }
+            result['value']['number_of_days_temp'] = 0
 
         return result
 

From 88f06c467cfd8625ab58b556a2529c4ab4291c11 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 5 Nov 2012 18:03:18 +0100
Subject: [PATCH 28/28] [IMP] use tools.DEFAULT_SERVER_DATETIME_FORMAT

bzr revid: abo@openerp.com-20121105170318-fmq31jsjf1xriqnh
---
 addons/hr_holidays/hr_holidays.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 7181f836bb5..f315f3d4ef3 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -27,6 +27,7 @@ from operator import itemgetter
 
 import math
 import netsvc
+import tools
 from osv import fields, osv
 from tools.translate import _
 
@@ -217,11 +218,10 @@ class hr_holidays(osv.osv):
             raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.'))
 
         result = {'value': {}}
-        DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
 
         # No date_to set so far: automatically compute one 8 hours later
         if date_from and not date_to:
-            date_to_with_delta = datetime.datetime.strptime(date_from, DATETIME_FORMAT) + datetime.timedelta(hours=8)
+            date_to_with_delta = datetime.datetime.strptime(date_from, tools.DEFAULT_SERVER_DATETIME_FORMAT) + datetime.timedelta(hours=8)
             result['value']['date_to'] = str(date_to_with_delta)
 
         # Compute and update the number of days