[MERGE]:merged abo's changes

bzr revid: apa@tinyerp.com-20120801123112-lagfsycqbnn82c3a
This commit is contained in:
Amit Patel (OpenERP) 2012-08-01 18:01:12 +05:30
commit 941fe87e7b
2 changed files with 16 additions and 8 deletions

View File

@ -1,19 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp> <openerp>
<data> <data>
<record id="view_general_configuration" model="ir.ui.view"> <record id="view_general_configuration" model="ir.ui.view">
<field name="name">base.config.settings.signup</field> <field name="name">base.config.settings.signup</field>
<field name="model">base.config.settings</field> <field name="model">base.config.settings</field>
<field name="inherit_id" ref="base_setup.view_general_configuration"/> <field name="inherit_id" ref="base_setup.view_general_configuration"/>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<div name="multi_company" position="after"> <xpath expr="//group[last()]" position="after">
<div> <group>
<label for="signup_template_user_id"/> <label for="id" string="External Users"/>
<field name="signup_template_user_id" class="oe_inline"/> <div>
</div> <div>
</div> <label for="signup_template_user_id"/>
<field name="signup_template_user_id" class="oe_inline"/>
</div>
</div>
</group>
</xpath>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

View File

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<openerp> <openerp>
<data> <data>
<record id="signup_form_view" model="ir.ui.view"> <record id="signup_form_view" model="ir.ui.view">
<field name="name">signup.signup.form</field> <field name="name">signup.signup.form</field>
<field name="model">signup.signup</field> <field name="model">signup.signup</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Signup" version="7.0"> <form string="Signup" version="7.0">
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
<group colspan="4" states="draft,missmatch"> <group colspan="4" states="draft,missmatch">
<field name="name" required="1"/> <field name="name" required="1"/>
<field name="email" required="1"/> <field name="email" required="1"/>