From 5f76928f9f3fc52f2f8eacb8f39a85752d4cd098 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 24 Aug 2016 15:30:13 +0200
Subject: [PATCH 1/3] [FIX] website, website_event: Google Maps image

Google made the use of an API key mandatory to use the "Google Static
Maps API". The API key field will be created for the upcoming version.

opw-686510
---
 addons/website/views/website_templates.xml   | 5 ++---
 addons/website_event/views/website_event.xml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index c51115e6e21..9e4e8d95999 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -926,9 +926,8 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                 "widget": "contact",
                 "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/>
     </address>
-     <a t-att-href="res_company.google_map_link()" target="_BLANK">
-        <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
-    </a>
+    <!-- FORWARD-PORT UP TO SAAS-12 -->
+     <a t-att-href="res_company.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
 </template>
 
 <template id="contactus" name="Contact us" page="True">
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 2754c924af5..019ca6fcbff 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -331,9 +331,8 @@
                     <h4>Where</h4>
                 </div>
                 <div class="panel-body">
-                    <a t-att-href="event.google_map_link()" target="_BLANK">
-                        <img t-att-src="event.google_map_img()" width="100%%"/>
-                    </a>
+                    <!-- FORWARD-PORT UP TO SAAS-12 -->
+                    <a t-att-href="event.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
                     <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-field-options='{
                         "widget": "contact",
                         "fields": ["address", "phone", "mobile", "fax", "email"]

From a86143276be3ed3180564a7be0dffdc0d9228a09 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 25 Aug 2016 14:12:54 +0200
Subject: [PATCH 2/3] [FIX] account: fix exchange rate entries

When a reconciliation creating an exchange rate entry was done, the newly account_move_line corresponding to the exchange entry was not given a full_reconcile_id.

Also when doing a full reconciliation in different currency, full_reconcile_id was not set on account_partial_reconcile object resulting in problem when trying to unreconcile entries.

This is a backward fix of commit: 9b5fed49769d2e010f29f73b0f288de63bd26bc4 and cda132bba59a73aba1539094ad88d1a66e77d09e
---
 addons/account/models/account_move.py             |  3 +++
 .../models/account_full_reconcile.py              | 15 +++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index cbf7dc8af45..6520897265d 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -945,6 +945,8 @@ class AccountMoveLine(models.Model):
         total_amount_currency = 0
         currency = False
         aml_to_balance_currency = self.env['account.move.line']
+        aml_id = False
+        partial_rec_id = False
         maxdate = None
         for aml in self:
             if aml.amount_residual_currency:
@@ -959,6 +961,7 @@ class AccountMoveLine(models.Model):
             #eventually create journal entries to book the difference due to foreign currency's exchange rate that fluctuates
             partial_rec = aml.credit and aml.matched_debit_ids[0] or aml.matched_credit_ids[0]
             aml_id, partial_rec_id = partial_rec.with_context(skip_full_reconcile_check=True).create_exchange_rate_entry(aml_to_balance_currency, 0.0, total_amount_currency, currency, maxdate)
+        return aml_id, partial_rec_id
 
     @api.multi
     def remove_move_reconcile(self):
diff --git a/addons/account_full_reconcile/models/account_full_reconcile.py b/addons/account_full_reconcile/models/account_full_reconcile.py
index 72439caa411..c2f5c130f03 100644
--- a/addons/account_full_reconcile/models/account_full_reconcile.py
+++ b/addons/account_full_reconcile/models/account_full_reconcile.py
@@ -12,13 +12,19 @@ class AccountMoveLine(models.Model):
 
     @api.model
     def compute_full_after_batch_reconcile(self):
-        super(AccountMoveLine, self).compute_full_after_batch_reconcile()
+        aml_id, partial_rec_id = super(AccountMoveLine, self).compute_full_after_batch_reconcile()
         #check if the reconcilation is full
         partial_rec_set = self.env['account.partial.reconcile']
         total_debit = 0
         total_credit = 0
         total_amount_currency = 0
         currency = False
+        # If we have an exchange rate entry, add it's value to amount_currency
+        if aml_id and partial_rec_id:
+            exchange_rate_aml = self.browse([aml_id])
+            exchange_rate_partial_rec = self.env['account.partial.reconcile'].browse([partial_rec_id])
+            total_amount_currency += exchange_rate_aml.amount_currency
+            partial_rec_set |= exchange_rate_partial_rec
         for aml in self:
             total_debit += aml.debit
             total_credit += aml.credit
@@ -26,7 +32,7 @@ class AccountMoveLine(models.Model):
                 currency = aml.currency_id
             if aml.currency_id and aml.currency_id == currency:
                 total_amount_currency += aml.amount_currency
-                partial_rec_set |= aml.matched_debit_ids | aml.matched_credit_ids
+            partial_rec_set |= aml.matched_debit_ids | aml.matched_credit_ids
         partial_rec_ids = [x.id for x in list(partial_rec_set)]
         #if the total debit and credit are equal, and the total amount in currency is 0, the reconciliation is full
         digits_rounding_precision = self[0].company_id.currency_id.rounding
@@ -34,8 +40,9 @@ class AccountMoveLine(models.Model):
           and (not currency or float_is_zero(total_amount_currency, precision_rounding=currency.rounding)):
             #in that case, mark the reference on the partial reconciliations and the entries
             self.env['account.full.reconcile'].with_context(check_move_validity=False).create({
-                'partial_reconcile_ids': [(6, 0, partial_rec_ids)],
-                'reconciled_line_ids': [(6, 0, self.ids)]})
+                'partial_reconcile_ids': [(4, p_id) for p_id in partial_rec_ids],
+                'reconciled_line_ids': [(4, r_id) for r_id in ((self + exchange_rate_aml).ids if aml_id else self.ids)],
+            })
 
 
 class AccountPartialReconcile(models.Model):

From 1b15aa590b83265794224cdd8e2da8ecc70044b8 Mon Sep 17 00:00:00 2001
From: Richard deMeester <richard@willowit.com.au>
Date: Fri, 26 Aug 2016 15:50:38 +1000
Subject: [PATCH 3/3] [FIX] account_budget: reset correctly result variable

If a budget line has no analytic account id, the code is intentional
about returning a value of 0 for it.  It is possible, that in some
cases, depending on the order of lines processed, the routine returns
the previous value, as it does not initialise an important
variable on each iteration of the loop.

Closes #13303
---
 addons/account_budget/account_budget.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 4537dbf1743..6056a657ab5 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -95,7 +95,6 @@ class crossovered_budget_lines(osv.osv):
 
     def _prac_amt(self, cr, uid, ids, context=None):
         res = {}
-        result = 0.0
         if context is None:
             context = {}
         for line in self.browse(cr, uid, ids, context=context):
@@ -109,8 +108,10 @@ class crossovered_budget_lines(osv.osv):
                        "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
                        "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
                 result = cr.fetchone()[0]
-            if result is None:
-                result = 0.00
+                if result is None:
+                    result = 0.0
+            else:
+                result = 0.0
             res[line.id] = result
         return res