[MERGE] Merged from main branch.

bzr revid: vra@tinyerp.com-20100524081117-s63vktc1m3grcu8v
2010-05-24 13:41:17 +05:30
parent e277449755
commit ff1b4fd3f0
143 changed files with 7082 additions and 2503 deletions
@@ -45,7 +45,7 @@
        <field name="type">form</field>
        <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
        <field name="arch" type="xml">
-            <field name="priority" position="after">
+            <field name="show_as" position="after">
                <field name="code"/>
            </field>
        </field>