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

[imp] l10n_ch: reformatting 

bzr revid: xmo@tinyerp.com-20091214170011-ykicgd8hyqcg86d0
This commit is contained in:
Xavier Morel 2009-12-14 18:00:11 +01:00
parent 844e999700
commit 6eb9f6a5bd
2 changed files with 40 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
addons/l10n_ch/account_journal_view.xml
View File

@ -5,40 +5,40 @@
<field name="model">account.journal.todo</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Journal">
<group colspan="4" col="6">
<field name="name" select="1"/>
</group>
<separator colspan="4" string="The accounts linked to the account journals"/>
<field name="default_credit_account_id"
on_change="on_change_credit(name, default_credit_account_id)" select="1"/>
<field name="default_debit_account_id"
on_change="on_change_debit(name, default_debit_account_id)" select="1"/>
<group col="4" colspan="4">
<button icon="gtk-cancel" name="action_cancel" string="Cancel" type="object"/>
<button icon="gtk-ok" name="action_new" string="Next" type="object"/>
</group>
</form>
<form string="Account Journal">
<group colspan="4" col="6">
<field name="name" select="1"/>
</group>
<separator colspan="4" string="
The accounts linked to the account journals"/>
<field name="default_credit_account_id" select="1"
on_change="on_change_credit(name, default_credit_account_id)"/>
<field name="default_debit_account_id" select="1"
on_change="on_change_debit(name, default_debit_account_id)"/>
<group col="4" colspan="4">
<button icon="gtk-cancel" name="action_cancel"
string="Cancel" type="object"/>
<button icon="gtk-ok" name="action_new"
string="Next" type="object"/>
</group>
</form>
</field>
</record>
<record id="action_config_journal" model="ir.actions.act_window">
<field name="name">Configure Journal</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.journal.todo</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="view_account_journal_form_todo"/>
<field name="target">new</field>
<record id="action_config_journal" model="ir.actions.act_window">
<field name="name">Configure Journal</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.journal.todo</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="view_account_journal_form_todo"/>
<field name="target">new</field>
</record>
<record id="action_config_journal_todo" model="ir.actions.todo">
<field name="name">Finalize your journal</field>
<field name="note">Set accounts on financial journals defined by
Camptocamp l10n_ch module</field>
<field name="action_id" ref="action_config_journal"/>
<field name="sequence">5</field>
<field name="name">Finalize your journal</field>
<field name="note">Set accounts on financial journals defined by
Camptocamp l10n_ch module</field>
<field name="action_id" ref="action_config_journal"/>
<field name="sequence">5</field>
</record>
</data>
</openerp>

44
addons/l10n_ch/wizard/journal_config.py
View File

@ -34,11 +34,8 @@ from osv import fields, osv
class Journal(osv.osv):
"""Create account.journal.todo in order to add configuration wizzard"""
_name ="account.journal.todo"
def _get_journal(self, cr, uid, ctx):
if not self.__dict__.has_key('_inner_steps') :
self._inner_steps = 0
@ -47,36 +44,30 @@ class Journal(osv.osv):
return False
return ids[self._inner_steps]
def _get_debit(self, cr, uid, ctx):
if not self.__dict__.has_key('_inner_steps') :
self._inner_steps = 0
if self._inner_steps == 'done' :
return False
ids = self.pool.get('account.journal').search(cr,uid,[])
id = self.pool.get('account.journal').browse(
return self.pool.get('account.journal').browse(
cr,
uid,
ids[self._inner_steps]
).default_debit_account_id.id
return id
def _get_credit(self, cr, uid, ctx):
if not self.__dict__.has_key('_inner_steps') :
self._inner_steps = 0
if self._inner_steps == 'done' :
return False
ids = self.pool.get('account.journal').search(cr,uid,[])
id = self.pool.get('account.journal').browse(
return self.pool.get('account.journal').browse(
cr,
uid,
ids[self._inner_steps]
).default_credit_account_id.id
return id
_columns={
'name': fields.many2one(
'account.journal',
@ -107,32 +98,19 @@ class Journal(osv.osv):
def on_change_debit(self, cr, uid, id, journal, account) :
if account :
self.pool.get('account.journal').write(
cr,
uid,
journal,
vals={
'default_debit_account_id': account,
}
)
cr, uid, journal,
vals={'default_debit_account_id': account,}
)
return {}
def on_change_credit(self, cr, uid, id, journal, account) :
if account :
self.pool.get('account.journal').write(
cr,
uid,
journal,
vals={
'default_credit_account_id': account,
}
)
cr, uid, journal,
vals={'default_credit_account_id': account,}
)
return {}
def action_cancel(self,cr,uid,ids,context=None):
return {
'view_type': 'form',
@ -140,7 +118,7 @@ class Journal(osv.osv):
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
}
def action_new(self,cr,uid,ids,context={}):
jids = self.pool.get('account.journal').search(cr, uid, [])
if self._inner_steps < len(jids)-1 :
@ -160,8 +138,6 @@ class Journal(osv.osv):
'type': 'ir.actions.act_window',
'target':'new',
}
Journal()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: