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

[IMP] clean code 

bzr revid: mra@mra-laptop-20100726132352-5abpwxvhtsv44f1d
This commit is contained in:
Mustufa Rangwala 2010-07-26 18:53:52 +05:30
parent 97b969804f
commit 2b733bab1b
3 changed files with 4 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/account/wizard/account_report_common.py
View File

@ -38,26 +38,10 @@ class account_common_report(osv.osv_memory):
'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by:", required=True),
'period_from': fields.many2one('account.period', 'Start period'),
'period_to': fields.many2one('account.period', 'End period'),
#not used. Do we really need it? 'period_ids': fields.many2many('account.period', 'ledger_period_rel', 'ledger_id', 'period_id', 'Periods'),
'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
'date_from': fields.date("Start Date"),
'date_to': fields.date("End Date"),
#'display_account': fields.selection([('bal_mouvement','With movements'), ('bal_all','All'), ('bal_solde','With balance is not equal to 0')],"Display accounts"),
#'amount_currency': fields.boolean("With Currency"),
#'company_id': fields.many2one('res.company', 'Company', required=True),
}
# def _get_company(self, cr, uid, context=None):
# user_obj = self.pool.get('res.users')
# company_obj = self.pool.get('res.company')
# if context is None:
# context = {}
# user = user_obj.browse(cr, uid, uid, context=context)
# if user.company_id:
# return user.company_id.id
# else:
# return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')
@ -94,14 +78,11 @@ class account_common_report(osv.osv_memory):
return self.pool.get('account.journal').search(cr, uid ,[])
_defaults = {
# 'company_id' : _get_company,
# 'display_account' : 'bal_all',
'fiscalyear_id' : _get_fiscalyear,
# 'amount_currency' : True,
'journal_ids': _get_all_journal,
'filter': 'filter_no',
'chart_account_id': _get_account,
}
}
def _build_periods(self, cr, uid, period_from, period_to):
period_obj = self.pool.get('account.period')

36
addons/account/wizard/account_report_common_view.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="account_common_report_view" model="ir.ui.view">
<field name="name">Common Report</field>
<field name="model">account.common.report</field>
@ -48,40 +49,5 @@
<field name="target">new</field>
</record>
<!--<menuitem icon="STOCK_PRINT" name="Common report" parent="account.menu_generic_report" action="action_account_common_menu" id="menu_account_common"/> -->
<!--
<record id="action_account_general_ledger_report" model="ir.actions.act_window">
<field name="name">General Ledger</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.general.ledger.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_general_ledger_report_view"/>
<field name="target">new</field>
</record>
<record model="ir.values" id="account_general_ledger_report_values">
<field name="model_id" ref="account.model_account_account" />
<field name="object" eval="1" />
<field name="name">Account General Ledger</field>
<field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_general_ledger_report'))" />
<field name="key">action</field>
<field name="model">account.account</field>
</record>
<record id="action_account_general_ledger_menu" model="ir.actions.act_window">
<field name="name">Select Chart</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.general.ledger.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_general_ledger_report_view1"/>
<field name="target">new</field>
</record>
-->
</data>
</openerp>

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

@ -20,7 +20,6 @@
##############################################################################
from osv import fields, osv
from tools.translate import _
class account_report_general_ledger(osv.osv_memory):
_inherit = "account.common.report"
@ -62,4 +61,4 @@ class account_report_general_ledger(osv.osv_memory):
account_report_general_ledger()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: