From a4879a590076b505c471056654c53f99bd035031 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 17 Jul 2012 11:09:45 +0530
Subject: [PATCH 01/24] [ADD] added summary field in ir.module.module

bzr revid: tpa@tinyerp.com-20120717053945-02f18osd5eq3eoca
---
 openerp/addons/base/module/module.py       | 2 ++
 openerp/addons/base/module/module_view.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index fde8fcf5b9a..7a890f9095a 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -227,6 +227,7 @@ class module(osv.osv):
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
         'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
+        'summary': fields.char('Summary', size=256, translate=True, readonly=True),
     }
 
     _defaults = {
@@ -481,6 +482,7 @@ class module(osv.osv):
             'application': terp.get('application', False),
             'auto_install': terp.get('auto_install', False),
             'icon': terp.get('icon', False),
+            'summary': terp.get('summary', ''),
         }
 
     # update the list of available packages
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 5624c8ff58c..12947c827f3 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -78,7 +78,8 @@
                         <div class="oe_module_desc">
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
-                             <field name="name"/><br/>
+                             <field name="summary"/>
+                             <field name="name" groups="base.group_no_one"/><br/>
                           </p>
                           <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
                           <button t-if="installed" disabled="disabled">Installed</button>

From 6b88b4317a7ca455f8bbae17dda60981717a65f9 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 17 Jul 2012 12:19:55 +0530
Subject: [PATCH 02/24] [IMP] view imp

bzr revid: jam@tinyerp.com-20120717064955-lz3b2u3fg5hs40f4
---
 openerp/addons/base/module/module.py       | 1 -
 openerp/addons/base/module/module_view.xml | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 7a890f9095a..927cefcccb9 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -227,7 +227,6 @@ class module(osv.osv):
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
         'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
-        'summary': fields.char('Summary', size=256, translate=True, readonly=True),
     }
 
     _defaults = {
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 12947c827f3..6ae7ec3962e 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -70,6 +70,7 @@
                   <field name="icon"/>
                   <field name="name"/>
                   <field name="state"/>
+                  <field name="summary"/>
                   <templates>
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette oe_kanban_auto_height">
@@ -78,8 +79,8 @@
                         <div class="oe_module_desc">
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
-                             <field name="summary"/>
-                             <field name="name" groups="base.group_no_one"/><br/>
+                             <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
+                             <i><field name="name" groups="base.group_no_one"/></i><br/>
                           </p>
                           <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
                           <button t-if="installed" disabled="disabled">Installed</button>

From 67931a35d29370416eac4ee10482294964b33a40 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 17 Jul 2012 14:20:28 +0530
Subject: [PATCH 03/24] [Add] Add module summary on db install

bzr revid: jam@tinyerp.com-20120717085028-2jkbf9ymrftkui45
---
 openerp/addons/base/base.sql | 1 +
 openerp/modules/db.py        | 6 +++---
 openerp/modules/module.py    | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql
index f2cb77709ed..26d70b7ede6 100644
--- a/openerp/addons/base/base.sql
+++ b/openerp/addons/base/base.sql
@@ -286,6 +286,7 @@ CREATE TABLE ir_module_module (
     write_date timestamp without time zone,
     write_uid integer references res_users on delete set null,
     website character varying(256),
+    summary character varying(256),
     name character varying(128) NOT NULL,
     author character varying(128),
     url character varying(128),
diff --git a/openerp/modules/db.py b/openerp/modules/db.py
index 2449efc7fcd..7490631a3b9 100644
--- a/openerp/modules/db.py
+++ b/openerp/modules/db.py
@@ -77,8 +77,8 @@ def initialize(cr):
 
         cr.execute('INSERT INTO ir_module_module \
                 (author, website, name, shortdesc, description, \
-                    category_id, auto_install, state, certificate, web, license, application, icon, sequence) \
-                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
+                    category_id, auto_install, state, certificate, web, license, application, icon, sequence, summary) \
+                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
             info['author'],
             info['website'], i, info['name'],
             info['description'], category_id,
@@ -86,7 +86,7 @@ def initialize(cr):
             info['web'],
             info['license'],
             info['application'], info['icon'],
-            info['sequence']))
+            info['sequence'], info['summary']))
         id = cr.fetchone()[0]
         cr.execute('INSERT INTO ir_model_data \
             (name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', (
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 265a23190e5..b1d4de31bce 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -341,6 +341,7 @@ def load_information_from_description_file(module):
                 'web': False,
                 'website': '',
                 'sequence': 100,
+                'summary': '',
             }
             info.update(itertools.izip(
                 'depends data demo test init_xml update_xml demo_xml'.split(),

From cdffbc85845529ea383bb6ad819e5ee5f1eb80c3 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 17 Jul 2012 16:05:27 +0530
Subject: [PATCH 04/24] [IMP] Made the summary search compitiablw with Keywords
 search

bzr revid: jam@tinyerp.com-20120717103527-0898nuuhg56utkhg
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 6ae7ec3962e..6f08e8c4e3d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -43,7 +43,7 @@
                 <search string="Search modules">
                     <group col='10' colspan='4'>
                         <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
-                        <field name="description" string="Keywords"/>
+                        <field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
                         <separator orientation="vertical"/>
                         <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                         <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>

From 0fb838686c78ee24a0ea2cce0247d782ce0b97d9 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 18:25:07 +0200
Subject: [PATCH 05/24] [IMP] give higher sequence numbers (with wider gaps) to
 top menu items it should now be easier to insert new elements wherever we
 want in the main menu

bzr revid: abo@openerp.com-20120717162507-eezg0luxap793wrx
---
 openerp/addons/base/base_menu.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 90c7dd348e6..6c8055ff8d4 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_reporting" name="Reporting" sequence="90" groups="base.group_user"/>
+
+        <menuitem id="menu_reporting" name="Reporting" sequence="170" groups="base.group_user"/>
             <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
             <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
-        <menuitem id="menu_administration" name="Settings" sequence="100"/>
+
+        <menuitem id="menu_administration" name="Settings" sequence="180"/>
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
             <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
@@ -12,11 +14,13 @@
             <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
                 <menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
                 <menuitem id="menu_translation_export" name="Import / Export" parent="menu_translation" sequence="3" groups="base.group_no_one"/>
+
             <menuitem id="menu_custom" name="Technical" parent="menu_administration" sequence="110" groups="base.group_no_one"/>
                 <menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
                 <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
                 <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                 <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
                 <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
+
     </data>
 </openerp>

From 2b59d63699aea495dfb747a3b90b527db2f81409 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 18:25:28 +0200
Subject: [PATCH 06/24] [IMP] give higher sequence numbers (with wider gaps) to
 top menu items it should now be easier to insert new elements wherever we
 want in the main menu

bzr revid: abo@openerp.com-20120717162528-0kkk32mjeoyda9c4
---
 addons/account/account_menuitem.xml         |  2 +-
 addons/base_tools/tools_view.xml            |  4 ++-
 addons/event/event_view.xml                 | 33 ++++++++++----------
 addons/hr/hr_view.xml                       | 14 ++++-----
 addons/knowledge/knowledge_view.xml         |  2 +-
 addons/mail/mail_thread_view.xml            |  4 +--
 addons/marketing/marketing_view.xml         |  5 ++-
 addons/membership/membership_view.xml       |  8 ++---
 addons/mrp/mrp_view.xml                     |  6 ++--
 addons/point_of_sale/point_of_sale_view.xml | 34 ++++++++++++---------
 addons/project/project_view.xml             | 15 ++++-----
 addons/purchase/purchase_view.xml           |  4 +--
 addons/sale/sale_view.xml                   |  4 +--
 addons/stock/stock_view.xml                 | 12 ++++----
 addons/survey/survey_view.xml               | 24 ++++++++-------
 15 files changed, 90 insertions(+), 81 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index c2275c0e461..401f77c9f94 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="14"
+        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="100"
             groups="group_account_user,group_account_manager,group_account_invoice"
             web_icon="images/accounting.png"
             web_icon_hover="images/accounting-hover.png"/>
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index eb51e000c1b..0541e452620 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
           <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools"
-                    name="Tools" sequence="28"
+                    name="Tools" sequence="160"
                     web_icon="images/tools.png"
                     web_icon_hover="images/tools-hover.png"/>
+
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1b1b5daa9a9..11e2322a0d8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-      <act_window
+        <act_window
             id="act_event_list_register_event"
             name="Registration"
             res_model="event.registration"
@@ -9,12 +9,13 @@
             view_mode="calendar,tree,form,graph"
             context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
-        <menuitem  name="Events" id="event_main_menu"/>
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
-    <!-- EVENTS  -->
+        <menuitem name="Events" id="event_main_menu" sequence="80"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
 
-    <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
+        <!-- EVENTS  -->
+
+        <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
         <record model="ir.ui.view" id="view_event_type_form">
             <field name="name">Event type</field>
             <field name="model">event.type</field>
@@ -52,7 +53,7 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+        <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <!-- Event Read/Unread actions -->
         <record id="actions_server_event_event_unread" model="ir.actions.server">
@@ -111,7 +112,7 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
-                        </div> 
+                        </div>
                         <div>
                             <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
                             </h2>
@@ -151,7 +152,7 @@
                                     </group>
                                     <group>
                                         <field name="register_attended"/>
-                                    </group> 
+                                    </group>
                                 </group>
                                 <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">
@@ -222,7 +223,7 @@
 
         <!-- Event Kanban View -->
 
-    <record model="ir.ui.view" id="view_event_kanban">
+        <record model="ir.ui.view" id="view_event_kanban">
             <field name="name">event.event.kanban</field>
             <field name="model">event.event</field>
             <field name="type">kanban</field>
@@ -286,7 +287,7 @@
             </field>
         </record>
 
-      <!-- Events  Calendar  View -->
+        <!-- Events  Calendar  View -->
 
         <record id="view_event_calendar" model="ir.ui.view">
             <field name="name">event.event.calendar</field>
@@ -316,7 +317,7 @@
             </field>
         </record>
 
-    <!-- Event Search View -->
+        <!-- Event Search View -->
 
         <record model="ir.ui.view" id="view_event_search">
             <field name="name">Events</field>
@@ -362,7 +363,7 @@
 
 
         <!-- Events Organisation/CONFIGURATION/EVENTS  -->
-       <record model="ir.actions.act_window" id="action_event_view">
+        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
@@ -371,9 +372,9 @@
            <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
-       </record>
+        </record>
 
-      <act_window
+        <act_window
             id="act_register_event_partner"
             name="Subscribe"
             res_model="event.registration"
@@ -382,9 +383,9 @@
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             view_type="form"/>
 
-       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
+        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
-    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
+        <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
         <!-- Registration Read/Unread actions -->
         <record id="actions_server_event_registration_unread" model="ir.actions.server">
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 54ced534880..6e798449fba 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="110"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
+                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
@@ -213,7 +213,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_employee_form"/>
             <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record> 
+        </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
@@ -418,8 +418,8 @@
                 <search string="Jobs">
                     <field name="name" string="Job"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"  
-                            domain="[('state','=','open')]" 
+                    <filter icon="terp-camera_test"
+                            domain="[('state','=','open')]"
                             string="In Position"
                             help="In Position"/>
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
@@ -435,7 +435,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="view_hr_job_employee_form" model="ir.ui.view">
             <field name="name">hr.job.employee.form</field>
             <field name="model">hr.job</field>
@@ -452,7 +452,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index cdc176b347f..b2eefd90cce 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,7 +1,7 @@
 <openerp>
 <data>
     <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-              sequence="19" groups="base.group_system,base.group_document_user"
+              sequence="130" groups="base.group_system,base.group_document_user"
               web_icon="images/knowledge.png"
               web_icon_hover="images/knowledge-hover.png"/>
     <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a32045efafc..f15141d3711 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,9 +3,9 @@
     <data>
 
         <!-- toplevel menu -->
-        <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
+        <menuitem id="mail_feeds_main" name="Feeds" sequence="10"
             web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png" 
+            web_icon_hover="static/src/img/feeds-hover.png"
             groups="base.group_user"/>
 
         <!-- left-side menu: Feeds !-->
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index a697d586cd4..e9ee0a11e97 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,11 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem
-            name="Marketing"
+        <menuitem name="Marketing"
             icon="terp-crm"
             id="base.marketing_menu"
-            sequence="17"
+            sequence="120"
             groups="marketing.group_marketing_user,marketing.group_marketing_manager"
             web_icon="images/marketing.png"
             web_icon_hover="images/marketing-hover.png"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9c566a69bde..6a421130544 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-
-
         <!-- MEMBERSHIP -->
 
         <!-- MEMBERSHIP/MEMBERSHIP PRODUCTS -->
@@ -71,7 +69,7 @@
                             <group>
                                 <label for="membership_date_from" string="Membership Duration"/>
                                 <div>
-                                    <field name="membership_date_from" required="1" class="oe_inline"/> - 
+                                    <field name="membership_date_from" required="1" class="oe_inline"/> -
                                     <field name="membership_date_to" required="1" class="oe_inline"/>
                                 </div>
                                 <field name="list_price" string="Membership Fee"/>
@@ -133,7 +131,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="70"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
@@ -282,7 +280,7 @@
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
 
-<!-- View for product.product object inherited from product module................ -->
+        <!-- View for product.product object inherited from product module -->
         <record model="ir.ui.view" id="view_product_form_inherit1">
             <field name="name">product.normal.form</field>
             <field name="type">form</field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 86b0fcee0d5..ac6c82f6642 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="8"
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
+            groups="group_mrp_user,group_mrp_manager" sequence="60"
             web_icon="images/manufacturing.png"
             web_icon_hover="images/manufacturing-hover.png"/>
 
@@ -336,7 +336,7 @@
                     <sheet>
                         <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
                         <h1>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
                         </h1>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index f3b491116b7..7f99599a04b 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <menuitem name="PoS Backend" id="menu_point_root" sequence="20"
             icon="terp-partner"
             groups="group_pos_manager"
@@ -8,7 +9,7 @@
             web_icon_hover="images/pos-hover.png"/>
 
         <record id="categ_others" model="pos.category">
-          <field name="name">Others</field>
+            <field name="name">Others</field>
         </record>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
@@ -16,7 +17,7 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Point of Sale Orders" version="7.0"> 
+                <form string="Point of Sale Orders" version="7.0">
                     <div class="oe_form_topbar">
                         <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft" context="{'pos_session_id' : session_id}"/>
                         <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
@@ -27,7 +28,7 @@
                                 <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                             </div>
                     </div>
-                    <sheet> 
+                    <sheet>
                     <group col="4" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
@@ -748,10 +749,15 @@
             <field name="tag">pos.ui</field>
         </record>
 
+        <!--
+            right now it's not possible to directly call a client action
+            from a menuitem, so we can't use this shortcut element and
+            use an explicit record element instead
+        -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
-          <field name="name">Point of Sale</field>
-          <field name="sequence" eval="21"/>
-          <field name="action" ref="action_pos_pos"/>
+            <field name="name">Point of Sale</field>
+            <field name="sequence">160</field>
+            <field name="action" ref="action_pos_pos"/>
         </record>
 
         <!-- use menuitem to add web_icon and web_icon_hover above -->
@@ -842,12 +848,12 @@
         </record>
 
 
-        <act_window 
-            id="act_pos_config_sessions" 
+        <act_window
+            id="act_pos_config_sessions"
             name="Sessions"
             src_model="pos.config"
             res_model="pos.session"
-            domain="[('config_id', '=', active_id)]" />         
+            domain="[('config_id', '=', active_id)]" />
 
         <record model="ir.actions.act_window" id="action_pos_config_pos">
             <field name="name">Point of Sales</field>
@@ -864,8 +870,8 @@
             id="menu_pos_config_pos"
             groups="group_pos_manager"/>
 
-        <act_window 
-            id="act_pos_session_orders" 
+        <act_window
+            id="act_pos_session_orders"
             name="Orders"
             src_model="pos.session"
             res_model="pos.order"
@@ -878,10 +884,10 @@
             <field name="model">pos.session</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Point of Sale Session" version="7.0">  
+                <form string="Point of Sale Session" version="7.0">
                     <header>
-                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" /> 
-                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened" /> 
+                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" />
+                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened" />
                         <button name="close" type="workflow" string="Validate &amp; Close" states="closing_control,opened" />
 
                         <div class="oe_right">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 26814892775..145af6f34ad 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data>
 
-        <menuitem
+        <menuitem name="Project"
             icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"
+            sequence="90"
             groups="group_project_manager,group_project_user"
             web_icon="images/project.png"
             web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        
+
         <act_window
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
             id="act_project_project_2_project_task_all"
@@ -157,7 +157,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
-                       <field name="complete_name" string="Project Name"/> 
+                       <field name="complete_name" string="Project Name"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-mail-message-new"
                            string="Inbox" help="Unread messages"
@@ -545,7 +545,7 @@
                                                     ,[5, (hours gte 5 and hours lt 10)]
                                                     ,[10, (hours gte 10)]
                                                 ]"/>
-                                                <t t-foreach="times" t-as="time"><a 
+                                                <t t-foreach="times" t-as="time"><a
                                                     t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b
                                                     t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t>
                                                 <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
@@ -652,7 +652,7 @@
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
                         <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
                             help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="project_id"/>
@@ -675,7 +675,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="analytic_account_inherited_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -827,5 +827,6 @@
 
       <!--     User Form-->
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 100c60e3f53..144ee741cb5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="40"
            groups="group_purchase_manager,group_purchase_user"
            web_icon="images/purchases.png"
            web_icon_hover="images/purchases-hover.png"/>
@@ -222,7 +222,7 @@
                                 <field name="amount_tax"/>
                                 <div class="oe_subtotal_footer_separator oe_inline">
 				    <label for="amount_total"/>
-                                    <button name="button_dummy" 
+                                    <button name="button_dummy"
 				    	states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
 			        <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e7420edb910..c1a8ea22d8b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="30" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 
@@ -197,7 +197,7 @@
                                         <group>
                                             <field name="product_id"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                groups="base.group_user" 
+                                                groups="base.group_user"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
                                             <label for="product_uom_qty"/>
                                             <div>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 432b3ce365b..38b5d677c6b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
-                  groups="group_stock_manager,group_stock_user" sequence="5"
+                  groups="group_stock_manager,group_stock_user" sequence="50"
                   web_icon="images/warehouse.png"
                   web_icon_hover="images/warehouse-hover.png"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
@@ -123,7 +123,7 @@
                 <sheet>
                     <div class="oe_title">
                         <div class="oe_edit_only">
-                            <label for="name"  /> 
+                            <label for="name"  />
                         </div>
                         <h1>
                             <field name="name" placeholder="Annual inventory"/>
@@ -1238,9 +1238,9 @@
                             </div>
                             <label for="product_uso_qty" />
                             <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                <field name="product_uos_qty"
+                                    groups="product.group_uos"
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
                                     class="oe_inline"/>
                                 <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
                             </div>
@@ -1419,7 +1419,7 @@
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/> 
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
                             <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 20f6f42a929..fb4b232f512 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
-            <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_manager"
-                 parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
-            <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" sequence="6"/>
-            <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
+
+        <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
+        <menuitem name="Define Surveys" id="menu_define_survey"
+             groups="base.group_tool_manager"
+             parent="menu_surveys" />
+        <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
+        <menuitem name="Reporting" parent="base.menu_tools"
+            id="base.menu_lunch_reporting" sequence="6"/>
+        <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
+
         <!--
             Survey
         -->
@@ -269,7 +271,7 @@
             </field>
         </record>
 
-       <record id="survey_search" model="ir.ui.view">
+        <record id="survey_search" model="ir.ui.view">
             <field name="name">survey_search</field>
             <field name="model">survey</field>
             <field name="type">search</field>
@@ -295,7 +297,7 @@
                </search>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_survey_kanban">
             <field name="name">event.survey.kanban</field>
             <field name="model">survey</field>
@@ -750,7 +752,7 @@
             </field>
         </record>
 
-       <record id="survey_question_search" model="ir.ui.view">
+        <record id="survey_question_search" model="ir.ui.view">
             <field name="name">survey_question_search</field>
             <field name="model">survey.question</field>
             <field name="type">search</field>

From 6a2f418bfd3662fc405839ea73c718d3f3754d88 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:11:12 +0200
Subject: [PATCH 07/24] [FIX] some wrong ordering sequences in top menus

bzr revid: abo@openerp.com-20120718101112-0i0oc550pd86oepu
---
 addons/association/profile_association.xml  | 10 ++++++----
 addons/membership/membership_data.xml       |  8 ++++----
 addons/membership/membership_view.xml       |  2 +-
 addons/point_of_sale/point_of_sale_view.xml | 12 ++++++++----
 addons/purchase/purchase_view.xml           | 15 ++++++++++-----
 addons/sale/sale_view.xml                   |  9 ++++++++-
 6 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index f131fe4f4a9..3936824972b 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            name="Association"
+
+        <!-- Top menu item -->
+        <menuitem name="Association"
             id="base.menu_association"
             icon="terp-calendar"
-            sequence="9"
             web_icon="images/association.png"
-            web_icon_hover="images/association-hover.png"/>
+            web_icon_hover="images/association-hover.png"
+            sequence="70"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
         <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
+
     </data>
 </openerp>
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
index 60c21fc6cf6..14fbb00f9a2 100644
--- a/addons/membership/membership_data.xml
+++ b/addons/membership/membership_data.xml
@@ -5,10 +5,10 @@
     <!--
     Price type
     -->
-        <record model="product.price.type" id="product_price_type_memberprice" >
-            <field name="name">Member Price</field>
-            <field name="field">member_price</field>
-        </record>
+    <record model="product.price.type" id="product_price_type_memberprice" >
+        <field name="name">Member Price</field>
+        <field name="field">member_price</field>
+    </record>
 
     <!--
     Price list
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 6a421130544..5eea7170367 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -131,7 +131,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="70"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 7f99599a04b..27fc6bb8637 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -2,11 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem name="PoS Backend" id="menu_point_root" sequence="20"
+        <!-- Top menu item -->
+        <menuitem name="PoS Backend"
+            id="menu_point_root"
             icon="terp-partner"
-            groups="group_pos_manager"
             web_icon="images/pos.png"
-            web_icon_hover="images/pos-hover.png"/>
+            web_icon_hover="images/pos-hover.png"
+            groups="group_pos_manager"
+            sequence="140"/>
 
         <record id="categ_others" model="pos.category">
             <field name="name">Others</field>
@@ -749,6 +752,7 @@
             <field name="tag">pos.ui</field>
         </record>
 
+        <!-- Top menu item -->
         <!--
             right now it's not possible to directly call a client action
             from a menuitem, so we can't use this shortcut element and
@@ -756,7 +760,7 @@
         -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
             <field name="name">Point of Sale</field>
-            <field name="sequence">160</field>
+            <field name="sequence">150</field>
             <field name="action" ref="action_pos_pos"/>
         </record>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 144ee741cb5..45728729719 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="40"
-           groups="group_purchase_manager,group_purchase_user"
-           web_icon="images/purchases.png"
-           web_icon_hover="images/purchases-hover.png"/>
-       <menuitem id="menu_procurement_management" name="Purchase"
+
+        <!-- Top menu item -->
+        <menuitem name="Purchases"
+            id="base.menu_purchase_root"
+            icon="terp-purchase"
+            web_icon="images/purchases.png"
+            web_icon_hover="images/purchases-hover.png"
+            groups="group_purchase_manager,group_purchase_user"
+            sequence="40"/>
+        <menuitem id="menu_procurement_management" name="Purchase"
             parent="base.menu_purchase_root" sequence="1" />
 
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c1a8ea22d8b..37b68a47ef7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="30" groups="base.group_sale_salesman,base.group_sale_manager"/>
+
+        <!-- Top menu item -->
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
+            icon="terp-partner"
+            groups="base.group_sale_salesman,base.group_sale_manager"
+            sequence="30"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 

From dbd2f400a60512471e96914c5a45a48dacc7887a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:11:29 +0200
Subject: [PATCH 08/24] [FIX] some wrong ordering sequences in top menus

bzr revid: abo@openerp.com-20120718101129-2l8yyzx4wu34yggr
---
 openerp/addons/base/base_menu.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 6c8055ff8d4..770e0e2d329 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -2,11 +2,18 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_reporting" name="Reporting" sequence="170" groups="base.group_user"/>
+        <!-- Top menu item -->
+        <menuitem name="Reporting"
+            id="menu_reporting"
+            groups="base.group_user"
+            sequence="170"/>
             <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
             <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
 
-        <menuitem id="menu_administration" name="Settings" sequence="180"/>
+        <!-- Top menu item -->
+        <menuitem name="Settings"
+            id="menu_administration"
+            sequence="500"/>
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
             <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>

From c7f4b5ead1edbd30cd0c43fc3fec8c45327e452a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:34:29 +0200
Subject: [PATCH 09/24] [IMP] format all the top menu items' XML the same way,
 prefixed by the comment '<- Top menu item -->', making them easier to spot
 also fix some identation

bzr revid: abo@openerp.com-20120718103429-98gl4oe0hkmmf35k
---
 addons/account/account_menuitem.xml | 11 ++++--
 addons/base_tools/tools_view.xml    | 11 +++---
 addons/event/event_view.xml         |  5 ++-
 addons/hr/hr_view.xml               |  8 +++--
 addons/knowledge/knowledge_view.xml | 24 ++++++++-----
 addons/mail/mail_thread_view.xml    | 13 ++++---
 addons/marketing/marketing_view.xml |  9 ++---
 addons/mrp/mrp_view.xml             | 15 +++++---
 addons/project/project_view.xml     | 54 +++++++++++++++--------------
 addons/purchase/stock_view.xml      |  8 ++---
 addons/sale/sale_view.xml           |  1 +
 addons/stock/stock_view.xml         | 13 ++++---
 12 files changed, 106 insertions(+), 66 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 401f77c9f94..69c4f3a7307 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,10 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="100"
-            groups="group_account_user,group_account_manager,group_account_invoice"
+        <!-- Top menu item -->
+        <menuitem name="Invoicing"
+            id="menu_finance"
+            icon="terp-account"
             web_icon="images/accounting.png"
-            web_icon_hover="images/accounting-hover.png"/>
+            web_icon_hover="images/accounting-hover.png"
+            groups="group_account_user,group_account_manager,group_account_invoice"
+            sequence="100"/>
+
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index 0541e452620..3002931cf17 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -2,10 +2,13 @@
 <openerp>
     <data>
 
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools"
-                    name="Tools" sequence="160"
-                    web_icon="images/tools.png"
-                    web_icon_hover="images/tools-hover.png"/>
+        <!-- Top menu item -->
+        <menuitem name="Tools"
+            id="base.menu_tools"
+            icon="STOCK_PREFERENCES"
+            web_icon="images/tools.png"
+            web_icon_hover="images/tools-hover.png"
+            sequence="160"/>
 
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 11e2322a0d8..890cb1be9e6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -10,7 +10,10 @@
             context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
 
-        <menuitem name="Events" id="event_main_menu" sequence="80"/>
+        <!-- Top menu item -->
+        <menuitem name="Events"
+            id="event_main_menu"
+            sequence="80"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
 
         <!-- EVENTS  -->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6e798449fba..521ebafdd97 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,10 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="110"
+        <!-- Top menu item -->
+        <menuitem name="Human Resources"
+            id="menu_hr_root"
+            icon="terp-hr"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"
-            groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
+            groups="base.group_hr_manager,base.group_hr_user,base.group_user"
+            sequence="110"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index b2eefd90cce..5f36ad110c6 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,13 +1,19 @@
 <openerp>
-<data>
-    <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-              sequence="130" groups="base.group_system,base.group_document_user"
-              web_icon="images/knowledge.png"
-              web_icon_hover="images/knowledge-hover.png"/>
-    <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+    <data>
 
-    <menuitem id="knowledge.menu_document2" name="Collaborative Content"
-       parent="knowledge.menu_document" />
+        <!-- Top menu item -->
+        <menuitem name="Knowledge"
+            id="knowledge.menu_document"
+            icon="terp-stock"
+            web_icon="images/knowledge.png"
+            web_icon_hover="images/knowledge-hover.png"
+            groups="base.group_system,base.group_document_user"
+            sequence="130"/>
 
-</data>
+        <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+
+        <menuitem id="knowledge.menu_document2" name="Collaborative Content"
+           parent="knowledge.menu_document"/>
+
+    </data>
 </openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index f15141d3711..06cb8189915 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -2,11 +2,13 @@
 <openerp>
     <data>
 
-        <!-- toplevel menu -->
-        <menuitem id="mail_feeds_main" name="Feeds" sequence="10"
-            web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png"
-            groups="base.group_user"/>
+        <!-- Top menu item -->
+        <menuitem name="Feeds"
+          id="mail_feeds_main"
+          web_icon="static/src/img/feeds.png"
+          web_icon_hover="static/src/img/feeds-hover.png"
+          groups="base.group_user"
+          sequence="10"/>
 
         <!-- left-side menu: Feeds !-->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
@@ -22,5 +24,6 @@
           <field name="action" ref="action_mail_my_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index e9ee0a11e97..d478b9f6479 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,13 +2,14 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
         <menuitem name="Marketing"
-            icon="terp-crm"
             id="base.marketing_menu"
-            sequence="120"
-            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            icon="terp-crm"
             web_icon="images/marketing.png"
-            web_icon_hover="images/marketing-hover.png"/>
+            web_icon_hover="images/marketing-hover.png"
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            sequence="120"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ac6c82f6642..72cd8b5c1ff 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,12 +2,19 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="60"
+        <!-- Top menu item -->
+        <menuitem name="Manufacturing"
+            id="base.menu_mrp_root"
+            icon="terp-mrp"
             web_icon="images/manufacturing.png"
-            web_icon_hover="images/manufacturing-hover.png"/>
+            web_icon_hover="images/manufacturing-hover.png"
+            groups="group_mrp_user,group_mrp_manager"
+            sequence="60"/>
 
-        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem name="Manufacturing"
+            id="menu_mrp_manufacturing"
+            parent="base.menu_mrp_root"
+            sequence="1"/>
 
         <menuitem name="Master Data"
             id="menu_mrp_bom"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 145af6f34ad..9edd731acf2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,12 +2,14 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
         <menuitem name="Project"
-            icon="terp-project" id="base.menu_main_pm"
-            sequence="90"
-            groups="group_project_manager,group_project_user"
+            id="base.menu_main_pm"
+            icon="terp-project"
             web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"/>
+            web_icon_hover="images/project-hover.png"
+            groups="group_project_manager,group_project_user"
+            sequence="90"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
@@ -156,31 +158,31 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                   <group>
-                       <field name="complete_name" string="Project Name"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-mail-message-new"
+                    <group>
+                        <field name="complete_name" string="Project Name"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-mail-message-new"
                            string="Inbox" help="Unread messages"
                            name="needaction_pending"
                            domain="[('needaction_pending','=',True)]"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
-                       <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                       <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                       <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
-                       <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                       <separator orientation="vertical"/>
-                       <field name="user_id" string="Project Manager"/>
-                       <field name="partner_id" string="Partner"/>
-                   </group>
-                   <newline />
-                   <group expand="0" string="Group By...">
-                       <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                       <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                       <separator orientation="vertical"/>
-                       <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
-                   </group>
-               </search>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
+                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
+                        <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
+                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                        <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Project Manager"/>
+                        <field name="partner_id" string="Partner"/>
+                    </group>
+                    <newline />
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f9d6239e0a5..d96d9124e0b 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -11,7 +11,7 @@
                     <field name="purchase_line_id" colspan="2" />
                 </xpath>
             </field>
-        </record>      
+        </record>
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
             <field name="name">Picking list</field>
             <field name="model">stock.picking</field>
@@ -35,7 +35,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <!-- Picking to Invoice -->
         <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
@@ -86,7 +86,7 @@
             <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
         </record>
-        
+
         <record id="purchase_order_2_stock_picking" model="ir.ui.view">
             <field name="name">Purchase Picking Inherited</field>
             <field name="model">purchase.order</field>
@@ -102,7 +102,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
             <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 37b68a47ef7..62145ad064b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -8,6 +8,7 @@
             icon="terp-partner"
             groups="base.group_sale_salesman,base.group_sale_manager"
             sequence="30"/>
+
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 38b5d677c6b..b8cda122e6b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,10 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
-                  groups="group_stock_manager,group_stock_user" sequence="50"
-                  web_icon="images/warehouse.png"
-                  web_icon_hover="images/warehouse-hover.png"/>
+        <!-- Top menu item -->
+        <menuitem name="Warehouse"
+            id="menu_stock_root"
+            icon="terp-stock"
+            web_icon="images/warehouse.png"
+            web_icon_hover="images/warehouse-hover.png"
+            groups="group_stock_manager,group_stock_user"
+            sequence="50"/>
+
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>

From 91e97798dbb276ad24c4282ec193d44a2351c7c2 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 18 Jul 2012 16:35:01 +0530
Subject: [PATCH 10/24] [IMP] sale: make only confirm as red button on
 quotations

bzr revid: cha@tinyerp.com-20120718110501-js1le7i30vxwlwpm
---
 addons/sale/sale_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 619ea161f28..98607994dab 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -146,10 +146,10 @@
                             <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                             <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                             <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent" class="oe_highlight"/>
+                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent"/>
                             <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
-                            <button name="print_quotation" string="Send by Post" type="object" states="draft,sent" class="oe_highlight"/>
-                            <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
+                            <button name="print_quotation" string="Send by Post" type="object" states="draft,sent"/>
+                            <button name="action_button_confirm" states="draft" string="Confirm" type="object" class="oe_highlight"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>

From 4cbee6dbed71862d8f7c76ce2db31c5c1fb6c1d1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 13:18:42 +0200
Subject: [PATCH 11/24] [FIX] put a missing <div> back in place

bzr revid: abo@openerp.com-20120718111842-o2q0dyuhbylhtvve
---
 addons/stock/stock_view.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e8c359e8196..77f4bc33147 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -15,7 +15,7 @@
         <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
-           parent="stock.menu_stock_product" sequence="0"/>
+            parent="stock.menu_stock_product" sequence="0"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="40" groups="base.group_no_one"/>
@@ -29,15 +29,15 @@
         <menuitem
             action="product.product_ul_form_action" groups="product.group_stock_packaging"
             id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
-         <menuitem
+        <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
             parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
-         <menuitem
-             action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
-             parent="menu_stock_configuration" sequence="30" groups="product.group_uom"/>
-         <menuitem
-              action="product.product_uom_form_action" id="menu_stock_uom_form_action"
-              parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/>
+        <menuitem
+            action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
+            parent="menu_stock_configuration" sequence="30" groups="product.group_uom"/>
+        <menuitem
+            action="product.product_uom_form_action" id="menu_stock_uom_form_action"
+            parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -126,6 +126,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div>
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -

From 0ec54ee4731a20bebe5aca96a358a5e1739f0073 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 13:35:34 +0200
Subject: [PATCH 12/24] [FIX] add a missing name attribute to the user's form
 view 'view_users_form_simple_modif' this name attribute is used by a xpath in
 the point_of_sale module (cf. 'res_users_form_preference_view' view)

bzr revid: abo@openerp.com-20120718113534-g9kd95y75t2x71c0
---
 openerp/addons/base/res/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 4f8fb9f94fd..546c1c063b8 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -58,7 +58,7 @@
                             <field name="comment"/>
                         </page>
                     </notebook>
-                  </sheet>  
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -199,7 +199,7 @@
                         <field name="name" readonly="1" class="oe_inline"/>
                         (<field name="login" readonly="1" class="oe_inline"/>)
                     </h1>
-                    <group col="4">
+                    <group name="preferences" col="4">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>

From e824580c89e974f716723f7c1300504934259f4a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 18 Jul 2012 17:10:32 +0530
Subject: [PATCH 13/24] [IMP] account : Create the invoice and validate it.
 then send it, once it is sent, only the register payment button must be red.

bzr revid: mdi@tinyerp.com-20120718114032-hjn8v2evgqffn5gw
---
 addons/account/account_invoice_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 211a40f030f..40283d28df3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -292,8 +292,10 @@
                 <form version="7.0">
                 <header>
                     <span groups="base.group_user">
-                        <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
-                        <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
+                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
+                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
+                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
                         <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
                         <button name="invoice_open" states="proforma2" string="Validate"/>
                         <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>

From 80e504e2709e147862bac4a034980acb035782f9 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 18 Jul 2012 17:30:36 +0530
Subject: [PATCH 14/24] [IMP] account_voucher :  Journal and account should go
 in accountant group.

bzr revid: mdi@tinyerp.com-20120718120036-r2v5o6xu9pt37qaw
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index e70156e4032..a003e4ea986 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -95,7 +95,7 @@
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                         <group>
-                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)" groups="account.group_account_user"/>
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="name"/>
                             <field name="paid" invisible="1"/>
@@ -249,14 +249,15 @@
                             <field name="journal_id"
                                 domain="[('type','in',['purchase','purchase_refund'])]"
                                 widget="selection"
-                                on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                                on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
+                                groups="account.group_account_user"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"  groups="account.group_account_user"/>
+                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]" groups="account.group_account_user"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>

From 1b1ff0fa6fa9395ecba2265079846fd5ab6ea7b5 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 14:49:27 +0200
Subject: [PATCH 15/24] [FIX] update sequence number of redundant Knowledge and
 Project top menu items

bzr revid: abo@openerp.com-20120718124927-9dxuo58te1d4w9r6
---
 addons/crm_claim/crm_claim_menu.xml       | 20 ++++++++--------
 addons/crm_helpdesk/crm_helpdesk_menu.xml | 13 +++++++----
 addons/knowledge/knowledge_view.xml       |  6 +++--
 addons/wiki/wiki_view.xml                 | 28 +++++++++++++----------
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index d4bfd8f21bb..bba8e6556ee 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"
-            groups="base.group_sale_salesman"
+
+        <!-- Top menu item -->
+        <menuitem name="Project"
+            id="base.menu_main_pm"
+            icon="terp-project"
             web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"/>
+            web_icon_hover="images/project-hover.png"
+            groups="base.group_sale_salesman"
+            sequence="90"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
             parent="base.menu_main_pm" sequence="2" />
 
         <!-- Claims Menu -->
-
         <record model="ir.actions.act_window" id="crm_case_categ_claim0">
             <field name="name">Claims</field>
             <field name="res_model">crm.claim</field>
@@ -51,13 +53,9 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
-        <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"/>
-        
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index f5c36eb1ab1..9557d5e1d45 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"
+
+        <!-- Top menu item -->
+        <menuitem name="Project"
+            id="base.menu_main_pm"
+            icon="terp-project"
             web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"/>
+            web_icon_hover="images/project-hover.png"
+            sequence="90"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
 
-<!-- Help Desk (menu) -->
+        <!-- Help Desk (menu) -->
 
         <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
             <field name="name">Helpdesk Requests</field>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 5f36ad110c6..5ed5256b0e6 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -10,9 +11,10 @@
             groups="base.group_system,base.group_document_user"
             sequence="130"/>
 
-        <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+        <menuitem name="Configuration" id="knowledge.menu_document_configuration"
+            parent="knowledge.menu_document" sequence="50"/>
 
-        <menuitem id="knowledge.menu_document2" name="Collaborative Content"
+        <menuitem name="Collaborative Content" id="knowledge.menu_document2"
            parent="knowledge.menu_document"/>
 
     </data>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 700585122d3..1041644f3b8 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge" icon="terp-stock"
-           id="knowledge.menu_document" sequence="19" />
 
-       <menuitem name="Configuration"
-           id="knowledge.menu_document_configuration"
-           parent="knowledge.menu_document" sequence="50"/>
+        <!-- Top menu item -->
+        <menuitem name="Knowledge"
+            id="knowledge.menu_document"
+            icon="terp-stock"
+            sequence="130"/>
 
-       <menuitem name="Wiki" id="menu_wiki_configuration"
-           parent="knowledge.menu_document_configuration" sequence="2" />
+        <menuitem name="Configuration"
+            id="knowledge.menu_document_configuration"
+            parent="knowledge.menu_document" sequence="50"/>
+
+        <menuitem name="Wiki" id="menu_wiki_configuration"
+            parent="knowledge.menu_document_configuration" sequence="2"/>
 
 
         <!--  Wiki Groups Tree view -->
@@ -38,7 +42,7 @@
                     <group col="2" colspan="1">
                         <field name="method"/>
                         <field name="home" domain="[('group_id','=',active_id)]"
-                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
+                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Notes">
@@ -61,7 +65,7 @@
                          name="open_wiki_page"
                          string="Open Wiki Page"
                           type="object"
-                          icon="gtk-ok" />
+                          icon="gtk-ok"/>
                 </form>
             </field>
         </record>
@@ -131,7 +135,7 @@
                     <sheet>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
-                                <h1><field name="name" select="1" /></h1>
+                                <h1><field name="name" select="1"/></h1>
                             <label for="group_id" class="oe_edit_only"/>
                             <h2>
                             <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/></h2>
@@ -203,7 +207,7 @@
 
         <menuitem parent="knowledge.menu_document2"
             id="menu_action_wiki_wiki" name="Wiki Pages"
-            action="action_wiki" />
+            action="action_wiki"/>
 
         <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">
@@ -258,7 +262,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <act_window 
+        <act_window
             context="{'search_default_wiki_id': [active_id], 'default_wiki_id': active_id}"
             id="act_wiki_wiki_history"
             name="Page History"

From 391a35389c42b81a5306f8954cace8a235a763bd Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 15:14:03 +0200
Subject: [PATCH 16/24] [IMP] remove deprecated attributes 'icon', 'web_icon'
 and 'web_icon_hover' from top menu items

bzr revid: abo@openerp.com-20120718131403-6pzpzhhqbxhtub9b
---
 addons/account/account_menuitem.xml         |  3 ---
 addons/association/profile_association.xml  |  3 ---
 addons/base_tools/tools_view.xml            |  3 ---
 addons/crm_claim/crm_claim_menu.xml         |  3 ---
 addons/crm_helpdesk/crm_helpdesk_menu.xml   |  3 ---
 addons/hr/hr_view.xml                       |  3 ---
 addons/knowledge/knowledge_view.xml         |  3 ---
 addons/mail/mail_thread_view.xml            |  2 --
 addons/marketing/marketing_view.xml         |  3 ---
 addons/mrp/mrp_view.xml                     |  3 ---
 addons/point_of_sale/point_of_sale_view.xml | 10 ++--------
 addons/project/project_view.xml             |  3 ---
 addons/purchase/purchase_view.xml           |  3 ---
 addons/sale/sale_view.xml                   |  1 -
 addons/stock/stock_view.xml                 |  3 ---
 addons/wiki/wiki_view.xml                   |  1 -
 16 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 69c4f3a7307..9ac6f98661c 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Invoicing"
             id="menu_finance"
-            icon="terp-account"
-            web_icon="images/accounting.png"
-            web_icon_hover="images/accounting-hover.png"
             groups="group_account_user,group_account_manager,group_account_invoice"
             sequence="100"/>
 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 3936824972b..099a6f1ac97 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Association"
             id="base.menu_association"
-            icon="terp-calendar"
-            web_icon="images/association.png"
-            web_icon_hover="images/association-hover.png"
             sequence="70"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
         <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index 3002931cf17..fbe0e16e31a 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Tools"
             id="base.menu_tools"
-            icon="STOCK_PREFERENCES"
-            web_icon="images/tools.png"
-            web_icon_hover="images/tools-hover.png"
             sequence="160"/>
 
     </data>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index bba8e6556ee..46f8760387a 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             groups="base.group_sale_salesman"
             sequence="90"/>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 9557d5e1d45..393428e091e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             sequence="90"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 521ebafdd97..0706da45c86 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Human Resources"
             id="menu_hr_root"
-            icon="terp-hr"
-            web_icon="images/hr.png"
-            web_icon_hover="images/hr-hover.png"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"
             sequence="110"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 5ed5256b0e6..9acba0f4b43 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Knowledge"
             id="knowledge.menu_document"
-            icon="terp-stock"
-            web_icon="images/knowledge.png"
-            web_icon_hover="images/knowledge-hover.png"
             groups="base.group_system,base.group_document_user"
             sequence="130"/>
 
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 06cb8189915..f07e1e467ee 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -5,8 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Feeds"
           id="mail_feeds_main"
-          web_icon="static/src/img/feeds.png"
-          web_icon_hover="static/src/img/feeds-hover.png"
           groups="base.group_user"
           sequence="10"/>
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index d478b9f6479..b4c8a295241 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Marketing"
             id="base.marketing_menu"
-            icon="terp-crm"
-            web_icon="images/marketing.png"
-            web_icon_hover="images/marketing-hover.png"
             groups="marketing.group_marketing_user,marketing.group_marketing_manager"
             sequence="120"/>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 72cd8b5c1ff..943fb0556ec 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Manufacturing"
             id="base.menu_mrp_root"
-            icon="terp-mrp"
-            web_icon="images/manufacturing.png"
-            web_icon_hover="images/manufacturing-hover.png"
             groups="group_mrp_user,group_mrp_manager"
             sequence="60"/>
 
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 27fc6bb8637..6b1b9132344 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="PoS Backend"
             id="menu_point_root"
-            icon="terp-partner"
-            web_icon="images/pos.png"
-            web_icon_hover="images/pos-hover.png"
             groups="group_pos_manager"
             sequence="140"/>
 
@@ -760,14 +757,11 @@
         -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
             <field name="name">Point of Sale</field>
-            <field name="sequence">150</field>
             <field name="action" ref="action_pos_pos"/>
+            <field name="groups_id" eval="[(6, 0, [ref('point_of_sale.group_pos_manager'), ref('point_of_sale.group_pos_user')])]"/>
+            <field name="sequence">150</field>
         </record>
 
-        <!-- use menuitem to add web_icon and web_icon_hover above -->
-        <menuitem id="menu_point_root_touchscreen"
-            web_icon="images/pos.png" web_icon_hover="images/pos-hover.png" groups="point_of_sale.group_pos_manager,point_of_sale.group_pos_user"/>
-
         <record model="ir.ui.view" id="view_pos_config_form">
             <field name="name">pos.config.form.view</field>
             <field name="model">pos.config</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9edd731acf2..94836221265 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             groups="group_project_manager,group_project_user"
             sequence="90"/>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 45728729719..ebc7df729b5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Purchases"
             id="base.menu_purchase_root"
-            icon="terp-purchase"
-            web_icon="images/purchases.png"
-            web_icon_hover="images/purchases-hover.png"
             groups="group_purchase_manager,group_purchase_user"
             sequence="40"/>
         <menuitem id="menu_procurement_management" name="Purchase"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 62145ad064b..0d000f8ec30 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -5,7 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Sales"
             id="base.menu_base_partner"
-            icon="terp-partner"
             groups="base.group_sale_salesman,base.group_sale_manager"
             sequence="30"/>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 77f4bc33147..b2d45196703 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Warehouse"
             id="menu_stock_root"
-            icon="terp-stock"
-            web_icon="images/warehouse.png"
-            web_icon_hover="images/warehouse-hover.png"
             groups="group_stock_manager,group_stock_user"
             sequence="50"/>
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1041644f3b8..c88255a073a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -5,7 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Knowledge"
             id="knowledge.menu_document"
-            icon="terp-stock"
             sequence="130"/>
 
         <menuitem name="Configuration"

From cf4f258306381903ecc20dd972b607888053d662 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 19 Jul 2012 14:12:03 +0530
Subject: [PATCH 17/24] [IMP]crm: improve button sequence and fix value error
 on button and improve name of view

bzr revid: mma@tinyerp.com-20120719084203-ww4pc42oz2rnma3e
---
 addons/crm/crm_lead_menu.xml      |  2 +-
 addons/crm/crm_lead_view.xml      |  4 +---
 addons/crm/crm_phonecall_view.xml | 16 +++++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index cbcd5b3b3bd..fde288c4a45 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -41,7 +41,7 @@
     </record>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">Opportunities</field>
+          <field name="name">Opportunity</field>
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 73c687e4ad0..f7bd27854f1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -97,8 +97,7 @@
                 groups="base.group_sale_salesman"
                 res_model="crm.phonecall"
                 view_mode="tree,calendar,form"
-                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-                domain="[('opportunity_id', '=', active_id)]"
+                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
                 view_type="form"/>
 
         <act_window
@@ -107,7 +106,6 @@
                 res_model="crm.meeting"
                 view_mode="tree,form,calendar"
                 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-                domain="[('opportunity_id', '=', active_id)]"
                 view_type="form"/>
 
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 1f15e29263b..e83ad45d851 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -101,23 +101,25 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="case_open" string="Confirm" type="object" class="oe_highlight"
-                        states="draft,pending"/>
                 <button name="case_close" string="Held" type="object" class="oe_highlight"
                         states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel"/>
-                <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending"/>
-                <button string="Convert to Opportunity"  class="oe_highlight"
+                <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}" />
+                <button string="Convert to Opportunity" class="oe_highlight"
+                        name="%(phonecall2opportunity_act)d"
+                        type="action"
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}" />
                 <button string="Schedule Other Call"
                         name="%(phonecall_to_phonecall_act)d"
                         type="action"  />
                 <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
-                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
+                <button name="case_cancel" string="Cancel" type="object"
+                        states="draft,open,pending"/>
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
             </header>
             <sheet string="Phone Call">
                   <div class="oe_title">

From 2a19e799d7489d254081692a80c6a3e86d93a366 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 19 Jul 2012 15:39:24 +0530
Subject: [PATCH 18/24] [IMP]: Place crm_meeting demo & data file at right
 location in base_calendar

bzr revid: cha@tinyerp.com-20120719100924-61t3jqsqzj61squb
---
 addons/base_calendar/__openerp__.py                |  5 +++--
 addons/{crm => base_calendar}/crm_meeting_data.xml |  0
 addons/{crm => base_calendar}/crm_meeting_demo.xml | 12 ++++++------
 addons/crm/__openerp__.py                          |  2 --
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename addons/{crm => base_calendar}/crm_meeting_data.xml (100%)
 rename addons/{crm => base_calendar}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 3f6ca129f6f..c7df187dd87 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,9 +39,10 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml'
+        'base_calendar_data.xml',
+        'crm_meeting_data.xml',
     ],
-    "demo_xml": [],
+    "demo_xml": ['crm_meeting_demo.xml'],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/crm/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
similarity index 100%
rename from addons/crm/crm_meeting_data.xml
rename to addons/base_calendar/crm_meeting_data.xml
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
similarity index 89%
rename from addons/crm/crm_meeting_demo.xml
rename to addons/base_calendar/crm_meeting_demo.xml
index dda6d5a03a8..ad88c11bb1b 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet1"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b4d41..9fb1a4db28d 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,7 +68,6 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
-        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -115,7 +114,6 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
-        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [

From 459ef0a9d9c2998550b3090ad238763daa40f058 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 19 Jul 2012 12:34:19 +0200
Subject: [PATCH 19/24] [FIX] crm: change the name of the action

bzr revid: stw@openerp.com-20120719103419-gtx93tuedw5imyah
---
 addons/crm/crm_lead_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index fde288c4a45..cbcd5b3b3bd 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -41,7 +41,7 @@
     </record>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">Opportunity</field>
+          <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>

From 010622a368f9d9af71c01aa69f76d266c3327ecf Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 19 Jul 2012 14:35:27 +0200
Subject: [PATCH 20/24] [FIX] mail: feeds: Can't make a search on title

bzr revid: stw@openerp.com-20120719123527-tvknq8x7b85ccgv6
---
 addons/mail/mail_message_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 9159190ab29..34ba6db1477 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -73,6 +73,7 @@
                 <search string="Messages Search">
                     <field name="user_id"/>
                     <field name="body"/>
+                    <field name="model" string="Message" filter_domain="['|', ('subject', 'ilike', self), ('body_text', 'ilike', self)]" />
                 </search>
             </field>
         </record>

From 37f391a5645c93a86a656efe70761ec8e9e8d76f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 19 Jul 2012 16:10:19 +0200
Subject: [PATCH 21/24] [FIX] Feeds header's layout

bzr revid: abo@openerp.com-20120719141019-p6ugjbsnt7wrfb03
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 982fb8aeb2f..ce15f83a3d4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_global">
+    <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
         <table class="oe_view_manager_header">
           <colgroup>
             <col width="33%"/>
@@ -9,7 +9,7 @@
             <col width="34%"/>
           </colgroup>
           <tbody>
-            <tr class="oe_header_row">
+            <tr class="oe_header_row oe_header_row_top">
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">All Feeds</span>

From ad9f16238d8122d1d07470cc445ebb946359b41d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 20 Jul 2012 04:45:32 +0000
Subject: [PATCH 22/24] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120720043734-rqxoubj45utde2nb
bzr revid: launchpad_translations_on_behalf_of_openerp-20120720044532-0x70lsjeu7dcpj56
---
 addons/web/i18n/ja.po           |   4 +-
 addons/web_calendar/i18n/ja.po  |   4 +-
 addons/web_dashboard/i18n/ja.po |   4 +-
 addons/web_diagram/i18n/ja.po   |   4 +-
 addons/web_gantt/i18n/hu.po     |  28 ++++++++
 addons/web_gantt/i18n/ja.po     |   4 +-
 addons/web_graph/i18n/hu.po     |  98 ++++++++++++++++++++++++++
 addons/web_graph/i18n/ja.po     |   4 +-
 addons/web_kanban/i18n/hu.po    |  66 ++++++++++++++++++
 addons/web_kanban/i18n/ja.po    |   4 +-
 addons/web_mobile/i18n/ja.po    |   4 +-
 addons/web_process/i18n/hu.po   | 118 ++++++++++++++++++++++++++++++++
 addons/web_process/i18n/ja.po   |   4 +-
 openerp/addons/base/i18n/ja.po  |  38 +++++-----
 14 files changed, 347 insertions(+), 37 deletions(-)
 create mode 100644 addons/web_gantt/i18n/hu.po
 create mode 100644 addons/web_graph/i18n/hu.po
 create mode 100644 addons/web_kanban/i18n/hu.po
 create mode 100644 addons/web_process/i18n/hu.po

diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index c1339863a4d..41154a91a72 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 00ea538f586..e950529be81 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_dashboard/i18n/ja.po b/addons/web_dashboard/i18n/ja.po
index 6b59633054b..c3e73cebb9d 100644
--- a/addons/web_dashboard/i18n/ja.po
+++ b/addons/web_dashboard/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/js/dashboard.js:60
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index bd1625fe9df..9897259683c 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
new file mode 100644
index 00000000000..7fe1cce2631
--- /dev/null
+++ b/addons/web_gantt/i18n/hu.po
@@ -0,0 +1,28 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_gantt/static/src/js/gantt.js:11
+msgid "Gantt"
+msgstr ""
+
+#. openerp-web
+#: addons/web_gantt/static/src/xml/web_gantt.xml:10
+msgid "Create"
+msgstr "Létrehozás"
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index d16a0e5452f..29dee705455 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
new file mode 100644
index 00000000000..b3b7b0a864d
--- /dev/null
+++ b/addons/web_graph/i18n/hu.po
@@ -0,0 +1,98 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Grafikon"
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:5
+msgid "Graph Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:7
+msgid "Graph Mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:11
+msgid "Pie"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:12
+msgid "Bars"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:14
+msgid "Lines"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:15
+msgid "Areas"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:18
+msgid "Radar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:20
+msgid "Legend"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:24
+msgid "Hidden"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:25
+msgid "Inside"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:26
+msgid "Top"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:28
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:32
+msgid "Switch Axis"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:33
+msgid "Show Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:34
+msgid "Download as PNG"
+msgstr ""
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 7fa475e3bcb..6952acbbc5d 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
new file mode 100644
index 00000000000..54814691329
--- /dev/null
+++ b/addons/web_kanban/i18n/hu.po
@@ -0,0 +1,66 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr "Kanban"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:293
+msgid "Undefined"
+msgstr "Nem definiált"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:468
+msgid "Are you sure you want to delete this record ?"
+msgstr "Biztosan törölni szeretné ezt a bejegyzést?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:839
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "Show more... ("
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "remaining)"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "or"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:72
+msgid "Cancel"
+msgstr ""
+
+#~ msgid "Create"
+#~ msgstr "Létrehozás"
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 440a2e15fbd..51a1a1559bf 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_mobile/i18n/ja.po b/addons/web_mobile/i18n/ja.po
index 9be55cb112a..82f05b3282d 100644
--- a/addons/web_mobile/i18n/ja.po
+++ b/addons/web_mobile/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_process/i18n/hu.po b/addons/web_process/i18n/hu.po
new file mode 100644
index 00000000000..d37cd5543e7
--- /dev/null
+++ b/addons/web_process/i18n/hu.po
@@ -0,0 +1,118 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Mentés"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentáció"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Olvassa a dokumentációt online"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Fórum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Közösségi vitafórum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Könyvek"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Megjegyzések:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Utoljára módosította:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Alfolyamatok:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Kapcsolódó:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Folyamat kiválasztása"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Kiválaszt"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr ""
diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po
index 4cc24782acb..22db0acff5e 100644
--- a/addons/web_process/i18n/ja.po
+++ b/addons/web_process/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 0e756def3ee..f4d05595b25 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-07-08 22:23+0000\n"
+"PO-Revision-Date: 2012-07-19 05:44+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:37+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -459,7 +459,7 @@ msgstr "ir.ui.view_sc"
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr "ウィジット"
+msgstr "ウィジェット"
 
 #. module: base
 #: view:ir.model.access:0
@@ -2514,7 +2514,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr "ホームページウィジット管理"
+msgstr "ホームページウィジェット管理"
 
 #. module: base
 #: field:res.company,rml_header1:0
@@ -2782,7 +2782,7 @@ msgstr "インポート / エクスポート"
 #. module: base
 #: model:ir.actions.todo.category,name:base.category_tools_customization_config
 msgid "Tools / Customization"
-msgstr "ツール / カスタマイゼーション"
+msgstr "ツール / カスタム化"
 
 #. module: base
 #: field:ir.model.data,res_id:0
@@ -2895,7 +2895,7 @@ msgstr "マネジャ"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr "カスタマイゼーション"
+msgstr "カスタム化"
 
 #. module: base
 #: model:res.country,name:base.py
@@ -7797,7 +7797,7 @@ msgstr ""
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Widget Wizard"
-msgstr "ウィジットウィザード"
+msgstr "ウィジェットウィザード"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -12068,7 +12068,7 @@ msgstr ""
 "このモジュールはパートナのアドレスの中にGoogleマップ項目を追加します。\n"
 "====================================================\n"
 "\n"
-"これを使うと、URLウィジットからGoogleマップを直接開くことができます。"
+"これを使うと、URLウィジェットからGoogleマップを直接開くことができます。"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -14297,7 +14297,7 @@ msgstr "連絡先を隠すためにはアクティブな項目のチェックを
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
 msgid "Add a widget for User"
-msgstr "ユーザのウィジットを追加"
+msgstr "ユーザのウィジェットを追加"
 
 #. module: base
 #: model:res.country,name:base.dk
@@ -15305,7 +15305,7 @@ msgstr "イラン"
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
 msgid "Widgets per User"
-msgstr "ユーザ当りのウィジット"
+msgstr "ユーザ当りのウィジェット"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
@@ -15579,7 +15579,7 @@ msgstr "情報"
 #. module: base
 #: view:res.widget.user:0
 msgid "User Widgets"
-msgstr "ユーザウィジット"
+msgstr "ユーザウィジェット"
 
 #. module: base
 #: view:base.module.update:0
@@ -17621,7 +17621,7 @@ msgstr "機能"
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr "ウィジットの検索"
+msgstr "ウィジェットの検索"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
@@ -17742,7 +17742,7 @@ msgstr "受発注のドキュメントの内容に応じて、自動的に正し
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr "ホームページウィジット"
+msgstr "ホームページウィジェット"
 
 #. module: base
 #: help:res.company,rml_footer2:0
@@ -17815,23 +17815,23 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールは何の開発もなしで新しいモジュールの作成ができます。\n"
+"このモジュールは何の開発もなしに新しいモジュールの作成ができます。\n"
 "======================================================================\n"
 "\n"
 "これは記録セッションの中でオブジェクトの全ての操作を記録します。そして、\n"
 ".ZIPモジュールを生成します。それによって、OpenERPクライアントから直接\n"
 "独自モジュールを作成することができます。\n"
 "\n"
-"このバージョンは作成と既存のレコードの更新にために動作します。それは依存関係と、\n"
-"全てのウィジットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
+"このバージョンは作成と既存のレコードの更新のために動作します。それは依存関係と、\n"
+"全てのウィジェットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
 "また、ワークフローとデモ / 更新データもサポートします。\n"
 "\n"
 "カスタム設定とデモ / テストデータのために、簡単に再利用と公表可能なモジュールを\n"
 "作成するために役立つはずです。\n"
 "\n"
 "利用方法：\n"
-"モジュールウィザードの アドミニストレーション/カスタマイゼーション/モジュール \n"
-"作成/エクスポート カスタマイゼーション を実行します。\n"
+"モジュールウィザードの アドミニストレーション/カスタム化/モジュール \n"
+"作成/エクスポート カスタム化 を実行します。\n"
 "記録の日時の基準、記録されるオブジェクト、記録モジュールを選択します。\n"
 "    "
 

From 7eb49260d163fb6a79e25208f24339cf0933dc3d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 20 Jul 2012 09:34:59 +0200
Subject: [PATCH 23/24] [REVERT] previous merge of
 lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha

bzr revid: stw@openerp.com-20120720073459-bhslng4t8qbigoka
---
 addons/base_calendar/__openerp__.py                |  5 ++---
 addons/crm/__openerp__.py                          |  2 ++
 addons/{base_calendar => crm}/crm_meeting_data.xml |  0
 addons/{base_calendar => crm}/crm_meeting_demo.xml | 12 ++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename addons/{base_calendar => crm}/crm_meeting_data.xml (100%)
 rename addons/{base_calendar => crm}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index c7df187dd87..3f6ca129f6f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,10 +39,9 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml',
-        'crm_meeting_data.xml',
+        'base_calendar_data.xml'
     ],
-    "demo_xml": ['crm_meeting_demo.xml'],
+    "demo_xml": [],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 9fb1a4db28d..0c9b75b4d41 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,6 +68,7 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
+        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -114,6 +115,7 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
similarity index 100%
rename from addons/base_calendar/crm_meeting_data.xml
rename to addons/crm/crm_meeting_data.xml
diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
similarity index 89%
rename from addons/base_calendar/crm_meeting_demo.xml
rename to addons/crm/crm_meeting_demo.xml
index ad88c11bb1b..dda6d5a03a8 100644
--- a/addons/base_calendar/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
+            <field name="categ_id" ref="crm.categ_meet1"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>

From 86e5835728bdd1a0be071f77eb5d208d2e028897 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 20 Jul 2012 11:23:27 +0200
Subject: [PATCH 24/24] [IMP] module kanban: remove unnecessary line break

bzr revid: rco@openerp.com-20120720092327-1j9777ss4n85c4og
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 6f08e8c4e3d..bd74abfa92d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -80,7 +80,7 @@
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
                              <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
-                             <i><field name="name" groups="base.group_no_one"/></i><br/>
+                             <i><field name="name" groups="base.group_no_one"/></i>
                           </p>
                           <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
                           <button t-if="installed" disabled="disabled">Installed</button>