Michael (OpenERP) has proposed merging
lp:~openerp-dev/openerp-int/mck_add_tab_company into
lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_add_tab_company/+merge/127712
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_add_tab_company/+merge/127712
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_add_tab_company into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_contact/view/company.xml'
--- mck_contact/view/company.xml 2012-10-02 07:38:46 +0000
+++ mck_contact/view/company.xml 2012-10-03 10:54:23 +0000
@@ -87,124 +87,131 @@
</group>
<label string="" colspan="4" />
<label string="" colspan="4" />
- <separator string="Company addresses" colspan="4" />
- <field name="addresses_ids" colspan="4" nolabel="1"
- on_change="onchange_location(addresses_ids)">
- <tree editable="top">
- <field name="hq" />
- <field name="street" />
- <field name="street2" />
- <field name="city" />
- <field name="zip" string="Postal Code"/>
- <field name="country_id" />
- <field name="state" />
- </tree>
- </field>
-
- <label string="" colspan="4" />
- <label string="" colspan="4" />
- <separator string="Executives" colspan="4" />
- <field name="address" colspan="4" nolabel="1" readonly="1">
- <tree string="">
- <field name="contact_name" />
- <field name="title" />
- <field name="type_id" />
- <field name="email" />
- <field name="level_id" />
- <field name="country_id" />
- <field name="state" string="State" />
- </tree>
- <form string="Role">
- <group colspan="4" col="16">
- <label string="" colspan="16" />
- <label string="" colspan="16" />
- <field name="contact_id" colspan="8" />
- <field name="location_id" colspan="8" />
- <label string="" colspan="16" />
- <label string="" colspan="16" />
- <separator string="Details" colspan="16" />
- <label string="" colspan="16" />
- <field name="title" colspan="4" />
- <field name="type_id" widget="selection" colspan="4"/>
- <field name="division" colspan="4" />
- <field name="level_id" widget="selection" colspan="4"/>
- <label string="" colspan="16" />
-
- <field name="title_source" colspan="4" />
- <label string="" />
- <button type="object" name="confirm_title" string="Confirm Title"
- colspan="3" />
- <field name="title_confirm_date" string="Confirmed On" colspan="4"/>
- <field name="title_confirm_user" colspan="4" string="By" />
-
-
- <label string="" colspan="16" />
- <label string="" colspan="16" />
- <separator string="Contact Information" colspan="16" />
- <label string="" colspan="16" />
- <field name="email" colspan="4" />
- <field name="mobile" colspan="4" />
- <field name="phone" colspan="4" />
- <newline/>
- <label string="" colspan="16" />
- <field name="email_source" colspan="4" />
+ <notebook>
+ <page string="General">
+ <separator string="Company addresses" colspan="4" />
+ <field name="addresses_ids" colspan="4" nolabel="1"
+ on_change="onchange_location(addresses_ids)">
+ <tree editable="top">
+ <field name="hq" />
+ <field name="street" />
+ <field name="street2" />
+ <field name="city" />
+ <field name="zip" string="Postal Code"/>
+ <field name="country_id" />
+ <field name="state" />
+ </tree>
+ </field>
+
+ <label string="" colspan="4" />
+ <label string="" colspan="4" />
+ <separator string="Executives" colspan="4" />
+ <field name="address" colspan="4" nolabel="1" readonly="1">
+ <tree string="">
+ <field name="contact_name" />
+ <field name="title" />
+ <field name="type_id" />
+ <field name="email" />
+ <field name="level_id" />
+ <field name="country_id" />
+ <field name="state" string="State" />
+ </tree>
+ <form string="Role">
+ <group colspan="4" col="16">
+ <label string="" colspan="16" />
+ <label string="" colspan="16" />
+ <field name="contact_id" colspan="8" />
+ <field name="location_id" colspan="8" />
+ <label string="" colspan="16" />
+ <label string="" colspan="16" />
+ <separator string="Details" colspan="16" />
+ <label string="" colspan="16" />
+ <field name="title" colspan="4" />
+ <field name="type_id" widget="selection" colspan="4"/>
+ <field name="division" colspan="4" />
+ <field name="level_id" widget="selection" colspan="4"/>
+ <label string="" colspan="16" />
+
+ <field name="title_source" colspan="4" />
<label string="" />
- <button type="object" name="confirm_email" string="Confirm Email"
- colspan="3" />
- <field name="email_confirm_date" string="Confirmed On" colspan="4" />
-
- <field name="email_confirm_user"
- colspan="4" string="By" />
-
-
-
- <label string="" colspan="16" />
- <label string="" colspan="16" />
- <separator string="Assistant Information" colspan="16" />
- <label string="" colspan="16" />
- <field name="assistant_first_name" colspan="4" />
- <field name="assistant_last_name" colspan="4" />
- <newline />
- <label string="" colspan="16" />
- <field name="assistant_email" colspan="4" />
- <field name="assistant_mobile" colspan="4" />
- <field name="assistant_phone" colspan="4" />
-
- <label string="" colspan="16" />
- <label string="" colspan="16" />
- <separator colspan="16" string="Function and Service Lines" />
- <label string="" colspan="16" />
- <field name="function_ids" colspan="16" nolabel="1">
- <tree editable="top">
- <field name="function_id" />
- <field name="service_line_1_id"
- attrs="{ 'readonly' : [('function_id', '=', False)] }"
- context="{'default_related_id' : function_id}" />
- <field name="service_line_2_id"
- attrs="{ 'readonly' : [('function_id', '=', False)] }"
- context="{'default_related_id' : function_id}" />
- <field name="service_line_3_id"
- attrs="{ 'readonly' : [('function_id', '=', False)] }"
- context="{'default_related_id' : function_id}" />
- </tree>
- </field>
- </group>
- </form>
- </field>
-
- <label string="" colspan="4" />
- <label string="" colspan="4" />
- <separator string="Comments" colspan="4" />
- <field name="comment" nolabel="1" colspan="4"/>
- <label string="" colspan="4" />
- <label string="" colspan="4" />
- <separator string="Edit History" colspan="4" />
- <label string="" colspan="4" />
- <field name="create_uid" widget="selection" />
- <field name="create_date" />
- <label string="" colspan="4" />
- <field name="write_uid" widget="selection" />
- <field name="write_date" />
+ <button type="object" name="confirm_title" string="Confirm Title"
+ colspan="3" />
+ <field name="title_confirm_date" string="Confirmed On" colspan="4"/>
+ <field name="title_confirm_user" colspan="4" string="By" />
+
+
+ <label string="" colspan="16" />
+ <label string="" colspan="16" />
+ <separator string="Contact Information" colspan="16" />
+ <label string="" colspan="16" />
+ <field name="email" colspan="4" />
+ <field name="mobile" colspan="4" />
+ <field name="phone" colspan="4" />
+ <newline/>
+ <label string="" colspan="16" />
+ <field name="email_source" colspan="4" />
+ <label string="" />
+ <button type="object" name="confirm_email" string="Confirm Email"
+ colspan="3" />
+ <field name="email_confirm_date" string="Confirmed On" colspan="4" />
+
+ <field name="email_confirm_user"
+ colspan="4" string="By" />
+
+
+
+ <label string="" colspan="16" />
+ <label string="" colspan="16" />
+ <separator string="Assistant Information" colspan="16" />
+ <label string="" colspan="16" />
+ <field name="assistant_first_name" colspan="4" />
+ <field name="assistant_last_name" colspan="4" />
+ <newline />
+ <label string="" colspan="16" />
+ <field name="assistant_email" colspan="4" />
+ <field name="assistant_mobile" colspan="4" />
+ <field name="assistant_phone" colspan="4" />
+
+ <label string="" colspan="16" />
+ <label string="" colspan="16" />
+ <separator colspan="16" string="Function and Service Lines" />
+ <label string="" colspan="16" />
+ <field name="function_ids" colspan="16" nolabel="1">
+ <tree editable="top">
+ <field name="function_id" />
+ <field name="service_line_1_id"
+ attrs="{ 'readonly' : [('function_id', '=', False)] }"
+ context="{'default_related_id' : function_id}" />
+ <field name="service_line_2_id"
+ attrs="{ 'readonly' : [('function_id', '=', False)] }"
+ context="{'default_related_id' : function_id}" />
+ <field name="service_line_3_id"
+ attrs="{ 'readonly' : [('function_id', '=', False)] }"
+ context="{'default_related_id' : function_id}" />
+ </tree>
+ </field>
+ </group>
+ </form>
+ </field>
+
+
+ <label string="" colspan="4" />
+ <label string="" colspan="4" />
+ <separator string="Edit History" colspan="4" />
+ <label string="" colspan="4" />
+ <field name="create_uid" widget="selection" />
+ <field name="create_date" />
+ <label string="" colspan="4" />
+ <field name="write_uid" widget="selection" />
+ <field name="write_date" />
+
+ </page>
+
+ <page string="Comments">
+ <separator string="Comments" colspan="4" />
+ <field name="comment" nolabel="1" colspan="4"/>
+ </page>
+ </notebook>
</form>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
