From 7c354067b22a3181c4775c576d9fcc23578a6fd1 Mon Sep 17 00:00:00 2001
From: "Meera Trambadia (OpenERP)" <mtr@tinyerp.com>
Date: Mon, 26 Mar 2012 15:45:14 +0530
Subject: [PATCH 1/3] [IMP]
 account,auction,crm,document,event,hr,mrp,project_*,purchase,sale,stock:-improved
 the parent menu name for dashboard menus

bzr revid: mtr@tinyerp.com-20120326101514-mkfubco6ngi9lzr0
---
 addons/account/board_account_view.xml             | 2 +-
 addons/auction/board_auction_view.xml             | 2 +-
 addons/crm/board_crm_statistical_view.xml         | 4 ++--
 addons/document/board_document_view.xml           | 2 +-
 addons/event/board_association_view.xml           | 2 +-
 addons/hr/hr_board.xml                            | 2 +-
 addons/mrp/board_manufacturing_view.xml           | 2 +-
 addons/project/board_project_view.xml             | 6 +++---
 addons/project_issue/board_project_issue_view.xml | 2 +-
 addons/project_planning/project_planning_view.xml | 4 ++--
 addons/project_scrum/board_project_scrum_view.xml | 2 +-
 addons/purchase/board_purchase_view.xml           | 2 +-
 addons/sale/board_sale_view.xml                   | 4 ++--
 addons/stock/board_warehouse_view.xml             | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 0ec75e7b5c8..6417bb99d88 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -61,7 +61,7 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_dasboard" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
         <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
 
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index cb5ed07804c..360d8f38116 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -93,7 +93,7 @@
             <field name="view_id" ref="board_auction_form1"/>
         </record>
 
-        <menuitem name="Auction" id="menu_board_auction" parent="base.menu_dasboard" sequence="40"/>
+        <menuitem name="Auction" id="menu_board_auction" parent="base.menu_reporting_dashboard" sequence="40"/>
 
         <menuitem
             name="Auction DashBoard"
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 69c4f0bfb9e..b1b9ec93784 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -107,10 +107,10 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
-	    <menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
+	    <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
 
         <menuitem
-            name="CRM Dashboard" parent="board.menu_sales_dasboard"
+            name="CRM Dashboard" parent="board.menu_sales_dashboard"
             action="open_board_statistical_dash"
             sequence="0"
             id="menu_board_statistics_dash"
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index ee6fc61f896..4412423c97b 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -37,7 +37,7 @@
          <menuitem
             name="Knowledge"
             id="menu_reports_document"
-            parent="base.menu_dasboard"
+            parent="base.menu_reporting_dashboard"
             sequence="45"
             groups="base.group_system"/>
 
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index b9187227b1c..96db3db6781 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -63,7 +63,7 @@
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
         <menuitem id="menus_event_dashboard" name="Events"
-            parent="base.menu_dasboard" sequence="25"/>
+            parent="base.menu_reporting_dashboard" sequence="25"/>
         <menuitem
             name="Event Dashboard" parent="menus_event_dashboard"
             action="open_board_associations_manager"
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 555312afb6b..6b541f5a557 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -26,7 +26,7 @@
 
     <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
     <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
-    <menuitem id="menu_hr_dashboard" parent="base.menu_dasboard"  name="Human Resources" sequence="35"/>
+    <menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard"  name="Human Resources" sequence="35"/>
     <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
 
     <!-- This board view will be complete by other hr_* modules-->
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 1815c4ceb12..cb81d51d439 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -29,7 +29,7 @@
         </record>
 
         <menuitem id="menus_dash_mrp" name="Manufacturing"
-            parent="base.menu_dasboard" sequence="15"/>
+            parent="base.menu_reporting_dashboard" sequence="15"/>
         <menuitem
             action="open_board_manufacturing" icon="terp-graph"
             id="menu_board_manufacturing" parent="menus_dash_mrp"
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 34de37fd9a7..f4a855283ba 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -104,17 +104,17 @@
         </record>
 
         <menuitem
-            id="menu_project_dasboard"
+            id="menu_project_dashboard"
             name="Project"
             sequence="20"
-            parent="base.menu_dasboard"
+            parent="base.menu_reporting_dashboard"
             />
 
         <menuitem
             action="open_board_project"
             icon="terp-graph"
             id="menu_board_project"
-            parent="menu_project_dasboard"
+            parent="menu_project_dashboard"
             sequence="1"/>
 
         <menuitem
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index bcb73456b88..ff33793d8e8 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -79,7 +79,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
-        <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dasboard"
+        <menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
              icon="terp-graph"
             action="open_board_project_issue"/>
 
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 3beb5ad39a9..d12b62dbf18 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -292,11 +292,11 @@
             <!-- <field name="context">{"search_default_user_id":uid}</field> -->
             <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
         </record>
-		
+
             <menuitem  action="action_account_analytic_planning_stat_form"
                        icon="terp-graph"
                        id="menu_board_planning"
-                       parent="project.menu_project_dasboard"/>
+                       parent="project.menu_project_dashboard"/>
 
 <!--        Analytic account Form -->
 
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 7d993dd90c9..924a1cbf5cc 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -98,7 +98,7 @@
         </record>
         <menuitem
             id="menu_deshboard_scurm"
-            name="Scrum Dashboard" parent="project.menu_project_dasboard"
+            name="Scrum Dashboard" parent="project.menu_project_dashboard"
             icon="terp-graph"
             action="open_board_project_scrum"/>
 
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 74f34a45cb6..4c9e776b96b 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -5,7 +5,7 @@
         <menuitem
             id="menu_purchase_deshboard"
             name="Purchase"
-            parent="base.menu_dasboard" sequence="5"/>
+            parent="base.menu_reporting_dashboard" sequence="5"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
             <field name="name">Request for Quotations</field>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 57eee7f184b..8a6caf1a849 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -30,8 +30,8 @@
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
 
-        <menuitem id="board.menu_sales_dasboard" name="Sales" sequence="1" parent="base.menu_dasboard"/>
-        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dasboard" sequence="0" groups="base.group_sale_manager"/>
+        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
+        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dashboard" sequence="0" groups="base.group_sale_manager"/>
 
 
     <record id="action_quotation_for_sale" model="ir.actions.act_window">
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 5c52c6412f3..b8de9cf445e 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -68,7 +68,7 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_dasboard"/>
+        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
         <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
 

From cc88233248b6f4bd9e088d6ed832adb66c02e439 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 27 Mar 2012 12:05:18 +0200
Subject: [PATCH 2/3] [FIX] Reference to legacy Widget#widget_parent

bzr revid: fme@openerp.com-20120327100518-p64ada2s831exv52
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0aaa0398e20..4a449d1152c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -393,7 +393,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
                     if (self.db_list) {
                         self.db_list.push(self.to_object(fields)['db_name']);
                         self.db_list.sort();
-                        self.widget_parent.set_db_list(self.db_list);
+                        self.getParent().set_db_list(self.db_list);
                     }
 
                     var form_obj = self.to_object(fields);

From 94c7dff4eafb5b64ae6326d31e12fda03b209b74 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 27 Mar 2012 17:13:57 +0200
Subject: [PATCH 3/3] [FIX] usage issue of py.eval: in py.js 0.4, it returns a
 JS object not a PY object, so .toJSON should not be called on the result

bzr revid: xmo@openerp.com-20120327151357-4en4skjqb66b816c
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/view_page.js | 2 +-
 addons/web/static/src/js/views.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8b1ec3098a6..b6788d979a5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1605,7 +1605,7 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
     init: function (view, node) {
         this._super(view, node);
         if (node.attrs.digits) {
-            this.digits = py.eval(node.attrs.digits).toJSON();
+            this.digits = py.eval(node.attrs.digits);
         } else {
             this.digits = view.fields_view.fields[node.attrs.name].digits;
         }
diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index 50cc95cdea6..1e7c570abdf 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -93,7 +93,7 @@ openerp.web.page = function (openerp) {
         init: function (view, node) {
             this._super(view, node);
             if (node.attrs.digits) {
-                this.digits = py.eval(node.attrs.digits).toJSON();
+                this.digits = py.eval(node.attrs.digits);
             } else {
                 this.digits = view.fields_view.fields[node.attrs.name].digits;
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5be0fad74f0..43ecc8444fc 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -763,7 +763,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
         _(log_records.reverse()).each(function (record) {
             var context = {};
             if (record.context) {
-                try { context = py.eval(record.context).toJSON(); }
+                try { context = py.eval(record.context); }
                 catch (e) { /* TODO: what do I do now? */ }
             }
             $(_.str.sprintf('<li><a href="#">%s</a></li>', record.name))