From defbe247e855e6fc61c7cc8560d73e5d3e41626d Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Mon, 13 Feb 2017 09:46:38 +0100
Subject: [PATCH 1/2] [FIX] product: method open_product_template duplicated

Introduced in 3befe66f432
Closes #15463
---
 addons/product/product.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index c59054f323bf5..96317ad1aca34 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -1179,15 +1179,6 @@ def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None,
             args.append((('categ_id', 'child_of', context['search_default_categ_id'])))
         return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
 
-    def open_product_template(self, cr, uid, ids, context=None):
-        """ Utility method used to add an "Open Template" button in product views """
-        product = self.browse(cr, uid, ids[0], context=context)
-        return {'type': 'ir.actions.act_window',
-                'res_model': 'product.template',
-                'view_mode': 'form',
-                'res_id': product.product_tmpl_id.id,
-                'target': 'new'}
-
     def create(self, cr, uid, vals, context=None):
         ctx = dict(context or {}, create_product_product=True)
         product_id = super(product_product, self).create(cr, uid, vals, context=ctx)

From 4a33db44b270c1fbfd5842acb8d5bbbf069e6c8b Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 13 Feb 2017 14:32:08 +0100
Subject: [PATCH 2/2] [FIX] account: crash if no currency in payment

- Register a payment on an invoice
- Do not set a journal, and do not set a currency
- Change the amount

It crashes.

opw-706807
---
 addons/account/models/account_payment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index ed29d95aa3029..c1768cc8da39f 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -81,7 +81,7 @@ def _get_invoices(self):
 
     def _compute_total_invoices_amount(self):
         """ Compute the sum of the residual of invoices, expressed in the payment currency """
-        payment_currency = self.currency_id or self.journal_id.currency_id or self.journal_id.company_id.currency_id
+        payment_currency = self.currency_id or self.journal_id.currency_id or self.journal_id.company_id.currency_id or self.env.user.company_id.currency_id
         invoices = self._get_invoices()
 
         if all(inv.currency_id == payment_currency for inv in invoices):