Merge lp:~openerp-dev/openobject-addons/trunk-home-action-rga into lp:openobject-addons

[Ravi Gadhia (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-home-action-rga]

8860. By RGA(OpenERP) on 2013-11-11

Merge with trunk

Unmerged revisions

8860. By RGA(OpenERP) on 2013-11-11

Merge with trunk

8859. By RGA(OpenERP) on 2013-10-15

[IMP] Dispaly dialog only for explicitly generated error using .rejectother error can gracefully handel by framework rpc

8858. By RGA(OpenERP) on 2013-10-14

[IMP] POS: if user have no active session available display error and redirect to your session form view

8857. By RGA(OpenERP) on 2013-10-10

Merge with trunk

8856. By RGA(OpenERP) on 2013-09-02

Merge with trunk

8855. By RGA(OpenERP) on 2013-08-23

Merge with trunk

8854. By RGA(OpenERP) on 2013-08-13

[IMP] usability: imporve dashboard action name it's more convenient when want to choose as home action

8853. By RGA(OpenERP) on 2013-08-13

[IMP] usability: imporve client action name it's more convenient when want to choose as home action

=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml	2012-11-29 22:26:45 +0000
+++ account/board_account_view.xml	2013-11-11 12:15:46 +0000
@@ -27,7 +27,7 @@
         </record>
 
         <record id="open_board_account" model="ir.actions.act_window">
-            <field name="name">Accounting</field>
+            <field name="name">Accounting Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -36,6 +36,7 @@
         </record>
 
         <menuitem id="menu_board_account"
+                  name="Accounting"
                   action="open_board_account" 
                   icon="terp-graph"  
                   parent="base.menu_reporting_dashboard" 

=== modified file 'account_accountant/account_accountant_data.xml'
--- account_accountant/account_accountant_data.xml	2012-11-29 22:26:45 +0000
+++ account_accountant/account_accountant_data.xml	2013-11-11 12:15:46 +0000
@@ -12,7 +12,7 @@
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_account_menu" model="ir.actions.client">
-            <field name="name">Open Accounting Menu</field>
+            <field name="name">Accounting</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
         </record>

=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml	2013-10-04 10:52:18 +0000
+++ account_voucher/account_voucher_view.xml	2013-11-11 12:15:46 +0000
@@ -271,7 +271,7 @@
 
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_invoice_menu" model="ir.actions.client">
-            <field name="name">Open Invoicing Menu</field>
+            <field name="name">Invoicing</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
         </record>

=== modified file 'crm/board_crm_view.xml'
--- crm/board_crm_view.xml	2013-07-16 15:15:13 +0000
+++ crm/board_crm_view.xml	2013-11-11 12:15:46 +0000
@@ -70,7 +70,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="open_board_statistical_dash">
-            <field name="name">CRM</field>
+            <field name="name">CRM Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -80,6 +80,7 @@
 
         <menuitem
             id="menu_board_statistics_dash"
+            name="CRM"
             parent="base.menu_reporting_dashboard"
             action="open_board_statistical_dash"
             sequence="10"

=== modified file 'crm/crm_data.xml'
--- crm/crm_data.xml	2013-05-21 14:27:53 +0000
+++ crm/crm_data.xml	2013-11-11 12:15:46 +0000
@@ -4,7 +4,7 @@
 
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_crm_menu" model="ir.actions.client">
-            <field name="name">Open Sale Menu</field>
+            <field name="name">Sales</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/>
         </record>

=== modified file 'event/board_association_view.xml'
--- event/board_association_view.xml	2012-11-29 22:26:45 +0000
+++ event/board_association_view.xml	2013-11-11 12:15:46 +0000
@@ -60,7 +60,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="open_board_associations_manager">
-            <field name="name">Events</field>
+            <field name="name">Events Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -68,6 +68,7 @@
         </record>
 
         <menuitem id="menu_board_associations_manager"
+                  name="Events"
                   parent="base.menu_reporting_dashboard"
                   action="open_board_associations_manager"
                   sequence="40"

=== modified file 'event/event_data.xml'
--- event/event_data.xml	2012-12-05 05:37:32 +0000
+++ event/event_data.xml	2013-11-11 12:15:46 +0000
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_event_menu" model="ir.actions.client">
-            <field name="name">Open Event Menu</field>
+            <field name="name">Event</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('event.event_main_menu')}"/>
         </record>

=== modified file 'fleet/fleet_board_view.xml'
--- fleet/fleet_board_view.xml	2012-12-04 16:20:56 +0000
+++ fleet/fleet_board_view.xml	2013-11-11 12:15:46 +0000
@@ -110,7 +110,7 @@
     </record>
 
     <record id="open_board_fleet" model="ir.actions.act_window">
-        <field name="name">Fleet</field>
+        <field name="name">Fleet Dashboard</field>
         <field name="res_model">board.board</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
@@ -133,6 +133,7 @@
     </record>
     
     <menuitem id="menu_fleet_dashboard" 
+              name="Fleet"
               parent="base.menu_reporting_dashboard" 
               action="open_board_fleet" 
               sequence="50"

=== modified file 'fleet/fleet_data.xml'
--- fleet/fleet_data.xml	2012-12-10 16:28:34 +0000
+++ fleet/fleet_data.xml	2013-11-11 12:15:46 +0000
@@ -18,7 +18,7 @@
 
       <!-- After installation of the module, open the related menu -->
       <record id="action_fleet_menu" model="ir.actions.client">
-          <field name="name">Open Fleet Menu</field>
+          <field name="name">Fleet</field>
           <field name="tag">reload</field>
           <field name="params" eval="{'menu_id': ref('fleet.menu_root')}"/>
       </record>

=== modified file 'hr/board_hr_view.xml'
--- hr/board_hr_view.xml	2012-11-29 22:26:45 +0000
+++ hr/board_hr_view.xml	2013-11-11 12:15:46 +0000
@@ -16,7 +16,7 @@
     </record>
 
     <record id="open_board_hr" model="ir.actions.act_window">
-        <field name="name">Human Resources</field>
+        <field name="name">Human Resources Dashboard</field>
         <field name="res_model">board.board</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
@@ -38,6 +38,7 @@
             </field>
     </record>
     <menuitem id="menu_hr_dashboard" 
+              name="Human Resources"
               parent="base.menu_reporting_dashboard" 
               action="open_board_hr" 
               sequence="50"/>

=== modified file 'hr/res_config_view.xml'
--- hr/res_config_view.xml	2012-11-29 22:26:45 +0000
+++ hr/res_config_view.xml	2013-11-11 12:15:46 +0000
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_hr_menu" model="ir.actions.client">
-            <field name="name">Open HR Menu</field>
+            <field name="name">Human Resources</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('menu_hr_root')}"/>
         </record>

=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml	2013-09-04 14:10:53 +0000
+++ marketing_campaign/marketing_campaign_view.xml	2013-11-11 12:15:46 +0000
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="action_client_marketing_menu" model="ir.actions.client">
-            <field name="name">Open Marketing Menu</field>
+            <field name="name">Marketing</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.marketing_menu')}"/>
         </record>

=== modified file 'mrp/board_manufacturing_view.xml'
--- mrp/board_manufacturing_view.xml	2012-11-29 22:26:45 +0000
+++ mrp/board_manufacturing_view.xml	2013-11-11 12:15:46 +0000
@@ -19,7 +19,7 @@
         </record>
 
         <record id="open_board_manufacturing" model="ir.actions.act_window">
-            <field name="name">Manufacturing</field>
+            <field name="name">Manufacturing Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -27,6 +27,7 @@
         </record>
 
         <menuitem action="open_board_manufacturing"
+                  name="Manufacturing"
                   icon="terp-graph"
                   id="menu_board_manufacturing"
                   parent="base.menu_reporting_dashboard"

=== modified file 'mrp/res_config_view.xml'
--- mrp/res_config_view.xml	2012-11-29 22:26:45 +0000
+++ mrp/res_config_view.xml	2013-11-11 12:15:46 +0000
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_mrp_menu" model="ir.actions.client">
-            <field name="name">Open MRP Menu</field>
+            <field name="name">MRP</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_mrp_root')}"/>
         </record>

=== modified file 'point_of_sale/point_of_sale_data.xml'
--- point_of_sale/point_of_sale_data.xml	2013-04-09 10:09:17 +0000
+++ point_of_sale/point_of_sale_data.xml	2013-11-11 12:15:46 +0000
@@ -5,7 +5,7 @@
 
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_pos_menu" model="ir.actions.client">
-            <field name="name">Open POS Menu</field>
+            <field name="name">Point Of Sale</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('menu_point_root')}"/>
         </record>

=== modified file 'point_of_sale/static/src/js/models.js'
--- point_of_sale/static/src/js/models.js	2013-09-23 17:13:10 +0000
+++ point_of_sale/static/src/js/models.js	2013-11-11 12:15:46 +0000
@@ -1,5 +1,6 @@
 function openerp_pos_models(instance, module){ //module is instance.point_of_sale
     var QWeb = instance.web.qweb;
+    var _t = instance.web._t;
 
     var round_di = instance.web.round_decimals;
     var round_pr = instance.web.round_precision
@@ -68,10 +69,23 @@
                 .done(function(){
                     //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
                     self.ready.resolve();
-                }).fail(function(){
+                }).fail(function(error){
                     //we failed to load some backend data, or the backend was badly configured.
-                    //the error messages will be displayed in PosWidget
-                    self.ready.reject();
+                    //the error messages will be displayed in openerp dialog box.
+                    //display error dialog only for explicitly reject deferred using .reject('error') 
+                    //if any internal server error occured than server will send error object and handle by framework rpc handler.
+                    instance.web.unblockUI();
+                    if(_.isString(error)){
+                        var dialog = new instance.web.Dialog(this, {
+                            title: _t("Error"),
+                            width: 850,
+                            buttons: [
+                                {text: "OK", click: function() { self.ready.reject();}},
+                            ]
+                        }).open();
+                        $("<div />").text(error).appendTo(dialog.$el);
+                        dialog.on("closing", this, function(){self.ready.reject();});
+                    } 
                 });
         },
 
@@ -145,6 +159,9 @@
                         [['state', '=', 'opened'], ['user_id', '=', self.session.uid]]
                     );
                 }).then(function(sessions){
+                    if(_.isEmpty(sessions)){
+                        return (new $.Deferred()).reject(_t("There is no active session available for this user."));
+                    }
                     self.set('pos_session', sessions[0]);
 
                     return self.fetch(

=== modified file 'point_of_sale/static/src/js/widgets.js'
--- point_of_sale/static/src/js/widgets.js	2013-10-09 13:29:44 +0000
+++ point_of_sale/static/src/js/widgets.js	2013-11-11 12:15:46 +0000
@@ -889,15 +889,7 @@
                 self.pos.flush();
 
             }).fail(function(){   // error when loading models data from the backend
-                instance.web.unblockUI();
-                return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
-                    .pipe( _.bind(function(res){
-                        return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']})
-                            .pipe(_.bind(function(result){
-                                var action = result.result;
-                                this.do_action(action);
-                            }, this));
-                    }, self));
+                self.close();
             });
         },
         

=== modified file 'project/board_project_view.xml'
--- project/board_project_view.xml	2013-07-19 10:01:19 +0000
+++ project/board_project_view.xml	2013-11-11 12:15:46 +0000
@@ -47,7 +47,7 @@
         </record>
 
         <record id="open_board_project" model="ir.actions.act_window">
-            <field name="name">Project</field>
+            <field name="name">Project Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -56,6 +56,7 @@
         </record>
 
         <menuitem id="menu_project_dashboard"
+                  name="Project"
                   sequence="35"
                   parent="base.menu_reporting_dashboard"
                   action="open_board_project"/>

=== modified file 'project/res_config_view.xml'
--- project/res_config_view.xml	2012-11-29 22:26:45 +0000
+++ project/res_config_view.xml	2013-11-11 12:15:46 +0000
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_project_menu" model="ir.actions.client">
-            <field name="name">Open Project Menu</field>
+            <field name="name">Project</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_main_pm')}"/>
         </record>

=== modified file 'purchase/board_purchase_view.xml'
--- purchase/board_purchase_view.xml	2012-11-29 22:26:45 +0000
+++ purchase/board_purchase_view.xml	2013-11-11 12:15:46 +0000
@@ -73,7 +73,7 @@
         </record>
 
         <record id="open_board_purchase" model="ir.actions.act_window">
-            <field name="name">Purchases</field>
+            <field name="name">Purchases Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -82,6 +82,7 @@
         </record>
 
         <menuitem action="open_board_purchase"
+                  name="Purchases"
                   icon="terp-graph"
                   id="menu_board_purchase"
                   parent="base.menu_reporting_dashboard"

=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml	2013-04-18 10:23:37 +0000
+++ purchase/res_config_view.xml	2013-11-11 12:15:46 +0000
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_purchase_menu" model="ir.actions.client">
-            <field name="name">Open Purchase Menu</field>
+            <field name="name">Purchases</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_purchase_root')}"/>
         </record>

=== modified file 'sale/board_sale_view.xml'
--- sale/board_sale_view.xml	2012-11-29 22:26:45 +0000
+++ sale/board_sale_view.xml	2013-11-11 12:15:46 +0000
@@ -62,7 +62,7 @@
         </record>
 
         <record id="open_board_sales" model="ir.actions.act_window">
-            <field name="name">Sales</field>
+            <field name="name">Sales Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -71,6 +71,7 @@
 
         <menuitem id="menu_dashboard_sales"
                   sequence="15"
+                  name="Sales"
                   parent="base.menu_reporting_dashboard"
                   action="open_board_sales"
                   groups="base.group_sale_salesman"/>

=== modified file 'sale/sale_data.xml'
--- sale/sale_data.xml	2013-03-18 07:15:19 +0000
+++ sale/sale_data.xml	2013-11-11 12:15:46 +0000
@@ -4,7 +4,7 @@
 
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_sale_menu" model="ir.actions.client">
-            <field name="name">Open Sale Menu</field>
+            <field name="name">Sales</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/>
         </record>

=== modified file 'stock/board_warehouse_view.xml'
--- stock/board_warehouse_view.xml	2012-12-05 12:13:11 +0000
+++ stock/board_warehouse_view.xml	2013-11-11 12:15:46 +0000
@@ -50,7 +50,7 @@
         </record>
 
         <record id="open_board_warehouse" model="ir.actions.act_window">
-            <field name="name">Warehouse</field>
+            <field name="name">Warehouse Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -58,6 +58,7 @@
         </record>
 
         <menuitem   id="menu_board_warehouse" 
+                    name="Warehouse"
                     parent="base.menu_reporting_dashboard" 
                     action="open_board_warehouse" 
                     sequence="25" 

=== modified file 'stock/res_config_view.xml'
--- stock/res_config_view.xml	2013-02-20 08:27:07 +0000
+++ stock/res_config_view.xml	2013-11-11 12:15:46 +0000
@@ -4,7 +4,7 @@
 
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_warehouse_menu" model="ir.actions.client">
-            <field name="name">Open Warehouse Menu</field>
+            <field name="name">Warehouse</field>
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('menu_stock_root')}"/>
         </record>