odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REV] revert revid9276 (no need to include formatLang as qweb has since introduced t-esc-options) 

bzr revid: sle@openerp.com-20140407133313-re7xwd5190hk6zqi
This commit is contained in:
Simon Lejeune 2014-04-07 15:33:13 +02:00
parent 97ffe7a5b9
commit d908d26c7c
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/report/models/report.py
View File

@ -23,7 +23,6 @@ from openerp.osv import osv
from openerp.tools import config
from openerp.tools.translate import _
from openerp.addons.web.http import request
from openerp.report.formatter import Formatter
import os
import time
@ -138,16 +137,6 @@ class Report(osv.Model):
website = None
if request and hasattr(request, 'website'):
website = request.website
# formatLang method
if not values.get('formatLang'):
formatter = Formatter(cr, uid, self.pool, lang=user.lang)
values.update({
'formatLang': formatter.formatLang,
'digits_fmt': formatter.digits_fmt,
'get_digits': formatter.get_digits,
})
values.update({
'time': time,
'render_doc': render_doc,

4
addons/sale_layout/views/sale_layout_template.xml
View File

@ -22,7 +22,7 @@
<tr class="text-right">
<td colspan="100">
<strong>Subtotal: </strong>
<t t-esc="formatLang(p['subtotal'], digits=get_digits(dp='Account'), currency_obj=res_company.currency_id)"></t>
<t t-esc="p['subtotal']"></t>
</td>
</tr>
</t>
@ -31,7 +31,7 @@
<!-- Separator -->
<t t-if="'separator' in p['category'] and p['category'].separator is True">
<tr class="text-center">
<td colspan="100">
<td colspan="100" class="active">
***
</td>
</tr>