Chris Biersbach (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-577045_2-cbi into
lp:openobject-addons/6.1.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-577045_2-cbi/+merge/130090
This fixes some small glitches I introduced in the branch
lp:openobject-addons/6.1-opw-577045
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-577045_2-cbi/+merge/130090
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-577045_2-cbi.
=== modified file 'account/report/account_balance.rml'
--- account/report/account_balance.rml 2012-10-08 11:59:50 +0000
+++ account/report/account_balance.rml 2012-10-17 11:23:28 +0000
@@ -232,10 +232,13 @@
<td>
<para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
</td>
- <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
- <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
- <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
- <td> <para style="terp_default_Centre_8">[[ not has_filter(data) and get_filter(data) or removeParentNode('para') ]] </para>
+ <td>
+ <para style="terp_default_Centre_8">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
+ <para style="terp_default_Centre_8">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
+ <para style="terp_default_Centre_8">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
<blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
<tr>
<td>
=== modified file 'account/report/account_central_journal.py'
--- account/report/account_central_journal.py 2011-01-14 00:11:01 +0000
+++ account/report/account_central_journal.py 2012-10-17 11:23:28 +0000
@@ -38,6 +38,7 @@
'lines': self.lines,
'sum_debit': self._sum_debit,
'sum_credit': self._sum_credit,
+ 'has_filter': self._has_filter,
'get_filter': self._get_filter,
'get_fiscalyear': self._get_fiscalyear,
'get_account': self._get_account,
@@ -105,4 +106,4 @@
report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='internal')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/report/account_central_journal.rml'
--- account/report/account_central_journal.rml 2011-12-21 09:08:11 +0000
+++ account/report/account_central_journal.rml 2012-10-17 11:23:28 +0000
@@ -238,7 +238,7 @@
<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">Journal</para></td>
- <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
+ <td><para style="terp_tblheader_General_Centre">Filter By [[ has_filter(data) and get_filter(data) ]]</para></td>
<td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
</tr>
<tr>
=== modified file 'account/report/account_financial_report.py'
--- account/report/account_financial_report.py 2012-10-09 09:47:28 +0000
+++ account/report/account_financial_report.py 2012-10-17 11:23:28 +0000
@@ -35,6 +35,7 @@
'get_account': self._get_account,
'get_start_period': self.get_start_period,
'get_end_period': self.get_end_period,
+ 'has_filter': self._has_filter,
'get_filter': self._get_filter,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
@@ -53,7 +54,8 @@
account_obj = self.pool.get('account.account')
currency_obj = self.pool.get('res.currency')
ids2 = self.pool.get('account.financial.report')._get_children_by_order(self.cr, self.uid, [data['form']['account_report_id'][0]], context=data['form']['used_context'])
- for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=data['form']['used_context']):
+ new_context = dict(data['form']['used_context'], lang=self.context.get('lang', 'en_US'))
+ for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=new_context):
vals = {
'name': report.name,
'balance': report.balance * report.sign or 0.0,
@@ -76,7 +78,7 @@
elif report.type == 'account_type' and report.account_type_ids:
account_ids = account_obj.search(self.cr, self.uid, [('user_type','in', [x.id for x in report.account_type_ids])])
if account_ids:
- for account in account_obj.browse(self.cr, self.uid, account_ids, context=data['form']['used_context']):
+ for account in account_obj.browse(self.cr, self.uid, account_ids, context=new_context):
#if there are accounts to display, we add them to the lines with a level equals to their level in
#the COA + 1 (to avoid having them with a too low level that would conflicts with the level of data
#financial reports for Assets, liabilities...)
=== 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-10-17 11:23:28 +0000
@@ -170,13 +170,13 @@
<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 [[ has_filter(data) 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>
- <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+ <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_General_Centre">Start Date</para></td>
<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@@ -186,7 +186,7 @@
<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
</tr>
</blockTable>
- <blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+ <blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_tblheader_General_Centre">Start Period</para></td>
<td><para style="terp_tblheader_General_Centre">End Period</para></td>
@@ -196,7 +196,7 @@
<td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
</tr>
</blockTable>
- </td>
+ </td>
</tr>
</blockTable>
<para style="Standard">
=== modified file 'account/report/account_general_ledger.py'
--- account/report/account_general_ledger.py 2012-09-24 12:41:57 +0000
+++ account/report/account_general_ledger.py 2012-10-17 11:23:28 +0000
@@ -31,6 +31,8 @@
from report import report_sxw
from common_report_header import common_report_header
+from tools.translate import _
+
class general_ledger(report_sxw.rml_parse, common_report_header):
_name = 'report.account.general.ledger'
@@ -300,10 +302,10 @@
def _get_sortby(self, data):
if self.sortby == 'sort_date':
- return 'Date'
+ return _('Date')
elif self.sortby == 'sort_journal_partner':
- return 'Journal & Partner'
- return 'Date'
+ return _('Journal & Partner')
+ return _('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.rml'
--- account/report/account_general_ledger.rml 2011-12-21 09:08:11 +0000
+++ account/report/account_general_ledger.rml 2012-10-17 11:23:28 +0000
@@ -353,7 +353,7 @@
<para style="terp_tblheader_General_Centre">Journals</para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
+ <para style="terp_tblheader_General_Centre">Filter By [[ has_filter(data) and get_filter(data) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Target Moves</para>
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2012-10-08 11:59:50 +0000
+++ account/report/account_general_ledger_landscape.rml 2012-10-17 11:23:28 +0000
@@ -372,7 +372,7 @@
<para style="terp_tblheader_General_Centre">Display Account</para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
+ <para style="terp_tblheader_General_Centre">Filter By [[ has_filter(data) and get_filter(data) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Entries Sorted By</para>
=== modified file 'account/report/account_partner_ledger.py'
--- account/report/account_partner_ledger.py 2012-09-24 12:41:57 +0000
+++ account/report/account_partner_ledger.py 2012-10-17 11:23:28 +0000
@@ -42,6 +42,7 @@
'get_start_period': self.get_start_period,
'get_end_period': self.get_end_period,
'get_account': self._get_account,
+ 'has_filter': self._has_filter,
'get_filter': self._get_filter,
'get_start_date': self._get_start_date,
'get_end_date': self._get_end_date,
=== modified file 'account/report/account_partner_ledger.rml'
--- account/report/account_partner_ledger.rml 2011-12-21 09:08:11 +0000
+++ account/report/account_partner_ledger.rml 2012-10-17 11:23:28 +0000
@@ -355,7 +355,7 @@
<para style="terp_tblheader_General_Centre">Journals</para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
+ <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Partner's</para>
@@ -377,7 +377,7 @@
<para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
+ <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
<blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
<tr>
<td>
=== modified file 'hr_holidays/report/holidays_summary.xsl'
--- hr_holidays/report/holidays_summary.xsl 2011-01-14 00:11:01 +0000
+++ hr_holidays/report/holidays_summary.xsl 2012-10-17 11:23:28 +0000
@@ -183,7 +183,7 @@
<td> </td>
</tr>
<tr>
- <td><para>
+ <td><para t="1">
<xsl:attribute name="style">employee</xsl:attribute>
Departments and Employees
</para>
=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py 2011-10-16 01:28:00 +0000
+++ hr_holidays/report/holidays_summary_report.py 2012-10-17 11:23:28 +0000
@@ -107,13 +107,14 @@
day_diff=eom-som
if data['form']['holiday_type']!='both':
- type=data['form']['holiday_type']
if data['form']['holiday_type']=='Confirmed':
+ type = _('Confirmed')
holiday_type=('confirm')
else:
+ type = _('Validated')
holiday_type=('validate')
else:
- type="Confirmed and Validated"
+ type = _("Confirmed and Validated")
holiday_type=('confirm','validate')
date_xml.append('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
