[IMP] Rename some files on report folder and change common report result_initial_bal => with day=-1 with from date
bzr revid: mra@mra-laptop-20100716072144-23il6f8qd3xazfmy
This commit is contained in:
@@ -78,10 +78,10 @@ module named account_vouchers
|
||||
'wizard/account_unreconcile_view.xml',
|
||||
'wizard/account_report_general_ledger_view.xml',
|
||||
'wizard/account_invoice_state_view.xml',
|
||||
'wizard/account_partner_balance_report_view.xml',
|
||||
'wizard/account_report_balance_view.xml',
|
||||
'wizard/account_report_partner_balance_view.xml',
|
||||
'wizard/account_report_account_balance_view.xml',
|
||||
'wizard/account_move_line_select_view.xml',
|
||||
'wizard/account_aged_trial_balance_view.xml',
|
||||
'wizard/account_report_aged_partner_balance_view.xml',
|
||||
'wizard/account_compare_account_balance_report_view.xml',
|
||||
'wizard/account_third_party_ledger.xml',
|
||||
'wizard/account_reconcile_view.xml',
|
||||
|
||||
@@ -34,9 +34,9 @@ import account_move_journal
|
||||
import account_journal_select
|
||||
import account_move_bank_reconcile
|
||||
import account_subscription_generate
|
||||
import account_aged_trial_balance
|
||||
import account_report_aged_partner_balance
|
||||
import account_third_party_ledger
|
||||
import account_partner_balance_report
|
||||
import account_report_partner_balance
|
||||
import account_period_close
|
||||
import account_fiscalyear_close
|
||||
import account_fiscalyear_close_state
|
||||
@@ -60,7 +60,7 @@ import account_report_print_journal
|
||||
import account_report_central_journal
|
||||
import account_report_general_journal
|
||||
import account_report_general_ledger
|
||||
import account_report_balance
|
||||
import account_report_account_balance
|
||||
|
||||
import account_change_currency
|
||||
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
##############################################################################
|
||||
|
||||
import time
|
||||
import datetime
|
||||
from datetime import timedelta
|
||||
from lxml import etree
|
||||
|
||||
from osv import fields, osv
|
||||
@@ -129,7 +131,7 @@ class account_common_report(osv.osv_memory):
|
||||
result['date_from'] = data['form']['date_from']
|
||||
result['date_to'] = data['form']['date_to']
|
||||
result_initial_bal['date_from'] = '0001-01-01'
|
||||
result_initial_bal['date_to'] = data['form']['date_from'] # FIXME: have to do -1 day!
|
||||
result_initial_bal['date_to'] = (datetime.datetime.strptime(data['form']['date_from'], "%Y-%m-%d") + timedelta(days=-1)).strftime('%Y-%m-%d')
|
||||
elif data['form']['filter'] == 'filter_period':
|
||||
if not data['form']['period_from'] or not data['form']['period_to']:
|
||||
raise osv.except_osv(_('Error'),_('Select a starting and an ending period'))
|
||||
@@ -152,7 +154,6 @@ class account_common_report(osv.osv_memory):
|
||||
query_line = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=used_context)
|
||||
data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
|
||||
data['form']['query_line'] = query_line
|
||||
data['form']['used_context'] = used_context
|
||||
data['form']['initial_bal_query'] = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=used_context_initial_bal)
|
||||
return self._print_report(cr, uid, ids, data, query_line, context=context)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user