- [[ repeatIn( lines( data['form']['period_id'][0][2], data['form']['journal_id'][0][2] ),'line')]]
+ [[ repeatIn( lines( data['form']['periods'], data['form']['journal_ids'] ),'line')]]
|
@@ -208,10 +208,10 @@
|
- [[ formatLang(sum_debit_period( line[0]['pid'],data['form']['journal_id'][0][2])) ]]
+ [[ formatLang(sum_debit_period( line[0]['pid'],data['form']['journal_ids'])) ]]
|
- [[ formatLang(sum_credit_period(line[0]['pid'],data['form']['journal_id'][0][2])) ]]
+ [[ formatLang(sum_credit_period(line[0]['pid'],data['form']['journal_ids'])) ]]
|
diff --git a/addons/account/wizard/account_general_journal.py b/addons/account/wizard/account_general_journal.py
index 8bd2913ae62..f50ab0b737f 100644
--- a/addons/account/wizard/account_general_journal.py
+++ b/addons/account/wizard/account_general_journal.py
@@ -22,23 +22,29 @@ from osv import osv, fields
from tools.translate import _
class account_general_journal(osv.osv_memory):
+ _inherit = "account.common.report"
_name = 'account.general.journal'
_description = 'Account General Journal'
- _columns = {
- 'journal_id': fields.many2many('account.journal', 'account_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
- 'period_id': fields.many2many('account.period', 'account_period_rel', 'account_id', 'period_id', 'Periods', required=True),
- }
+ def _build_context(self, cr, uid, ids, data, context=None):
+ period_obj = self.pool.get('account.period')
+ result = super(account_general_journal, self)._build_context(cr, uid, ids, data, context=context)
+ if not data['form']['period_from'] or not data['form']['period_to']:
+ raise osv.except_osv(_('Error'),_('Select Start period and End period'))
+ elif (data['form']['period_from'] > data['form']['period_to']):
+ raise osv.except_osv(_('Error'),_('Start period should be smaller then End period'))
+ period_date_start = period_obj.read(cr, uid, data['form']['period_from'], ['date_start'])['date_start']
+ period_date_stop = period_obj.read(cr, uid, data['form']['period_to'], ['date_stop'])['date_stop']
+ cr.execute('SELECT id FROM account_period WHERE date_start >= %s AND date_stop <= %s', (period_date_start, period_date_stop))
+ result.update({'periods': map(lambda x: x[0], cr.fetchall())})
+ return result
- def check_data(self, cr, uid, ids, context=None):
+ def _print_report(self, cr, uid, ids, data, query_line, context=None):
+ if context is None:
+ context = {}
obj_jperiod = self.pool.get('account.journal.period')
- datas = {}
- datas['ids'] = []
- datas['model'] = 'account.journal.period'
- datas['form'] = self.read(cr, uid, ids)[0]
- period_id = datas['form']['period_id']
- journal_id = datas['form']['journal_id']
-
+ period_id = data['form']['periods']
+ journal_id = data['form']['journal_ids']
if type(period_id)==type([]):
ids_final = []
for journal in journal_id:
@@ -48,12 +54,13 @@ class account_general_journal(osv.osv_memory):
ids_final.append(ids_journal_period)
if not ids_final:
raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
- return {
- 'type': 'ir.actions.report.xml',
- 'report_name': 'account.general.journal',
- 'datas': datas,
- 'nodestroy':True,
- }
+ data['ids'] = []
+ data['form']['query_get'] = query_line
+ if data['model'] == 'ir.ui.menu':
+ return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal.wiz', 'datas': data, 'nodestroy':True, }
+ else:
+ return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal', 'datas': data, 'nodestroy':True, }
account_general_journal()
+
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
index fc39300d390..0fd994ec707 100644
--- a/addons/account/wizard/account_general_journal_view.xml
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -7,17 +7,22 @@
account.general.journal
form
-
+
|