From 717e4106adc25572d6975a65c39762c3074a4b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 29 Apr 2014 12:19:32 +0200
Subject: [PATCH 01/18] [FIX] product: backport of 0059d7b, avoid rounding 0
 for kg

The precision 'Product Unit of Measure' was defined after the declaration of kg.
Since fc85a7ee, the precision of kg is set in data to 0.001.
As the Product Unit of Measure was not defined yet, the rounding was stripped to
(16,2) precision, so getting a rounding of 0.0 for the kg unit of measure.

[FIX] product: the declaration of decimal precision was done after
the declaration of uom precision, preventing uom precision from going above
the default decimal precision. + made the Kg unit precise up to grams by default.
---
 addons/product/product_data.xml | 53 ++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 4e62e1e0b3f..15d53f4da25 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -28,6 +28,35 @@
             <field name="name">Volume</field>
         </record>
 
+        <!--
+             Precisions
+        -->
+
+        <record forcecreate="True" id="decimal_price" model="decimal.precision">
+            <field name="name">Product Price</field>
+            <field name="digits">2</field>
+        </record>
+        <record forcecreate="True" id="decimal_discount" model="decimal.precision">
+            <field name="name">Discount</field>
+            <field name="digits">2</field>
+        </record>
+        <record forcecreate="True" id="decimal_account" model="decimal.precision">
+            <field name="name">Account</field>
+            <field name="digits">2</field>
+        </record>
+        <record forcecreate="True" id="decimal_stock_weight" model="decimal.precision">
+            <field name="name">Stock Weight</field>
+            <field name="digits">2</field>
+        </record>
+        <record forcecreate="True" id="decimal_product_uom" model="decimal.precision">
+            <field name="name">Product Unit of Measure</field>
+            <field name="digits" eval="3"/>
+        </record>
+        <record forcecreate="True" id="decimal_product_uos" model="decimal.precision">
+            <field name="name">Product UoS</field>
+            <field name="digits" eval="3"/>
+        </record>
+
         <!--
             Resource: product.uom
         -->
@@ -162,30 +191,6 @@ parameter) will see those record just disappear.
             <field eval="'product.pricelist,'+str(ref('list0'))" name="value"/>
         </record>
 
-        <record forcecreate="True" id="decimal_price" model="decimal.precision">
-            <field name="name">Product Price</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_discount" model="decimal.precision">
-            <field name="name">Discount</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_account" model="decimal.precision">
-            <field name="name">Account</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_stock_weight" model="decimal.precision">
-            <field name="name">Stock Weight</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_product_uom" model="decimal.precision">
-            <field name="name">Product Unit of Measure</field>
-            <field name="digits" eval="3"/>
-        </record>
-        <record forcecreate="True" id="decimal_product_uos" model="decimal.precision">
-            <field name="name">Product UoS</field>
-            <field name="digits" eval="3"/>
-        </record>        
 
         <!--
         Product

From 5be3ac1fd08922a25f051263544b6642bb3b8ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lionel=20Sausin=20=28Num=C3=A9rigraphe=29?=
 <ls@numerigraphe.com>
Date: Fri, 19 Sep 2014 16:38:31 +0200
Subject: [PATCH 02/18] [FIX] sale_stock: use current product's UoM to check
 availability

When selecting a product in a sale.order, the asked quantity is verified against
the available quantity.
If the user changes the UoM or the onchange from super call changes it,
the context should be updated accordingly.
Fixes #2559
---
 addons/sale_stock/sale_stock.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index d389715e6c1..bc7a6737f07 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -601,6 +601,14 @@ class sale_order_line(osv.osv):
             res['value'].update({'product_packaging': False})
             return res
 
+        # set product uom in context to get virtual stock in current uom
+        if res.get('value', {}).get('product_uom'):
+            # use the uom changed by super call
+            context.update({'uom': res['value']['product_uom']})
+        elif uom:
+            # fallback on selected
+            context.update({'uom': uom})
+
         #update of result obtained in super function
         product_obj = product_obj.browse(cr, uid, product, context=context)
         res['value']['delay'] = (product_obj.sale_delay or 0.0)

From e73a3c68980b4c3b6fb54425525ba4a6803c12b1 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 25 Feb 2015 09:13:41 +0100
Subject: [PATCH 03/18] [FIX] Web: view_list.js: pager next and previous
 actions

When the number of records n and the limit l were such that n%l = 0
(e.g. 16 records total, 8 displayed per page), clicking on the
previous button on the first page, or on the next button on the
last page produced a bug because the total number of pages
computed for this edge case was incorrect.
---
 addons/web/static/src/js/view_list.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 600e049d1ff..5e7a2ce812f 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -294,21 +294,24 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             this.$pager
                 .on('click', 'a[data-pager-action]', function () {
                     var $this = $(this);
-                    var max_page = Math.floor(self.dataset.size() / self.limit());
+                    var max_page_index = Math.ceil(self.dataset.size() / self.limit()) - 1;
                     switch ($this.data('pager-action')) {
                         case 'first':
-                            self.page = 0; break;
+                            self.page = 0;
+                            break;
                         case 'last':
-                            self.page = max_page - 1;
+                            self.page = max_page_index;
                             break;
                         case 'next':
-                            self.page += 1; break;
+                            self.page += 1;
+                            break;
                         case 'previous':
-                            self.page -= 1; break;
+                            self.page -= 1;
+                            break;
                     }
                     if (self.page < 0) {
-                        self.page = max_page;
-                    } else if (self.page > max_page) {
+                        self.page = max_page_index;
+                    } else if (self.page > max_page_index) {
                         self.page = 0;
                     }
                     self.reload_content();

From e2fa66b05df027c3d0977bccf6bb508f2cfc3669 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Fri, 24 Oct 2014 15:36:58 +0200
Subject: [PATCH 04/18] [FIX] web: avoid incoherent actual_mode after refresh

When accessing an existing record in form mode directly (enter the url or refresh a page), the daterecord has not been initialized yet. This means that the value of actual_mode will be set to 'edit' before loading the current record (method _actualize_mode() called from do_show()).
This was problematic for one2many fields that we loaded in edit mode, showing add/delete icons/buttons in readonly views. (opw 607910)

Backport of 7ec7f1ba4088525f3ad612557757deae294fc688 for 7.0 and saas<6. (opw 627885)
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 201f472b800..b7e6d9225c8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -253,7 +253,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 this.dataset.ids.push(state.id);
             }
             this.dataset.select_id(state.id);
-            this.do_show({ reload: warm });
+            this.do_show();
         }
     },
     /**

From 3bf1615ad40f23212a0fff23eeb506f3bcc69043 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 27 Feb 2015 11:55:45 +0100
Subject: [PATCH 05/18] [FIX] hr_timesheet: worked hours summary when sign in
 without sign out

In a timesheet, when a sign in is added, and a sign out
is not following, the current time is took as sign out value.

Rev. dbb2a669f44eff8889d96e0ed5113fd394ae1cae corrected an issue
regarding the worked hours summary not taking into account
the employee timezone.
This timezone has to be applied on the current_time also.

e.g: For an employee being in timezone UTC + 1
If the current_time is presently 12:00 (UTC+1)
If the employee set his sign in to 10:00
and do not entered a sign out
The hours summary table displayed 1:00 of worked hours,
based on computation (11:00 - 10:00)
11:00 being 12:00 but in timezone UTC

Besides, another issue was present when entering
a sign in at midnight exactly without a sign out:
If the employee set his sign in to 00:00:00
and do not set a sign out, worked hours displayed 0 worked hours
whatever the current time.

Fixes #5379
Closes #5378
Closes #5503
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index c964f0c57b6..4fd0ecbdca7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -534,12 +534,13 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                         MAX(id) as id,
                         name,
                         sheet_id,
+                        timezone,
                         SUM(total_timesheet) as total_timesheet,
-                        CASE WHEN SUM(total_attendance) < 0
+                        CASE WHEN SUM(orphan_attendances) != 0
                             THEN (SUM(total_attendance) +
                                 CASE WHEN current_date <> name
                                     THEN 1440
-                                    ELSE (EXTRACT(hour FROM current_time AT TIME ZONE 'UTC') * 60) + EXTRACT(minute FROM current_time AT TIME ZONE 'UTC')
+                                    ELSE (EXTRACT(hour FROM current_time AT TIME ZONE 'UTC' AT TIME ZONE coalesce(timezone, 'UTC')) * 60) + EXTRACT(minute FROM current_time AT TIME ZONE 'UTC' AT TIME ZONE coalesce(timezone, 'UTC'))
                                 END
                                 )
                             ELSE SUM(total_attendance)
@@ -548,21 +549,25 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                         ((
                             select
                                 min(hrt.id) as id,
+                                'UTC' as timezone,
                                 l.date::date as name,
                                 s.id as sheet_id,
                                 sum(l.unit_amount) as total_timesheet,
+                                0 as orphan_attendances,
                                 0.0 as total_attendance
                             from
                                 hr_analytic_timesheet hrt
                                 JOIN account_analytic_line l ON l.id = hrt.line_id
                                 LEFT JOIN hr_timesheet_sheet_sheet s ON s.id = hrt.sheet_id
-                            group by l.date::date, s.id
+                            group by l.date::date, s.id, timezone
                         ) union (
                             select
                                 -min(a.id) as id,
+                                p.tz as timezone,
                                 (a.name AT TIME ZONE 'UTC' AT TIME ZONE coalesce(p.tz, 'UTC'))::date as name,
                                 s.id as sheet_id,
                                 0.0 as total_timesheet,
+                                SUM(CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END) as orphan_attendances,
                                 SUM(((EXTRACT(hour FROM (a.name AT TIME ZONE 'UTC' AT TIME ZONE coalesce(p.tz, 'UTC'))) * 60) + EXTRACT(minute FROM (a.name AT TIME ZONE 'UTC' AT TIME ZONE coalesce(p.tz, 'UTC')))) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
                             from
                                 hr_attendance a
@@ -577,9 +582,9 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                                 LEFT JOIN res_partner p
                                 ON u.partner_id = p.id
                             WHERE action in ('sign_in', 'sign_out')
-                            group by (a.name AT TIME ZONE 'UTC' AT TIME ZONE coalesce(p.tz, 'UTC'))::date, s.id
+                            group by (a.name AT TIME ZONE 'UTC' AT TIME ZONE coalesce(p.tz, 'UTC'))::date, s.id, timezone
                         )) AS foo
-                        GROUP BY name, sheet_id
+                        GROUP BY name, sheet_id, timezone
                 )) AS bar""")
 
 hr_timesheet_sheet_sheet_day()

From 323233dd028b9db3e28faca65a89ec569738145b Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Tue, 10 Feb 2015 15:32:21 +0100
Subject: [PATCH 06/18] [FIX] ir_filters: return _auto_init's result

Closes #5204
---
 openerp/addons/base/ir/ir_filters.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py
index f302fe5c7bf..dacacfd3d16 100644
--- a/openerp/addons/base/ir/ir_filters.py
+++ b/openerp/addons/base/ir/ir_filters.py
@@ -118,12 +118,13 @@ class ir_filters(osv.osv):
     ]
 
     def _auto_init(self, cr, context=None):
-        super(ir_filters, self)._auto_init(cr, context)
+        result = super(ir_filters, self)._auto_init(cr, context)
         # Use unique index to implement unique constraint on the lowercase name (not possible using a constraint)
         cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = 'ir_filters_name_model_uid_unique_index'")
         if not cr.fetchone():
             cr.execute("""CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters
                             (lower(name), model_id, COALESCE(user_id,-1))""")
+        return result
 
     _columns = {
         'name': fields.char('Filter Name', size=64, translate=True, required=True),

From eda2736e4c251e05ab50eb1db9c2cd9889088f30 Mon Sep 17 00:00:00 2001
From: Laetitia Gangloff <laetitia.gangloff@acsone.eu>
Date: Mon, 9 Feb 2015 11:05:48 +0100
Subject: [PATCH 07/18] [FIX] account: journal_id should be readonly when there
 is already invoice internal number

Closes #5162, #5167
---
 addons/account/account_invoice_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f353877dd21..1106bd532d9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -181,8 +181,10 @@
                             <field name="date_due"/>
                             <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                 name="account_id" groups="account.group_account_user"/>
+                            <field name="internal_number" invisible="1"/>
                             <field name="journal_id" groups="account.group_account_user"
-                                on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
+                                on_change="onchange_journal_id(journal_id, context)" widget="selection"
+                                attrs="{'readonly':[('internal_number','!=',False)]}"/>
                             <field name="currency_id" groups="base.group_multi_currency"/>
                             <field name="check_total" groups="account.group_supplier_inv_check_total"/>
                         </group>
@@ -327,8 +329,10 @@
                         </group>
                         <group>
                             <field name="date_invoice"/>
+                            <field name="internal_number" invisible="1"/>
                             <field name="journal_id" groups="account.group_account_user"
-                                on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
+                                on_change="onchange_journal_id(journal_id, context)" widget="selection"
+                                attrs="{'readonly':[('internal_number','!=',False)]}"/>
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
                                 name="account_id" groups="account.group_account_user"/>
 

From 31194a59fb6ad662cb5d6bac48f80bca5bb14983 Mon Sep 17 00:00:00 2001
From: Olivier LAURENT <olivier.laurent@acsone.eu>
Date: Fri, 27 Feb 2015 19:06:01 +0100
Subject: [PATCH 08/18] [FIX] analytic: parent of contract form view

unhide the parent_id field in the form view of analytic accounts of type
"contract or project"
Fixes #5513, lp:1237512, opw 598926
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0faca841a0f..8c3f959d94a 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -29,7 +29,7 @@
                                 <field name="type" invisible="context.get('default_type', False)"/>
                                 <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="code"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" />
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>

From 1628050030f289e7991fb6de4af7219000199ceb Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 3 Mar 2015 17:06:23 +0100
Subject: [PATCH 09/18] [FIX] board: board creation of users other than admin.

It wasn't possible to create a new dashboard,
as a user other than SUPERUSER_ID,
using the "Create board" menu specifically
Reporting > Configuration > Create Board
(Technical Features & Administration > Settings groups required)
Because it creates a new menu for this dashboard,
which lead to the automatic creation of an "ir.values" record
which is prevented for other users than SUPERUSER_ID

opw-629367
---
 addons/board/board.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/board/board.py b/addons/board/board.py
index fafb0eae290..2bd2804356a 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -23,7 +23,7 @@
 from operator import itemgetter
 from textwrap import dedent
 
-from openerp import tools
+from openerp import tools, SUPERUSER_ID
 from openerp.osv import fields, osv
 
 class board_board(osv.osv):
@@ -144,7 +144,7 @@ class board_create(osv.osv_memory):
             ''')
         }, context=context)
 
-        menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
+        menu_id = self.pool.get('ir.ui.menu').create(cr, SUPERUSER_ID, {
             'name': this.name,
             'parent_id': this.menu_parent_id.id,
             'action': 'ir.actions.act_window,%s' % (action_id,)

From 56f3f01491f3c682f3604c6d0011d7ecfbbaa210 Mon Sep 17 00:00:00 2001
From: Romain Deheele <romain.deheele@camptocamp.com>
Date: Tue, 3 Mar 2015 17:55:35 +0100
Subject: [PATCH 10/18] [FIX] crm: retrieve title and function of partner in
 leads

When setting a partner on the lead,
the on_change_partner method retrieves
the various partner field values.

title & function fields were omitted, without obvious reasons

opw-629374
Closes #5388
---
 addons/crm/crm_lead.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00c6f931ee3..5d238b9a26c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -349,6 +349,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
                 'partner_name' : partner.name,
+                'title': partner.title and partner.title.id or False,
                 'street' : partner.street,
                 'street2' : partner.street2,
                 'city' : partner.city,
@@ -359,6 +360,7 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'mobile' : partner.mobile,
                 'fax' : partner.fax,
                 'zip': partner.zip,
+                'function': partner.function,
             }
         return {'value' : values}
 

From 4781deb5b602ab74da369c69e997829204c2829b Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Tue, 3 Mar 2015 17:10:54 +0100
Subject: [PATCH 11/18] [FIX] base: Replace unreliable reference count through
 ORM by SQL

When the ORM is cleaning up related attachments upon record deletion, the
search() method hides the attachment of the record that is being deleted.
If the same file is used exactly once in another attachment, the reference
count will be 1 and the file will be deleted.
---
 openerp/addons/base/ir/ir_attachment.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
index 996b0f69c4b..6452b0d4f47 100644
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@ -108,7 +108,9 @@ class ir_attachment(osv.osv):
         return fname
 
     def _file_delete(self, cr, uid, location, fname):
-        count = self.search(cr, 1, [('store_fname','=',fname)], count=True)
+        # using SQL to include files hidden through unlink or due to record rules
+        cr.execute("SELECT COUNT(*) FROM ir_attachment WHERE store_fname = %s", (fname,))
+        count = cr.fetchone()[0]
         if count <= 1:
             full_path = self._full_path(cr, uid, location, fname)
             try:

From a81a7513b2c84408cc376838223d090e3a46132a Mon Sep 17 00:00:00 2001
From: jbeficent <jordi.ballester@eficent.com>
Date: Wed, 4 Mar 2015 11:20:42 +0100
Subject: [PATCH 12/18] [FIX] purchase: prevent user to confirm a purchase
 order when there is a service product in it and invoicing is based on
 incoming shipments Fix for issue 3492 and opw 628377

---
 addons/purchase/purchase.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index accce18ddbb..e3b0fa5bfd9 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -149,6 +149,19 @@ class purchase_order(osv.osv):
                                                 limit=1)
         return res and res[0] or False  
 
+    def _has_non_stockable_item(self, cr, uid, ids, *args):
+        res = dict.fromkeys(ids, False)
+        for order in self.browse(cr, uid, ids):
+            for order_line in order.order_line:
+                if (
+                    not order_line.product_id
+                    or
+                    order_line.product_id
+                    and order_line.product_id.type not in ('product', 'consu')
+                ):
+                    res[order.id] = True
+        return res
+
     STATE_SELECTION = [
         ('draft', 'Draft PO'),
         ('sent', 'RFQ Sent'),
@@ -224,6 +237,7 @@ class purchase_order(osv.osv):
         'create_uid':  fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal'),
+        'has_non_stockable_item': fields.function(_has_non_stockable_item, method=True, type='boolean', string='Contains a non-stockable item'),
     }
     _defaults = {
         'date_order': fields.date.context_today,
@@ -405,6 +419,7 @@ class purchase_order(osv.osv):
         })
         return action
 
+
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
@@ -470,6 +485,10 @@ class purchase_order(osv.osv):
         for po in self.browse(cr, uid, ids, context=context):
             if not po.order_line:
                 raise osv.except_osv(_('Error!'),_('You cannot confirm a purchase order without any purchase order line.'))
+            if po.invoice_method == 'picking' and po.has_non_stockable_item is True:
+                raise osv.except_osv(
+                    _('Error!'),
+                    _("You cannot confirm a purchase order with Invoice Control Method 'Based on incoming shipments' that contains non-stockable items."))
             for line in po.order_line:
                 if line.state=='draft':
                     todo.append(line.id)

From f18304c0cdd2266134cf35c004c7279c0ac1b46f Mon Sep 17 00:00:00 2001
From: Laetitia Gangloff <laetitia.gangloff@acsone.eu>
Date: Wed, 4 Mar 2015 10:52:45 +0100
Subject: [PATCH 13/18] [IMP] account: Add auto_join on account move line

As the number of journal entries can grow quickly, domains such as
[('move_id.state', 'in', ['draft'])] will degrade very quickly.
Fixes #5573
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index edd0778eedb..8f6618d50ae 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -439,7 +439,7 @@ class account_move_line(osv.osv):
         'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
         'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
-        'move_id': fields.many2one('account.move', 'Journal Entry', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
+        'move_id': fields.many2one('account.move', 'Journal Entry', ondelete="cascade", help="The move of this entry line.", select=2, required=True, auto_join=True),
         'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Internal Note'),
         'ref': fields.related('move_id', 'ref', string='Reference', type='char', size=64, store=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),

From ab9f02cdee91d9caa873f190a40bbb17e6cbc7b4 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 4 Mar 2015 09:37:19 +0100
Subject: [PATCH 14/18] [FIX] account_followup: overdue payments must exclude
 payments not yet due. Before this revision, the overdue payments report
 contained all payments due, including the ones in the future, that are not
 actually due yet.

opw-628874
---
 addons/account_followup/account_followup.py              | 1 +
 addons/account_followup/report/account_followup_print.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 9cedbebf974..e7778cb76c2 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -315,6 +315,7 @@ class res_partner(osv.osv):
                                                                    ('reconcile_id', '=', False),
                                                                    ('state', '!=', 'draft'),
                                                                    ('company_id', '=', company_id),
+                                                                   ('date_maturity', '<=', fields.date.context_today(self,cr,uid)),
                                                                   ], context=context):
             raise osv.except_osv(_('Error!'),_("The partner does not have any accounting entries to print in the overdue report for the current company."))
         self.message_post(cr, uid, [ids[0]], body=_('Printed overdue payments report'), context=context)
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 25103498b4b..cd868629de5 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -21,6 +21,7 @@
 
 import time
 from collections import defaultdict
+from openerp.osv import fields
 
 from openerp import pooler
 from openerp.report import report_sxw
@@ -57,6 +58,7 @@ class report_rappel(report_sxw.rml_parse):
                             ('reconcile_id', '=', False),
                             ('state', '!=', 'draft'),
                             ('company_id', '=', company_id),
+                            ('date_maturity', '<=', fields.date.context_today(self,self.cr,self.uid)),
                         ])
 
         # lines_per_currency = {currency: [line data, ...], ...}

From c9a72b79e4ca3594f20689ccb3099c6c7143d3c9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 4 Mar 2015 17:51:24 +0100
Subject: [PATCH 15/18] [FIX] web: size of text fields textarea when invisible
 by default

Text fields, or char fields having widget="text",
were not sized correctly when the field was not
visible by default, ans was set visible thanks
to attrs and other fields values.

opw-629394
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b7e6d9225c8..1eef15a051b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2647,6 +2647,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
             this.$textarea = this.$el.find('textarea');
             this.auto_sized = false;
             this.default_height = this.$textarea.css('height');
+            if (this.default_height === '0px') this.default_height = '90px';
             if (this.get("effective_readonly")) {
                 this.$textarea.attr('disabled', 'disabled');
             }

From 6c9afff057047724953ee14aed47eea34bd2650c Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 4 Mar 2015 15:20:17 +0100
Subject: [PATCH 16/18] [FIX] account_payment: amount in payment order is not
 correct.

Amount in payment order is not correct if the account move
line has already been paid by another way. The right amount is
in the residual field related with move_id to the account invoice.

opw:628903, 628428
---
 addons/account_payment/account_move_line.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 9cc300d2e4b..e8d67e6dd89 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -31,21 +31,15 @@ class account_move_line(osv.osv):
         (excepting cancelled orders)"""
         if not ids:
             return {}
+        res = dict.fromkeys(ids, 0.0)
         cr.execute("""SELECT ml.id,
-                    CASE WHEN ml.amount_currency < 0
-                        THEN - ml.amount_currency
-                        ELSE ml.credit
-                    END -
-                    (SELECT coalesce(sum(amount_currency),0)
-                        FROM payment_line pl
-                            INNER JOIN payment_order po
-                                ON (pl.order_id = po.id)
-                        WHERE move_line_id = ml.id
-                        AND po.state != 'cancel') AS amount
+                    (SELECT sum(coalesce(residual, 0))
+                        FROM account_invoice
+                        WHERE move_id = ml.move_id)
                     FROM account_move_line ml
                     WHERE id IN %s""", (tuple(ids),))
-        r = dict(cr.fetchall())
-        return r
+        res.update(cr.fetchall())
+        return res
 
     def _to_pay_search(self, cr, uid, obj, name, args, context=None):
         if not args:

From d9c9ac72daf45a4a8bd3cd9d2d1dbf33423a1deb Mon Sep 17 00:00:00 2001
From: xmo-odoo <xmo-odoo@users.noreply.github.com>
Date: Fri, 6 Mar 2015 13:12:50 +0100
Subject: [PATCH 17/18] [FIX] export: decode Field strings before comparisons

Allows exporting fields whose string is a non-ascii *byte*string (rather than unicode).

backport of 7286f4e4244 fixing #773 to branch 7.0 by request of @flotho
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index b3acbbe5119..080025dd737 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1481,7 +1481,7 @@ class Export(openerpweb.Controller):
             fields['.id'] = fields.pop('id', {'string': 'ID'})
 
         fields_sequence = sorted(fields.iteritems(),
-            key=lambda field: field[1].get('string', ''))
+            key=lambda field: openerp.tools.ustr(field[1].get('string', '')))
 
         records = []
         for field_name, field in fields_sequence:

From 209ce6f48c75fe91e79d7b54d981dcea9a7d3a8c Mon Sep 17 00:00:00 2001
From: odoo-tac <tac@odoo.com>
Date: Fri, 6 Mar 2015 17:06:12 +0100
Subject: [PATCH 18/18] [FIX] Fixed a typo in project.py exception message

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

diff --git a/addons/project/project.py b/addons/project/project.py
index f62774fc107..45fbd3c4a94 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -319,7 +319,7 @@ class project(osv.osv):
         return True
 
     _constraints = [
-        (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date'])
+        (_check_dates, 'Error! project start-date must be lower than project end-date.', ['date_start', 'date'])
     ]
 
     def set_template(self, cr, uid, ids, context=None):
@@ -891,7 +891,7 @@ class task(base_stage, osv.osv):
 
     _constraints = [
         (_check_recursion, 'Error ! You cannot create recursive tasks.', ['parent_ids']),
-        (_check_dates, 'Error ! Task end-date must be greater then task start-date', ['date_start','date_end'])
+        (_check_dates, 'Error ! Task end-date must be greater than task start-date', ['date_start','date_end'])
     ]
 
     # Override view according to the company definition