[MERGE] forward port branch 9.0 up to 1b15aa5

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
 

addons/website/views/website_templates.xml

@@ -907,9 +907,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">

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"]