← Back to branch summary

~openerp/openobject-server/trunk-speedup-need_action-tde

« back to all changes in this revision

Viewing changes to bin/addons/base/ir/ir.xml

  • Committer: Harry (Open ERP)
  • Author(s): xrg
  • Date: 2009-11-20 14:31:04 UTC
  • mfrom: (1119.1.208)
  • mto: (1898.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1900.
  • Revision ID: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9
[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/addons/base/ir/ir.xml
114
114
                        <field name="padding"/>
115
115
                        <field name="number_increment"/>
116
116
                        <field name="number_next"/>
 
117
                        <field name="weight" />
 
118
                        <field name="condition" colspan="4" />
117
119
                        <separator colspan="4" string="Legend (for prefix, suffix)"/>
118
120
                        <group col="8" colspan="4">
119
121
                            <group>