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

[FIX][IMP] account_analytic_plans: improved the account_crossovered_analytic wizard, fixed the many2many field 'journal_jds' problem in report. 

bzr revid: vra@tinyerp.com-20100810050349-0gghhjo43a0flb7z
This commit is contained in:
vra 2010-08-10 10:33:49 +05:30
parent ebb9370343
commit 9e18e480f8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account_analytic_plans/report/crossovered_analytic.py
View File

@ -70,8 +70,8 @@ class crossovered_analytic(report_sxw.rml_parse):
line_pool = self.pool.get('account.analytic.line')
self.dict_acc_ref = {}
if form['journal_ids'][0][2]:
journal = " in (" + ','.join(map(lambda x: str(x), form['journal_ids'][0][2])) + ")"
if form['journal_ids']:
journal = " in (" + ','.join(map(lambda x: str(x), form['journal_ids'])) + ")"
else:
journal = 'is not null'
@ -114,8 +114,8 @@ class crossovered_analytic(report_sxw.rml_parse):
if not ids:
ids = self.ids
if form['journal_ids'][0][2]:
journal=" in (" + ','.join(map(lambda x: str(x), form['journal_ids'][0][2])) + ")"
if form['journal_ids']:
journal=" in (" + ','.join(map(lambda x: str(x), form['journal_ids'])) + ")"
else:
journal= 'is not null'

7
addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
View File

@ -8,13 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Crossovered Analytic">
<group height="280" width="300">
<group height="300" width="620">
<group col="4" colspan="6">
<field name="date1"/>
<field name="date2"/>
<field name="ref" colspan="4"/>
<field name="journal_ids" colspan="4"/>
<field name="ref"/>
<field name="empty_line"/>
<separator colspan="4" string="Analytic Journal"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">