pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to 1b15aa5

Browse Source
This commit is contained in:
Christophe Simonis
2016-08-26 14:43:03 +02:00
parent 57972b8754 1b15aa590b
commit 7a4116cd03
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_budget/account_budget.py
+4 -3
View File
@@ -95,7 +95,6 @@ class crossovered_budget_lines(osv.osv):
def _prac_amt(self, cr, uid, ids, context=None): def _prac_amt(self, cr, uid, ids, context=None):
res = {} res = {}
result = 0.0
if context is None: if context is None:
context = {} context = {}
for line in self.browse(cr, uid, ids, context=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 " "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,)) "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
result = cr.fetchone()[0] result = cr.fetchone()[0]
if result is None: if result is None:
result = 0.00 result = 0.0
else:
result = 0.0
res[line.id] = result res[line.id] = result
return res return res
addons/website/views/website_templates.xml
+2 -3
View File
@@ -907,9 +907,8 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
"widget": "contact", "widget": "contact",
"fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/> "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/>
</address> </address>
<a t-att-href="res_company.google_map_link()" target="_BLANK"> <!-- FORWARD-PORT UP TO SAAS-12 -->
<img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" /> <a t-att-href="res_company.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
</a>
</template> </template>
<template id="contactus" name="Contact us" page="True"> <template id="contactus" name="Contact us" page="True">
addons/website_event/views/website_event.xml
+2 -3
View File
@@ -331,9 +331,8 @@
<h4>Where</h4> <h4>Where</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<a t-att-href="event.google_map_link()" target="_BLANK"> <!-- FORWARD-PORT UP TO SAAS-12 -->
<img t-att-src="event.google_map_img()" width="100%%"/> <a t-att-href="event.google_map_link()" target="_BLANK">Visualize on Google Maps</a>
</a>
<div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-field-options='{ <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-field-options='{
"widget": "contact", "widget": "contact",
"fields": ["address", "phone", "mobile", "fax", "email"] "fields": ["address", "phone", "mobile", "fax", "email"]