Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-577185-jap into lp:openobject-addons/6.1

  1. 6.1-opw-577185-jap
  2. Merge into 6.1
Proposed by Jagdish Panchal (Open ERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6938
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-577185-jap
Merge into: lp:openobject-addons/6.1
Diff against target: 651 lines (+60/-60)
20 files modified
account/report/account_print_overdue.rml (+1/-1)
account_invoice_layout/report/report_account_invoice_layout.py (+1/-1)
account_invoice_layout/report/report_account_invoice_layout.rml (+6/-6)
account_invoice_layout/report/special_message_invoice.py (+1/-1)
account_invoice_layout/report/special_message_invoice.rml (+6/-6)
base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py (+1/-1)
hr_expense/report/expense.rml (+2/-2)
hr_payroll/report/report_contribution_register.rml (+2/-2)
hr_payroll/report/report_payslip.rml (+1/-1)
hr_payroll/report/report_payslip_details.rml (+2/-2)
mrp_repair/report/order.rml (+5/-5)
point_of_sale/report/account_statement.rml (+4/-4)
point_of_sale/report/all_closed_cashbox_of_the_day.rml (+5/-5)
point_of_sale/report/pos_details.rml (+8/-8)
point_of_sale/report/pos_payment_report_user.rml (+2/-2)
point_of_sale/report/pos_users_product.rml (+2/-2)
sale_layout/report/report_sale_layout.py (+1/-1)
sale_layout/report/report_sale_layout.rml (+4/-4)
stock/report/lot_overview.rml (+3/-3)
stock/report/lot_overview_all.rml (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-577185-jap
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+118085@code.launchpad.net

Description of the change

Hello,

[FIX] improve the code in sxw files_Passed the code of printing symbol in formatLang() method

I have changed the code in sxw files for printing symbol and passed the code in formatLang() function, because while using the option "Conversion Braces---> Field" in OpenOffice the report removes the spaces between the amount and symbol.

Stpes:
1). Open "Invoices" report in OpenOffice
2). Click on "Conversion Braces---> Fields", and click on send to server
3). Now print the report you will see the spaces are remove from field "Price, Total, Tax an Net Total"

Thanks,
JAP

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/6.1-opw-577185-jap updated
6931. By Olivier Dony (Odoo)

[MERGE] project.issue: actually use the Reply-To address of the project when sending out messages

6932. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6933. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6934. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6935. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6936. By Xavier ALT

[MERGE] OPW 576898: stock: when changing stock.move product lot, do not crash if user didn't fill the product field

6937. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6938. By Amit Dodiya<email address hidden>

[FIX] (1) base report designer plugin removes the space from two attached string in report while using the option Conversion_Braces_to_fields (2) Improve the code in sxw files_Passed the code of printing symbol in formatLang() method

Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Reply
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed(partially) on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-577185-port-dhr/+merge/139390 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Reply

Unmerged revisions

6938. By Amit Dodiya<email address hidden>

[FIX] (1) base report designer plugin removes the space from two attached string in report while using the option Conversion_Braces_to_fields (2) Improve the code in sxw files_Passed the code of printing symbol in formatLang() method

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_aged_partner_balance.sxw'
2Binary files account/report/account_aged_partner_balance.sxw 2011-02-07 09:06:40 +0000 and account/report/account_aged_partner_balance.sxw 2012-08-09 09:37:21 +0000 differ
3=== modified file 'account/report/account_balance.sxw'
4Binary files account/report/account_balance.sxw 2011-10-27 21:11:24 +0000 and account/report/account_balance.sxw 2012-08-09 09:37:21 +0000 differ
5=== modified file 'account/report/account_general_ledger.sxw'
6Binary files account/report/account_general_ledger.sxw 2011-10-27 21:11:24 +0000 and account/report/account_general_ledger.sxw 2012-08-09 09:37:21 +0000 differ
7=== modified file 'account/report/account_general_ledger_landscape.sxw'
8Binary files account/report/account_general_ledger_landscape.sxw 2011-10-27 21:11:24 +0000 and account/report/account_general_ledger_landscape.sxw 2012-08-09 09:37:21 +0000 differ
9=== modified file 'account/report/account_partner_ledger.sxw'
10Binary files account/report/account_partner_ledger.sxw 2011-10-27 21:11:24 +0000 and account/report/account_partner_ledger.sxw 2012-08-09 09:37:21 +0000 differ
11=== modified file 'account/report/account_partner_ledger_other.sxw'
12Binary files account/report/account_partner_ledger_other.sxw 2011-10-27 21:11:24 +0000 and account/report/account_partner_ledger_other.sxw 2012-08-09 09:37:21 +0000 differ
13=== modified file 'account/report/account_print_invoice.sxw'
14Binary files account/report/account_print_invoice.sxw 2011-01-14 00:11:01 +0000 and account/report/account_print_invoice.sxw 2012-08-09 09:37:21 +0000 differ
15=== modified file 'account/report/account_print_overdue.rml'
16--- account/report/account_print_overdue.rml 2011-12-22 15:17:58 +0000
17+++ account/report/account_print_overdue.rml 2012-08-09 09:37:21 +0000
18@@ -219,7 +219,7 @@
19 <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
20 </td>
21 <td>
22- <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]] </para>
23+ <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj=company.currency_id) ]] </para>
24 </td>
25 <td>
26 <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
27
28=== modified file 'account/report/account_print_overdue.sxw'
29Binary files account/report/account_print_overdue.sxw 2011-12-21 09:55:12 +0000 and account/report/account_print_overdue.sxw 2012-08-09 09:37:21 +0000 differ
30=== modified file 'account_analytic_plans/report/crossovered_analytic.sxw'
31Binary files account_analytic_plans/report/crossovered_analytic.sxw 2011-01-14 00:11:01 +0000 and account_analytic_plans/report/crossovered_analytic.sxw 2012-08-09 09:37:21 +0000 differ
32=== modified file 'account_budget/report/analytic_account_budget_report.sxw'
33Binary files account_budget/report/analytic_account_budget_report.sxw 2011-01-14 00:11:01 +0000 and account_budget/report/analytic_account_budget_report.sxw 2012-08-09 09:37:21 +0000 differ
34=== modified file 'account_budget/report/crossovered_budget_report.sxw'
35Binary files account_budget/report/crossovered_budget_report.sxw 2011-01-14 00:11:01 +0000 and account_budget/report/crossovered_budget_report.sxw 2012-08-09 09:37:21 +0000 differ
36=== modified file 'account_invoice_layout/report/report_account_invoice_layout.py'
37--- account_invoice_layout/report/report_account_invoice_layout.py 2011-04-29 08:49:48 +0000
38+++ account_invoice_layout/report/report_account_invoice_layout.py 2012-08-09 09:37:21 +0000
39@@ -70,7 +70,7 @@
40 res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account'))
41 res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account'))
42 res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account'))
43- res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'))
44+ res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'), currency_obj=invoice.currency_id)
45 sub_total[i] = entry.price_subtotal
46 i = i + 1
47 res['note'] = entry.note
48
49=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml'
50--- account_invoice_layout/report/report_account_invoice_layout.rml 2011-12-22 15:17:58 +0000
51+++ account_invoice_layout/report/report_account_invoice_layout.rml 2012-08-09 09:37:21 +0000
52@@ -293,7 +293,7 @@
53 <para style="terp_default_Centre_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['discount'] ]]</para>
54 </td>
55 <td>
56- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]] [[ a['currency'] ]]</para>
57+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]]</para>
58 </td>
59 </tr>
60 <tr>
61@@ -377,7 +377,7 @@
62 <para style="terp_default_9">Net Total:</para>
63 </td>
64 <td>
65- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
66+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
67 </td>
68 </tr>
69 </blockTable>
70@@ -392,7 +392,7 @@
71 <para style="terp_default_9">Taxes:</para>
72 </td>
73 <td>
74- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
75+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
76 </td>
77 </tr>
78 </blockTable>
79@@ -407,7 +407,7 @@
80 <para style="terp_default_Bold_9">Total:</para>
81 </td>
82 <td>
83- <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
84+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
85 </td>
86 </tr>
87 </blockTable>
88@@ -443,10 +443,10 @@
89 <para style="terp_default_8">[[ t.name ]]</para>
90 </td>
91 <td>
92- <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
93+ <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account', currency_obj=o.currency_id) ]]</para>
94 </td>
95 <td>
96- <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
97+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account', currency_obj=o.currency_id) ]]</para>
98 </td>
99 <td>
100 <para style="terp_default_Right_8">
101
102=== modified file 'account_invoice_layout/report/report_account_invoice_layout.sxw'
103Binary files account_invoice_layout/report/report_account_invoice_layout.sxw 2011-01-14 00:11:01 +0000 and account_invoice_layout/report/report_account_invoice_layout.sxw 2012-08-09 09:37:21 +0000 differ
104=== modified file 'account_invoice_layout/report/special_message_invoice.py'
105--- account_invoice_layout/report/special_message_invoice.py 2011-04-29 08:49:48 +0000
106+++ account_invoice_layout/report/special_message_invoice.py 2012-08-09 09:37:21 +0000
107@@ -80,7 +80,7 @@
108 res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account'))
109 res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account'))
110 res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account'))
111- res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'))
112+ res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'), currency_obj=invoice.currency_id)
113 sub_total[i] = entry.price_subtotal
114 i = i + 1
115 res['note'] = entry.note
116
117=== modified file 'account_invoice_layout/report/special_message_invoice.rml'
118--- account_invoice_layout/report/special_message_invoice.rml 2011-12-22 15:17:58 +0000
119+++ account_invoice_layout/report/special_message_invoice.rml 2012-08-09 09:37:21 +0000
120@@ -297,7 +297,7 @@
121 <para style="terp_default_Centre_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['discount'] ]]</para>
122 </td>
123 <td>
124- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]] [[ a['currency'] ]]</para>
125+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]]</para>
126 </td>
127 </tr>
128 <tr>
129@@ -381,7 +381,7 @@
130 <para style="terp_default_9">Net Total : </para>
131 </td>
132 <td>
133- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
134+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account', currency_obj=o.currency_id.symbol) ]]</para>
135 </td>
136 </tr>
137 </blockTable>
138@@ -396,7 +396,7 @@
139 <para style="terp_default_9">Taxes : </para>
140 </td>
141 <td>
142- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
143+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.currency_id.symbol ]]</para>
144 </td>
145 </tr>
146 </blockTable>
147@@ -411,7 +411,7 @@
148 <para style="terp_default_Bold_9">Total : </para>
149 </td>
150 <td>
151- <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
152+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account', currency_obj=o.currency_id.symbol) ]]</para>
153 </td>
154 </tr>
155 </blockTable>
156@@ -447,10 +447,10 @@
157 <para style="terp_default_8">[[ t.name ]]</para>
158 </td>
159 <td>
160- <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
161+ <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account', currency_obj=o.currency_id.symbol ]]</para>
162 </td>
163 <td>
164- <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
165+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account', currency_obj=o.currency_id.symbol) ]]</para>
166 </td>
167 <td>
168 <para style="terp_default_Right_8">
169
170=== modified file 'account_invoice_layout/report/special_message_invoice.sxw'
171Binary files account_invoice_layout/report/special_message_invoice.sxw 2011-01-14 00:11:01 +0000 and account_invoice_layout/report/special_message_invoice.sxw 2012-08-09 09:37:21 +0000 differ
172=== modified file 'base_report_designer/plugin/openerp_report_designer.zip'
173Binary files base_report_designer/plugin/openerp_report_designer.zip 2011-06-17 14:10:24 +0000 and base_report_designer/plugin/openerp_report_designer.zip 2012-08-09 09:37:21 +0000 differ
174=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py'
175--- base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py 2011-12-19 16:54:40 +0000
176+++ base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py 2012-08-09 09:37:21 +0000
177@@ -268,7 +268,7 @@
178 if res[1]<>"Expression":
179 oInputList.Items=(u""+found.String,u""+found.String)
180 else:
181- oInputList.Items=(u"?",u""+found.String)
182+ oInputList.Items=(u"?",u" "+found.String)
183 aReportSyntex.append([oInputList,res[1]])
184 text.insertTextContent(found,oInputList,False)
185 found.String =""
186
187=== modified file 'hr_expense/report/expense.rml'
188--- hr_expense/report/expense.rml 2011-12-21 09:08:11 +0000
189+++ hr_expense/report/expense.rml 2012-08-09 09:37:21 +0000
190@@ -231,7 +231,7 @@
191 <para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
192 </td>
193 <td>
194- <para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
195+ <para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.currency_id) ]]</para>
196 </td>
197 </tr>
198 <tr>
199@@ -277,7 +277,7 @@
200 <para style="terp_tblheader_Details">Total:</para>
201 </td>
202 <td>
203- <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
204+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.currency_id) ]]</para>
205 </td>
206 </tr>
207 </blockTable>
208
209=== modified file 'hr_expense/report/expense.sxw'
210Binary files hr_expense/report/expense.sxw 2011-01-14 00:11:01 +0000 and hr_expense/report/expense.sxw 2012-08-09 09:37:21 +0000 differ
211=== modified file 'hr_payroll/report/report_contribution_register.rml'
212--- hr_payroll/report/report_contribution_register.rml 2011-12-21 09:08:11 +0000
213+++ hr_payroll/report/report_contribution_register.rml 2012-08-09 09:37:21 +0000
214@@ -206,7 +206,7 @@
215 <para style="P2">[[ formatLang(r['amount']) ]]</para>
216 </td>
217 <td>
218- <para style="P3">[[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
219+ <para style="P3">[[ formatLang(r['total'], currency_obj=o.company_id.currency_id) ]]</para>
220 </td>
221 </tr>
222 </blockTable>
223@@ -222,7 +222,7 @@
224 <para style="P15">Total:</para>
225 </td>
226 <td>
227- <para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
228+ <para style="P11">[[ formatLang(sum_total(), currency_obj=o.company_id.currency_id) ]]</para>
229 </td>
230 </tr>
231 </blockTable>
232
233=== modified file 'hr_payroll/report/report_contribution_register.sxw'
234Binary files hr_payroll/report/report_contribution_register.sxw 2011-06-29 10:31:10 +0000 and hr_payroll/report/report_contribution_register.sxw 2012-08-09 09:37:21 +0000 differ
235=== modified file 'hr_payroll/report/report_payslip.rml'
236--- hr_payroll/report/report_payslip.rml 2011-12-21 09:08:11 +0000
237+++ hr_payroll/report/report_payslip.rml 2012-08-09 09:37:21 +0000
238@@ -293,7 +293,7 @@
239 <para style="P4">[[ formatLang(p.amount) ]]</para>
240 </td>
241 <td>
242- <para style="P5">[[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
243+ <para style="P5">[[ formatLang(p.total, currency_obj=o.company_id.currency_id) ]]</para>
244 </td>
245 </tr>
246 </blockTable>
247
248=== modified file 'hr_payroll/report/report_payslip.sxw'
249Binary files hr_payroll/report/report_payslip.sxw 2011-06-03 10:32:38 +0000 and hr_payroll/report/report_payslip.sxw 2012-08-09 09:37:21 +0000 differ
250=== modified file 'hr_payroll/report/report_payslip_details.rml'
251--- hr_payroll/report/report_payslip_details.rml 2011-12-21 09:08:11 +0000
252+++ hr_payroll/report/report_payslip_details.rml 2012-08-09 09:37:21 +0000
253@@ -334,7 +334,7 @@
254 <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
255 </td>
256 <td>
257- <para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
258+ <para style="P6">[[ formatLang(h['total'], currency_obj=o.company_id.currency_id) ]]<font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
259 </td>
260 </tr>
261 </blockTable>
262@@ -391,7 +391,7 @@
263 <para style="P5">[[ formatLang(r['amount']) ]]</para>
264 </td>
265 <td>
266- <para style="P6">[[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
267+ <para style="P6">[[ formatLang(r['total'], currency_obj=o.company_id.currency_id) ]]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
268 </td>
269 </tr>
270 </blockTable>
271
272=== modified file 'hr_payroll/report/report_payslip_details.sxw'
273Binary files hr_payroll/report/report_payslip_details.sxw 2011-06-03 10:32:38 +0000 and hr_payroll/report/report_payslip_details.sxw 2012-08-09 09:37:21 +0000 differ
274=== modified file 'mrp_repair/report/order.rml'
275--- mrp_repair/report/order.rml 2011-12-22 15:17:58 +0000
276+++ mrp_repair/report/order.rml 2012-08-09 09:37:21 +0000
277@@ -312,7 +312,7 @@
278 <para style="terp_default_Right_9">[[ formatLang(line.price_unit) ]] </para>
279 </td>
280 <td>
281- <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
282+ <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]</para>
283 </td>
284 </tr>
285 </blockTable>
286@@ -337,7 +337,7 @@
287 <para style="terp_default_Right_9">[[ formatLang(fees.price_unit) ]]</para>
288 </td>
289 <td>
290- <para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
291+ <para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]</para>
292 </td>
293 </tr>
294 </blockTable>
295@@ -353,7 +353,7 @@
296 <para style="terp_default_9">Net Total :</para>
297 </td>
298 <td>
299- <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
300+ <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id)]]</para>
301 </td>
302
303 </tr>
304@@ -367,7 +367,7 @@
305 <para style="terp_default_9">Taxes:</para>
306 </td>
307 <td>
308- <para style="P26">[[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
309+ <para style="P26">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id)]]</para>
310 </td>
311 </tr>
312 <tr>
313@@ -380,7 +380,7 @@
314 <para style="terp_tblheader_Details">Total :</para>
315 </td>
316 <td>
317- <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
318+ <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
319 </td>
320 </tr>
321 </blockTable>
322
323=== modified file 'point_of_sale/report/account_statement.rml'
324--- point_of_sale/report/account_statement.rml 2011-12-21 09:08:11 +0000
325+++ point_of_sale/report/account_statement.rml 2012-08-09 09:37:21 +0000
326@@ -214,10 +214,10 @@
327 <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True)]]</para>
328 </td>
329 <td>
330- <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]</para>
331+ <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account', currency_obj=o.company.currency_id) ]]</para>
332 </td>
333 <td>
334- <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]</para>
335+ <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account', currency_obj=o.company.currency_id) ]]</para>
336 </td>
337 </tr>
338 </blockTable>
339@@ -250,7 +250,7 @@
340 <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
341 </td>
342 <td>
343- <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]</para>
344+ <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account', currency_obj=o.company.currency_id) ]]</para>
345 </td>
346 </tr>
347 </blockTable>
348@@ -267,7 +267,7 @@
349 <para style="terp_tblheader_Details">Total :</para>
350 </td>
351 <td>
352- <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
353+ <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj=o.company.currency_id) ]]</para>
354 </td>
355 </tr>
356 </blockTable>
357
358=== modified file 'point_of_sale/report/account_statement.sxw'
359Binary files point_of_sale/report/account_statement.sxw 2011-01-14 00:11:01 +0000 and point_of_sale/report/account_statement.sxw 2012-08-09 09:37:21 +0000 differ
360=== modified file 'point_of_sale/report/all_closed_cashbox_of_the_day.rml'
361--- point_of_sale/report/all_closed_cashbox_of_the_day.rml 2011-12-21 09:08:11 +0000
362+++ point_of_sale/report/all_closed_cashbox_of_the_day.rml 2012-08-09 09:37:21 +0000
363@@ -183,10 +183,10 @@
364 </para>
365 </td>
366 <td>
367- <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</u></para>
368+ <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1], currency_obj=o.company.currency_id) ]]</u></para>
369 </td>
370 <td>
371- <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</u></para>
372+ <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user), currency_obj=o.company.currency_id) ]]</u></para>
373 </td>
374 </tr>
375 </blockTable>
376@@ -207,10 +207,10 @@
377 <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
378 </td>
379 <td>
380- <para style="P1"><u>[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</u></para>
381+ <para style="P1"><u>[[ (get_bal(statement)) or '0.00' , currency_obj=o.company.currency_id]]</u></para>
382 </td>
383 <td>
384- <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</u></para>
385+ <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']) ,currency_obj=o.company.currency_id) ]]</u></para>
386 </td>
387 </tr>
388 </blockTable>
389@@ -236,7 +236,7 @@
390 </para>
391 </td>
392 <td>
393- <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]</para>
394+ <para style="terp_default_Right_9">[[ formatLang(line_ids['amount'], currency_obj=o.company.currency_id) ]]</para>
395 </td>
396 </tr>
397 </blockTable>
398
399=== modified file 'point_of_sale/report/all_closed_cashbox_of_the_day.sxw'
400Binary files point_of_sale/report/all_closed_cashbox_of_the_day.sxw 2011-01-14 00:11:01 +0000 and point_of_sale/report/all_closed_cashbox_of_the_day.sxw 2012-08-09 09:37:21 +0000 differ
401=== modified file 'point_of_sale/report/pos_details.rml'
402--- point_of_sale/report/pos_details.rml 2011-12-29 16:58:23 +0000
403+++ point_of_sale/report/pos_details.rml 2012-08-09 09:37:21 +0000
404@@ -252,7 +252,7 @@
405 <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
406 </td>
407 <td>
408- <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
409+ <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
410 </td>
411 <td>
412 <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
413@@ -289,7 +289,7 @@
414 <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
415 </td>
416 <td>
417- <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
418+ <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount'], currency_obj=o.company.currency_id) or removeParentNode('tr') ]]</para>
419 </td>
420 </tr>
421 </blockTable>
422@@ -320,7 +320,7 @@
423 <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
424 </td>
425 <td>
426- <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
427+ <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account', currency_obj=o.company.currency_id) or removeParentNode('tr') ]]</para>
428 </td>
429 </tr>
430 </blockTable>
431@@ -349,7 +349,7 @@
432 <para style="terp_default_Bold_9">Sales total(Revenue)</para>
433 </td>
434 <td>
435- <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
436+ <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
437 </td>
438 </tr>
439 <tr>
440@@ -365,7 +365,7 @@
441 <para style="terp_default_Bold_9">Total invoiced</para>
442 </td>
443 <td>
444- <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
445+ <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
446 </td>
447 </tr>
448 <tr>
449@@ -373,7 +373,7 @@
450 <para style="terp_default_Bold_9">Total discount</para>
451 </td>
452 <td>
453- <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
454+ <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
455 </td>
456 </tr>
457 <tr>
458@@ -381,7 +381,7 @@
459 <para style="terp_default_Bold_9">Total paid</para>
460 </td>
461 <td>
462- <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
463+ <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
464 </td>
465 </tr>
466 <tr>
467@@ -389,7 +389,7 @@
468 <para style="terp_default_Bold_9">Total of the day</para>
469 </td>
470 <td>
471- <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
472+ <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
473 </td>
474 </tr>
475 </blockTable>
476
477=== modified file 'point_of_sale/report/pos_details.sxw'
478Binary files point_of_sale/report/pos_details.sxw 2011-11-25 09:47:15 +0000 and point_of_sale/report/pos_details.sxw 2012-08-09 09:37:21 +0000 differ
479=== modified file 'point_of_sale/report/pos_payment_report_user.rml'
480--- point_of_sale/report/pos_payment_report_user.rml 2011-12-21 09:08:11 +0000
481+++ point_of_sale/report/pos_payment_report_user.rml 2012-08-09 09:37:21 +0000
482@@ -168,7 +168,7 @@
483 <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
484 </td>
485 <td>
486- <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
487+ <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], currency_obj=o.company.currency_id) ]]</para>
488 </td>
489 </tr>
490 </blockTable>
491@@ -194,7 +194,7 @@
492 <para style="terp_tblheader_General_Right">Total:</para>
493 </td>
494 <td>
495- <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
496+ <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form']), currency_obj=o.company.currency_id) or removeParentNode('blockTable')]]</para>
497 </td>
498 </tr>
499 </blockTable>
500
501=== modified file 'point_of_sale/report/pos_payment_report_user.sxw'
502Binary files point_of_sale/report/pos_payment_report_user.sxw 2011-01-14 00:11:01 +0000 and point_of_sale/report/pos_payment_report_user.sxw 2012-08-09 09:37:21 +0000 differ
503=== modified file 'point_of_sale/report/pos_users_product.rml'
504--- point_of_sale/report/pos_users_product.rml 2011-12-21 09:08:11 +0000
505+++ point_of_sale/report/pos_users_product.rml 2012-08-09 09:37:21 +0000
506@@ -191,7 +191,7 @@
507 <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
508 </td>
509 <td>
510- <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
511+ <para style="terp_default_Right_9">[[ formatLang(line_ids['amt'], currency_obj=o.company.currency_id) ]]</para>
512 </td>
513 </tr>
514 </blockTable>
515@@ -208,7 +208,7 @@
516 <para style="terp_tblheader_General_Right">Total :</para>
517 </td>
518 <td>
519- <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
520+ <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement), currency_obj=o.company.currency_id) ]]</para>
521 </td>
522 </tr>
523 </blockTable>
524
525=== modified file 'point_of_sale/report/pos_users_product.sxw'
526Binary files point_of_sale/report/pos_users_product.sxw 2011-01-14 00:11:01 +0000 and point_of_sale/report/pos_users_product.sxw 2012-08-09 09:37:21 +0000 differ
527=== modified file 'purchase/report/order.sxw'
528Binary files purchase/report/order.sxw 2011-11-03 11:53:04 +0000 and purchase/report/order.sxw 2012-08-09 09:37:21 +0000 differ
529=== modified file 'sale/report/sale_order.sxw'
530Binary files sale/report/sale_order.sxw 2011-05-10 09:14:36 +0000 and sale/report/sale_order.sxw 2012-08-09 09:37:21 +0000 differ
531=== modified file 'sale_layout/report/report_sale_layout.py'
532--- sale_layout/report/report_sale_layout.py 2011-07-18 06:44:21 +0000
533+++ sale_layout/report/report_sale_layout.py 2012-08-09 09:37:21 +0000
534@@ -67,7 +67,7 @@
535 sub_total[i] = entry.price_subtotal and entry.price_subtotal
536 i = i + 1
537 res['note'] = entry.notes or ''
538- res['currency'] = sale_order.pricelist_id.currency_id.symbol
539+ res['currency'] = sale_order.pricelist_id.currency_id
540 res['layout_type'] = entry.layout_type
541 else:
542 res['product_uom_qty'] = ''
543
544=== modified file 'sale_layout/report/report_sale_layout.rml'
545--- sale_layout/report/report_sale_layout.rml 2012-03-15 18:11:12 +0000
546+++ sale_layout/report/report_sale_layout.rml 2012-08-09 09:37:21 +0000
547@@ -257,7 +257,7 @@
548 <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['discount']) ]]</para>
549 </td>
550 <td>
551- <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ a['currency'] ]]</para>
552+ <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price'), currency_obj=a['currency']) ]]</para>
553 </td>
554 </tr>
555 <tr>
556@@ -313,7 +313,7 @@
557 <para style="terp_default_9">Net Total :</para>
558 </td>
559 <td>
560- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
561+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]]</para>
562 </td>
563 </tr>
564 <tr>
565@@ -326,7 +326,7 @@
566 <para style="terp_default_9">Taxes :</para>
567 </td>
568 <td>
569- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
570+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]]</para>
571 </td>
572 </tr>
573 <tr>
574@@ -339,7 +339,7 @@
575 <para style="terp_default_Bold_9">Total :</para>
576 </td>
577 <td>
578- <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
579+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]] </para>
580 </td>
581 </tr>
582 </blockTable>
583
584=== modified file 'sale_layout/report/report_sale_layout.sxw'
585Binary files sale_layout/report/report_sale_layout.sxw 2011-05-10 09:14:36 +0000 and sale_layout/report/report_sale_layout.sxw 2012-08-09 09:37:21 +0000 differ
586=== modified file 'stock/report/lot_overview.rml'
587--- stock/report/lot_overview.rml 2011-12-21 09:08:11 +0000
588+++ stock/report/lot_overview.rml 2012-08-09 09:37:21 +0000
589@@ -184,7 +184,7 @@
590 <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
591 </td>
592 <td>
593- <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
594+ <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj=o.company_id.currency_id) ]]</para>
595 </td>
596 </tr>
597 </blockTable>
598@@ -198,7 +198,7 @@
599 <para style="terp_default_Bold_9">Total:</para>
600 </td>
601 <td>
602- <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
603+ <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj=o.company.currency_id) ]]</para>
604 </td>
605 </tr>
606 </blockTable>
607@@ -215,7 +215,7 @@
608 </para>
609 </td>
610 <td>
611- <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
612+ <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj=o.company_id.currency_id) ]]</para>
613 </td>
614 </tr>
615 </blockTable>
616
617=== modified file 'stock/report/lot_overview.sxw'
618Binary files stock/report/lot_overview.sxw 2011-01-14 00:11:01 +0000 and stock/report/lot_overview.sxw 2012-08-09 09:37:21 +0000 differ
619=== modified file 'stock/report/lot_overview_all.rml'
620--- stock/report/lot_overview_all.rml 2011-12-21 09:08:11 +0000
621+++ stock/report/lot_overview_all.rml 2012-08-09 09:37:21 +0000
622@@ -184,7 +184,7 @@
623 <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
624 </td>
625 <td>
626- <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
627+ <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj=o.company_id.currency_id) ]] </para>
628 </td>
629 </tr>
630 </blockTable>
631@@ -198,7 +198,7 @@
632 <para style="terp_default_Bold_9">Total:</para>
633 </td>
634 <td>
635- <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
636+ <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj=o.company_id.currency_id) ]]</para>
637 </td>
638 </tr>
639 </blockTable>
640@@ -215,7 +215,7 @@
641 </para>
642 </td>
643 <td>
644- <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
645+ <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account' , currency_obj=o.company.currency_id) ]]</para>
646 </td>
647 </tr>
648 </blockTable>
649
650=== modified file 'stock/report/lot_overview_all.sxw'
651Binary files stock/report/lot_overview_all.sxw 2011-01-14 00:11:01 +0000 and stock/report/lot_overview_all.sxw 2012-08-09 09:37:21 +0000 differ