[MERGE] Account_sequence: misc improvements on view

[FIX] account_sequence: indentation

bzr revid: mra@mra-laptop-20101122050707-6n1j9c41m0nkns4p
This commit is contained in:
Mustufa Rangwala 2010-11-22 10:37:07 +05:30
commit 095fe81866
4 changed files with 130 additions and 31 deletions

View File

@ -37,4 +37,4 @@
'certificate': '',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -26,7 +26,7 @@ class account_move(osv.osv):
_inherit = 'account.move'
_columns = {
'internal_sequence_number': fields.char('Internal Sequence Number', size=64, readonly=True),
'internal_sequence_number': fields.char('Internal Number', size=64, readonly=True),
}
def post(self, cr, uid, ids, context=None):
@ -51,4 +51,11 @@ class account_journal(osv.osv):
account_journal()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
class account_move_line(osv.osv):
_inherit = "account.move.line"
_columns = {
'internal_sequence_number': fields.related('move_id','internal_sequence_number', type='char', relation='account.move', string='Internal Number'),
}
account_move_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -2,29 +2,80 @@
<openerp>
<data>
<record id="view_account_move_form_inherit" model="ir.ui.view">
<field name="name">account.move.form.inherit</field>
<field name="model">account.move</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml">
<field name="to_check" position="after">
<field name="internal_sequence_number"/>
<record id="view_account_move_form_inherit" model="ir.ui.view">
<field name="name">account.move.form.inherit</field>
<field name="model">account.move</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml">
<field name="to_check" position="after">
<field name="internal_sequence_number"/>
</field>
</field>
</record>
<record id="view_account_journal_form_inherit" model="ir.ui.view">
<field name="name">account.journal.form.inherit</field>
<field name="model">account.journal</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_journal_form"/>
<field name="arch" type="xml">
<field name="sequence_id" position="after">
<field name="internal_sequence"/>
</field>
</field>
</record>
<record id="view_account_move_tree_inherit" model="ir.ui.view">
<field name="name">account.move.tree.inherit</field>
<field name="model">account.move</field>
<field name="type">tree</field>
<field name="inherit_id" ref="account.view_move_tree"/>
<field name="arch" type="xml">
<field name="ref" position="before">
<field name="internal_sequence_number"/>
</field>
</field>
</field>
</record>
<record id="view_account_journal_form_inherit" model="ir.ui.view">
<field name="name">account.journal.form.inherit</field>
<field name="model">account.journal</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_journal_form"/>
<field name="arch" type="xml">
<field name="sequence_id" position="after">
<field name="internal_sequence"/>
</record>
<record model="ir.ui.view" id="view_move_search_inherit">
<field name="name">view.move.search.inherit</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_account_move_filter"/>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='ref']" position="before">
<field name="internal_sequence_number"/>
</xpath>
</data>
</field>
</field>
</record>
</record>
<record model="ir.ui.view" id="view_move_line_form_inherit">
<field name="name">view.move.line.form.inherit</field>
<field name="model">account.move.line</field>
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='ref']" position="after">
<field name="internal_sequence_number"/>
</xpath>
</data>
</field>
</record>
<record model="ir.ui.view" id="view_move_line_search_inherit">
<field name="name">view.move.line.search.inherit</field>
<field name="model">account.move.line</field>
<field name="inherit_id" ref="account.view_account_move_line_filter"/>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='ref']" position="after">
<field name="internal_sequence_number"/>
</xpath>
</data>
</field>
</record>
</data>
</openerp>

View File

@ -1,15 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--Account Journal Internal Sequences-->
<!--Account Journal Internal Sequences-->
<record id="internal_sequence_journal" model="ir.sequence">
<field name="name">Internal Sequence Journal</field>
<field name="code">account.journal</field>
<field name="number_next">1</field>
<field name="code">account.journal</field>
<field name="number_next">1</field>
</record>
<function eval="('default', False, 'internal_sequence', [('account.journal', False)], internal_sequence_journal, True, False, False, False, True)" id="internal_seq_default_set" model="ir.values" name="set"/>
<!--Account Journal Internal Number of account move line-->
<record id="sp_journal_col3" model="account.journal.column">
<field name="view_id" ref="account.account_sp_journal_view"/>
<field name="name">Internal Number</field>
<field name="field">internal_sequence_number</field>
<field eval="True" name="required"/>
<field eval="2" name="sequence"/>
</record>
<record id="journal_col1" model="account.journal.column">
<field name="view_id" ref="account.account_journal_view"/>
<field name="name">Internal Number</field>
<field name="field">internal_sequence_number</field>
<field eval="True" name="required"/>
<field eval="2" name="sequence"/>
</record>
<record id="bank_col3" model="account.journal.column">
<field name="view_id" ref="account.account_journal_bank_view"/>
<field name="name">Internal Number</field>
<field name="field">internal_sequence_number</field>
<field eval="True" name="required"/>
<field eval="2" name="sequence"/>
</record>
<record id="bank_col3_multi" model="account.journal.column">
<field name="view_id" ref="account.account_journal_bank_view_multi"/>
<field name="name">Internal Number</field>
<field name="field">internal_sequence_number</field>
<field eval="True" name="required"/>
<field eval="2" name="sequence"/>
</record>
<record id="sp_refund_journal_col3" model="account.journal.column">
<field name="view_id" ref="account.account_sp_refund_journal_view"/>
<field name="name">Internal Number</field>
<field name="field">internal_sequence_number</field>
<field eval="True" name="required"/>
<field eval="2" name="sequence"/>
</record>
</data>
</openerp>
</openerp>