From c09112510f243851200f7e4f5b8dd5e09d6a19ba Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 29 Jun 2012 17:09:33 +0530
Subject: [PATCH 01/23] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120629113933-ei3t7z6u0fx3e5h4
---
 addons/crm_claim/crm_claim_view.xml            |  5 ++++-
 addons/event/res_partner_view.xml              | 12 ++++++++++--
 addons/marketing_campaign/res_partner_view.xml |  7 +++++--
 addons/project/res_partner_view.xml            |  7 +++++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a080dd71c52..35c5e300bc5 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -257,6 +257,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Claim']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
             </field>
         </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
@@ -267,7 +270,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='History']" position="inside">
+                    <xpath expr="//group[@string='Claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 410030408c7..6a3db28d486 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,6 +13,12 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
+                <xpath expr="//group[@string='Event']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//group[@string='Registration']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
             </field>
        </record>
        <record id="view_event_partner_info_form" model="ir.ui.view">
@@ -21,13 +27,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="inside">
+                <group string="Event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
                             <field name="main_speaker_id"/>
                         </tree>
                     </field>
+                   </group>
+                   <group string="Registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
@@ -39,7 +47,7 @@
                             <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                         </tree>
                     </field>
-                </page>
+               </group>
             </field>
        </record>
 
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index b5fb2a31f1a..a424ad03a5f 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -12,6 +12,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Campaign']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
            </field>
           </record>	
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
@@ -20,9 +23,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <page string="History" position="inside">
+                    <group string="Campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
-                        </page>
+                    </group>
             </field>
        </record>
    </data>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 2a648791056..2fd15bbf8d1 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -12,6 +12,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Tasks']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
              </field>
           </record>	
         <record id="view_task_partner_info_form" model="ir.ui.view">
@@ -20,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="inside">
+                   <group string="Tasks" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>
@@ -31,7 +34,7 @@
 			    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                         </tree>
                     </field>
-                </page>
+                  </group>
             </field>
        </record>
        

From c965934484ba6824b81cb5d4cd5aa0fcca88b9b7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 29 Jun 2012 17:51:53 +0530
Subject: [PATCH 02/23] [IMP] imporve the view of outlook and thunderbird
 plugins.

bzr revid: nco@tinyerp.com-20120629122153-hzkibz5gx02f8nff
---
 addons/plugin_outlook/plugin_outlook.xml         | 14 +++-----------
 addons/plugin_thunderbird/plugin_thunderbird.xml | 13 +++----------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 13c1e6f32c4..c1fe66b3354 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -11,14 +11,8 @@
                     <form position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
-                    <separator string="title" position="before">
-                        <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
-                    </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace">
-                    </xpath>
+                    <xpath expr="//button[@string='Install Modules']" position="replace"/>
+                    <xpath expr="//button[@string='Cancel']" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
@@ -32,9 +26,7 @@
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
                     </xpath>
-                    <separator string="title" position="attributes">
-                        <attribute name="string">Install Outlook Plug-In</attribute>
-                    </separator>
+                    <separator position="replace"/>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 7ff4f529fd0..4c8f90d3d1d 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -11,13 +11,8 @@
                     <form position="attributes">
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
-                     <separator string="title" position="before">
-                        <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
-                    </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
+                  	<xpath expr="//button[@string='Install Modules']" position="replace"/> 
+                    <xpath expr="//button[@string='Cancel']" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
                             <field name="thunderbird" invisible="1"/>
@@ -37,9 +32,7 @@
                             <li>7. Configure your openerp server.</li>
                         </ul>
                     </xpath>
-                    <separator string="title" position="attributes">
-                         <attribute name="string">Install Thunderbird Plug-In</attribute>
-                    </separator>
+                    <separator position="replace"/>
                 </data>
             </field>
         </record>

From 4ef750426e011f5daf3dc4c268260acccc348605 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 29 Jun 2012 18:19:37 +0530
Subject: [PATCH 03/23] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120629124937-csslsnhmqlm4woa5
---
 addons/event/res_partner_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 6a3db28d486..478ffd0fb2e 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,6 +13,9 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
+                <xpath expr="//page[@string='History']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
                 <xpath expr="//group[@string='Event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>

From 66c7c07a83df000cf0d314a035855fb1ddb76aa0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 10:21:47 +0530
Subject: [PATCH 04/23] [IMP]: Improve view.change separator string.

bzr revid: atp@tinyerp.com-20120702045147-zes3zfsjllegrykz
---
 addons/plugin_outlook/plugin_outlook.xml         | 4 +++-
 addons/plugin_thunderbird/plugin_thunderbird.xml | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c1fe66b3354..b8a9129cad2 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -26,7 +26,9 @@
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
                     </xpath>
-                    <separator position="replace"/>
+                    <separator string="title" position="attributes">
+                        <attribute name="string"></attribute>
+                      </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 4c8f90d3d1d..8cfff8a18d4 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -32,7 +32,10 @@
                             <li>7. Configure your openerp server.</li>
                         </ul>
                     </xpath>
-                    <separator position="replace"/>
+                    <separator string="title" position="attributes">
+                        <attribute name="string"></attribute>
+                      </separator>
+
                 </data>
             </field>
         </record>

From 548f2475316c16852bd01afcd398e00e9fb14e69 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 2 Jul 2012 11:14:33 +0530
Subject: [PATCH 05/23] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120702054433-6kx399wosnidbm0p
---
 addons/marketing_campaign/res_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index a424ad03a5f..1ee2e349472 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -3,8 +3,8 @@
     <data>
 
          <!--  Partners inherited form -->
-        <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-           <field name="name">res.partner.crm.history.inherit1</field>
+        <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
+           <field name="name">res.partner.crm.history.inherit2</field>
            <field name="model">res.partner</field>
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>

From f9f68fb2f17184029f1d0287d486b8068f94af8f Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 5 Jul 2012 13:13:33 +0530
Subject: [PATCH 06/23] [IMP]MRP :BOM view are improved

bzr revid: hsa@tinyerp.com-20120705074333-re3dyycj5ktkocbq
---
 addons/mrp/mrp_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0b725108be4..149ef5e717f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -381,8 +381,10 @@
                                         <field name="active"/>
                                     </group>
                                     <group>
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
+                                        <label for="date_start" string="Validity"/>
+                                        <div name="validity">
+                                            <field name="date_start" class="oe_inline"/> - <field name="date_stop" class="oe_inline"/>
+                                        </div>
                                         <field name="product_rounding"/>
                                         <field name="product_efficiency"/>
                                     </group>

From cca9a711c5ed92a53e46fdfb456d4e8e55d2b6f8 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Thu, 5 Jul 2012 15:30:06 +0530
Subject: [PATCH 07/23] [IMP]sale-crm-imp

bzr revid: pna@tinyerp.com-20120705100006-uhhkms5ya687iopc
---
 addons/sale/stock_view.xml  | 2 +-
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 242d2c4cef6..9e71f14f49e 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="auto_picking" position="after">
+                <field name="move_type" position="before">
                     <field name="sale_id"/>
                 </field>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 55be1fdc267..dfbb1211167 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -864,7 +864,7 @@
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Add an internal note..."/>
+                            <field name="note" placeholder="Add an internal note"/>
                         </page>
                     </notebook>
                 </sheet>

From 502de7ba97ca5d9765601df68db4937690719017 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 5 Jul 2012 17:06:04 +0530
Subject: [PATCH 08/23] [IMP]MRP :BOM Properties view are improved

bzr revid: hsa@tinyerp.com-20120705113604-0uy5a013eltntp6i
---
 addons/mrp/mrp_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 149ef5e717f..1e7a686acc1 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -382,8 +382,10 @@
                                     </group>
                                     <group>
                                         <label for="date_start" string="Validity"/>
-                                        <div name="validity">
-                                            <field name="date_start" class="oe_inline"/> - <field name="date_stop" class="oe_inline"/>
+                                        <div>
+                                            <field name="date_start" class="oe_online" nolabel="1"/>
+                                            <label string="-"/>
+                                            <field name="date_stop" class="oe_online" nolabel="1"/>
                                         </div>
                                         <field name="product_rounding"/>
                                         <field name="product_efficiency"/>

From 62e79c8401e38ea17f622ed999a6b4b6bd0b1899 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 17:36:11 +0530
Subject: [PATCH 09/23] [IMP] change as per review

bzr revid: kjo@tinyerp.com-20120705120611-mavp52c52psenqiw
---
 addons/crm_fundraising/crm_fundraising_menu.xml     |  2 +-
 addons/import_sugarcrm/import_sugarcrm_view.xml     |  2 +-
 addons/membership/membership.py                     | 12 ++++++------
 addons/project_long_term/project_long_term_view.xml |  8 +++++---
 addons/wiki_sale_faq/wiki_sale_faq_view.xml         |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index 38187ed1d4d..20fcdeee861 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -9,7 +9,7 @@
         parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
-        <field name="name">Funds</field>
+        <field name="name">Fund Raising</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7188108ba6c..9f38f4e1959 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -13,7 +13,7 @@
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" class="oe_highlight" />
+                        type="object" class="oe_highlight" /> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>
             </header>
             <sheet>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index dc4eadbada9..06b84ec80c5 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -315,11 +315,11 @@ class Partner(osv.osv):
         return self._membership_state(*args, **kwargs)
 
     _columns = {
-        'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
+        'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
-        'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."),
+        'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."),
         'membership_amount': fields.float(
-                    'Membership amount', digits=(16, 2),
+                    'Membership Amount', digits=(16, 2),
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state,
@@ -338,7 +338,7 @@ class Partner(osv.osv):
                     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
                     _membership_date, multi = 'membeship_start',
-                    string = 'Start membership date', type = 'date',
+                    string = 'Start Membership Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@ class Partner(osv.osv):
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date,
-                    string = 'Stop membership date', type='date', multi='membership_stop',
+                    string = 'Stop Membership Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
@@ -354,7 +354,7 @@ class Partner(osv.osv):
                     }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
                     _membership_date,
-                    string = 'Cancel membership date', type='date', multi='membership_cancel',
+                    string = 'Cancel Membership Date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a98e9088402..7e24c61e769 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -164,10 +164,12 @@
                     <label for="date_start" string="Duration"/>
                     <div>
                         <div>
-                            <field name="duration" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
+                            <field name="date_start" class="oe_inline"/>
+                            <label string=" - " class="oe_inline oe_edit_only"/>
+                            <field name="date_end" class="oe_inline"/>
                         </div>
-                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+                        <field name="duration" class="oe_inline"/>
+                        <field name="product_uom" class="oe_inline"/>
                     </div>
                     </group>
                     <notebook>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index b43649af23a..f3116bc73b5 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -17,7 +17,7 @@
        </record>
 
        <record model="ir.actions.act_window" id="action_wiki_test">
-           <field name="name">Wiki Pages</field>
+           <field name="name">Sales FAQ</field>
            <field name="res_model">wiki.wiki</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>

From 09701b83acbade29fdebc471730ccbafa4d8c75e Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 6 Jul 2012 11:32:56 +0530
Subject: [PATCH 10/23] [IMP]Sale Quotation : view are improved

bzr revid: hsa@tinyerp.com-20120706060256-ymn92nvfmf1m4ctq
---
 addons/delivery/delivery_view.xml       |  4 ++--
 addons/sale/sale_view.xml               | 12 +++++++-----
 addons/sale_margin/sale_margin_view.xml |  9 +++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e54f74f7f1..094bf426e88 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -256,12 +256,12 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='sale_total']" position="after">
+                <xpath expr="//group[@name='sale_delivery']" position="inside">
                     <group>
                         <label for="carrier_id"/>
                         <div>
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
-                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
+                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object" class="oe_inline"/>
                         </div>
                         <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
                     </group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d5d6b5346eb..42a141befd0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,6 +244,9 @@
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                                             <separator colspan="4" string="Stock Moves"/>
                                             <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                            <div>
+                                                <field name="notes" nolabel="1" placeholder="Add a note on order line..."/>
+                                            </div>
                                         </div>
                                     </group>
                                 </form>
@@ -264,11 +267,10 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <div class="oe_clear">
-                                <label for="note"/>
-                            </div>
+                            <group name="sale_delivery">
+                            </group>
                             <div>
-                                <field name="note" class="oe_inline"/>
+                                <field name="note" nolabel="1" class="oe_online" placeholder="Add a global note on the sale order..."/>
                             </div>
                         </page>
                         <page string="Other Information" groups="base.group_user">
@@ -300,7 +302,7 @@
                                 <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
                                     <field name="date_invoice"/>
                                     <field name="number"/>
-                                    <field name="partner_id"/>
+                                    <field name="partner_id" string="Customer"/>
                                     <field name="user_id"/>
                                     <field name="date_due"/>
                                     <field name="amount_total"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index c45cd228dec..c56e66e5ae2 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,8 +8,13 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_total']" position="inside">
-                <field name="margin"/>
+            <xpath expr="//group[@name='sale_delivery']" position="inside">
+                <group>
+                    <label for="margin"/>
+                    <div>
+                        <field name="margin"/>
+                    </div>
+                </group>
             </xpath>
         </field>
     </record>

From 907b1ca49f266aeadb82aeed52728a0e9a9f8308 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:15:08 +0530
Subject: [PATCH 11/23] [IMP]project_long_term: set attrs

bzr revid: kjo@tinyerp.com-20120706064508-7s2r3ivfu30vmt0p
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7e24c61e769..aed6492d78a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -165,7 +165,7 @@
                     <div>
                         <div>
                             <field name="date_start" class="oe_inline"/>
-                            <label string=" - " class="oe_inline oe_edit_only"/>
+                            <label string=" - " attrs="{'invisible':[('date_start','=', False),('date_end','=', False)]}"/>
                             <field name="date_end" class="oe_inline"/>
                         </div>
                         <field name="duration" class="oe_inline"/>

From d18206a2251951a19c7646b338394440466e9599 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 16:00:51 +0530
Subject: [PATCH 12/23] [IMP] change view of sale,stock and membership

bzr revid: kjo@tinyerp.com-20120706103051-k3ep6fibqaxelgj2
---
 addons/membership/membership_view.xml | 9 +++------
 addons/sale/sale_view.xml             | 2 --
 addons/stock/stock_view.xml           | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 0f2ad6836c8..cfc3d855671 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -239,13 +239,10 @@
                 <notebook position="inside">
                     <page string="Membership">
                         <group>
-                            <group>
+                            <group col="3">
                                 <field name="free_member"/>
-                                <label for="membership_state"/>
-                                <div>
-                                    <field name="membership_state" class="oe_inline"/>
-                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
-                                </div>
+                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                <field name="membership_state" class="oe_inline"/>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 42a141befd0..3f774ef3cbb 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -174,8 +174,6 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
-
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dfbb1211167..5185c22b371 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -850,7 +850,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Additional info">
+                        <page string="Additional Info">
                             <group>
                                 <group>
                                     <field name="move_type"/>

From e99fb67bc66a3d93061b8f1c60072337d5b50dbb Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 19:09:41 +0530
Subject: [PATCH 13/23] [IMP]crm: improve meeting view

bzr revid: kjo@tinyerp.com-20120706133941-a1spe9qj8dtevco8
---
 addons/account/partner_view.xml | 76 ++++++++++++++++-----------------
 addons/crm/crm_meeting_view.xml | 39 +++++++----------
 addons/wiki/wiki_view.xml       |  2 +-
 3 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ec3dcba3b84..a916a59c42a 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -76,56 +76,56 @@
             <field name="arch" type="xml">
                 <page string="History" position="before" version="7.0">
                 <page string="Accounting" col="4">
-                    <group col="4">
-                        <group string="Customer Accounting Properties" col="4">
+                    <group>
+                        <group >
                             <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
                             <field name="property_payment_term" widget="selection"/>
                         </group>
-                        <group string="Supplier Accounting Properties" col="4">
+                        <group>
                             <field name="property_account_payable" groups="account.group_account_invoice"/>
                         </group>
-                        <group string="Customer Credit" col="4">
+                        <group>
                             <field name="credit"/>
                             <field name="credit_limit"/>
                         </group>
-                        <group string="Supplier Debit" col="4">
+                        <group>
                             <field name="debit"/>
                         </group>
-                        <field name="bank_ids">
-                            <form string="Bank account" version="7.0">
-                                <field name="state"/>
-                                <field name="acc_number"/>
-                                <group>
-                                    <group name="owner" string="Bank Account Owner">
-                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                        <field name="owner_name"/>
-                                        <label for="street" string="Address"/>
-                                        <div>
-                                            <field name="street" placeholder="Street..."/>
-                                            <div>
-                                                <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                                <field name="city" class="oe_inline" placeholder="City"/>
-                                            </div>
-                                            <field name="state_id" placeholder="State"/>
-                                            <field name="country_id" placeholder="Country"/>
-                                        </div>
-                                    </group>
-                                    <group name="bank" string="Information About the Bank">
-                                        <field name="bank" on_change="onchange_bank_id(bank)"/>
-                                        <field name="bank_name"/>
-                                        <field name="bank_bic" placeholder="[Identifier code]"/>
-                                    </group>
-                                </group>
-                            </form>
-                            <tree string="Bank Details">
-                                <field name="sequence" invisible="1"/>
-                                <field name="acc_number"/>
-                                <field name="bank_name"/>
-                                <field name="owner_name"/>
-                            </tree>
-                        </field>
                     </group>
+                    <field name="bank_ids">
+                        <form string="Bank account" version="7.0">
+                            <field name="state"/>
+                            <field name="acc_number"/>
+                            <group>
+                                <group name="owner" string="Bank Account Owner">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                    <field name="owner_name"/>
+                                    <label for="street" string="Address"/>
+                                    <div>
+                                        <field name="street" placeholder="Street..."/>
+                                        <div>
+                                            <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                            <field name="city" class="oe_inline" placeholder="City"/>
+                                        </div>
+                                        <field name="state_id" placeholder="State"/>
+                                        <field name="country_id" placeholder="Country"/>
+                                    </div>
+                                </group>
+                                <group name="bank" string="Information About the Bank">
+                                    <field name="bank" on_change="onchange_bank_id(bank)"/>
+                                    <field name="bank_name"/>
+                                    <field name="bank_bic" placeholder="[Identifier code]"/>
+                                </group>
+                            </group>
+                        </form>
+                        <tree string="Bank Details">
+                            <field name="sequence" invisible="1"/>
+                            <field name="acc_number"/>
+                            <field name="bank_name"/>
+                            <field name="owner_name"/>
+                        </tree>
+                    </field>
                 </page>
                 </page>
             </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 88ef7134735..a007fc99091 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -51,9 +51,9 @@
         <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action"
+     <!--menuitem action="crm_meeting_categ_action"
         groups="base.group_no_one"
-        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
+        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/-->
 
     <!-- CRM Meetings Form View -->
 
@@ -87,41 +87,32 @@
                     </div>
                     <group>
                         <h2>
-                            <label for="date" string="Starting at"/>
                             <field name="date" required="1" class="oe_inline"/>
-                            <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
+                            at <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
                     <group>
                         <h2>
                             <label for="duration" string="Duration" />
-                            <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"
-                                class="oe_inline"/> ( 
-                            <field name="date_deadline" 
-                                string="End Date" required="1"
-                                on_change="onchange_dates(date,False,date_deadline)"                            
-                                class="oe_inline"/> )
+                            
                         </h2>
                     </group>
                 <group colspan="4" col="4">
                     <group colspan="2">
                         <field name="user_id" />
-                        <field name="organizer"/>
                         <field name="section_id" widget="selection"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
-                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
                         <field name="email_from"/>
                     </group>
                     <group colspan="2">
+                        <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"/> 
+                        <field name="date_deadline" 
+                                string="End Date" required="1"
+                                on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="alarm_id" string="Reminder" widget="selection" />
+                        <field name="class" string="Privacy"/>
+                        <field name="show_as" string="Show Time as"/>
                         <field name="categ_id" widget="selection"
                             string="Meeting Type"
                             domain="[('object_id.model', '=', 'crm.meeting')]" />
@@ -129,9 +120,9 @@
                         <field name="recurrent_id" invisible="1"/>
                         <field name="recurrent_uid" invisible="1"/>
                     </group>
+                    <group colspan="2">
+                    </group>
                 </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
                     <page string="Invitation Detail">
                         <button string="Invite People"
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 700585122d3..0aabcd5b59f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -155,7 +155,7 @@
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="4" string="Meta Information"/>
-                            <field name="tags"/>
+                            <field name="tags" widget="many2many_tags"/>
                             <field name="toc" groups="base.group_no_one"/>
                         </group>
                     </sheet>

From ba6439548a0df4167e6baa3d9095f6c8177dd75f Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 11:10:08 +0530
Subject: [PATCH 14/23] [IMP] change in view

bzr revid: kjo@tinyerp.com-20120709054008-ico77jmm32mcztx2
---
 addons/base_calendar/base_calendar.py         |  6 +++---
 addons/crm/crm_meeting_view.xml               | 10 +++++-----
 addons/document/document_view.xml             |  7 +++----
 .../import_sugarcrm/import_sugarcrm_view.xml  |  3 ++-
 addons/product/product_view.xml               | 19 +++++++------------
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bbededc8eaf..3b8e37e8697 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
              ('confidential', 'Public for Employees')], 'Mark as', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show as', states={'done': [('readonly', True)]}),
+                                                'Show Time As', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('cancelled', 'Cancelled'),
@@ -1060,8 +1060,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
         'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
-        'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence termination'),
-        'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
+        'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
+        'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
         'count': fields.integer('Repeat', help="Repeat x times"),
         'mo': fields.boolean('Mon'),
         'tu': fields.boolean('Tue'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a007fc99091..79ed5a3adb2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -88,7 +88,7 @@
                     <group>
                         <h2>
                             <field name="date" required="1" class="oe_inline"/>
-                            at <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
+                            <label string="at" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
                     <group>
@@ -104,15 +104,15 @@
                         <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
                         <field name="email_from"/>
                     </group>
-                    <group colspan="2">
-                        <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"/> 
+                    <group> 
                         <field name="date_deadline" 
                                 string="End Date" required="1"
                                 on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"/>
                         <field name="alarm_id" string="Reminder" widget="selection" />
                         <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
+                        <field name="show_as"/>
                         <field name="categ_id" widget="selection"
                             string="Meeting Type"
                             domain="[('object_id.model', '=', 'crm.meeting')]" />
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6fb99d936d4..b8954eb248b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -250,7 +250,7 @@
                     <notebook colspan="4">
                     <page string="Attachment">
                         <group>
-                            <group string="Data">
+                            <group>
                                 <field name="type"/>
                                 <newline />
                                 <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
@@ -261,14 +261,13 @@
                                 <field name="res_id" invisible="True"/>
                                 <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
                                 <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <separator string="Related to" colspan="2"/>
                                 <field name="partner_id"/>
                             </group>
-                            <group groups="base.group_no_one" string="Created">
+                            <group groups="base.group_no_one">
                                 <field name="create_uid" readonly="1"/>
                                 <field name="create_date" readonly="1"/>
                             </group>
-                            <group groups="base.group_no_one" string="Modified">
+                            <group groups="base.group_no_one">
                                 <field name="write_uid" readonly="1"/>
                                 <field name="write_date" readonly="1"/>
                             </group>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 9f38f4e1959..7f751a38729 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -12,8 +12,9 @@
             <header>
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
+                <label string=" "/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" class="oe_highlight" /> or
+                        type="object"/> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>
             </header>
             <sheet>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index cdf4d48c904..25367538c3f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,19 +313,14 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <label for="name" class="oe_edit_only"/>
-                                <field name="name"/>
-                            </h1>
-                        </div>
                         <group>
-                                <group>
-                                    <field name="type"/>
-                                </group>
-                                <group>
-                                    <field name="parent_id"/>
-                                </group>
+                            <group>
+                                <field name="name"/>
+                                <field name="parent_id"/>
+                            </group>
+                            <group>
+                                <field name="type"/>
+                            </group>
                         </group>
                         <group name="basic">
                             <group name="account_property" string="Account Properties"/>

From b1dc0beb352a5d09632a17897efc46b4e4fa7363 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 15:39:03 +0530
Subject: [PATCH 15/23] [IMP]account: change account.analytic.line view

bzr revid: kjo@tinyerp.com-20120709100903-da6v6cu2ekorm2o2
---
 addons/account/project/project_view.xml       | 34 ++++++++-----------
 .../hr_timesheet_invoice_view.xml             |  2 +-
 .../project_timesheet_view.xml                |  2 +-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7658ab111d9..e0e5df040fa 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -123,33 +123,27 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="account_id"/>
-                            <field name="journal_id"/>
+                            <field name="date"/>
+                            <label for="unit_amount"/>
+                                <group class="oe_inline">
+                                    <field name="unit_amount" nolabel="1"/>
+                                    <field name="product_uom_id" nolabel="1" />
+                                </group>
+                            <field name="amount"/>
+                        </group>
+                        <group>
+                            <field name="account_id"/>
+                            <field name="journal_id"/>
+                            <field name="product_id"/>
                         </group>
                         <group>
-                            <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group string="Amount">
-                            <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="Product Information">
-                            <field name="product_id"/>
-                            <label for="unit_amount"/>
-                            <div>
-                                <field name="unit_amount" class="oe_inline"/>
-                                <field name="product_uom_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="General Accounting">
+                        <group>
                             <field name="general_account_id"/>
                             <field name="move_id" readonly="1"/>
+                            <field name="amount_currency" class="oe_inline"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index d07314498e1..92873614172 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -114,7 +114,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
-                <field name="product_uom_id" position="after">
+                <field name="amount" position="before">
                     <field name="to_invoice"/>
                     <field name="invoice_id"/>
                 </field>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2e2ec7f2677..9fb145aa536 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -70,7 +70,7 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
-                   <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
+                   <field name="account_id" string="Analytic Account/Project" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>

From a900a06f9d00aef229d023ed22e1325f347158a0 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 16:10:23 +0530
Subject: [PATCH 16/23] [IMP]l10n_fr_rib: set xpath

bzr revid: kjo@tinyerp.com-20120709104023-31dczp1vq59kyr09
---
 addons/l10n_fr_rib/bank_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index b3062f4c706..38c51df58e0 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>

From 158ffb05dfa1cd6588256426b8d218b6d1f9263e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 10 Jul 2012 11:15:35 +0530
Subject: [PATCH 17/23] [IMP]set priority for account.analytic.line form

bzr revid: kjo@tinyerp.com-20120710054535-ggqe2amf122y6d8s
---
 addons/account/project/project_view.xml         | 5 +++--
 addons/import_sugarcrm/import_sugarcrm_view.xml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e0e5df040fa..4af08c7766c 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -118,6 +118,7 @@
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
             <field name="type">form</field>
+            <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Analytic Entry" version="7.0">
                     <group>
@@ -245,8 +246,8 @@
                         <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                         <field invisible="True" name="general_account_id"/>
                         <field name="amount"/>
-                        <field name="currency_id" />
-                        <field name="amount_currency" />
+                        <field name="currency_id"/>
+                        <field name="amount_currency"/>
                         <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     </group>
                 </form>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7f751a38729..6ef9be1a5bd 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -12,7 +12,6 @@
             <header>
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
-                <label string=" "/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
                         type="object"/> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>

From 58677aa2dffc263d7d8993789fa1e3a77f3ec57b Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 11 Jul 2012 10:33:09 +0530
Subject: [PATCH 18/23] [IMP]crm: remove duration label

bzr revid: kjo@tinyerp.com-20120711050309-n3tvgy4196q7wdsk
---
 addons/crm/crm_meeting_view.xml | 301 ++++++++++++++++----------------
 1 file changed, 147 insertions(+), 154 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 79ed5a3adb2..aef7b411ae9 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -91,162 +91,155 @@
                             <label string="at" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
-                    <group>
-                        <h2>
-                            <label for="duration" string="Duration" />
-                            
-                        </h2>
-                    </group>
-                <group colspan="4" col="4">
-                    <group colspan="2">
-                        <field name="user_id" />
-                        <field name="section_id" widget="selection"/>
-                        <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="email_from"/>
-                    </group>
-                    <group> 
-                        <field name="date_deadline" 
-                                string="End Date" required="1"
-                                on_change="onchange_dates(date,False,date_deadline)"/>
-                        <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"/>
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as"/>
-                        <field name="categ_id" widget="selection"
-                            string="Meeting Type"
-                            domain="[('object_id.model', '=', 'crm.meeting')]" />
-                        <field name="rrule" invisible="1" readonly="1"/>
-                        <field name="recurrent_id" invisible="1"/>
-                        <field name="recurrent_uid" invisible="1"/>
-                    </group>
-                    <group colspan="2">
-                    </group>
-                </group>
-                <notebook>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
-                        <field name="attendee_ids" colspan="4"
-                            nolabel="1" widget="one2many" mode="tree">
-                            <tree string="Invitation details" editable="top">
-                                <field name="sent_by_uid" string="From"/>
-                                <field name="user_id" string="To"/>
-                                <field name="email" string="Mail To"/>
-                                <field name="role" />
-                                <field name="state" />
-                                <button name="do_tentative"
-                                    states="needs-action,declined,accepted"
-                                    string="Uncertain" type="object"
-                                    icon="terp-crm" />
-                                <button name="do_accept" string="Accept"
-                                    states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
-                                <button name="do_decline" string="Decline"
-                                    states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                            </tree>
-                            <form string="Invitation details" version="7.0">
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <field name="email" />
-                                        <field name="rsvp" />
-                                        <field name="cutype" />
-                                        <field name="role" />
-                                        <separator colspan="4" string="" />
-                                        <group col="6" colspan="4">
-                                            <field name="state" />
-                                            <button name="do_tentative"
-                                                states="needs-action,declined,accepted"
-                                                string="Uncertain"
-                                                type="object"
-                                                icon="terp-crm" />
-                                            <button name="do_accept"
-                                                string="Accept"
-                                                states="needs-action,tentative,declined"
-                                                type="object"
-                                                icon="gtk-apply" />
-                                            <button name="do_decline"
-                                                string="Decline"
-                                                states="needs-action,tentative,accepted"
-                                                type="object"
-                                                icon="gtk-cancel" />
-                                            <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate"
-                                                type="action"
-                                                icon="gtk-sort-descending"
-                                                states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                                        </group>
-                                    </page>
-                                    <page string="Other">
-                                        <field name="user_id"/>
-                                        <newline />
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
-                        <group col="4" colspan="4" name="rrule">
-                            <group col="4" colspan="4">
-                                <field name="rrule_type" string=" Recurrence Pattern" />
-                                <field name="interval" />
-                                <field name="end_type" />
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
-                                <newline />
-
-
-                            </group>
-                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
-                                <separator string="Choose day where repeat the meeting" colspan="8"/>
-                                <field name="mo" colspan="1" />
-                                <field name="tu" colspan="1" />
-                                <field name="we" colspan="1" />
-                                <field name="th" colspan="1" />
-                                <newline/>
-                                <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  />
-                                <field name="su" colspan="1"  />
-                                <newline />
-                            </group>
-                            <group col="10" colspan="4"
-                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
-                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
-                                <group col="2" colspan="1">
-                                    <field name="select1" />
-                                </group>
-                                <group col="2" colspan="1">
-                                    <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : [('select1','=','day')]}" />
-                                </group>
-                                <group col="3" colspan="1">
-                                    <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                    <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                </group>
-                            </group>
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <field name="user_id" />
+                            <field name="section_id" widget="selection"/>
+                            <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
+                            <field name="email_from"/>
                         </group>
+                        <group> 
+                            <field name="date_deadline" 
+                                    string="End Date" required="1"
+                                    on_change="onchange_dates(date,False,date_deadline)"/>
+                            <field name="duration" widget="float_time"
+                                    on_change="onchange_dates(date,duration,False,allday)"/>
+                            <field name="alarm_id" string="Reminder" widget="selection" />
+                            <field name="class" string="Privacy"/>
+                            <field name="show_as"/>
+                            <field name="categ_id" widget="selection"
+                                string="Meeting Type"
+                                domain="[('object_id.model', '=', 'crm.meeting')]" />
+                            <field name="rrule" invisible="1" readonly="1"/>
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                        <group colspan="2">
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Invitation Detail">
+                            <button string="Invite People"
+                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                icon="terp-partner" type="action"
+                                attrs="{'readonly': [('state', '=', 'done')]}"
+                                context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                            <field name="attendee_ids" colspan="4"
+                                nolabel="1" widget="one2many" mode="tree">
+                                <tree string="Invitation details" editable="top">
+                                    <field name="sent_by_uid" string="From"/>
+                                    <field name="user_id" string="To"/>
+                                    <field name="email" string="Mail To"/>
+                                    <field name="role" />
+                                    <field name="state" />
+                                    <button name="do_tentative"
+                                        states="needs-action,declined,accepted"
+                                        string="Uncertain" type="object"
+                                        icon="terp-crm" />
+                                    <button name="do_accept" string="Accept"
+                                        states="needs-action,tentative,declined"
+                                        type="object" icon="gtk-apply" />
+                                    <button name="do_decline" string="Decline"
+                                        states="needs-action,tentative,accepted"
+                                        type="object" icon="gtk-cancel" />
+                                    <button
+                                        name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                        string="Delegate" type="action"
+                                        icon="gtk-sort-descending"
+                                        states="needs-action,tentative,declined,accepted"
+                                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                </tree>
+                                <form string="Invitation details" version="7.0">
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="email" />
+                                            <field name="rsvp" />
+                                            <field name="cutype" />
+                                            <field name="role" />
+                                            <separator colspan="4" string="" />
+                                            <group col="6" colspan="4">
+                                                <field name="state" />
+                                                <button name="do_tentative"
+                                                    states="needs-action,declined,accepted"
+                                                    string="Uncertain"
+                                                    type="object"
+                                                    icon="terp-crm" />
+                                                <button name="do_accept"
+                                                    string="Accept"
+                                                    states="needs-action,tentative,declined"
+                                                    type="object"
+                                                    icon="gtk-apply" />
+                                                <button name="do_decline"
+                                                    string="Decline"
+                                                    states="needs-action,tentative,accepted"
+                                                    type="object"
+                                                    icon="gtk-cancel" />
+                                                <button
+                                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                                    string="Delegate"
+                                                    type="action"
+                                                    icon="gtk-sort-descending"
+                                                    states="needs-action,tentative,declined,accepted"
+                                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                            </group>
+                                        </page>
+                                        <page string="Other">
+                                            <field name="user_id"/>
+                                            <newline />
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
+                            <group col="4" colspan="4" name="rrule">
+                                <group col="4" colspan="4">
+                                    <field name="rrule_type" string=" Recurrence Pattern" />
+                                    <field name="interval" />
+                                    <field name="end_type" />
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
+                                    <newline />
 
-                    </page>
-                </notebook>
+
+                                </group>
+                                <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                    <separator string="Choose day where repeat the meeting" colspan="8"/>
+                                    <field name="mo" colspan="1" />
+                                    <field name="tu" colspan="1" />
+                                    <field name="we" colspan="1" />
+                                    <field name="th" colspan="1" />
+                                    <newline/>
+                                    <field name="fr" colspan="1" />
+                                    <field name="sa" colspan="1"  />
+                                    <field name="su" colspan="1"  />
+                                    <newline />
+                                </group>
+                                <group col="10" colspan="4"
+                                    attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
+                                    <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
+                                    <group col="2" colspan="1">
+                                        <field name="select1" />
+                                    </group>
+                                    <group col="2" colspan="1">
+                                        <field name="day"
+                                            attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                                'invisible' : [('select1','=','day')]}" />
+                                    </group>
+                                    <group col="3" colspan="1">
+                                        <field name="byday" string="The"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                        <field name="week_list" nolabel="1"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
                 </sheet>
                 <footer>
                     <field name="message_ids" widget="mail_thread"/>

From 38b6a92f0113f3c8eaee425b900c4190c1c93266 Mon Sep 17 00:00:00 2001
From: Kuldeep <th_dev2@openerp.co.in>
Date: Wed, 18 Jul 2012 17:48:17 +0530
Subject: [PATCH 19/23] [IMP] set name in xpath

bzr revid: th_dev2@openerp.co.in-20120718121817-le2288em9d23740w
---
 addons/account/partner_view.xml                |  2 +-
 addons/crm_claim/crm_claim_view.xml            |  6 +++---
 addons/event/res_partner_view.xml              | 10 +++++-----
 addons/marketing_campaign/res_partner_view.xml |  6 +++---
 addons/project/res_partner_view.xml            |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index a916a59c42a..53f556b77c2 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -77,7 +77,7 @@
                 <page string="History" position="before" version="7.0">
                 <page string="Accounting" col="4">
                     <group>
-                        <group >
+                        <group>
                             <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
                             <field name="property_payment_term" widget="selection"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 0444479ee14..6317d53a1cc 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -254,10 +254,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Claim']" position="attributes">
+                <xpath expr="//group[@name='Claim']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -270,7 +270,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//group[@string='Claim']" position="inside">
+                    <xpath expr="//group[@name='Claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 478ffd0fb2e..007feb5ec02 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,13 +13,13 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Event']" position="attributes">
+                <xpath expr="//group[@name='Event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Registration']" position="attributes">
+                <xpath expr="//group[@name='Registration']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -30,7 +30,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <group string="Event" position="inside">
+                <group name="Event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
@@ -38,7 +38,7 @@
                         </tree>
                     </field>
                    </group>
-                   <group string="Registration" position="inside">
+                   <group name="Registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index ee512f61049..b8ff13367d1 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -9,10 +9,10 @@
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Campaign']" position="attributes">
+                <xpath expr="//group[@name='Campaign']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
            </field>
@@ -23,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group string="Campaign" position="inside">
+                    <group name="Campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
             </field>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 1d4c63fc0ef..5d0544b78ef 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -9,10 +9,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Tasks']" position="attributes">
+                <xpath expr="//group[@name='Tasks']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
@@ -23,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group string="Tasks" position="inside">
+                   <group name="Tasks" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>

From 92cb98fd73fcb064ae72ed489a6f3dafd236e43d Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 19 Jul 2012 11:08:13 +0530
Subject: [PATCH 20/23] [REVERT] account: analytical line view

bzr revid: hmo@tinyerp.com-20120719053813-y7vdq59yjw2svhen
---
 addons/account/project/project_view.xml | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8e2006b8d29..76aaaf7df6a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -124,27 +124,33 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="date"/>
-                            <label for="unit_amount"/>
-                                <group class="oe_inline">
-                                    <field name="unit_amount" nolabel="1"/>
-                                    <field name="product_uom_id" nolabel="1" />
-                                </group>
-                            <field name="amount"/>
-                        </group>
-                        <group>
                             <field name="account_id"/>
                             <field name="journal_id"/>
-                            <field name="product_id"/>
                         </group>
                         <group>
+                            <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group>
+                        <group string="Amount">
+                            <field name="amount"/>
+                            <label for="amount_currency"/>
+                            <div>
+                                <field name="amount_currency" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group string="Product Information">
+                            <field name="product_id"/>
+                            <label for="unit_amount"/>
+                            <div>
+                                <field name="unit_amount" class="oe_inline"/>
+                                <field name="product_uom_id" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group string="General Accounting">
                             <field name="general_account_id"/>
                             <field name="move_id" readonly="1"/>
-                            <field name="amount_currency" class="oe_inline"/>
                         </group>
                     </group>
                 </form>

From 85aa1450c6a30ded29a68c58009084a4cb542c6c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 19 Jul 2012 11:46:37 +0530
Subject: [PATCH 21/23] [FIX] put comment regarding TOFIX to set sequence into
 group element

bzr revid: hmo@tinyerp.com-20120719061637-p9j9ydzku61t8np1
---
 addons/crm_claim/crm_claim_view.xml            |  7 ++++---
 addons/event/res_partner_view.xml              | 12 ++++++------
 addons/marketing_campaign/res_partner_view.xml |  7 ++++---
 addons/project/res_partner_view.xml            |  7 ++++---
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6317d53a1cc..f00b524a204 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -248,16 +248,17 @@
             </field>
         </record>
 
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
             <field name="name">res.partner.crm.history.inherit1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Claim']" position="attributes">
+                <xpath expr="//group[@name='grp_claim']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -270,7 +271,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//group[@name='Claim']" position="inside">
+                    <xpath expr="//group[@name='grp_claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 007feb5ec02..44a3d4613ec 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -3,7 +3,7 @@
     <data>
 
          <!--  Partners inherited form -->
-
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="view_speaker_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.speaker.info.inherit</field>
             <field name="model">res.partner</field>
@@ -13,13 +13,13 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Event']" position="attributes">
+                <xpath expr="//group[@name='grp_event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Registration']" position="attributes">
+                <xpath expr="//group[@name='grp_registration']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -30,7 +30,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <group name="Event" position="inside">
+                <group name="grp_event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
@@ -38,7 +38,7 @@
                         </tree>
                     </field>
                    </group>
-                   <group name="Registration" position="inside">
+                   <group name="grp_registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index b8ff13367d1..2b1b9dc09dd 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -3,16 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
            <field name="name">res.partner.crm.history.inherit2</field>
            <field name="model">res.partner</field>
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Campaign']" position="attributes">
+                <xpath expr="//group[@name='grp_campaign']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
            </field>
@@ -23,7 +24,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group name="Campaign" position="inside">
+                    <group name="grp_campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
             </field>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 5d0544b78ef..3c2dde07376 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,16 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
+         <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
          <record id="base.view_crm_partner_info_History" model="ir.ui.view">
             <field name="name">res.partner.crm.history.inherit1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Tasks']" position="attributes">
+                <xpath expr="//group[@name='grp_task']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
@@ -23,7 +24,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group name="Tasks" position="inside">
+                   <group name="grp_task" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>

From 9e7bcb9c4068cd16a9b187692d90faafa40f9b49 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 19 Jul 2012 11:02:43 +0200
Subject: [PATCH 22/23] [IMP] sales/crm: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120719090243-bdya6ozfklsi6v2k
---
 addons/account/partner_view.xml               |  2 +-
 addons/base_calendar/base_calendar.py         |  2 +-
 addons/crm/crm_meeting_view.xml               |  2 +
 addons/crm_claim/crm_claim_view.xml           | 26 ++------
 addons/event/res_partner_view.xml             | 64 ++++++++-----------
 addons/l10n_fr_rib/bank_view.xml              |  4 +-
 .../marketing_campaign/res_partner_view.xml   | 26 +++-----
 addons/membership/membership_view.xml         |  9 ++-
 addons/plugin_outlook/plugin_outlook.xml      |  2 +-
 .../plugin_thunderbird/plugin_thunderbird.xml |  3 +-
 addons/product/product_view.xml               |  7 +-
 addons/project/res_partner_view.xml           | 44 +++++--------
 addons/stock/stock_view.xml                   |  2 +-
 13 files changed, 79 insertions(+), 114 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 53f556b77c2..cd75daa6c07 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -115,7 +115,7 @@
                                 <group name="bank" string="Information About the Bank">
                                     <field name="bank" on_change="onchange_bank_id(bank)"/>
                                     <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="[Identifier code]"/>
+                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
                                 </group>
                             </group>
                         </form>
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5aead3d086d..a9e5949a3ca 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
              ('confidential', 'Public for Employees')], 'Privacy', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show Time As', states={'done': [('readonly', True)]}),
+                                                'Show Time as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('cancelled', 'Cancelled'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 46cfb098166..0340b4f11a6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
     <!-- Calendar Attendee Form View -->
+
     <record id="attendee_form_view_inherit" model="ir.ui.view">
             <field name="name">calendar.attendee.form.inherit</field>
             <field name="model">calendar.attendee</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index f00b524a204..80e373160be 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -248,21 +248,6 @@
             </field>
         </record>
 
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_claim']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-        </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.claim.info.form</field>
             <field name="model">res.partner</field>
@@ -270,15 +255,18 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='grp_claim']" position="inside">
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_claim" string="Claim">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
                             </tree>
                         </field>
-                    </xpath>
-                </data>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 44a3d4613ec..c8760c0b07f 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -3,9 +3,9 @@
     <data>
 
          <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="view_speaker_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.speaker.info.inherit</field>
+
+       <record id="view_event_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.event.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -14,43 +14,31 @@
                     <field name="speaker"/>
                 </field>
                 <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='grp_event']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_event" string="Event">
+                        <field name="event_ids" colspan="4" nolabel="1">
+                            <tree string="Events">
+                                <field name="name" string="Event"/>
+                                <field name="main_speaker_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group name="grp_registration" string="Registration">
+                        <field name="event_registration_ids" colspan="4" nolabel="1">
+                            <tree string="Events Registration">
+                                <field name="event_begin_date" string="Date"/>
+                                <field name="event_id" />
+                                <field name="nb_register"/>
+                                <field name="state"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
-                <xpath expr="//group[@name='grp_registration']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-       </record>
-       <record id="view_event_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.event.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <group name="grp_event" position="inside">
-                    <field name="event_ids" colspan="4" nolabel="1">
-                        <tree string="Events">
-                            <field name="name" string="Event"/>
-                            <field name="main_speaker_id"/>
-                        </tree>
-                    </field>
-                   </group>
-                   <group name="grp_registration" position="inside">
-                    <field name="event_registration_ids" colspan="4" nolabel="1">
-                        <tree string="Events Registration">
-                            <field name="event_begin_date" string="Date"/>
-                            <field name="event_id" />
-                            <field name="nb_register"/>
-                            <field name="state"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                        </tree>
-                    </field>
-               </group>
             </field>
        </record>
 
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 38c51df58e0..627c2eacf04 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 2b1b9dc09dd..ee619f041e8 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -2,31 +2,21 @@
 <openerp>
     <data>
 
-         <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
-           <field name="name">res.partner.crm.history.inherit2</field>
-           <field name="model">res.partner</field>
-           <field name="type">form</field>
-           <field name="inherit_id" ref="base.view_partner_form"/>
-           <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_campaign']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-           </field>
-          </record>    
+         <!--  Partners inherited form -->  
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.workitem.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group name="grp_campaign" position="inside">
-                            <field name="workitem_ids" colspan="4" nolabel="1"/>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_campaign" string="Campaign">
+                        <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
+                </xpath>
             </field>
        </record>
    </data>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 71d9bca3a71..9c566a69bde 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -242,10 +242,13 @@
                 <notebook position="inside">
                     <page string="Membership">
                         <group>
-                            <group col="3">
+                            <group>
                                 <field name="free_member"/>
-                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
-                                <field name="membership_state" class="oe_inline"/>
+                                <label for="membership_state"/>
+                                <div>
+                                    <field name="membership_state" class="oe_inline"/>
+                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                </div>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 052b49c5294..04e5dca32de 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -27,7 +27,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 8433824c268..1adb4fa5eda 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -33,8 +33,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
-
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7610222d166..4fe51dc67f6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,9 +313,14 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="name"/>
                                 <field name="parent_id"/>
                             </group>
                             <group>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 3c2dde07376..09170c43434 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,39 +3,29 @@
     <data>
 
          <!--  Partners inherited form -->
-         <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_task']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-             </field>
-          </record>
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group name="grp_task" position="inside">
-                    <field name="task_ids" colspan="4" nolabel="1">
-                        <tree string="Tasks" editable="bottom">
-                            <field name="name"/>
-                            <field name="user_id"/>
-                            <field name="date_deadline"/>
-                            <field name="state" invisible="1"/>
-                            <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
-                        </tree>
-                    </field>
-                  </group>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_task" string="Tasks">
+                        <field name="task_ids" colspan="4" nolabel="1">
+                            <tree string="Tasks" editable="bottom">
+                                <field name="name"/>
+                                <field name="user_id"/>
+                                <field name="date_deadline"/>
+                                <field name="state" invisible="1"/>
+                                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            </tree>
+                        </field>
+                      </group>
+                </xpath>
             </field>
        </record>
        
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 668c48e1bf6..053f0e1765a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -874,7 +874,7 @@
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Add an internal note"/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>

From e1d6ecb015ce1db604eedc93048995ed74022664 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 19 Jul 2012 11:34:14 +0200
Subject: [PATCH 23/23] [IMP] sale, sale_margin: better name for <group> tag

bzr revid: qdp-launchpad@openerp.com-20120719093414-eqsw86hkj8qunxir
---
 addons/sale/sale_view.xml               | 2 +-
 addons/sale_margin/sale_margin_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1c41951d438..f7ab8fd748e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -262,7 +262,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <group name="sale_delivery">
+                            <group name="sale_margin_grp">
                             </group>
                             <div class="oe_clear">
                                 <label for="note"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index faac570e500..30c2a0dea14 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,7 +8,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_delivery']" position="inside">
+            <xpath expr="//group[@name='sale_margin_grp']" position="inside">
                 <group>
                     <label for="margin"/>
                     <div>