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

[IMP] General ledger: misc changes 

bzr revid: mra@mra-laptop-20100709064001-otp1p0nvkbcgny4l
This commit is contained in:
Mustufa Rangwala 2010-07-09 12:10:01 +05:30
parent b708438349
commit 21bb305610
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/account/report/general_ledger.py
View File

@ -23,10 +23,12 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import time
from report import report_sxw
import xml
import rml_parse
import pooler
@ -34,9 +36,7 @@ class general_ledger(rml_parse.rml_parse):
_name = 'report.account.general.ledger'
def set_context(self, objects, data, ids, report_type = None):
##
self.borne_date = self.get_min_date(data['form'])
##
new_ids = []
if (data['model'] == 'account.account'):
new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
@ -45,7 +45,9 @@ class general_ledger(rml_parse.rml_parse):
objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
super(general_ledger, self).set_context(objects, data, new_ids, report_type)
def __init__(self, cr, uid, name, context):
def __init__(self, cr, uid, name, context=None):
if context is None:
context = {}
super(general_ledger, self).__init__(cr, uid, name, context=context)
self.date_borne = {}
self.query = ""
@ -122,7 +124,7 @@ class general_ledger(rml_parse.rml_parse):
res = []
ctx = self.context.copy()
self.query = form['query_get']
self.query = form['query_line']
if account and account.child_consol_ids: # add ids of consolidated childs also of selected account
ctx['consolidate_childs'] = True
ctx['account_id'] = account.id
@ -324,19 +326,19 @@ class general_ledger(rml_parse.rml_parse):
else:
currency_total = self.tot_currency = 0.0
return currency_total
def get_fiscalyear(self,form):
return pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear_id']).name
def get_account(self,form):
return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr,self.uid,form['chart_account_id']).name
def get_start_period(self, form):
if form['filter'] == 'filter_period':
if form['filter'] == 'filter_period':
if form['period_from']:
return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,form['period_from']).name
return ''
def get_end_period(self, form):
if form['filter'] == 'filter_period':
if form['period_to']:

11
addons/account/wizard/account_report_general_ledger.py
View File

@ -22,10 +22,9 @@ import time
from osv import fields, osv
from tools.translate import _
import tools
class account_report_general_ledger(osv.osv_memory):
_inherit = "account.common.report"
_inherit = "account.common.journal.report"
_name = "account.report.general.ledger"
_description = "General Ledger Report"
@ -35,7 +34,7 @@ class account_report_general_ledger(osv.osv_memory):
'soldeinit': fields.boolean("Include initial balances"),
'amount_currency': fields.boolean("With Currency"),
'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
}
}
_defaults = {
'display_account' : 'bal_all',
@ -45,14 +44,14 @@ class account_report_general_ledger(osv.osv_memory):
}
def _print_report(self, cr, uid, ids, data, query_line, context=None):
data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
data['form'].update(self.read(cr, uid, ids, ['display_account', 'landscape', 'soldeinit', 'amount_currency', 'sortby'])[0])
data['form']['query_get'] = query_line
# data['form']['query_get'] = query_line
if data['form']['landscape'] == True:
return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data, 'nodestroy':True, }
else:
return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data, 'nodestroy':True, }
account_report_general_ledger()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: