[REM] Account: general journal and central journal with target moves

bzr revid: mra@mra-laptop-20101004100521-ixj77ede6yq12l7o
This commit is contained in:
Mustufa Rangwala 2010-10-04 15:35:21 +05:30
parent 96ad74ccc0
commit d2f2e832af
4 changed files with 4 additions and 8 deletions

View File

@ -8,7 +8,7 @@
<field name="inherit_id" ref="account_common_report_view" />
<field name="type">form</field>
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="target_move" position="after">
<field name="amount_currency"/>
<newline/>
</field>

View File

@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="target_move" position="after">
<field name="amount_currency"/>
<newline/>
</field>

View File

@ -30,19 +30,16 @@ class account_print_journal(osv.osv_memory):
'sort_selection': fields.selection([('date', 'Date'),
('ref', 'Reference Number'),],
'Entries Sorted By', required=True),
'target_move': fields.selection([('all', 'All Entries'),
('posted', 'All Posted Entries')], 'Target Moves', required=True)
}
_defaults = {
'sort_selection': 'date',
'target_move': 'all'
}
def _print_report(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
data['form'].update(self.read(cr, uid, ids, ['sort_selection','target_move'])[0])
data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data}
account_print_journal()

View File

@ -8,9 +8,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="target_move" position="after">
<field name="sort_selection"/>
<field name="target_move"/>
<field name="amount_currency"/>
<newline/>
</field>