[IMP] Partner Form View Reorganization

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 71d17ca..600a13e 100644 (file)
--- 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 f05376a..2e39732 100644 (file)
--- 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 88492fb..c26505f 100644 (file)
--- 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 710dab1..80de531 100644 (file)
--- 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 fbcfa8b..0a41c7c 100644 (file)
--- 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 c81569e..627c1d3 100644 (file)
--- 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 5066d85..6b36a62 100644 (file)
--- 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 f18bcb5..28591af 100644 (file)
--- 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 f22359a..00f957a 100644 (file)
--- 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 30d5ffb..eb9cb78 100644 (file)
--- 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 1ce5eda..fdebe49 100644 (file)
--- 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 19fa5e3..ed81d3a 100644 (file)
--- 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 073539f..6278115 100644 (file)
--- 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 4ebf9da..b6410d3 100644 (file)
--- 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 c909e76..d89a854 100644 (file)
--- 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 &amp; 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>