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

[IMP] moved the creation of the link between old fiscal year and new entries journal from wizard_fiscalyear_close_state.py to wizard_fiscalyear_close.py 

bzr revid: qdp@tinyerp.com-20090116162853-2unkpd1wgjbabmvt
This commit is contained in:
qdp 2009-01-16 17:28:53 +01:00
parent 373d638f95
commit 28391eaa27
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/account/wizard/wizard_fiscalyear_close.py
View File

@ -43,7 +43,7 @@ _transaction_fields = {
}
def _data_load(self, cr, uid, data, context):
data['form']['report_name'] = 'End of Fiscal Year Entry'
data['form']['report_name'] = _('End of Fiscal Year Entry')
return data['form']
def _data_save(self, cr, uid, data, context):
@ -152,6 +152,11 @@ def _data_save(self, cr, uid, data, context):
pool.get('account.move.line').create(cr, uid, move)
offset += limit
new_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy2_id'])
start_jp = new_fyear.start_journal_period_id
cr.execute('UPDATE account_fiscalyear ' \
'SET end_journal_period_id = %s ' \
'WHERE id = %s', (start_jp and start_jp.id or None, fy_id))
return {}
class wiz_journal_close(wizard.interface):

7
addons/account/wizard/wizard_fiscalyear_close_state.py
View File

@ -28,14 +28,12 @@ from tools.translate import _
_transaction_form = '''<?xml version="1.0"?>
<form string=" Close states of Fiscal year and periods">
<field name="fy_id"/>
<field name="fy2_id"/>
<separator string="Are you sure you want to close the states of fiscal year and its period?" colspan="4"/>
<field name="sure"/>
</form>'''
_transaction_fields = {
'fy_id': {'string':'Fiscal Year to close', 'type':'many2one', 'relation': 'account.fiscalyear','required':True, 'domain':[('state','=','draft')]},
'fy2_id': {'string':'New Fiscal Year', 'type':'many2one', 'relation': 'account.fiscalyear', 'domain':[('state','=','draft')], 'required':True},
'sure': {'string':'Check this box', 'type':'boolean'},
}
@ -45,8 +43,6 @@ def _data_save(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
fy_id = data['form']['fy_id']
new_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy2_id'])
start_jp = new_fyear.start_journal_period_id
cr.execute('UPDATE account_journal_period ' \
'SET state = %s ' \
@ -55,8 +51,7 @@ def _data_save(self, cr, uid, data, context):
cr.execute('UPDATE account_period SET state = %s ' \
'WHERE fiscalyear_id = %s', ('done',fy_id))
cr.execute('UPDATE account_fiscalyear ' \
'SET state = %s, end_journal_period_id = %s ' \
'WHERE id = %s', ('done', start_jp and start_jp.id or None, fy_id))
'SET state = %s WHERE id = %s', ('done', fy_id))
return {}
class wiz_journal_close_state(wizard.interface):