addons/account_sequence/account_sequence.xml

   1 <?xml version="1.0" encoding="utf-8"?>
   2 <openerp>
   3     <data>
   4
   5 <<<<<<< TREE
   6         <record id="view_account_move_form_inherit" model="ir.ui.view">
   7                 <field name="name">account.move.form.inherit</field>
   8                 <field name="model">account.move</field>
   9                 <field name="type">form</field>
  10                 <field name="inherit_id" ref="account.view_move_form"/>
  11                 <field name="arch" type="xml">
  12                         <field name="to_check" position="after">
  13                                 <field name="internal_sequence_number"/>
  14                         </field>
  15                 </field>
  16     </record>
  17
  18         <record id="view_account_move_tree_inherit" model="ir.ui.view">
  19                 <field name="name">account.move.tree.inherit</field>
  20                 <field name="model">account.move</field>
  21                 <field name="type">tree</field>
  22                 <field name="inherit_id" ref="account.view_move_tree"/>
  23                 <field name="arch" type="xml">
  24                         <field name="ref" position="after">
  25                                 <field name="internal_sequence_number"/>
  26                         </field>
  27                 </field>
  28         </record>
  29
  30         <record model="ir.ui.view" id="view_move_search_inherit">
  31                 <field name="name">view.move.search.inherit</field>
  32                 <field name="model">account.move</field>
  33                 <field name="inherit_id" ref="account.view_account_move_filter"/>
  34                 <field name="arch" type="xml">
  35                         <data>
  36                                 <xpath expr="//field[@name='ref']" position="after">
  37                                         <field name="internal_sequence_number"/>
  38                                 </xpath>
  39                         </data>
  40                 </field>
  41         </record>
  42
  43         <record id="view_account_journal_form_inherit" model="ir.ui.view">
  44                 <field name="name">account.journal.form.inherit</field>
  45                 <field name="model">account.journal</field>
  46                 <field name="type">form</field>
  47                 <field name="inherit_id" ref="account.view_account_journal_form"/>
  48                 <field name="arch" type="xml">
  49                         <field name="code" position="after">
  50                                 <field name="internal_sequence"/>
  51                         </field>
  52                 </field>
  53         </record>
  54
  55         <record model="ir.ui.view" id="view_move_line_form_inherit">
  56                 <field name="name">view.move.line.form.inherit</field>
  57                 <field name="model">account.move.line</field>
  58                 <field name="inherit_id" ref="account.view_move_line_form"/>
  59                 <field name="arch" type="xml">
  60                         <data>
  61                                 <xpath expr="//field[@name='ref']" position="after">
  62                                         <field name="internal_sequence_number"/>
  63                                 </xpath>
  64                         </data>
  65                 </field>
  66         </record>
  67
  68         <record model="ir.ui.view" id="view_move_line_search_inherit">
  69                 <field name="name">view.move.line.search.inherit</field>
  70                 <field name="model">account.move.line</field>
  71                 <field name="inherit_id" ref="account.view_account_move_line_filter"/>
  72                 <field name="arch" type="xml">
  73                         <data>
  74                                 <xpath expr="//field[@name='ref']" position="after">
  75                                         <field name="internal_sequence_number"/>
  76                                 </xpath>
  77                         </data>
  78                 </field>
  79         </record>
  80
  81         </data>
  82 =======
  83     <record id="view_account_move_form_inherit" model="ir.ui.view">
  84        <field name="name">account.move.form.inherit</field>
  85        <field name="model">account.move</field>
  86        <field name="type">form</field>
  87        <field name="inherit_id" ref="account.view_move_form"/>
  88        <field name="arch" type="xml">
  89             <field name="to_check" position="after">
  90                 <field name="internal_sequence_number"/>
  91             </field>
  92        </field>
  93     </record>
  94
  95     <record id="view_account_journal_form_inherit" model="ir.ui.view">
  96        <field name="name">account.journal.form.inherit</field>
  97        <field name="model">account.journal</field>
  98        <field name="type">form</field>
  99        <field name="inherit_id" ref="account.view_account_journal_form"/>
 100        <field name="arch" type="xml">
 101             <field name="sequence_id" position="after">
 102                 <field name="internal_sequence"/>
 103             </field>
 104        </field>
 105     </record>
 106
 107     </data>
 108 >>>>>>> MERGE-SOURCE
 109 </openerp>