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

ACCOUNT: add on_change on one2many form and use xml action in journal_select 

bzr revid: ced-f28f446c25267fe74d1d0c1a6091505d4945e5db
This commit is contained in:
ced 2007-06-11 06:09:43 +00:00
parent 62efbb069a
commit 4a8429a83b
2 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
addons/account/account_view.xml
View File

@ -418,6 +418,15 @@
<field name="amount"/>
<field name="reconcile_id" context="{'partner_id':partner_id,'amount':amount,'account_id':account_id}"/>
</tree>
<form string="Statement lines">
<field name="date"/>
<field name="name"/>
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id,type)"/>
<field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
<field name="amount"/>
<field name="reconcile_id" context="{'partner_id':partner_id,'amount':amount,'account_id':account_id}"/>
</form>
</field>
</page><page string="Real Entries">
<field name="move_line_ids" colspan="4" nolabel="1"/>
@ -808,41 +817,48 @@
<field name="arch" type="xml">
<form string="Account Entry Line">
<notebook>
<page string="Information">
<separator string="General Information" colspan="4"/>
<field name="name" select="1"/>
<field name="date" select="2"/>
<field name="journal_id" select="1" readonly="False"/>
<field name="period_id" select="2" readonly="False"/>
<field name="account_id" select="1"/>
<field name="partner_id" select="2"/>
<newline/>
<field name="debit" select="2"/>
<field name="credit" select="2"/>
<page string="Information">
<separator string="General Information" colspan="4"/>
<field name="name" select="1"/>
<field name="date" select="2"/>
<field name="journal_id" select="1" readonly="False"/>
<field name="period_id" select="2" readonly="False"/>
<field name="account_id" select="1"/>
<field name="partner_id" select="2"/>
<newline/>
<field name="debit" select="2"/>
<field name="credit" select="2"/>
<separator string="Optional Information" colspan="4"/>
<field name="currency_id"/>
<field name="amount_currency"/>
<field name="quantity" select="3"/>
<field name="move_id" required="False"/>
<newline/>
<field name="date_maturity"/>
<field name="date_created"/>
<field name="date_created"/>
<field name="blocked" select="3"/>
<separator string="Optional Information" colspan="4"/>
<field name="currency_id"/>
<field name="amount_currency"/>
<field name="quantity" select="3"/>
<field name="move_id" required="False"/>
<newline/>
<field name="date_maturity"/>
<field name="date_created"/>
<field name="date_created"/>
<field name="blocked" select="3"/>
<separator string="State" colspan="4"/>
<field name="state" select="2"/>
<field name="reconcile_id"/>
</page><page string="Analytic Lines">
<field name="analytic_lines" colspan="4" nolabel="1"/>
</page>
<separator string="State" colspan="4"/>
<field name="state" select="2"/>
<field name="reconcile_id"/>
</page>
<page string="Analytic Lines">
<field name="analytic_lines" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="action_move_line_select">
<field name="res_model">account.move.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_move_line_tree"/>
</record>
# --------------------------------------------------------
# Account.Entry Edition
# --------------------------------------------------------
@ -883,7 +899,7 @@
<field name="name" select="1"/>
<field name="date"/>
<field name="account_id"/>
<field name="partner_id"/>
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit)"/>
<field name="debit" select="1"/>
<field name="credit" select="1"/>
@ -999,6 +1015,15 @@
<field name="amount"/>
<field name="reconcile_id" context="{'partner_id':partner_id,'amount':amount,'account_id':account_id}"/>
</tree>
<form string="Statement lines">
<field name="date"/>
<field name="name"/>
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id,type)"/>
<field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
<field name="amount"/>
<field name="reconcile_id" context="{'partner_id':partner_id,'amount':amount,'account_id':account_id}"/>
</form>
</field>
</page>
</notebook>

24
addons/account/wizard/wizard_journal_select.py
View File

@ -27,22 +27,22 @@
##############################################################################
import wizard
import pooler
def _action_open_window(self, cr, uid, data, context):
cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form'))
view_res = cr.fetchone()
mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_select')
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
result = act_obj.read(cr, uid, [id])[0]
cr.execute('select journal_id,period_id from account_journal_period where id=%d', (data['id'],))
journal_id,period_id = cr.fetchone()
return {
'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (journal_id,period_id),
#'name': 'Saisie Standard',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'account.move.line',
'view_id': view_res,
'context': "{'journal_id':%d, 'period_id':%d}" % (journal_id,period_id),
'type': 'ir.actions.act_window'
}
result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
return result
class wiz_journal(wizard.interface):
states = {