Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-573714-han into
lp:openobject-addons/6.1.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
Related bugs:
Bug #969923 in OpenERP Server: "account.general.ledger_landscape missing
translations"
https://bugs.launchpad.net/openobject-server/+bug/969923
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-573714-han/+merge/102435
Hello,
Fixed the issue of translation in account.general.ledger_landscape report.
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-573714-han/+merge/102435
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-573714-han.
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2012-02-08 01:08:30 +0000
+++ account/i18n/account.pot 2012-04-18 05:51:22 +0000
@@ -532,6 +532,8 @@
#: selection:account.report.general.ledger,display_account:0
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "All"
msgstr ""
@@ -1343,6 +1345,7 @@
#: selection:account.common.account.report,display_account:0
#: selection:account.partner.balance,display_partner:0
#: selection:account.report.general.ledger,display_account:0
+#: report:account.general.ledger_landscape:0
msgid "With balance is not equal to 0"
msgstr ""
@@ -3299,6 +3302,8 @@
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
#: field:analytic.entries.report,date:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Date"
msgstr ""
@@ -3367,6 +3372,9 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+
msgid "No Filters"
msgstr ""
@@ -5794,6 +5802,8 @@
#. module: account
#: selection:account.report.general.ledger,sortby:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Journal & Partner"
msgstr ""
@@ -8892,6 +8902,8 @@
#: model:ir.actions.act_window,name:account.action_account_period_form
#: model:ir.ui.menu,name:account.menu_action_account_period_form
#: model:ir.ui.menu,name:account.next_id_23
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Periods"
msgstr ""
@@ -9398,6 +9410,8 @@
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "With movements"
msgstr ""
=== modified file 'account/report/account_financial_report.rml'
--- account/report/account_financial_report.rml 2012-02-13 10:49:37 +0000
+++ account/report/account_financial_report.rml 2012-04-18 05:51:22 +0000
@@ -170,12 +170,12 @@
<tr>
<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
- <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+ <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
</tr>
<tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
- <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
+ <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filters' and get_filter(data) or removeParentNode('para') ]] </para>
<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_General_Centre">Start Date</para></td>
=== modified file 'account/report/account_general_ledger.py'
--- account/report/account_general_ledger.py 2011-06-08 10:04:27 +0000
+++ account/report/account_general_ledger.py 2012-04-18 05:51:22 +0000
@@ -87,6 +87,7 @@
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'get_target_move': self._get_target_move,
+ 'get_display_account': self._get_display_account,
})
self.context = context
@@ -299,10 +300,10 @@
def _get_sortby(self, data):
if self.sortby == 'sort_date':
- return 'Date'
+ return self._translate('Date')
elif self.sortby == 'sort_journal_partner':
- return 'Journal & Partner'
- return 'Date'
+ return self._translate('Journal & Partner')
+ return self._translate('Date')
report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal')
report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal landscape')
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2011-10-27 21:11:24 +0000
+++ account/report/account_general_ledger_landscape.rml 2012-04-18 05:51:22 +0000
@@ -395,7 +395,7 @@
<para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
</td>
<td>
- <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>
+ <para style="terp_default_Centre_7">[[ get_display_account(data) ]]</para>
</td>
<td>
<para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
=== modified file 'account/report/common_report_header.py'
--- account/report/common_report_header.py 2011-12-19 16:54:40 +0000
+++ account/report/common_report_header.py 2012-04-18 05:51:22 +0000
@@ -94,10 +94,18 @@
def _get_filter(self, data):
if data.get('form', False) and data['form'].get('filter', False):
if data['form']['filter'] == 'filter_date':
- return 'Date'
+ return self._translate('Date')
elif data['form']['filter'] == 'filter_period':
- return 'Periods'
- return 'No Filter'
+ return self._translate('Periods')
+ return self._translate('No Filters')
+
+ def _get_display_account(self, data):
+ if data.get('form', False) and data['form'].get('display_account', False):
+ if data['form']['display_account'] == 'all':
+ return self._translate('All')
+ elif data['form']['display_account'] == 'movement':
+ return self._translate('With movements')
+ return self._translate('With balance is not equal to 0')
def _sum_debit_period(self, period_id, journal_id=None):
journals = journal_id or self.journal_ids
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
