diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 71d17ca98576f1dda19d2b2530f558abbee17c98..600a13edfeba67423e737210f62270bb126898b4 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -117,25 +117,26 @@
<page name="sales_purchases" position="after">
<page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}" groups="account.group_account_invoice">
<group>
- <group>
- <field name="property_account_position" widget="selection"/>
- </group>
- <group>
- <field name="last_reconciliation_date"/>
- </group>
- <group>
- <field name="property_account_receivable" groups="account.group_account_invoice" />
+ <group string="Sale" name="acc_sale">
<field name="property_payment_term" widget="selection"/>
<field name="credit"/>
<field name="credit_limit"/>
</group>
- <group>
- <field name="property_account_payable" groups="account.group_account_invoice"/>
+ <group string="Purchase" name="acc_purchase">
<field name="property_supplier_payment_term" widget="selection"/>
<field name="debit"/>
</group>
+ <group string="Fiscal Information" name="fiscal_information">
+ <field name="property_account_position" widget="selection"/>
+ </group>
+ <group string="Accounting Entries" name="accounting_entries">
+ <field name="property_account_receivable" groups="account.group_account_invoice" />
+ <field name="property_account_payable" groups="account.group_account_invoice"/>
+ <field name="last_reconciliation_date"/>
+ </group>
</group>
- <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
+ <group string="Bank Accounts" name="bank_accounts">
+ <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}" nolabel="1">
<tree string="Bank Details">
<field name="state" invisible="1"/>
<field name="sequence" invisible="1"/>
@@ -144,6 +145,7 @@
<field name="owner_name"/>
</tree>
</field>
+ </group>
</page>
<page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}" groups="account.group_account_invoice">
<div>
diff --git a/addons/base_geolocalize/views/res_partner_view.xml b/addons/base_geolocalize/views/res_partner_view.xml
index f05376a425951c35518e68c34c5929fcbce9a24b..2e39732f90fb004fe70057172335fdee80ec5932 100644
--- a/addons/base_geolocalize/views/res_partner_view.xml
+++ b/addons/base_geolocalize/views/res_partner_view.xml
@@ -8,7 +8,7 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//notebook[last()]" position="inside">
- <page string="Geo Location" name="geo_location">
+ <page string="Partner Assignation" name="geo_location">
<group colspan="2" col="2">
<separator string="Geo Location" colspan="2"/>
<button
@@ -17,9 +17,15 @@
colspan="2"
icon="gtk-apply"
type="object"/>
- <field name="partner_latitude"/>
- <field name="partner_longitude"/>
- <field name="date_localization"/>
+ <div>
+ <span class="oe_inline"> ( On </span>
+ <field name="date_localization" nolabel="1" class="oe_inline"/>
+ <span> : Lat : </span>
+ <field name="partner_latitude" nolabel="1" class="oe_inline"/>
+ <span> ; Long: </span>
+ <field name="partner_longitude" nolabel="1" class="oe_inline"/>
+ <span>) </span>
+ </div>
</group>
</page>
</xpath>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 88492fb1de71085d4e057d85865319753185f4e5..c26505f61a1535d6f31c6e851e7f7a7106e36d06 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -105,26 +105,30 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base_geolocalize.view_crm_partner_geo_form"/>
<field name="arch" type="xml">
- <xpath expr="//page[@name='geo_location']" position="inside">
- <group>
+ <data>
+ <xpath expr="//page[@name='geo_location']" position="inside">
<group>
- <separator string="Partner Activation" colspan="2"/>
- <field name="grade_id" widget="selection"/>
- <field name="activation" widget="selection"/>
- <field name="partner_weight"/>
- <field name="assigned_partner_id"/>
+ <group>
+ <separator string="Partner Activation" colspan="2"/>
+ <field name="grade_id" widget="selection"/>
+ <field name="activation" widget="selection"/>
+ <field name="partner_weight"/>
+ </group>
+ <group>
+ <separator string="Partner Review" colspan="2"/>
+ <field name="date_review"/>
+ <field name="date_review_next"/>
+ <field name="date_partnership"/>
+ </group>
+ <group>
+ <button name="%(crm.relate_partner_opportunities)d" string="Assigned Opportunities" type="action" />
+ </group>
</group>
- <group>
- <separator string="Partner Review" colspan="2"/>
- <field name="date_review"/>
- <field name="date_review_next"/>
- <field name="date_partnership"/>
- </group>
- <group>
- <button name="%(crm.relate_partner_opportunities)d" string="Assigned Opportunities" type="action" />
- </group>
- </group>
- </xpath>
+ </xpath>
+ <xpath expr="//group[@name='sale']" position="inside">
+ <field name="assigned_partner_id"/>
+ </xpath>
+ </data>
</field>
</record>
diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml
index 710dab18b9391cf2782215ad008861fe8b280958..80de531547068ea4b06a69d8d9e1acaa5ac649b3 100644
--- a/addons/delivery/partner_view.xml
+++ b/addons/delivery/partner_view.xml
@@ -4,7 +4,7 @@
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.carrier.property.form.inherit</field>
<field name="model">res.partner</field>
- <field name="inherit_id" ref="stock.view_partner_property_form" />
+ <field name="inherit_id" ref="stock.view_partner_stock_form" />
<field name="arch" type="xml">
<field name="property_stock_supplier" position="after">
<field name="property_delivery_carrier"/>
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index fbcfa8ba6ea22813ddda7871c46c9ae44b4d4dd7..0a41c7c05cab4e96dc65ee2dfbdc4eb1413a12ef 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -6,9 +6,9 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
- <xpath expr="//field[@name='active']" position="after">
+ <group name="mailing" string="Mailing">
<field name="opt_out"/>
- </xpath>
+ </group>
</field>
</record>
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
index c81569e0ad26df1b6a2ed92c797dd2fea67fa438..627c1d3ace6197922151445fb0388de831679d84 100644
--- a/addons/event/res_partner.py
+++ b/addons/event/res_partner.py
@@ -25,6 +25,6 @@ from openerp import models, fields
class res_partner(models.Model):
_inherit = 'res.partner'
- speaker = fields.Boolean(help="Check this box if this contact is a speaker.")
+ speaker = fields.Boolean(help="Check this box if this contact is a speaker.", string='Event Track Speaker')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 5066d85e6826d9f63be65d28123719e7f51936e0..6b36a62005f068bf7056ec9a5cbdf08e34cda1a7 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -7,8 +7,12 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
- <xpath expr="//field[@name='active']" position="after">
- <field name='notify_email' widget="radio"/>
+ <xpath expr="//group[@name='container_row_2']" position="after">
+ <group name="container_row_communication">
+ <group string="Mailing" name="mailing">
+ <field name='notify_email' widget="radio"/>
+ </group>
+ </group>
</xpath>
<xpath expr="//sheet" position="after">
<div class="oe_chatter">
diff --git a/addons/point_of_sale/res_partner_view.xml b/addons/point_of_sale/res_partner_view.xml
index f18bcb5e72700e45cb2e48de5bbf63a4ae44351a..28591affe5c09994d5f9ca3a7511fb2e92967026 100644
--- a/addons/point_of_sale/res_partner_view.xml
+++ b/addons/point_of_sale/res_partner_view.xml
@@ -3,16 +3,18 @@
<data>
<record id="view_partner_property_form" model="ir.ui.view">
- <field name="name">res.partner.product.property.form.inherit</field>
+ <field name="name">res.partner.pos.form.inherit</field>
<field name="model">res.partner</field>
- <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="inherit_id" ref="stock.view_partner_stock_form"/>
<field name="arch" type="xml">
- <group name="point_of_sale" position="replace">
- <group string="Point of Sale">
- <field name="ean13" />
- <button name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" />
+ <xpath expr="//group[@name='warehouse']" position="before">
+ <group name="point_of_sale" position="replace">
+ <group string="Point of Sale">
+ <field name="ean13" />
+ <button name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" />
+ </group>
</group>
- </group>
+ </xpath>
</field>
</record>
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index f22359a6fb782bf49dfe0c6c2e382f61032694b9..00f957aaa4b7fb3d46d3b4ca5782b05863026d53 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -5,17 +5,13 @@
<field name="name">res.partner.product.property.form.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
- <field name="arch" type="xml">
- <page name="sales_purchases" position="inside">
- <group name="property_invoice_type" position="after">
- <group name="pricelists" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
- <field name="property_product_pricelist" groups="product.group_sale_pricelist"/>
- </group>
- <div name="parent_pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
- <p>Pricelists are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
- </div>
- </group>
- </page>
+ <field name="arch" type="xml">
+ <group name="sale">
+ <field name="property_product_pricelist" groups="product.group_sale_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}"/>
+ <div name="parent_pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+ <p>Pricelists are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+ </div>
+ </group>
</field>
</record>
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 30d5ffb01caef0b7b2fb4b9bd46907a478af17ad..eb9cb781bcea85ca1753e4ef0e7eb48a7cfce336 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -7,9 +7,9 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="priority">36</field>
<field name="arch" type="xml">
- <field name="property_product_pricelist" position="after">
+ <group name="purchase" position="inside">
<field name="property_product_pricelist_purchase" groups="product.group_purchase_pricelist"/>
- </field>
+ </group>
</field>
</record>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 1ce5eda80f5e4a085bd9cce739175c18e1fbfc89..fdebe49cc02610d5fce3dd711a8820f9e82dd952 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -90,12 +90,8 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
- <group name="invoicing" position="replace">
- <group string="Invoicing">
- <group cols="2" colspan="2" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
- <field name="property_invoice_type"/>
- </group>
- </group>
+ <group name="sale">
+ <field name="property_invoice_type"/>
</group>
</field>
</record>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 19fa5e33a781db895ec2141f9652ba75c70eba0b..ed81d3adabfe096cbf0c15e781e3c3db93e38c89 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -5,15 +5,17 @@
Partners Extension
-->
- <record id="view_partner_property_form" model="ir.ui.view">
+ <record id="view_partner_stock_form" model="ir.ui.view">
<field name="name">res.partner.stock.property.form.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="product.view_partner_property_form"/>
<field name="arch" type="xml">
- <xpath expr="//group[@name='mailing']" position="after">
- <group groups="stock.group_locations" string="Warehouse">
- <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
- <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
+ <xpath expr="//group[@name='container_row_communication']" position="after">
+ <group name="container_row_stock">
+ <group groups="stock.group_locations" string="Warehouse" name="warehouse">
+ <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
+ <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
+ </group>
</group>
</xpath>
</field>
diff --git a/addons/website_partner/views/res_partner_view.xml b/addons/website_partner/views/res_partner_view.xml
index 073539f43065a51e3b32c33ea41dae9f0cf40051..62781155e07a06e3ac3d894ae1b9621982d33aaa 100644
--- a/addons/website_partner/views/res_partner_view.xml
+++ b/addons/website_partner/views/res_partner_view.xml
@@ -6,13 +6,15 @@
<record id="view_partners_form_website" model="ir.ui.view">
<field name="name">view.res.partner.form.website</field>
<field name="model">res.partner</field>
- <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="inherit_id" ref="mail.view_emails_partner_info_form"/>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<data>
- <field name="active" position="after">
- <field name="website_private"/>
- </field>
+ <xpath expr="//group[@name='mailing']" position="after">
+ <group name="website" string="Website">
+ <field name="website_private"/>
+ </group>
+ </xpath>
</data>
</field>
</record>
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 4ebf9da16dd9a8075732f6ecd8d6bf2c0f02a4de..b6410d3445be22365cb52360bce40d7002abc63b 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -251,8 +251,8 @@ class res_partner(osv.Model, format_address):
'credit_limit': fields.float(string='Credit Limit'),
'ean13': fields.char('EAN13', size=13),
'active': fields.boolean('Active'),
- 'customer': fields.boolean('Customer', help="Check this box if this contact is a customer."),
- 'supplier': fields.boolean('Supplier', help="Check this box if this contact is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
+ 'customer': fields.boolean('Is a Customer', help="Check this box if this contact is a customer."),
+ 'supplier': fields.boolean('Is a Supplier', help="Check this box if this contact is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
'employee': fields.boolean('Employee', help="Check this box if this contact is an Employee."),
'function': fields.char('Job Position'),
'type': fields.selection([('default', 'Default'), ('invoice', 'Invoice'),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index c909e76d1f5b056cee223631295d5a10c29fb16b..d89a8540a67bbe12a748de44fd18bc719c24d6e0 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -298,29 +298,29 @@
<field name="comment" placeholder="Put an internal note..."/>
</page>
<page name='sales_purchases' string="Sales & Purchases">
- <group>
- <group>
- <field name="user_id"
- context="{'default_groups_ref': ['base.group_partner_manager']}"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </group>
- <group>
- <field name="customer"/>
- <field name="supplier"/>
- </group>
+ <group name="container_row_1">
<group>
<field name="ref"/>
<field name="lang"/>
</group>
+ <group>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="active"/>
+ </group>
</group>
- <group>
- <group string="Mailing" name="mailing">
- <field name="active"/>
+ <group name="container_row_2">
+ <group string="Sale" name="sale">
+ <field name="customer"/>
+ <field name="user_id"
+ context="{'default_groups_ref': ['base.group_partner_manager']}"/>
+ </group>
+ <group string="Purchase" name="purchase">
+ <field name="supplier"/>
</group>
</group>
- <group>
- <group name="invoicing"/>
- <group name="point_of_sale"/>
+ <group name="container_row_3">
+ <group name="container_left"/>
+ <group name="container_right"/>
</group>
</page>
</notebook>