Merge lp:~openerp-dev/openobject-addons/7.0-opw-590139-ksa into lp:openobject-addons/7.0
- 7.0-opw-590139-ksa
- Merge into 7.0
Status: | Merged |
---|---|
Approved by: | Naresh(OpenERP) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 9240 |
Proposed branch: | lp:~openerp-dev/openobject-addons/7.0-opw-590139-ksa |
Merge into: | lp:openobject-addons/7.0 |
Diff against target: |
226 lines (+43/-26) 10 files modified
account/report/account_aged_partner_balance.py (+4/-3) account/report/account_aged_partner_balance.rml (+5/-2) account/report/account_balance.rml (+9/-3) account/report/account_general_journal.rml (+2/-2) account/report/account_general_ledger_landscape.rml (+5/-4) account/report/account_journal.py (+4/-3) account/report/account_journal.rml (+6/-4) account/report/account_partner_ledger.py (+4/-3) account/report/account_partner_ledger.rml (+3/-1) account/wizard/account_report_common.py (+1/-1) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-590139-ksa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Naresh(OpenERP) (community) | Approve | ||
Kirti Savalia(OpenERP) (community) | Needs Resubmitting | ||
Review via email: mp+159758@code.launchpad.net |
Commit message
Description of the change
Hello,
Fixed the traslation related problem for the accout related report.
Thanks
KSA
Kirti Savalia(OpenERP) (ksa-openerp) wrote : | # |
Hello,
Apply the changes according your given suggestion.
Thanks
KSA
Naresh(OpenERP) (nch-openerp) : | # |
Olivier Dony (Odoo) (odo-openerp) wrote : | # |
Some remarks:
- some obvious translations were missing next to terms that were fixed (for example the 'Company' labels next to the 'Chart of Accounts' labels in headers => the same fix should have been applied directly).
- none of the .sxw files were updated with the same corrections done in the rml files - causing more desynchronization
- the call to _translate() in the report helpers was not working because it looks for translations of type RML/Report only, and this happens only when the terms appear in RML source, which was not the case. We can achieve the correct result by putting the terms in the RML directly (combined with removeParentNod
I fixed all of the above before merging, please pay attention to those details in the future, at least as long as we are using RML-based reports :-)
Thanks,
Preview Diff
1 | === modified file 'account/report/account_aged_partner_balance.py' | |||
2 | --- account/report/account_aged_partner_balance.py 2012-12-06 14:56:32 +0000 | |||
3 | +++ account/report/account_aged_partner_balance.py 2013-06-14 21:43:25 +0000 | |||
4 | @@ -366,12 +366,13 @@ | |||
5 | 366 | return period or 0.0 | 366 | return period or 0.0 |
6 | 367 | 367 | ||
7 | 368 | def _get_partners(self,data): | 368 | def _get_partners(self,data): |
8 | 369 | # TODO: deprecated, to remove in trunk | ||
9 | 369 | if data['form']['result_selection'] == 'customer': | 370 | if data['form']['result_selection'] == 'customer': |
11 | 370 | return 'Receivable Accounts' | 371 | return self._translate('Receivable Accounts') |
12 | 371 | elif data['form']['result_selection'] == 'supplier': | 372 | elif data['form']['result_selection'] == 'supplier': |
14 | 372 | return 'Payable Accounts' | 373 | return self._translate('Payable Accounts') |
15 | 373 | elif data['form']['result_selection'] == 'customer_supplier': | 374 | elif data['form']['result_selection'] == 'customer_supplier': |
17 | 374 | return 'Receivable and Payable Accounts' | 375 | return self._translate('Receivable and Payable Accounts') |
18 | 375 | return '' | 376 | return '' |
19 | 376 | 377 | ||
20 | 377 | report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner', | 378 | report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner', |
21 | 378 | 379 | ||
22 | === modified file 'account/report/account_aged_partner_balance.rml' | |||
23 | --- account/report/account_aged_partner_balance.rml 2011-09-21 23:46:12 +0000 | |||
24 | +++ account/report/account_aged_partner_balance.rml 2013-06-14 21:43:25 +0000 | |||
25 | @@ -147,7 +147,9 @@ | |||
26 | 147 | <para style="terp_default_Centre_8">[[ data['form']['period_length'] ]]</para> | 147 | <para style="terp_default_Centre_8">[[ data['form']['period_length'] ]]</para> |
27 | 148 | </td> | 148 | </td> |
28 | 149 | <td> | 149 | <td> |
30 | 150 | <para style="terp_default_Centre_8">[[ get_partners(data) ]]</para> | 150 | <para style="terp_default_Centre_8">Receivable Accounts[[ data['form']['result_selection'] == 'customer' or removeParentNode('para') ]]</para> |
31 | 151 | <para style="terp_default_Centre_8">Payable Accounts[[ data['form']['result_selection'] == 'supplier' or removeParentNode('para') ]]</para> | ||
32 | 152 | <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form']['result_selection'] == 'customer_supplier' or removeParentNode('para') ]]</para> | ||
33 | 151 | </td> | 153 | </td> |
34 | 152 | <td> | 154 | <td> |
35 | 153 | <para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para> | 155 | <para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para> |
36 | @@ -166,7 +168,8 @@ | |||
37 | 166 | <para style="terp_tblheader_Details">Partners</para> | 168 | <para style="terp_tblheader_Details">Partners</para> |
38 | 167 | </td> | 169 | </td> |
39 | 168 | <td> | 170 | <td> |
41 | 169 | <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para> | 171 | <para style="terp_tblheader_Details_Right">Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</para> |
42 | 172 | <para style="terp_tblheader_Details_Right">Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]</para> | ||
43 | 170 | </td> | 173 | </td> |
44 | 171 | <td> | 174 | <td> |
45 | 172 | <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para> | 175 | <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para> |
46 | 173 | 176 | ||
47 | === modified file 'account/report/account_aged_partner_balance.sxw' | |||
48 | 174 | Binary files account/report/account_aged_partner_balance.sxw 2011-02-07 09:06:40 +0000 and account/report/account_aged_partner_balance.sxw 2013-06-14 21:43:25 +0000 differ | 177 | Binary files account/report/account_aged_partner_balance.sxw 2011-02-07 09:06:40 +0000 and account/report/account_aged_partner_balance.sxw 2013-06-14 21:43:25 +0000 differ |
49 | === modified file 'account/report/account_balance.rml' | |||
50 | --- account/report/account_balance.rml 2011-12-21 09:08:11 +0000 | |||
51 | +++ account/report/account_balance.rml 2013-06-14 21:43:25 +0000 | |||
52 | @@ -211,8 +211,10 @@ | |||
53 | 211 | </para> | 211 | </para> |
54 | 212 | <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8"> | 212 | <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8"> |
55 | 213 | <tr> | 213 | <tr> |
58 | 214 | <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para> | 214 | <td> |
59 | 215 | <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td> | 215 | <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para> |
60 | 216 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para> | ||
61 | 217 | </td> | ||
62 | 216 | <td> | 218 | <td> |
63 | 217 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 219 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> |
64 | 218 | </td> | 220 | </td> |
65 | @@ -233,7 +235,11 @@ | |||
66 | 233 | <td> | 235 | <td> |
67 | 234 | <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para> | 236 | <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para> |
68 | 235 | </td> | 237 | </td> |
70 | 236 | <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td> | 238 | <td> |
71 | 239 | <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para> | ||
72 | 240 | <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para> | ||
73 | 241 | <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para> | ||
74 | 242 | </td> | ||
75 | 237 | <td> <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> | 243 | <td> <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para> |
76 | 238 | <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] | 244 | <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] |
77 | 239 | <tr> | 245 | <tr> |
78 | 240 | 246 | ||
79 | === modified file 'account/report/account_balance.sxw' | |||
80 | 241 | Binary files account/report/account_balance.sxw 2011-10-27 21:11:24 +0000 and account/report/account_balance.sxw 2013-06-14 21:43:25 +0000 differ | 247 | Binary files account/report/account_balance.sxw 2011-10-27 21:11:24 +0000 and account/report/account_balance.sxw 2013-06-14 21:43:25 +0000 differ |
81 | === modified file 'account/report/account_general_journal.rml' | |||
82 | --- account/report/account_general_journal.rml 2011-12-21 09:08:11 +0000 | |||
83 | +++ account/report/account_general_journal.rml 2013-06-14 21:43:25 +0000 | |||
84 | @@ -220,8 +220,8 @@ | |||
85 | 220 | </blockTable> | 220 | </blockTable> |
86 | 221 | <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2"> | 221 | <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2"> |
87 | 222 | <tr> | 222 | <tr> |
90 | 223 | <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para> | 223 | <td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]</para> |
91 | 224 | <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td> | 224 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td> |
92 | 225 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 225 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> |
93 | 226 | <td><para style="terp_tblheader_General_Centre">Journals</para></td> | 226 | <td><para style="terp_tblheader_General_Centre">Journals</para></td> |
94 | 227 | <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td> | 227 | <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td> |
95 | 228 | 228 | ||
96 | === modified file 'account/report/account_general_journal.sxw' | |||
97 | 229 | Binary files account/report/account_general_journal.sxw 2011-10-27 21:11:24 +0000 and account/report/account_general_journal.sxw 2013-06-14 21:43:25 +0000 differ | 229 | Binary files account/report/account_general_journal.sxw 2011-10-27 21:11:24 +0000 and account/report/account_general_journal.sxw 2013-06-14 21:43:25 +0000 differ |
98 | === modified file 'account/report/account_general_ledger_landscape.rml' | |||
99 | --- account/report/account_general_ledger_landscape.rml 2012-06-13 09:06:00 +0000 | |||
100 | +++ account/report/account_general_ledger_landscape.rml 2013-06-14 21:43:25 +0000 | |||
101 | @@ -360,9 +360,8 @@ | |||
102 | 360 | <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1"> | 360 | <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1"> |
103 | 361 | <tr> | 361 | <tr> |
104 | 362 | <td> | 362 | <td> |
108 | 363 | <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para> | 363 | <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para> |
109 | 364 | <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para> | 364 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td> |
107 | 365 | </td> | ||
110 | 366 | <td> | 365 | <td> |
111 | 367 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> | 366 | <para style="terp_tblheader_General_Centre">Fiscal Year</para> |
112 | 368 | </td> | 367 | </td> |
113 | @@ -395,7 +394,9 @@ | |||
114 | 395 | <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para> | 394 | <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para> |
115 | 396 | </td> | 395 | </td> |
116 | 397 | <td> | 396 | <td> |
118 | 398 | <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para> | 397 | <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para> |
119 | 398 | <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para> | ||
120 | 399 | <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para> | ||
121 | 399 | </td> | 400 | </td> |
122 | 400 | <td> | 401 | <td> |
123 | 401 | <para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para> | 402 | <para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para> |
124 | 402 | 403 | ||
125 | === modified file 'account/report/account_general_ledger_landscape.sxw' | |||
126 | 403 | Binary files account/report/account_general_ledger_landscape.sxw 2011-10-27 21:11:24 +0000 and account/report/account_general_ledger_landscape.sxw 2013-06-14 21:43:25 +0000 differ | 404 | Binary files account/report/account_general_ledger_landscape.sxw 2011-10-27 21:11:24 +0000 and account/report/account_general_ledger_landscape.sxw 2013-06-14 21:43:25 +0000 differ |
127 | === modified file 'account/report/account_journal.py' | |||
128 | --- account/report/account_journal.py 2012-12-06 14:56:32 +0000 | |||
129 | +++ account/report/account_journal.py 2013-06-14 21:43:25 +0000 | |||
130 | @@ -189,11 +189,12 @@ | |||
131 | 189 | return data['form']['amount_currency'] | 189 | return data['form']['amount_currency'] |
132 | 190 | 190 | ||
133 | 191 | def _get_sortby(self, data): | 191 | def _get_sortby(self, data): |
134 | 192 | # TODO: deprecated, to remove in trunk | ||
135 | 192 | if self.sort_selection == 'date': | 193 | if self.sort_selection == 'date': |
137 | 193 | return 'Date' | 194 | return self._translate('Date') |
138 | 194 | elif self.sort_selection == 'ref': | 195 | elif self.sort_selection == 'ref': |
141 | 195 | return 'Reference Number' | 196 | return self._translate('Reference Number') |
142 | 196 | return 'Date' | 197 | return self._translate('Date') |
143 | 197 | 198 | ||
144 | 198 | report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external') | 199 | report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external') |
145 | 199 | report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external') | 200 | report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external') |
146 | 200 | 201 | ||
147 | === modified file 'account/report/account_journal.rml' | |||
148 | --- account/report/account_journal.rml 2012-02-06 12:33:34 +0000 | |||
149 | +++ account/report/account_journal.rml 2013-06-14 21:43:25 +0000 | |||
150 | @@ -186,8 +186,8 @@ | |||
151 | 186 | </para> | 186 | </para> |
152 | 187 | <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2"> | 187 | <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2"> |
153 | 188 | <tr> | 188 | <tr> |
156 | 189 | <td><para style="terp_tblheader_General_Centre"> [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para> | 189 | <td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para> |
157 | 190 | <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td> | 190 | <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td> |
158 | 191 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> | 191 | <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> |
159 | 192 | <td><para style="terp_tblheader_General_Centre">Journal</para></td> | 192 | <td><para style="terp_tblheader_General_Centre">Journal</para></td> |
160 | 193 | <td><para style="terp_tblheader_General_Centre">Period</para></td> | 193 | <td><para style="terp_tblheader_General_Centre">Period</para></td> |
161 | @@ -199,8 +199,10 @@ | |||
162 | 199 | <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td> | 199 | <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td> |
163 | 200 | <td><para style="terp_default_Centre_8">[[ o.journal_id.name ]]</para></td> | 200 | <td><para style="terp_default_Centre_8">[[ o.journal_id.name ]]</para></td> |
164 | 201 | <td><para style="terp_default_Centre_8">[[ o.period_id.name ]] </para></td> | 201 | <td><para style="terp_default_Centre_8">[[ o.period_id.name ]] </para></td> |
167 | 202 | <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td> | 202 | <td> |
168 | 203 | <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td> | 203 | <para style="terp_default_Centre_8">Date[[ data['form'].get('sort_selection', 'date') == 'date' and ' ' or removeParentNode('para') ]]</para> |
169 | 204 | <para style="terp_default_Centre_8">Reference Number[[ data['form'].get('sort_selection', 'date') == 'ref' and ' ' or removeParentNode('para') ]]</para> | ||
170 | 205 | </td> | ||
171 | 204 | </tr> | 206 | </tr> |
172 | 205 | </blockTable> | 207 | </blockTable> |
173 | 206 | <para style="P9"> | 208 | <para style="P9"> |
174 | 207 | 209 | ||
175 | === modified file 'account/report/account_journal.sxw' | |||
176 | 208 | Binary files account/report/account_journal.sxw 2011-10-27 21:11:24 +0000 and account/report/account_journal.sxw 2013-06-14 21:43:25 +0000 differ | 210 | Binary files account/report/account_journal.sxw 2011-10-27 21:11:24 +0000 and account/report/account_journal.sxw 2013-06-14 21:43:25 +0000 differ |
177 | === modified file 'account/report/account_partner_ledger.py' | |||
178 | --- account/report/account_partner_ledger.py 2013-01-23 11:32:53 +0000 | |||
179 | +++ account/report/account_partner_ledger.py 2013-06-14 21:43:25 +0000 | |||
180 | @@ -267,12 +267,13 @@ | |||
181 | 267 | return result_tmp + result_init | 267 | return result_tmp + result_init |
182 | 268 | 268 | ||
183 | 269 | def _get_partners(self): | 269 | def _get_partners(self): |
184 | 270 | # TODO: deprecated, to remove in trunk | ||
185 | 270 | if self.result_selection == 'customer': | 271 | if self.result_selection == 'customer': |
187 | 271 | return 'Receivable Accounts' | 272 | return _('Receivable Accounts') |
188 | 272 | elif self.result_selection == 'supplier': | 273 | elif self.result_selection == 'supplier': |
190 | 273 | return 'Payable Accounts' | 274 | return _('Payable Accounts') |
191 | 274 | elif self.result_selection == 'customer_supplier': | 275 | elif self.result_selection == 'customer_supplier': |
193 | 275 | return 'Receivable and Payable Accounts' | 276 | return _('Receivable and Payable Accounts') |
194 | 276 | return '' | 277 | return '' |
195 | 277 | 278 | ||
196 | 278 | def _sum_currency_amount_account(self, account, form): | 279 | def _sum_currency_amount_account(self, account, form): |
197 | 279 | 280 | ||
198 | === modified file 'account/report/account_partner_ledger.rml' | |||
199 | --- account/report/account_partner_ledger.rml 2012-06-13 09:06:00 +0000 | |||
200 | +++ account/report/account_partner_ledger.rml 2013-06-14 21:43:25 +0000 | |||
201 | @@ -423,7 +423,9 @@ | |||
202 | 423 | </para> | 423 | </para> |
203 | 424 | </td> | 424 | </td> |
204 | 425 | <td> | 425 | <td> |
206 | 426 | <para style="terp_default_Centre_8">[[ get_partners() ]]</para> | 426 | <para style="terp_default_Centre_8">Receivable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer' or removeParentNode('para') ]]</para> |
207 | 427 | <para style="terp_default_Centre_8">Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'supplier' or removeParentNode('para') ]]</para> | ||
208 | 428 | <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer_supplier' or removeParentNode('para') ]]</para> | ||
209 | 427 | </td> | 429 | </td> |
210 | 428 | <td> | 430 | <td> |
211 | 429 | <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para> | 431 | <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para> |
212 | 430 | 432 | ||
213 | === modified file 'account/report/account_partner_ledger.sxw' | |||
214 | 431 | Binary files account/report/account_partner_ledger.sxw 2011-10-27 21:11:24 +0000 and account/report/account_partner_ledger.sxw 2013-06-14 21:43:25 +0000 differ | 433 | Binary files account/report/account_partner_ledger.sxw 2011-10-27 21:11:24 +0000 and account/report/account_partner_ledger.sxw 2013-06-14 21:43:25 +0000 differ |
215 | === modified file 'account/wizard/account_report_common.py' | |||
216 | --- account/wizard/account_report_common.py 2012-12-19 23:31:33 +0000 | |||
217 | +++ account/wizard/account_report_common.py 2013-06-14 21:43:25 +0000 | |||
218 | @@ -175,7 +175,7 @@ | |||
219 | 175 | data['form'][field] = data['form'][field][0] | 175 | data['form'][field] = data['form'][field][0] |
220 | 176 | used_context = self._build_contexts(cr, uid, ids, data, context=context) | 176 | used_context = self._build_contexts(cr, uid, ids, data, context=context) |
221 | 177 | data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or [] | 177 | data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or [] |
223 | 178 | data['form']['used_context'] = used_context | 178 | data['form']['used_context'] = dict(used_context, lang=context.get('lang', 'en_US')) |
224 | 179 | return self._print_report(cr, uid, ids, data, context=context) | 179 | return self._print_report(cr, uid, ids, data, context=context) |
225 | 180 | 180 | ||
226 | 181 | account_common_report() | 181 | account_common_report() |
Needs proper fix by fixing the actual root