[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
parent d75a9c0023 8662748bf6
commit 2e3728db21
75 changed files with 2831 additions and 1302 deletions
@@ -31,12 +31,13 @@
                        <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                        <field name="state" widget="statusbar"/>
                    </header>
-                    <group col="4">
+                    <sheet>
+                     <group col="4">
                        <field name="name"/>
                        <field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                        <field name="date"/>
-                    </group>
-                    <notebook>
+                     </group>
+                     <notebook>
                        <page string="Server &amp; Login">
                            <group>
                                <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
@@ -67,6 +68,7 @@
                            </group>
                        </page>
                    </notebook>
+                  </sheet>
                </form>
            </field>
        </record>