From 63ee6a74a91a630f5b5049f10ae67291df85f760 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 9 Jul 2012 17:09:54 +0530
Subject: [PATCH 01/56] [IMP] project : column
 project_task_history_cumulative.project_id does not exist.

lp bug: https://launchpad.net/bugs/1022509 fixed

bzr revid: mdi@tinyerp.com-20120709113954-l17wlurxovz6z05i
---
 addons/project/report/project_cumulative.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 3f7f3b26d96..535fbaf5f87 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -9,7 +9,6 @@
             <field name="arch" type="xml">
                 <tree string="Tasks's Cumulative Flow">
                     <field name="date"/>
-                    <field name="project_id"/>
                     <field name="task_id"/>
                     <field name="type_id"/>
                     <field name="user_id"/>
@@ -63,9 +62,7 @@
                         <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
                         <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="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <field name="project_id"/>
                         <field name="user_id"/>
                     </group>
                 </search>

From e2ba0eb95c38a16839836deeaa9a73b58221e9aa Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 9 Jul 2012 18:42:59 +0530
Subject: [PATCH 02/56] [IMP] project : Revert the unneccessary changes.

bzr revid: mdi@tinyerp.com-20120709131259-c9fl7g3hgwhxutgb
---
 addons/project/report/project_cumulative.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 535fbaf5f87..177e945bc93 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -9,6 +9,7 @@
             <field name="arch" type="xml">
                 <tree string="Tasks's Cumulative Flow">
                     <field name="date"/>
+                    <field name="project_id"/>
                     <field name="task_id"/>
                     <field name="type_id"/>
                     <field name="user_id"/>

From cb265f710c0b752e2928553ffc8a654ed2436ca5 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 4 Oct 2012 17:57:11 +0530
Subject: [PATCH 03/56] [IMP]replace callenabled for on_record_loaded method.

bzr revid: vme@tinyerp.com-20121004122711-hzymzdnzbyutxge5
---
 addons/web/static/src/js/view_form.js       | 20 ++++++----
 addons/web_diagram/static/src/js/diagram.js | 42 +++++++++++++++++----
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1c32d5ef63e..279f44827ba 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -111,6 +111,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.on("change:actual_mode", self, self.init_pager);
             self.init_pager();
         });
+        self.on("record_load", self, self.on_record_loaded);
         instance.web.bus.on('clear_uncommitted_changes', this, function(e) {
             if (!this.can_be_discarded()) {
                 e.preventDefault();
@@ -316,7 +317,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 fields.push('display_name');
                 return self.dataset.read_index(fields, {
                     context: { 'bin_size': true, 'future_display_name' : true }
-                }).pipe(self.on_record_loaded);
+                }).pipe(function(r){self.trigger('record_load',r)});
             });
         }
         return shown.pipe(function() {
@@ -364,6 +365,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             field._inhibit_on_change_flag = false;
             set_values.push(result);
         });
+        console.log("on_record_loaded");
         return $.when.apply(null, set_values).pipe(function() {
             if (!record.id) {
                 // New record: Second pass in order to trigger the onchanges
@@ -398,12 +400,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
      * @return {$.Deferred}
      */
     load_defaults: function () {
+        var self = this;
         var keys = _.keys(this.fields_view.fields);
         if (keys.length) {
             return this.dataset.default_get(keys)
-                    .pipe(this.on_record_loaded);
+                    .pipe(function(r){self.trigger('record_load',r)});
         }
-        return this.on_record_loaded({});
+        return self.trigger('record_load',{});
     },
     on_form_changed: function() {
         this.trigger("view_content_has_changed");
@@ -737,7 +740,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 this.trigger('history_back');
             } else {
                 this.to_view_mode();
-                this.on_record_loaded(this.datarecord);
+                self.trigger('record_load',this.datarecord);
             }
         }
         return false;
@@ -943,7 +946,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 fields.push('display_name');
                 return self.dataset.read_index(fields, {
                     context : { 'bin_size' : true, 'future_display_name' : true }
-                }).pipe(self.on_record_loaded);
+                }).pipe(function(r){self.trigger('record_load',r)});
             }
         });
     },
@@ -3291,9 +3294,10 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                 if (self.get("effective_readonly")) {
                     $(".oe_form_buttons", controller.$el).children().remove();
                 }
-                controller.on_record_loaded.add_last(function() {
-                    once.resolve();
-                });
+                controller.on("record_load", self, function(){
+                    console.log("view manager form");
+                     once.resolve();
+                 });
                 controller.on_pager_action.add_first(function() {
                     self.save_any_view();
                 });
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 543cc6a9c12..e2ec463ec8e 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -241,22 +241,35 @@ instance.web.DiagramView = instance.web.View.extend({
                 }
             );
 
-        pop.on_write.add(function() {
+        pop.on_write_completed.add(function() {
             self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
             });
 
         var form_fields = [self.parent_field];
         var form_controller = pop.view_form;
 
-        form_controller.on_record_loaded.add_first(function() {
+        /*form_controller.on_record_loaded.add_first(function() {
+            console.log("web diagram add_first");
             _.each(form_fields, function(fld) {
                 if (!(fld in form_controller.fields)) { return; }
                 var field = form_controller.fields[fld];
                 field.$input.prop('disabled', true);
                 field.$drop_down.unbind();
-                field.$menu_btn.unbind();
+                //field.$menu_btn.unbind();
             });
-        });
+        });*/
+       form_controller.on("record_load", self, function(){
+            console.log("web diagram add_first");
+            _.each(form_fields, function(fld) {
+                if (!(fld in form_controller.fields)) { return; }
+                var field = form_controller.fields[fld];
+                field.$input.prop('disabled', true);
+                field.$drop_down.unbind();
+                //field.$menu_btn.unbind();
+            });
+         });
+
+       
     },
 
     // Creates a popup to add a node to the diagram
@@ -281,7 +294,15 @@ instance.web.DiagramView = instance.web.View.extend({
         var form_controller = pop.view_form;
         var form_fields = [this.parent_field];
 
-        form_controller.on_record_loaded.add_last(function() {
+        /*form_controller.on_record_loaded.add_last(function() {
+            _.each(form_fields, function(fld) {
+                if (!(fld in form_controller.fields)) { return; }
+                var field = form_controller.fields[fld];
+                field.set_value(self.id);
+                field.dirty = true;
+            });
+        });*/
+        form_controller.on("record_load", self, function(){
             _.each(form_fields, function(fld) {
                 if (!(fld in form_controller.fields)) { return; }
                 var field = form_controller.fields[fld];
@@ -340,12 +361,19 @@ instance.web.DiagramView = instance.web.View.extend({
 
         var form_controller = pop.view_form;
 
-        form_controller.on_record_loaded.add_last(function () {
+        /*form_controller.on_record_loaded.add_last(function () {
             form_controller.fields[self.connectors.attrs.source].set_value(node_source_id);
             form_controller.fields[self.connectors.attrs.source].dirty = true;
             form_controller.fields[self.connectors.attrs.destination].set_value(node_dest_id);
             form_controller.fields[self.connectors.attrs.destination].dirty = true;
-        });
+        });*/
+       form_controller.on("record_load", self, function(){
+            console.log("add_connector");
+            form_controller.fields[self.connectors.attrs.source].set_value(node_source_id);
+            form_controller.fields[self.connectors.attrs.source].dirty = true;
+            form_controller.fields[self.connectors.attrs.destination].set_value(node_dest_id);
+            form_controller.fields[self.connectors.attrs.destination].dirty = true;
+       });
     },
 
     on_pager_action: function(action) {

From 6b30915df24f7f5082d0ad3a636e57de12d4bb7d Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 8 Oct 2012 12:57:33 +0530
Subject: [PATCH 04/56] [Fix]replace callenabled for on_button_cancel

bzr revid: vja@tinyerp.com-20121008072733-kveozkvheu9kiti2
---
 addons/web_kanban/static/src/js/kanban.js           | 4 ++--
 addons/web_view_editor/static/src/js/view_editor.js | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 41cc366226f..dae3d7b214d 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -194,7 +194,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on_button_cancel.add_last(am.dialog.on_close);
+        form.on("on_button_cancel",self,am.dialog.on_close);
         form.on_created.add_last(function(r) {
             (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r.result]).then(function(new_record) {
                 am.dialog.on_close();
@@ -672,7 +672,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on_button_cancel.add_last(am.dialog.on_close);
+        form.on("on_button_cancel",self,am.dialog.on_close);
         form.on_saved.add_last(function() {
             am.dialog.on_close();
             self.view.do_reload();
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index e65f0ab5d38..f26e12a55d7 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -1014,9 +1014,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         var action_manager = new instance.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_widget.views['form'].controller;
-            controller.on_button_cancel.add_last(function(){
-                action_manager.destroy()
-            });
+            controller.on("on_button_cancel",self,action_manager.destroy);
             controller.do_save.add_last(function(){
                 action_manager.destroy();
                 var value =controller.fields.name.get('value');

From 33952153679e8227fcfa720c9dfc1e0573ce8fe8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 11:12:43 +0200
Subject: [PATCH 05/56] [IMP] crm: lead search view

bzr revid: qdp-launchpad@openerp.com-20121008091243-f0ktqoee67y6kb3x
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f91a8756598..1a099fcb803 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -359,7 +359,7 @@
                     <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-camera_test" string="In Progress" name="open" domain="[('state','=','open')]"/>
                     <separator/>
                     <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
                     <separator/>

From 777243bef32482803e8ccbc6735293c19187a54a Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 8 Oct 2012 15:03:15 +0530
Subject: [PATCH 06/56] [Fix]Improve code

bzr revid: vja@tinyerp.com-20121008093315-tnfnrr0rhum2yyoy
---
 addons/web_view_editor/static/src/js/view_editor.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index f26e12a55d7..b3a4f0dcfac 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -1014,7 +1014,9 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         var action_manager = new instance.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_widget.views['form'].controller;
-            controller.on("on_button_cancel",self,action_manager.destroy);
+            controller.on("on_button_cancel",self,function(){
+                action_manager.destroy();
+            });
             controller.do_save.add_last(function(){
                 action_manager.destroy();
                 var value =controller.fields.name.get('value');

From 0cfb72791dd068f1cb349a024208d6b4b7c486b3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 12:00:32 +0200
Subject: [PATCH 07/56] [IMP] renamed filter 'Inbox' into 'Unread Messages'
 which is clearer

bzr revid: qdp-launchpad@openerp.com-20121008100032-mh7sd740fhsbjemr
---
 addons/base_calendar/crm_meeting_view.xml     | 2 +-
 addons/crm/crm_lead_view.xml                  | 6 +++---
 addons/event/event_view.xml                   | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 addons/project/project_view.xml               | 4 ++--
 addons/project_issue/project_issue_view.xml   | 2 +-
 addons/purchase/purchase_view.xml             | 2 +-
 addons/sale/sale_view.xml                     | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index adcfc23a520..3782141fd3f 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -279,7 +279,7 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <filter string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
                 <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
                 <field name="user_id"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1a099fcb803..0c6d1d1fe96 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -356,7 +356,7 @@
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
                     <field name="create_date"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="In Progress" name="open" domain="[('state','=','open')]"/>
@@ -569,10 +569,10 @@
                     <field name="name" string="Opportunity / Customer"
                         filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-camera_test" string="In Progress" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
                     <separator/>
                     <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
                     <separator/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 003072616f7..a290172d499 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -339,7 +339,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
@@ -529,7 +529,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 08e5f31a2d2..d48086f5663 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -208,7 +208,7 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-                <filter string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
                 <filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
                 <filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bd63eec84c5..686ae08ee73 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -163,7 +163,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                     <field name="complete_name" string="Project Name"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <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"/>
@@ -619,7 +619,7 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                     <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 3214b93c8d3..4cd9e2c19ff 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -198,7 +198,7 @@
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                     <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 7702d182b09..bfff06f5eaf 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -323,7 +323,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5505a6a88b5..4323261a19d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -337,7 +337,7 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>

From da443ff975c233d37126cda2d86d4d20a4f93226 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 12:05:47 +0200
Subject: [PATCH 08/56] [IMP] hr: removed job and manager from hr.employee
 search view

bzr revid: qdp-launchpad@openerp.com-20121008100547-nlos20k0xyz3f72e
---
 addons/hr/hr_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 69567902763..89c327f4d13 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -112,8 +112,6 @@
                 <search string="Employees">
                     <field name="name" string="Employees"/>
                     <field name="department_id" />
-                    <field name="job_id"/>
-                    <field name="parent_id"/>
                     <field name="category_ids"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>

From 109d418de05226bbd242745c6f55010b7f6a8cb7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 12:11:31 +0200
Subject: [PATCH 09/56] [IMP] hr_expense: search view

bzr revid: qdp-launchpad@openerp.com-20121008101131-r34boe2joemso1mu
---
 addons/hr_expense/hr_expense_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 388e5262f6e..2032d3f0567 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -155,11 +155,12 @@
                     <field name="name" string="Expenses"/>
                     <field name="date"/>
                     <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
-                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expenses"/>
                     <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+                    <separator/>
+                    <filter domain="[('user_id', '=', uid)]"  string="My Expenses"/>
                     <field name="employee_id"/>
                     <field name="department_id" string="Department" context="{'invisible_department': False}"/>
-                    <field name="user_id"  string="User"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>

From d058f68e2f9c2d301880219880ba9e32cb64dfd0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 12:11:44 +0200
Subject: [PATCH 10/56] [IMP] account: search view

bzr revid: qdp-launchpad@openerp.com-20121008101144-bx103sqfkhd03a21
---
 addons/account/account_invoice_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 26e18271dc2..3c2922ff141 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -458,7 +458,6 @@
                     <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
                     <field name="partner_id"/>
                     <field name="user_id" string="Salesperson"/>
-                    <field name="journal_id"/>
                     <field name="period_id" string="Period"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>

From bc3009d590af243ee28bb1e6994bcb2fae6d2bba Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Oct 2012 14:03:51 +0200
Subject: [PATCH 11/56] [FIX] mail: default alias_domain should be web.base.url

bzr revid: odo@openerp.com-20121008120351-fqmjckrjmy52xdji
---
 addons/mail/data/mail_demo.xml |  5 -----
 addons/mail/res_config.py      | 13 +++++++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 1350fd33547..7bda32c002b 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -42,10 +42,5 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="type">comment</field>
         </record>
 
-        <record model="ir.config_parameter" id="user_mail_alias">
-            <field name="key">mail.catchall.domain</field>
-            <field name="value">demo.openerp.com</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index ce2f75687ba..91606e1c720 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+import urlparse
+
 from openerp.osv import osv, fields
 
 class project_configuration(osv.TransientModel):
@@ -31,9 +33,16 @@ class project_configuration(osv.TransientModel):
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
-        return {'alias_domain': self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)}
+        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
+        if not alias_domain:
+            domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context)
+            try:
+                alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0]
+            except Exception:
+                pass
+        return {'alias_domain': alias_domain}
 
     def set_alias_domain(self, cr, uid, ids, context=None):
         config_parameters = self.pool.get("ir.config_parameter")
         for record in self.browse(cr, uid, ids, context=context):
-            config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
\ No newline at end of file
+            config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)

From 43595fbeb1f2020ab7e1f545c0dbf6a579bf77b2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Oct 2012 14:04:21 +0200
Subject: [PATCH 12/56] [FIX] mail: default email From should consider user
 email if there is no alias

bzr revid: odo@openerp.com-20121008120421-k9aj7g6vsr3zu5u2
---
 addons/mail/mail_mail.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index e9a569a8192..5b4a096e969 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -63,10 +63,12 @@ class mail_mail(osv.Model):
     }
 
     def _get_default_from(self, cr, uid, context=None):
-        cur = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if not cur.alias_domain:
-            raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
-        return cur.alias_name + '@' + cur.alias_domain
+        this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if this.alias_domain:
+            return '%s@%s' % (this.alias, this.alias_domain)
+        elif this.email:
+            return this.email
+        raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
 
     _defaults = {
         'state': 'outgoing',

From d54120565152cc0f1c8164bf7538802f7d527332 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Oct 2012 15:02:45 +0200
Subject: [PATCH 13/56] [FIX] portal: add test email address for outgoing
 emails sent during tests

bzr revid: odo@openerp.com-20121008130245-7n1ed3i2ez9bzniy
---
 addons/portal/tests/test_portal.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 653a05d40aa..10392be53ff 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -49,6 +49,9 @@ class test_portal(test_mail.TestMailMockups):
         self.user_chell = self.res_users.browse(cr, uid, self.user_chell_id)
         self.partner_chell_id = self.user_chell.partner_id.id
 
+        # Set an email address for the user running the tests, used as Sender for outgoing mails
+        self.res_users.write(cr, uid, uid, {'email': 'test@localhost'})
+
     def test_00_access_rights(self):
         """ Test basic mail_message and mail_group access rights for portal users. """
         cr, uid = self.cr, self.uid

From a369130a35341779d0876da02aaa49b284f8f09f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 15:08:31 +0200
Subject: [PATCH 14/56] [IMP] crm: remove 'sale team' from res.partner search
 view

bzr revid: qdp-launchpad@openerp.com-20121008130831-hjm46vehb54tqc74
---
 addons/crm/res_partner_view.xml       | 16 ----------------
 addons/hr_expense/hr_expense_view.xml |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 84a0bd4cf49..4b313bcef71 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -15,28 +15,12 @@
                 </field>
         </record>
 
-        <record id="view_partners_tree_crm2" model="ir.ui.view">
-                <field name="name">view.res.partner.tree.crm.inherited2</field>
-                <field name="model">res.partner</field>
-                <field name="inherit_id" ref="base.view_partner_tree"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <field name="phone" position="after">
-                        <field name="section_id" completion="1" invisible="context.get('invisible_section', True)"/>
-                    </field>
-                </field>
-        </record>
-
         <record id="view_partners_form_crm3" model="ir.ui.view">
                 <field name="name">view.res.partner.search.crm.inherited3</field>
                 <field name="model">res.partner</field>
                 <field name="inherit_id" ref="base.view_res_partner_filter"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
-                    <field name="category_id" position="after">
-                        <field name="section_id" completion="1"/>
-                        <field name="section_id" completion="1" widget="selection" context="{'invisible_section': False}"/>
-                    </field>
                     <xpath expr="//field[@name='user_id']" position="after">
                         <field name="country_id"/>
                     </xpath>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 2032d3f0567..67d629eee6a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -158,7 +158,7 @@
                     <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expenses"/>
                     <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
                     <separator/>
-                    <filter domain="[('user_id', '=', uid)]"  string="My Expenses"/>
+                    <filter domain="[('user_id', '=', uid)]" string="My Expenses"/>
                     <field name="employee_id"/>
                     <field name="department_id" string="Department" context="{'invisible_department': False}"/>
                     <group expand="0" string="Group By...">

From 635c3225dbf78dd6ff548b9f979f549a49a663da Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Oct 2012 16:08:57 +0200
Subject: [PATCH 15/56] [FIX] project_long_term: demo project with phases
 should be marked as `use_phases`

bzr revid: odo@openerp.com-20121008140857-zd3kcyq8t2ewyfno
---
 addons/project_long_term/project_long_term_demo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index bca8231fdaa..fda481d5a11 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -7,6 +7,7 @@
 
         <record id="project.project_project_1" model="project.project">
             <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
+            <field name="use_phases" eval="True"/>
         </record>
 
         <!-- Project Phases -->

From a9b9412f182c3bc7e53b7a001d5edfa0b21b24bf Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 16:26:19 +0200
Subject: [PATCH 16/56] [IMP] crm: remove 'country_id' from res.partner search
 view

bzr revid: qdp-launchpad@openerp.com-20121008142619-mxqis0ubc8m3o4z9
---
 addons/crm/res_partner_view.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 4b313bcef71..b7aa334a9c3 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -21,9 +21,6 @@
                 <field name="inherit_id" ref="base.view_res_partner_filter"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
-                    <xpath expr="//field[@name='user_id']" position="after">
-                        <field name="country_id"/>
-                    </xpath>
                     <xpath expr="//group[@string='Group By...']" position="after">
                         <group string="Display">
                             <filter string="Show Sales Team" context="{'invisible_section': False}"/>

From 6210cf76a6fba0d3054dcbe837e0824858eeea4b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 16:27:57 +0200
Subject: [PATCH 17/56] [IMP] base: module search view imp

bzr revid: qdp-launchpad@openerp.com-20121008142757-c3597to9h42e56tl
---
 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 729d3ef7b4c..c3b3684f07c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -39,7 +39,7 @@
             <field name="arch" type="xml">
                 <search string="Search modules">
                     <field name="name" filter_domain="['|', '|', ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
-                        'ilike', self)]"/>
+                        'ilike', self)]" string="Module"/>
                     <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                     <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
                     <separator/>

From 5db1b37797c2e2e8ed2743e89cac8dd7489b6d8d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Oct 2012 16:47:22 +0200
Subject: [PATCH 18/56] [IMP] crm: opportunity search view imp

bzr revid: qdp-launchpad@openerp.com-20121008144722-r6th49qhfzq8jmbf
---
 addons/crm/crm_lead_view.xml                | 3 +--
 addons/crm_partner_assign/crm_lead_view.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0c6d1d1fe96..6a152f44b67 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -580,9 +580,8 @@
                             domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to either me or one of the sale teams I manage" />
                     <field name="user_id"/>
-                    <field name="country_id"/>
-                    <field name="partner_id"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <field name="partner_id"/>
                     <group expand="0" string="Group By..." colspan="16">
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index cd2e3f08c9a..2cffb6fb899 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -56,7 +56,7 @@
                     <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
 
-                <field name="user_id" position="after">
+                <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>

From 5300124eb0cf643297971e4c7d9d6756ffd40c62 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 8 Oct 2012 18:49:24 +0200
Subject: [PATCH 19/56] [FIX] wrong var assignation

lp bug: https://launchpad.net/bugs/1022509 fixed

bzr revid: abo@openerp.com-20121008164924-6pfc9k8lzt11uw9m
---
 addons/board/static/src/js/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 43d7ca76d39..6037c8c08fa 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -173,7 +173,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
     },
     on_load_action: function(result, index, action_attrs) {
         var self = this,
-            action = result.result,
+            action = result,
             view_mode = action_attrs.view_mode;
 
         if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) {

From bcefce701e8c1edd32de5268798838f89f757f72 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 9 Oct 2012 11:21:29 +0200
Subject: [PATCH 20/56] [IMP] account: monetary widget for bank statements

bzr revid: qdp-launchpad@openerp.com-20121009092129-w4pjhhuhxpabdjqg
---
 addons/account/account_bank_statement.py | 5 +++--
 addons/account/account_view.xml          | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8b2a9aff257..549363ce269 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -461,9 +461,10 @@ class account_bank_statement(osv.osv):
             return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
-        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id'], context=context)
+        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context)
         company_id = journal_data['company_id']
-        return {'value': {'balance_start': balance_start, 'company_id': company_id}}
+        currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id
+        return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1c40bebba52..3391158696a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -633,13 +633,10 @@
                                 <field name="period_id" class="oe_inline"/>
                             </div>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
+                            <field name="currency" invisible="1"/>
                         </group><group>
-                            <label for="balance_start"/>
-                            <div>
-                                <field name="balance_start" class="oe_inline"/>
-                                <field name="currency" class="oe_inline"/>
-                            </div>
-                            <field name="balance_end_real"/>
+                            <field name="balance_start" widget="monetary" options='{"currency_field" : "currency"}'/>
+                            <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
                         </group>
                     </group>
 

From 1b7d0029221be19c6b23634f60d6f8109db852d8 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Tue, 9 Oct 2012 15:40:28 +0530
Subject: [PATCH 21/56] [IMP]replace callenabled for on_mode_switch

bzr revid: vja@tinyerp.com-20121009101028-z5andmt2pi0973za
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/views.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b41039361c0..db68b8d7a23 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3370,7 +3370,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             }
             def.resolve();
         });
-        this.viewmanager.on_mode_switch.add_first(function(n_mode, b, c, d, e) {
+        this.viewmanager.on('on_mode_switch',self,function(n_mode, b, c, d, e) {
             $.when(self.save_any_view()).then(function() {
                 if(n_mode === "list")
                     $.async_when().then(function() {self.reload_current_view();});
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 21f539fed1b..18d7e9d5666 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -552,7 +552,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
     add_breadcrumb: function(on_reverse_breadcrumb) {
         var self = this;
         var views = [this.active_view || this.views_src[0].view_type];
-        this.on_mode_switch.add(function(mode) {
+        this.on('on_mode_switch',self,function(mode) { 
             var last = views.slice(-1)[0];
             if (mode !== last) {
                 if (mode !== 'form') {

From 42ece6cdb779bfdaed041768736a521dbc2aadc3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 9 Oct 2012 12:35:35 +0200
Subject: [PATCH 22/56] [FIX] project: leftover typos in mail processing
 methods

bzr revid: odo@openerp.com-20121009103535-ohvpd1u81hcc5izi
---
 addons/project/project.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 6b02a018293..98c385c0ce3 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1173,11 +1173,10 @@ class task(base_stage, osv.osv):
         """ Override to updates the document according to the email. """
         if custom_values is None: custom_values = {}
         custom_values.update({
-            'name': subject,
+            'name': msg.get('subject'),
             'planned_hours': 0.0,
-            'subject': msg.get('subject'),
         })
-        return super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
+        return super(task,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
         """ Override to update the task according to the email. """
@@ -1202,7 +1201,7 @@ class task(base_stage, osv.osv):
                     act = 'do_%s' % res.group(2).lower()
         if act:
             getattr(self,act)(cr, uid, ids, context=context)
-        return super(project_tasks,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
+        return super(task,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
 
     # ---------------------------------------------------
     # OpenChatter methods and notifications

From fb3a8ca573e4ce66ad562e1b504a9abd4fa0f695 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 9 Oct 2012 14:23:49 +0200
Subject: [PATCH 23/56] [REM] commented code

bzr revid: abo@openerp.com-20121009122349-ex5ypwulksc7ibx4
---
 addons/project/report/project_cumulative.xml | 30 --------------------
 1 file changed, 30 deletions(-)

diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 3531b5ffc27..dc556be22e7 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -29,21 +29,6 @@
                 </graph>
             </field>
         </record>
-        
-        <!-- Where is this object in py file ? -->
-        
-        <!--<record id="view_task_history_burndown_graph" model="ir.ui.view">-->
-        <!--    <field name="name">project.task.history.burndown.graph</field>-->
-        <!--    <field name="model">project.task.history.burndown</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <graph string="Burndown Chart of Tasks" type="bar">-->
-        <!--            <field name="date"/>-->
-        <!--            <field name="remaining_hours" operator="+"/>-->
-        <!--            <field name="type_id" group="True"/>-->
-        <!--        </graph>-->
-        <!--    </field>-->
-        <!--</record>-->
-
 
         <record id="view_task_history_search" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.search</field>
@@ -78,20 +63,5 @@
             id="menu_action_view_task_history_cumulative"
             parent="base.menu_project_report" />
 
-
-        <!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
-        <!--    <field name="name">Burndown Chart</field>-->
-        <!--    <field name="res_model">project.task.history.cumulative</field>-->
-        <!--    <field name="view_type">form</field>-->
-        <!--    <field name="view_mode">graph,tree</field>-->
-        <!--    <field name="view_id" ref="view_task_history_burndown_graph"/>-->
-        <!--    <field eval="False" name="filter"/>-->
-        <!--    <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>-->
-        <!--</record>-->
-        <!--<menuitem action="action_view_task_history_burndown"-->
-        <!--    id="menu_action_view_task_history_burndown"-->
-        <!--    parent="project_report_task" />-->
-
-
     </data>
 </openerp>

From abac1cae455e3380fee45a2d9503427ed6fa3269 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 9 Oct 2012 18:05:32 +0530
Subject: [PATCH 24/56] [IMP]improvements to record load event.

bzr revid: vme@tinyerp.com-20121009123532-bwlrg4ldtprd1w2d
---
 addons/web/static/src/js/view_form.js       |  3 +-
 addons/web_diagram/static/src/js/diagram.js | 34 +++------------------
 addons/web_tests/static/src/js/web_tests.js |  6 ++--
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e55258d45d1..45e49366ba2 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -380,7 +380,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             field._inhibit_on_change_flag = false;
             set_values.push(result);
         });
-        console.log("on_record_loaded");
         return $.when.apply(null, set_values).pipe(function() {
             if (!record.id) {
                 // New record: Second pass in order to trigger the onchanges
@@ -755,7 +754,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 this.trigger('history_back');
             } else {
                 this.to_view_mode();
-                self.trigger('record_load',this.datarecord);
+                this.trigger('record_load',this.datarecord);
             }
         }
         return false;
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 083dfd56dc0..6c32a12384a 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -239,24 +239,13 @@ instance.web.DiagramView = instance.web.View.extend({
                     title: _t("Open: ") + title
                 }
             );
-
-        pop.on_write_completed.add(function() {
+        pop.on('on_write_complete', self, function() {
             self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
             });
-
+        
         var form_fields = [self.parent_field];
         var form_controller = pop.view_form;
 
-        /*form_controller.on_record_loaded.add_first(function() {
-            console.log("web diagram add_first");
-            _.each(form_fields, function(fld) {
-                if (!(fld in form_controller.fields)) { return; }
-                var field = form_controller.fields[fld];
-                field.$input.prop('disabled', true);
-                field.$drop_down.unbind();
-                //field.$menu_btn.unbind();
-            });
-        });*/
        form_controller.on("record_load", self, function(){
             console.log("web diagram add_first");
             _.each(form_fields, function(fld) {
@@ -264,7 +253,6 @@ instance.web.DiagramView = instance.web.View.extend({
                 var field = form_controller.fields[fld];
                 field.$input.prop('disabled', true);
                 field.$drop_down.unbind();
-                //field.$menu_btn.unbind();
             });
          });
 
@@ -293,14 +281,6 @@ instance.web.DiagramView = instance.web.View.extend({
         var form_controller = pop.view_form;
         var form_fields = [this.parent_field];
 
-        /*form_controller.on_record_loaded.add_last(function() {
-            _.each(form_fields, function(fld) {
-                if (!(fld in form_controller.fields)) { return; }
-                var field = form_controller.fields[fld];
-                field.set_value(self.id);
-                field.dirty = true;
-            });
-        });*/
         form_controller.on("record_load", self, function(){
             _.each(form_fields, function(fld) {
                 if (!(fld in form_controller.fields)) { return; }
@@ -324,7 +304,7 @@ instance.web.DiagramView = instance.web.View.extend({
                 title: _t("Open: ") + title
             }
         );
-        pop.on_write.add(function() {
+        pop.on('on_write_complete', self, function() {
             self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
         });
     },
@@ -360,14 +340,8 @@ instance.web.DiagramView = instance.web.View.extend({
 
         var form_controller = pop.view_form;
 
-        /*form_controller.on_record_loaded.add_last(function () {
-            form_controller.fields[self.connectors.attrs.source].set_value(node_source_id);
-            form_controller.fields[self.connectors.attrs.source].dirty = true;
-            form_controller.fields[self.connectors.attrs.destination].set_value(node_dest_id);
-            form_controller.fields[self.connectors.attrs.destination].dirty = true;
-        });*/
+
        form_controller.on("record_load", self, function(){
-            console.log("add_connector");
             form_controller.fields[self.connectors.attrs.source].set_value(node_source_id);
             form_controller.fields[self.connectors.attrs.source].dirty = true;
             form_controller.fields[self.connectors.attrs.destination].set_value(node_dest_id);
diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js
index 5b9c1d02503..8c146644372 100644
--- a/addons/web_tests/static/src/js/web_tests.js
+++ b/addons/web_tests/static/src/js/web_tests.js
@@ -23,14 +23,14 @@ openerp.web_tests = function (instance) {
         on_everything_loaded: function (slice) {
             var records = slice[0].records;
             if (!records.length) {
-                this.form.on_record_loaded({});
+                this.form.trigger("record_load",{});
                 return;
             }
-            this.form.on_record_loaded(records[0]);
+            this.form.trigger("record_load", records[0])
             _(records.slice(1)).each(function (record, index) {
                 this.dataset.index = index+1;
                 this.form.reposition($('<div>').appendTo(this.$el));
-                this.form.on_record_loaded(record);
+                this.form.trigger("record_load", record)
             }, this);
         }
     });

From 5645a84a1651b9f2104ec22e62033de70fa8a334 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 9 Oct 2012 18:19:08 +0530
Subject: [PATCH 25/56] [IMP]replace add* method.

bzr revid: vme@tinyerp.com-20121009124908-r33qqpx15ea39p78
---
 addons/board/static/src/js/dashboard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 43d7ca76d39..bba076e8594 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -25,9 +25,9 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         }).bind('sortstop', self.do_save_dashboard);
 
         var old_title = this.__parentedParent.get('title');
-        this.__parentedParent.on_record_loaded.add_last(function(){
+        this.__parentedParent.on('record_load', this, function(){
             self.__parentedParent.set({ 'title' : old_title});
-        });
+        })
         // Events
         this.$el.find('.oe_dashboard_link_reset').click(this.on_reset);
         this.$el.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);

From 91f97769790fbd59bd6360c0392a4c1c1cece0cd Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 9 Oct 2012 18:26:47 +0530
Subject: [PATCH 26/56] [rem]console

bzr revid: vme@tinyerp.com-20121009125647-zwx4fj95fjs0y34u
---
 addons/web_diagram/static/src/js/diagram.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 6c32a12384a..3b9e81fdf6e 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -247,7 +247,6 @@ instance.web.DiagramView = instance.web.View.extend({
         var form_controller = pop.view_form;
 
        form_controller.on("record_load", self, function(){
-            console.log("web diagram add_first");
             _.each(form_fields, function(fld) {
                 if (!(fld in form_controller.fields)) { return; }
                 var field = form_controller.fields[fld];

From 70ebec1cd62b532fb21da247f2deb2d8e13e9db1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 9 Oct 2012 14:56:53 +0200
Subject: [PATCH 27/56] [IMP] Do not update auth_oauth service providers

bzr revid: fme@openerp.com-20121009125653-p9i84663xygtb1r0
---
 addons/auth_oauth/auth_oauth_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index 83e9df2e44d..c07359a062c 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="provider_openerp" model="auth.oauth.provider">
             <field name="name">OpenERP Accounts</field>

From b8d7b8cb0ac768220eb28b3823b02d63027267ca Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 9 Oct 2012 18:30:30 +0530
Subject: [PATCH 28/56] [REM]one more console.

bzr revid: vme@tinyerp.com-20121009130030-8437spz1j1eogh8x
---
 addons/web/static/src/js/view_form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 45e49366ba2..43afe3a3bf1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3372,7 +3372,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                     $(".oe_form_buttons", controller.$el).children().remove();
                 }
                 controller.on("record_load", self, function(){
-                    console.log("view manager form");
                      once.resolve();
                  });
                 controller.on_pager_action.add_first(function() {

From 099825109ef0795693d6fce665891e0641d2766d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 9 Oct 2012 15:19:11 +0200
Subject: [PATCH 29/56] [FIX] mail.message: catch more error cases when trying
 to resolve msg author + lint cleanup

bzr revid: odo@openerp.com-20121009131911-6lo2knsrh2qgrxv8
---
 addons/mail/mail_message.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 9c873a31097..98b7ef9f36d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -180,7 +180,6 @@ class mail_message(osv.Model):
             fields allow to have the foreign record name without having
             to check external access rights).
         """
-        child_nbr = len(msg.child_ids)
         has_voted = False
         vote_ids = self.pool.get('res.users').name_get(cr, SUPERUSER_ID, [user.id for user in msg.vote_user_ids], context=context)
         for vote in vote_ids:
@@ -194,7 +193,7 @@ class mail_message(osv.Model):
         try:
             author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
             is_author = uid == msg.author_id.user_ids[0].id
-        except (orm.except_orm, osv.except_osv):
+        except Exception:
             author_id = False
             is_author = False
         try:

From fac6e9246be0f03915c199a2f9277658dd501c95 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 9 Oct 2012 15:31:32 +0200
Subject: [PATCH 30/56] [FIX] mail: allow overriding message_post in threads +
 fix res.users' delegation to res.partner

bzr revid: odo@openerp.com-20121009133132-at5j8pm8engxqi10
---
 addons/mail/mail_thread.py |  2 +-
 addons/mail/res_users.py   | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9f53b4c08b1..8dee944751c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -427,7 +427,7 @@ class mail_thread(osv.AbstractModel):
                 model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
                 thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-            self.message_post(cr, uid, [thread_id], context=context, **msg)
+            model_pool.message_post(cr, uid, [thread_id], context=context, **msg)
         return thread_id
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 545198f4c7f..f870604b03a 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -110,9 +110,19 @@ class res_users(osv.Model):
         alias_pool.unlink(cr, uid, alias_ids, context=context)
         return res
 
-    def message_post(self, cr, uid, thread_id, **kwargs):
-        partner_id = self.pool.get('res.users').browse(cr, uid, thread_id)[0].partner_id.id
-        return self.pool.get('res.partner').message_post(cr, uid, partner_id, **kwargs)
+    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
+        assert thread_id, "res.users does not support posting global messages"
+        if context and 'thread_model' in context:
+            context['thread_model'] = 'res.partner'
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        partner_id = self.pool.get('res.users').browse(cr, uid, thread_id).partner_id.id
+        return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs)
+
+    def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
+        partner_id = self.pool.get('res.users').browse(cr, uid, ids)[0].partner_id.id
+        return self.pool.get('res.partner').message_update(cr, uid, [partner_id], msg_dict,
+            update_vals=update_vals, context=context)
 
 class res_users_mail_group(osv.Model):
     """ Update of res.users class

From 0ce1ef32a872bd1f942dd73ee11214374b6ce520 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 9 Oct 2012 15:40:20 +0200
Subject: [PATCH 31/56] [FIX] mail: typos -> message-id header is mapped to
 message_id column

bzr revid: odo@openerp.com-20121009134020-9wf96yszv8qcmbm1
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8dee944751c..2261b940944 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -422,7 +422,7 @@ class mail_thread(osv.AbstractModel):
             model_pool = self.pool.get(model)
             assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
                 "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
-                    (msg['message-id'], model)
+                    (msg['message_id'], model)
             if thread_id and hasattr(model_pool, 'message_update'):
                 model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
@@ -538,7 +538,7 @@ class mail_thread(osv.AbstractModel):
                     field may not be present if missing in original
                     message::
 
-                    { 'message-id': msg_id,
+                    { 'message_id': msg_id,
                       'subject': subject,
                       'from': from,
                       'to': to,

From cb57169c97fa8577d2b2e24789b563f2066f059e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 9 Oct 2012 15:44:14 +0200
Subject: [PATCH 32/56] [FIX] mail.mail: typo in previous commits

bzr revid: odo@openerp.com-20121009134414-923kv1ciw00pxh6v
---
 addons/mail/mail_mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 5b4a096e969..741184ef7a3 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -65,7 +65,7 @@ class mail_mail(osv.Model):
     def _get_default_from(self, cr, uid, context=None):
         this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if this.alias_domain:
-            return '%s@%s' % (this.alias, this.alias_domain)
+            return '%s@%s' % (this.alias_name, this.alias_domain)
         elif this.email:
             return this.email
         raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))

From 7f516d2835e3f2ba9a9b466d7ad4a92251566a20 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 9 Oct 2012 15:50:40 +0200
Subject: [PATCH 33/56] [FIX] mail.message: incorrect message-id generation,
 id/model were swapped

For backwards-compatibility reasons we need to stick
with this format: `res_id-model`, even if reversing
the values would look more logical

bzr revid: odo@openerp.com-20121009135040-spvejc1l4mos25yv
---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 98b7ef9f36d..7e77b2f2e8c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -501,7 +501,7 @@ class mail_message(osv.Model):
 
     def create(self, cr, uid, values, context=None):
         if not values.get('message_id') and values.get('res_id') and values.get('model'):
-            values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s' % values)
+            values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
         newid = super(mail_message, self).create(cr, uid, values, context)
         self._notify(cr, SUPERUSER_ID, newid, context=context)
         return newid

From c98de15a09c4d2dda02426ccb0bda9f6d37677bd Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 9 Oct 2012 16:26:07 +0200
Subject: [PATCH 34/56] [IMP] osv/orm.py: evaluate in python the 'options'
 attribute of a field in an xml view, before enclosing it in json. This allow
 to use python instead of json syntax in the definition of the options of a
 widget, which is a much more consistent behavior

bzr revid: qdp-launchpad@openerp.com-20121009142607-rk3l00atu3w3kksp
---
 openerp/addons/base/res/res_bank_view.xml    | 4 ++--
 openerp/addons/base/res/res_company_view.xml | 4 ++--
 openerp/addons/base/res/res_country_view.xml | 2 +-
 openerp/addons/base/res/res_partner_view.xml | 6 +++---
 openerp/osv/orm.py                           | 8 ++++++--
 openerp/tools/safe_eval.py                   | 2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index ac91684d4d9..33b98c690c6 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -106,8 +106,8 @@
                                     <field name="zip" class="oe_inline" placeholder="ZIP"/>
                                     <field name="city" class="oe_inline" placeholder="City"/>
                                 </div>
-                                <field name="state_id" placeholder="State" options='{"no_open": true}'/>
-                                <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                <field name="state_id" placeholder="State" options='{"no_open": True}'/>
+                                <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                             </div>
                         </group>
                         <group name="bank" string="Information About the Bank">
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index cac53b7a76a..b8cb12d3dd0 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -46,10 +46,10 @@
                                         <field name="street2"/>
                                         <div>
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%" options='{"no_open": true}'/>
+                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%" options='{"no_open": True}'/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}' on_change="on_change_country(country_id)"/>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}' on_change="on_change_country(country_id)"/>
                                     </div>
                                     <label for="rml_header1"/>
                                     <div>
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index c8046d34eb2..52c8b64ba34 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -73,7 +73,7 @@
                     <group>
                         <field name="name"/>
                         <field name="code"/>
-                        <field name="country_id" options='{"no_open": true}'/>
+                        <field name="country_id" options='{"no_open": True}'/>
                     </group>
                 </form>
             </field>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index f90e2971b0e..caa5ce22a6d 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -161,10 +161,10 @@
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>
                                     <field name="zip" placeholder="ZIP" style="width: 20%%"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
+                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
@@ -177,7 +177,7 @@
                             <field name="email" widget="email"/>
                             <field name="title" domain="[('domain', '=', 'contact')]"
                                 groups="base.group_no_one"
-                                options='{"no_open": true}' attrs="{'invisible': [('is_company','=', True)]}" />
+                                options='{"no_open": True}' attrs="{'invisible': [('is_company','=', True)]}" />
                         </group>
                     </group>
 
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c713c0378ea..8bc5c386527 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -60,7 +60,7 @@ import openerp
 import openerp.netsvc as netsvc
 import openerp.tools as tools
 from openerp.tools.config import config
-from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import const_eval, safe_eval as eval
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 from query import Query
@@ -1732,7 +1732,11 @@ class BaseModel(object):
                 field = model_fields.get(node.get('name'))
                 if field:
                     transfer_field_to_modifiers(field, modifiers)
-
+                if node.get('options'):
+                    try:
+                        node.set('options', simplejson.dumps(const_eval(node.get('options'))))
+                    except Exception, msg:
+                        raise except_orm('Invalide Python code in %s'%(node.get('options')), msg[0])
 
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)
diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py
index 601fd95200a..6bc92e57465 100644
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -46,7 +46,7 @@ _ALLOWED_MODULES = ['_strptime', 'time']
 _CONST_OPCODES = set(opmap[x] for x in [
     'POP_TOP', 'ROT_TWO', 'ROT_THREE', 'ROT_FOUR', 'DUP_TOP', 'DUP_TOPX',
     'POP_BLOCK','SETUP_LOOP', 'BUILD_LIST', 'BUILD_MAP', 'BUILD_TUPLE',
-    'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR'] if x in opmap)
+    'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR', 'STORE_MAP', 'LOAD_NAME'] if x in opmap)
 
 _EXPR_OPCODES = _CONST_OPCODES.union(set(opmap[x] for x in [
     'UNARY_POSITIVE', 'UNARY_NEGATIVE', 'UNARY_NOT',

From fbbc0bad19c57bfbf5df9351373c8edd0ead3ded Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 9 Oct 2012 16:34:33 +0200
Subject: [PATCH 35/56] [IMP] all: replaced 'true' by 'True' in 'options'
 attribute in views, because now the syntax of these options must be expressed
 in python instead of json

bzr revid: qdp-launchpad@openerp.com-20121009143433-s4y6isbewqdn2fu2
---
 addons/account/account_invoice_view.xml              |  2 +-
 addons/account/account_view.xml                      |  2 +-
 .../account_voucher/voucher_sales_purchase_view.xml  |  2 +-
 addons/crm/crm_lead_view.xml                         | 12 ++++++------
 addons/document_page/document_page_view.xml          |  2 +-
 .../wizard/document_page_show_diff_view.xml          |  2 +-
 .../wizard/email_template_preview_view.xml           |  2 +-
 addons/event/event_view.xml                          |  4 ++--
 addons/hr/hr_view.xml                                |  8 ++++----
 addons/portal_crm/wizard/contact_view.xml            |  4 ++--
 addons/project/project_view.xml                      |  6 +++---
 addons/project_gtd/project_gtd_view.xml              |  4 ++--
 addons/project_gtd/wizard/project_gtd_fill_view.xml  |  2 +-
 addons/sale/sale_view.xml                            |  4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 26e18271dc2..48737bd5fef 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -322,7 +322,7 @@
                             <field string="Customer" name="partner_id"
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                                 groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
-                                options='{"always_reload": true}'/>
+                                options='{"always_reload": True}'/>
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3391158696a..d2680a8456f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -635,7 +635,7 @@
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                             <field name="currency" invisible="1"/>
                         </group><group>
-                            <field name="balance_start" widget="monetary" options='{"currency_field" : "currency"}'/>
+                            <field name="balance_start" widget="monetary" options="{'currency_field' : 'currency'}"/>
                             <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
                         </group>
                     </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 4c388730644..a362c553ccd 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -73,7 +73,7 @@
                     <group>
                         <group>
                             <field name="type" invisible="True"/>
-                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
+                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                         <group>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f91a8756598..f7acb6b557d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -160,17 +160,17 @@
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                    <field name="state_id" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                             </div>
                         </group>
                         <group>
                             <label for="contact_name" />
                             <div>
                                 <field name="contact_name" class="oe_inline"/>,
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": true}'/>
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
                             <field name="function" />
@@ -477,10 +477,10 @@
                                         <field name="street2"/>
                                         <div class="address_format">
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                            <field name="state_id" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                        <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                                     </div>
                                 </group>
 
@@ -488,7 +488,7 @@
                                     <label for="contact_name" />
                                     <div>
                                         <field name="contact_name" class="oe_inline"/>
-                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
+                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}' class="oe_inline"/>
                                     </div>
                                     <field name="function" />
                                     <field name="mobile"/>
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 63f208c08a7..d8daaada967 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -55,7 +55,7 @@
                     </div>
                     <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
                     <div class="oe_document_page">
-                        <field name="display_content" widget="html" class="oe_view_only" options='{"safe": true}'/>
+                        <field name="display_content" widget="html" class="oe_view_only" options='{"safe": True}'/>
                     </div>
                 </form>
             </field>
diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index b1dfb536853..e2d5ef1af4b 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -8,7 +8,7 @@
             <field name="model">wizard.document.page.history.show_diff</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <field name="diff" widget="html" options='{"safe": true}'/>
+                    <field name="diff" widget="html" options='{"safe": True}'/>
                     <footer>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 5e8eaa3a836..f91535a17a5 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -20,7 +20,7 @@
                       <field name="email_cc" readonly="1" attrs="{'invisible':[('email_cc','=',False)]}"/>
                       <field name="reply_to" readonly="1" attrs="{'invisible':[('reply_to','=',False)]}"/>
                       <field name="subject" readonly="1"/>
-                      <field name="body_html" widget="html" readonly="1" options='{"safe": true}'/>
+                      <field name="body_html" widget="html" readonly="1" options='{"safe": True}'/>
                     </group>
                 </form>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b46fafe270f..cbfc670c9cf 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -126,10 +126,10 @@
                                         <field name="street2"/>
                                         <div class="address_format">
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>
                                             <field name="zip" placeholder="ZIP" style="width: 20%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
                                     </div>
                                 </group>
                                 <group>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 69567902763..caa893aea6e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -42,14 +42,14 @@
                                     </group>
                                     <group string="Position">
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                                        <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                        <field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
                                         <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                                         <field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
-                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
                                     </group>
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
@@ -57,14 +57,14 @@
                             <page string="Personal Information" groups="base.group_hr_user">
                                 <group>
                                     <group string="Citizenship &amp; Other Info">
-                                        <field name="country_id" options='{"no_open": true}'/>
+                                        <field name="country_id" options='{"no_open": True}'/>
                                         <field name="identification_id" groups="base.group_hr_user"/>
                                         <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="bank_account_id"/>
                                         <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
                                     <group string="Contact Information">
-                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
                                     </group>
                                     <group string="Status">
                                         <field name="gender"/>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 1776632d7ab..778e7f9562e 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -35,8 +35,8 @@
                                             <field name="street2"/>
                                             <field name="zip"/>
                                             <field name="city"/>
-                                            <field name="country_id" options='{"no_open": true}'/>
-                                            <field name="state_id" options='{"no_open": true}'/>
+                                            <field name="country_id" options='{"no_open": True}'/>
+                                            <field name="state_id" options='{"no_open": True}'/>
                                             <templates>
                                                 <t t-name="kanban-box">
                                                     <h4><field name="name"/></h4>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bd63eec84c5..9d3b137f7c1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -103,7 +103,7 @@
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
-                                <kanban quick_create="false" create="true">
+                                <kanban quick_create="false" create="True">
                                     <field name="name"/>
                                     <templates>
                                         <t t-name="kanban-box">
@@ -311,7 +311,7 @@
                         <field colspan="4" name="name"/>
                         <field name="hours" widget="float_time"/>
                         <field name="date"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id" options='{"no_open": True}'/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </form>
@@ -401,7 +401,7 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": true}'/>
+                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": True}'/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index fdb8ae8495c..a7026da8854 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -92,8 +92,8 @@
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="progress" position="after">
-                <field name="context_id" widget="selection" options='{"no_open": true}'/>
-                <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
+                <field name="context_id" widget="selection" options='{"no_open": True}'/>
+                <field name="timebox_id" widget="selection" options='{"no_open": True}'/>
             </field>
         </field>
     </record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 8807c00a76b..626dfb699b8 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                       <group col="4">
-                          <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
+                          <field name="timebox_id" widget="selection" options='{"no_open": True}'/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5505a6a88b5..0055deb8d3d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -214,7 +214,7 @@
                                             <label for="product_uos_qty" groups="product.group_uos"/>
                                             <div groups="product.group_uos">
                                                 <field name="product_uos_qty" class="oe_inline"/>
-                                                <field name="product_uos" options='{"no_open": true}' class="oe_inline"/>
+                                                <field name="product_uos" options='{"no_open": True}' class="oe_inline"/>
                                             </div>
                                             <field name="price_unit"/>
                                             <label for="discount" groups="sale.group_discount_per_so_line"/>
@@ -251,7 +251,7 @@
                                         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, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <field name="product_uom"
                                         on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
-                                        groups="product.group_uom" options='{"no_open": true}'/>
+                                        groups="product.group_uom" options='{"no_open": True}'/>
                                     <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
                                     <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
                                     <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>

From fe07dc2e6d67c32ebf6aab8e3e32e57f24886c28 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Tue, 9 Oct 2012 16:51:13 +0200
Subject: [PATCH 36/56] [FIX] Fixed on_switch_mode tirggering.

bzr revid: vta@openerp.com-20121009145113-8sazhfrp3xaan5cq
---
 addons/web/static/src/js/view_form.js         |  9 ++++--
 addons/web/static/src/js/views.js             | 32 ++++++++-----------
 addons/web_kanban/static/src/js/kanban.js     |  4 +--
 .../static/src/js/view_editor.js              |  4 +--
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index db68b8d7a23..98fd83dadaf 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3370,10 +3370,13 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             }
             def.resolve();
         });
-        this.viewmanager.on('on_mode_switch',self,function(n_mode, b, c, d, e) {
+        this.viewmanager.on("on_mode_switch", self, function(n_mode, b, c, d, e) {
             $.when(self.save_any_view()).then(function() {
-                if(n_mode === "list")
-                    $.async_when().then(function() {self.reload_current_view();});
+                if (n_mode === "list") {
+                    $.async_when().then(function() {
+                        self.reload_current_view();
+                    });
+                }
             });
         });
         this.is_setted.then(function() {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 18d7e9d5666..e18a3e361be 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -417,7 +417,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         this._super();
         var self = this;
         this.$el.find('.oe_view_manager_switch a').click(function() {
-            self.on_mode_switch($(this).data('view-type'));
+            self.trigger('on_mode_switch', $(this).data('view-type'));
         }).tipsy();
         var views_ids = {};
         _.each(this.views_src, function(view) {
@@ -439,16 +439,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         }
         // If no default view defined, switch to the first one in sequence
         var default_view = this.flags.default_view || this.views_src[0].view_type;
-        return this.on_mode_switch(default_view);
+        this.on('on_mode_switch', self, function(view_type, no_store, view_options) {
+            self.switch_mode(view_type, no_store, view_options);
+        });
+        return this.trigger('on_mode_switch', default_view);
     },
-    /**
-     * Asks the view manager to switch visualization mode.
-     *
-     * @param {String} view_type type of view to display
-     * @param {Boolean} [no_store=false] don't store the view being switched to on the switch stack
-     * @returns {jQuery.Deferred} new view loading promise
-     */
-    on_mode_switch: function(view_type, no_store, view_options) {
+    switch_mode: function(view_type, no_store, view_options) {
         var self = this;
         var view = this.views[view_type];
         var view_promise;
@@ -552,7 +548,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
     add_breadcrumb: function(on_reverse_breadcrumb) {
         var self = this;
         var views = [this.active_view || this.views_src[0].view_type];
-        this.on('on_mode_switch',self,function(mode) { 
+        this.on('on_mode_switch',self,function(mode) {
             var last = views.slice(-1)[0];
             if (mode !== last) {
                 if (mode !== 'form') {
@@ -568,7 +564,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                 var view_to_select = views[index];
                 self.$el.show();
                 if (self.active_view !== view_to_select) {
-                    self.on_mode_switch(view_to_select);
+                    self.trigger('on_mode_switch', view_to_select);
                 }
             },
             get_title: function() {
@@ -604,7 +600,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
      * consist to switch to the asked view.
      */
     switch_view: function(view_type, no_store, options) {
-        return this.on_mode_switch(view_type, no_store, options);
+        return this.trigger('on_mode_switch', view_type, no_store, options);
     },
     /**
      * Returns to the view preceding the caller view in this manager's
@@ -623,12 +619,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         if (options.created && current_view === 'form' && previous_view === 'list') {
             // APR special case: "If creation mode from list (and only from a list),
             // after saving, go to page view (don't come back in list)"
-            return this.on_mode_switch('form');
+            return this.trigger('on_mode_switch', 'form');
         } else if (options.created && !previous_view && this.action && this.action.flags.default_view === 'form') {
             // APR special case: "If creation from dashboard, we have no previous view
-            return this.on_mode_switch('form');
+            return this.trigger('on_mode_switch', 'form');
         }
-        return this.on_mode_switch(previous_view, true);
+        return this.trigger('on_mode_switch', previous_view, true);
     },
     /**
      * Sets up the current viewmanager's search view.
@@ -897,7 +893,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
         }, action || {});
         this.do_action(action);
     },
-    on_mode_switch: function (view_type, no_store, options) {
+    switch_mode: function (view_type, no_store, options) {
         var self = this;
 
         return $.when(this._super.apply(this, arguments)).then(function () {
@@ -932,7 +928,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
         if (state.view_type && state.view_type !== this.active_view) {
             defs.push(
                 this.views[this.active_view].deferred.pipe(function() {
-                    return self.on_mode_switch(state.view_type, true);
+                    return self.trigger('on_mode_switch', state.view_type, true)
                 })
             );
         } 
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 41cc366226f..dae3d7b214d 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -194,7 +194,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on_button_cancel.add_last(am.dialog.on_close);
+        form.on("on_button_cancel",self,am.dialog.on_close);
         form.on_created.add_last(function(r) {
             (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r.result]).then(function(new_record) {
                 am.dialog.on_close();
@@ -672,7 +672,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on_button_cancel.add_last(am.dialog.on_close);
+        form.on("on_button_cancel",self,am.dialog.on_close);
         form.on_saved.add_last(function() {
             am.dialog.on_close();
             self.view.do_reload();
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index e65f0ab5d38..f26e12a55d7 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -1014,9 +1014,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         var action_manager = new instance.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_widget.views['form'].controller;
-            controller.on_button_cancel.add_last(function(){
-                action_manager.destroy()
-            });
+            controller.on("on_button_cancel",self,action_manager.destroy);
             controller.do_save.add_last(function(){
                 action_manager.destroy();
                 var value =controller.fields.name.get('value');

From 90fc4d66511634b11c95dfcb454eebe097486459 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 9 Oct 2012 17:28:28 +0200
Subject: [PATCH 37/56] [IMP] use of literal_eval from ast instead of
 const_eval from tools, as per Olivier recommendation

bzr revid: qdp-launchpad@openerp.com-20121009152828-3bdxpatkrl1qmyfi
---
 openerp/osv/orm.py         | 5 +++--
 openerp/tools/safe_eval.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 8bc5c386527..a6d192240a2 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -60,7 +60,8 @@ import openerp
 import openerp.netsvc as netsvc
 import openerp.tools as tools
 from openerp.tools.config import config
-from openerp.tools.safe_eval import const_eval, safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
+from ast import literal_eval
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 from query import Query
@@ -1734,7 +1735,7 @@ class BaseModel(object):
                     transfer_field_to_modifiers(field, modifiers)
                 if node.get('options'):
                     try:
-                        node.set('options', simplejson.dumps(const_eval(node.get('options'))))
+                        node.set('options', simplejson.dumps(literal_eval(node.get('options'))))
                     except Exception, msg:
                         raise except_orm('Invalide Python code in %s'%(node.get('options')), msg[0])
 
diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py
index 6bc92e57465..601fd95200a 100644
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -46,7 +46,7 @@ _ALLOWED_MODULES = ['_strptime', 'time']
 _CONST_OPCODES = set(opmap[x] for x in [
     'POP_TOP', 'ROT_TWO', 'ROT_THREE', 'ROT_FOUR', 'DUP_TOP', 'DUP_TOPX',
     'POP_BLOCK','SETUP_LOOP', 'BUILD_LIST', 'BUILD_MAP', 'BUILD_TUPLE',
-    'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR', 'STORE_MAP', 'LOAD_NAME'] if x in opmap)
+    'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR'] if x in opmap)
 
 _EXPR_OPCODES = _CONST_OPCODES.union(set(opmap[x] for x in [
     'UNARY_POSITIVE', 'UNARY_NEGATIVE', 'UNARY_NOT',

From e9d314646d310c1310fd405719cc1b518b00feaf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 9 Oct 2012 17:54:20 +0200
Subject: [PATCH 38/56] [FIX] mail.thread subclasses: convert body to plaintext
 in message_new, as body is now HTML

Also disable the updating of the body when new messages
are received for project.issue records, because this
might discard important information that was manually
entered.

bzr revid: odo@openerp.com-20121009155420-72xvyhhiwd696upv
---
 addons/crm/crm_lead.py                  | 5 ++++-
 addons/crm_claim/crm_claim.py           | 4 +++-
 addons/crm_helpdesk/crm_helpdesk.py     | 4 +++-
 addons/hr_recruitment/hr_recruitment.py | 4 +++-
 addons/project/project.py               | 8 +++++---
 addons/project_issue/project_issue.py   | 6 ++++--
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 7e33f397e8a..48c6491a7c3 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -26,6 +26,7 @@ from osv import fields, osv
 import time
 import tools
 from tools.translate import _
+from tools import html2plaintext
 
 from base.res.res_partner import format_address
 
@@ -812,9 +813,11 @@ class crm_lead(base_stage, format_address, osv.osv):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index cbf3ec9f13a..c88b2fe26af 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -26,6 +26,7 @@ from osv import fields, osv
 import time
 import tools
 from tools.translate import _
+from tools import html2plaintext
 
 CRM_CLAIM_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -192,9 +193,10 @@ class crm_claim(base_stage, osv.osv):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
         })
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index f36a3b72640..ceffd282aa8 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -25,6 +25,7 @@ from crm import crm
 from osv import fields, osv
 import tools
 from tools.translate import _
+from tools import html2plaintext
 
 CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -104,9 +105,10 @@ class crm_helpdesk(base_state, base_stage, osv.osv):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 31959d7e9c7..ccfcae0d26e 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -26,6 +26,7 @@ from base_status.base_stage import base_stage
 from datetime import datetime
 from osv import fields, osv
 from tools.translate import _
+from tools import html2plaintext
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
@@ -327,9 +328,10 @@ class hr_applicant(base_stage, osv.Model):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
diff --git a/addons/project/project.py b/addons/project/project.py
index 98c385c0ce3..a47b582be77 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -19,12 +19,14 @@
 #
 ##############################################################################
 
-from base_status.base_stage import base_stage
-from datetime import datetime, date
+import time
 from lxml import etree
+from datetime import datetime, date
+
+import tools
+from base_status.base_stage import base_stage
 from osv import fields, osv
 from openerp.addons.resource.faces import task as Task
-import time
 from tools.translate import _
 from openerp import SUPERUSER_ID
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2004e1310f0..9e434078d2f 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -27,6 +27,7 @@ from tools.translate import _
 import binascii
 import time
 import tools
+from tools import html2plaintext
 
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
@@ -462,9 +463,11 @@ class project_issue(base_stage, osv.osv):
         if context is None: context = {}
         context['state_to'] = 'draft'
 
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
+
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -486,7 +489,6 @@ class project_issue(base_stage, osv.osv):
         if update_vals is None: update_vals = {}
 
         # Update doc values according to the message
-        update_vals['description'] = msg.get('body', '')
         if msg.get('priority'):
             update_vals['priority'] = msg.get('priority')
         # Parse 'body' to find values to update

From 49b102b54a860e655156fced1940ae6b913a7458 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 10 Oct 2012 04:44:51 +0000
Subject: [PATCH 39/56] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121010044451-x88fqu2rrhax9fq4
---
 addons/account_analytic_default/i18n/hu.po |  13 +-
 addons/account_budget/i18n/hu.po           |  27 +-
 addons/account_budget/i18n/lo.po           |  32 +-
 addons/hr_contract/i18n/mk.po              | 271 +++++++
 addons/hr_holidays/i18n/mk.po              | 864 +++++++++++++++++++++
 5 files changed, 1185 insertions(+), 22 deletions(-)
 create mode 100644 addons/hr_contract/i18n/mk.po
 create mode 100644 addons/hr_holidays/i18n/mk.po

diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index 557aa2e66f5..8b863f51679 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-02-01 18:11+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-10-09 13:58+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -134,12 +133,14 @@ msgstr "Gyűjtőkód alapértelmezések"
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Minden vállalkozáshoz egyedi hivatkozás kell!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
 msgstr ""
+"A mai napnál későbbi lejáratú vagy nem létező dátumú elemzések "
+"alapértelmezései"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index c48392c7c8a..35df6ac7dc9 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-30 16:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-10-09 13:49+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -105,6 +104,7 @@ msgid "Percentage"
 msgstr "Százalék"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:crossovered.budget.report:0
 msgid "to"
 msgstr "-"
@@ -138,21 +138,24 @@ msgstr ""
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "A '%s' költségvetésnek nincs számlaszáma!"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "%"
 msgstr "%"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Description"
 msgstr "Leírás"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Currency"
 msgstr "Pénznem"
@@ -187,6 +190,7 @@ msgid "Planned Amount"
 msgstr "Tervezett összeg"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
@@ -199,6 +203,7 @@ msgid "Done"
 msgstr "Kész"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
@@ -259,7 +264,7 @@ msgstr "Üzleti terv"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve Budgets"
-msgstr ""
+msgstr "Költségvetés jóváhagyása"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
@@ -333,6 +338,7 @@ msgid "Account Budget  crossvered summary report"
 msgstr "Üzleti terv összesítő kimutatás"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
@@ -359,9 +365,10 @@ msgstr "Nyomtatás"
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "Elméleti mennyiség"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,analytic_account_id:0
 #: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
@@ -373,6 +380,7 @@ msgid "Budget :"
 msgstr "Üzleti terv :"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
@@ -413,6 +421,7 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
@@ -421,7 +430,7 @@ msgstr "Elemzési időszak"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr ""
+msgstr "Előzetes, tervezett költségvetés"
 
 #, python-format
 #~ msgid "The General Budget '%s' has no Accounts!"
diff --git a/addons/account_budget/i18n/lo.po b/addons/account_budget/i18n/lo.po
index daa39b8a6e6..cbc81b84000 100644
--- a/addons/account_budget/i18n/lo.po
+++ b/addons/account_budget/i18n/lo.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-19 15:50+0000\n"
+"PO-Revision-Date: 2012-10-09 16:05+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@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-08-28 06:27+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -31,7 +31,7 @@ msgstr "ຮັບຮູ້ເເລັວ"
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr "ຈຸດງົບປະມານ"
+msgstr "ຕໍາແຫນ່ງງົບປະມານ"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -105,6 +105,7 @@ msgid "Percentage"
 msgstr "ເປີເຊັນ"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:crossovered.budget.report:0
 msgid "to"
 msgstr "ຫາ"
@@ -126,6 +127,14 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"ງົບປະມານແມ່ນຄາດຄະເນລາຍໄດ້ຂອງບໍລິສັດຂອງທ່ານແລະຄ່າໃຊ້ຈ່າຍຄາດວ່າຈະສໍາລັບໄລຍະເວລາ"
+"ໃນອະນາຄົດໄດ້. ມີງົບປະມານ, "
+"ບໍລິສັດສາມາດລະມັດລະວັງເບິ່ງວິທີການເງິນຫຼາຍປານເຂົາເຈົ້າໄດ້ຖືກກິນໃນໄລຍະເວລາໃນໄລ"
+"ຍະໃດຫນຶ່ງ, ແລະສະວິທີທີ່ດີທີ່ສຸດເພື່ອແບ່ງມັນໃນບັນດາປະເພດຂອງລາຍການຕ່າງໆ. "
+"ໂດຍການຮັກສາຕິດຕາມບ່ອນທີ່ເງິນຂອງທ່ານດີ, ທ່ານອາດຈະມີຫນ້ອຍອາດຈະ overspend, "
+"ແລະອື່ນໆທີ່ອາດຈະຕອບສະຫນອງໄດ້ຕາມເປົ້າຫມາຍທາງດ້ານການເງິນຂອງທ່ານ. "
+"ຄາດງົບປະມານໂດຍ detailing ລາຍຮັບຄາດວ່າຈະຕໍ່ບັນຊີແຍກທາດແລະຕິດຕາມກວດກາຂອງຕົນ "
+"evolution ອີງຕາມຕົວຈິງໃນ realized ໃນໄລຍະນັ້ນ."
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
@@ -134,18 +143,21 @@ msgid "The Budget '%s' has no accounts!"
 msgstr ""
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "%"
 msgstr ""
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Description"
 msgstr "ຄຳອະທິບາຍ"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Currency"
 msgstr "ເງິນຕາ"
@@ -170,7 +182,7 @@ msgstr "ເພື່ອຮັບຮູ້"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "ປັບກັບຮ່າງ"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -180,6 +192,7 @@ msgid "Planned Amount"
 msgstr "ຈໍານວນຄາດໝາຍມ້ຽນ"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
@@ -192,6 +205,7 @@ msgid "Done"
 msgstr "ຈົບເເລັວ"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
@@ -203,7 +217,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "ຈໍານວນເງິນປະຕິບັດໄດ້"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
@@ -292,7 +306,7 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "ຍົກເລີກ"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -326,6 +340,7 @@ msgid "Account Budget  crossvered summary report"
 msgstr ""
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
@@ -355,6 +370,7 @@ msgid "Theoretical Amount"
 msgstr ""
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,analytic_account_id:0
 #: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
@@ -366,6 +382,7 @@ msgid "Budget :"
 msgstr "ງົບປະມານ"
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
@@ -406,6 +423,7 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: account_budget
+#: report:account.analytic.account.budget:0
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
diff --git a/addons/hr_contract/i18n/mk.po b/addons/hr_contract/i18n/mk.po
new file mode 100644
index 00000000000..2a4011c9e0d
--- /dev/null
+++ b/addons/hr_contract/i18n/mk.po
@@ -0,0 +1,271 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-09 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Плата"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "Информации"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Пробен Период"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Пробен Почетен Датум"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Систематски Преглед"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Службено Возило"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Разно"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Тековен"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Изминат"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "Вработен"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Пребарај Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts in progress"
+msgstr "Договори во тек"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Дома-Работа Одалеченост"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "Договори"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Лични информации"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts whose end date already passed"
+msgstr "Договори чии што краен рок е веќе поминат"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Последен договор на вработениот"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Работно Место"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Придобивки"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Валиден за"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Дозвола за Работа"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Број на Деца"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "Типови на Договор"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Грешка! Не можете да креирате рекурзивна хиерархија на вработените."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Краен датум"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "Основна Плата на вработениот"
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Референца"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "во километри"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Забелешки"
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "Број на Дозвола за Работа"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr "Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr "Тип на Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Распоред за Работа"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Информации за Работата"
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Виза Датум на Истекување"
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Звање"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Менаџер"
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Почетен датум"
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Грешка! Почетниот датум на договорот мора да биде помал од крајниот датум."
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr "Број на Виза"
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Место на раѓање"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Траење"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Датум за Систематски Преглед"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Пробен Краен Датум"
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Пребарај Тип на Договор"
diff --git a/addons/hr_holidays/i18n/mk.po b/addons/hr_holidays/i18n/mk.po
new file mode 100644
index 00000000000..2694317ebe9
--- /dev/null
+++ b/addons/hr_holidays/i18n/mk.po
@@ -0,0 +1,864 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-09 08:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Сина"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "Тип на Алокација"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "Се чека на второ одобрување"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "Мкасимален број на дозволени отсуства - Отсуствата се веќе земени"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Менаџирање на Отсуства"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr "Мод на Алокација"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr "Одобри Барања"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Одбиени"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr "Категорија на Вработен"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr " Месец-1"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "Кафена"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "Останати Денови"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "По Вработен"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr ""
+"Менаџерот за отсуства може да го остави ова поле празно ако барањето за "
+"отсуство/преместување е за секој вработен"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr "Подеси на нацрт"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr "Светла Цијан"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "Светло зелено"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr "Тековен Тип на Отсуство"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave requests can be recorded by employees and validated by their managers. "
+"Once a leave request is validated, it appears automatically in the agenda of "
+"the employee. You can define several allowance types (paid holidays, "
+"sickness, etc.) and manage allowances per type."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "Збир на Отсуства"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "Одобрено"
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr "Последна Конекција"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "Одбиј"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+"Не можете да валидирате отсуства за вработениот %s: премалку преостанати "
+"денови (%s)."
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.  "
+"          \n"
+"The state is 'Refused', when holiday request is refused by manager.          "
+"  \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr "Отсуства"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr "Барања за отсуства за одобрување"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "Отсуства по Сектор"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "Откажано"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
+"the employees if the configuration does not allow to use this field."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr ""
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+#: view:hr.holidays:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr ""
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr "Пребарај Отсуство"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
+msgid ""
+"You can assign remaining Legal Leaves for each employee, OpenERP will "
+"automatically create and validate allocation requests."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""

From f7d5b5ff0aabd129cbb9c9c1278eab0c3ec361f2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 10 Oct 2012 09:25:10 +0200
Subject: [PATCH 40/56] [FIX] mail: in function field mail_follower_ids,
 support value False in setter

bzr revid: rco@openerp.com-20121010072510-aacyyj3csj720z8l
---
 addons/mail/mail_thread.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 529ee8c65cc..e6150640eb3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -138,6 +138,8 @@ class mail_thread(osv.AbstractModel):
         return res
 
     def _set_followers(self, cr, uid, id, name, value, arg, context=None):
+        if not value:
+            return
         partner_obj = self.pool.get('res.partner')
         fol_obj = self.pool.get('mail.followers')
 

From 83c00b75ff7773916d8a1d6b7a8cc1087be3779d Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 11:37:00 +0200
Subject: [PATCH 41/56] [FIX] Fixed on_mode_switch.

bzr revid: vta@openerp.com-20121010093700-nz326tlux3v5olqj
---
 addons/web_shortcuts/static/src/js/web_shortcuts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index 743f3fc73aa..c6d5a2f41fb 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -108,7 +108,7 @@ instance.web.UserMenu.include({
 });
 
 instance.web.ViewManagerAction.include({
-    on_mode_switch: function (view_type, no_store) {
+    switch_mode: function (view_type, no_store) {
         var self = this;
         this._super.apply(this, arguments).then(function() {
             self.shortcut_check(self.views[view_type]);

From 12c35d031dac08296e05bd4231994257e5247bbd Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 11:37:37 +0200
Subject: [PATCH 42/56] [FIX] Fixed on_mode_switch.

bzr revid: vta@openerp.com-20121010093737-0kheus1v0kdj5tk7
---
 addons/web/static/src/js/view_form.js     |  2 +-
 addons/web/static/src/js/views.js         | 24 +++++++++++------------
 addons/web_kanban/static/src/js/kanban.js |  4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 98fd83dadaf..7395011a5e7 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3370,7 +3370,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             }
             def.resolve();
         });
-        this.viewmanager.on("on_mode_switch", self, function(n_mode, b, c, d, e) {
+        this.viewmanager.on("switch_mode", self, function(n_mode, b, c, d, e) {
             $.when(self.save_any_view()).then(function() {
                 if (n_mode === "list") {
                     $.async_when().then(function() {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e18a3e361be..f0df367c5e3 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -417,7 +417,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         this._super();
         var self = this;
         this.$el.find('.oe_view_manager_switch a').click(function() {
-            self.trigger('on_mode_switch', $(this).data('view-type'));
+            self.trigger('switch_mode', $(this).data('view-type'));
         }).tipsy();
         var views_ids = {};
         _.each(this.views_src, function(view) {
@@ -439,10 +439,8 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         }
         // If no default view defined, switch to the first one in sequence
         var default_view = this.flags.default_view || this.views_src[0].view_type;
-        this.on('on_mode_switch', self, function(view_type, no_store, view_options) {
-            self.switch_mode(view_type, no_store, view_options);
-        });
-        return this.trigger('on_mode_switch', default_view);
+        this.on('switch_mode', self, self.switch_mode);
+        return this.trigger('switch_mode', default_view);
     },
     switch_mode: function(view_type, no_store, view_options) {
         var self = this;
@@ -548,7 +546,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
     add_breadcrumb: function(on_reverse_breadcrumb) {
         var self = this;
         var views = [this.active_view || this.views_src[0].view_type];
-        this.on('on_mode_switch',self,function(mode) {
+        this.on('switch_mode', self, function(mode) {
             var last = views.slice(-1)[0];
             if (mode !== last) {
                 if (mode !== 'form') {
@@ -564,7 +562,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                 var view_to_select = views[index];
                 self.$el.show();
                 if (self.active_view !== view_to_select) {
-                    self.trigger('on_mode_switch', view_to_select);
+                    self.trigger('switch_mode', view_to_select);
                 }
             },
             get_title: function() {
@@ -600,12 +598,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
      * consist to switch to the asked view.
      */
     switch_view: function(view_type, no_store, options) {
-        return this.trigger('on_mode_switch', view_type, no_store, options);
+        return this.trigger('switch_mode', view_type, no_store, options);
     },
     /**
      * Returns to the view preceding the caller view in this manager's
      * navigation history (the navigation history is appended to via
-     * on_mode_switch)
+     * switch_mode)
      *
      * @param {Object} [options]
      * @param {Boolean} [options.created=false] resource was created
@@ -619,12 +617,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         if (options.created && current_view === 'form' && previous_view === 'list') {
             // APR special case: "If creation mode from list (and only from a list),
             // after saving, go to page view (don't come back in list)"
-            return this.trigger('on_mode_switch', 'form');
+            return this.trigger('switch_mode', 'form');
         } else if (options.created && !previous_view && this.action && this.action.flags.default_view === 'form') {
             // APR special case: "If creation from dashboard, we have no previous view
-            return this.trigger('on_mode_switch', 'form');
+            return this.trigger('switch_mode', 'form');
         }
-        return this.trigger('on_mode_switch', previous_view, true);
+        return this.trigger('switch_mode', previous_view, true);
     },
     /**
      * Sets up the current viewmanager's search view.
@@ -928,7 +926,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
         if (state.view_type && state.view_type !== this.active_view) {
             defs.push(
                 this.views[this.active_view].deferred.pipe(function() {
-                    return self.trigger('on_mode_switch', state.view_type, true)
+                    return self.trigger('switch_mode', state.view_type, true)
                 })
             );
         } 
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index dae3d7b214d..d95546dfe41 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -194,7 +194,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel",self,am.dialog.on_close);
+        form.on("on_button_cancel", self, am.dialog.on_close);
         form.on_created.add_last(function(r) {
             (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r.result]).then(function(new_record) {
                 am.dialog.on_close();
@@ -672,7 +672,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel",self,am.dialog.on_close);
+        form.on("on_button_cancel", self, am.dialog.on_close);
         form.on_saved.add_last(function() {
             am.dialog.on_close();
             self.view.do_reload();

From 9c71d984e6937cc598fc8da52bf353322acc03cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 10 Oct 2012 11:55:09 +0200
Subject: [PATCH 43/56] [IMP] Class instanciations throws an error when you
 forgot to use the new operator

bzr revid: fva@openerp.com-20121010095509-ojvigsva4hblta7m
---
 addons/web/static/src/js/corelib.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index ff193605033..21d593069e7 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -121,6 +121,10 @@ openerp.web.corelib = function(instance) {
 
         // The dummy class constructor
         function Class() {
+            if(this.constructor !== instance.web.Class){
+                throw new Error("You need a 'new' to instanciate an object");
+                return null;
+            }
             // All construction is actually done in the init method
             if (!initializing && this.init) {
                 var ret = this.init.apply(this, arguments);

From 31760fd2496a3287e10515a6e88cc5cd32f8db2c Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 12:02:18 +0200
Subject: [PATCH 44/56] [FIX] Fixed on_record_loaded.

bzr revid: vta@openerp.com-20121010100218-drvx420qtrjucom1
---
 addons/board/static/src/js/dashboard.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index bba076e8594..2dbd9f5c9cc 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -25,8 +25,8 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         }).bind('sortstop', self.do_save_dashboard);
 
         var old_title = this.__parentedParent.get('title');
-        this.__parentedParent.on('record_load', this, function(){
-            self.__parentedParent.set({ 'title' : old_title});
+        this.__parentedParent.on('load_record', self, function(){
+            self.__parentedParent.set({ 'title': old_title});
         })
         // Events
         this.$el.find('.oe_dashboard_link_reset').click(this.on_reset);
@@ -173,7 +173,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
     },
     on_load_action: function(result, index, action_attrs) {
         var self = this,
-            action = result.result,
+            action = result,
             view_mode = action_attrs.view_mode;
 
         if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) {

From 40eceb20a384b56b1e1acad6750afa27521a8fa4 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 12:02:33 +0200
Subject: [PATCH 45/56] [FIX] Fixed on_record_loaded.

bzr revid: vta@openerp.com-20121010100233-tulf3c1fvnt2s85e
---
 addons/web/static/src/js/view_form.js         | 31 ++++++++++++-------
 .../web/static/src/js/view_list_editable.js   |  7 ++---
 addons/web_diagram/static/src/js/diagram.js   |  6 ++--
 addons/web_tests/static/src/js/web_tests.js   |  6 ++--
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 43afe3a3bf1..6a9d1dcb3a4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -126,7 +126,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.on("change:actual_mode", self, self.init_pager);
             self.init_pager();
         });
-        self.on("record_load", self, self.on_record_loaded);
+        self.on("load_record", self, self.load_record);
         instance.web.bus.on('clear_uncommitted_changes', this, function(e) {
             if (!this.can_be_discarded()) {
                 e.preventDefault();
@@ -332,7 +332,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 fields.push('display_name');
                 return self.dataset.read_index(fields, {
                     context: { 'bin_size': true, 'future_display_name' : true }
-                }).pipe(function(r){self.trigger('record_load',r)});
+                }).pipe(function(r) {
+                    self.trigger('load_record', r);
+                });
             });
         }
         return shown.pipe(function() {
@@ -355,7 +357,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         this._super();
     },
-    on_record_loaded: function(record) {
+    load_record: function(record) {
         var self = this, set_values = [];
         if (!record) {
             this.set({ 'title' : undefined });
@@ -417,10 +419,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         var self = this;
         var keys = _.keys(this.fields_view.fields);
         if (keys.length) {
-            return this.dataset.default_get(keys)
-                    .pipe(function(r){self.trigger('record_load',r)});
+            return this.dataset.default_get(keys).pipe(function(r) {
+                self.trigger('load_record', r);
+            });
         }
-        return self.trigger('record_load',{});
+        return self.trigger('load_record', {});
     },
     on_form_changed: function() {
         this.trigger("view_content_has_changed");
@@ -754,7 +757,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 this.trigger('history_back');
             } else {
                 this.to_view_mode();
-                this.trigger('record_load',this.datarecord);
+                this.trigger('load_record', this.datarecord);
             }
         }
         return false;
@@ -954,9 +957,15 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             } else {
                 var fields = _.keys(self.fields_view.fields);
                 fields.push('display_name');
-                return self.dataset.read_index(fields, {
-                    context : { 'bin_size' : true, 'future_display_name' : true }
-                }).pipe(function(r){self.trigger('record_load',r)});
+                return self.dataset.read_index(fields,
+                    {
+                        context: {
+                            'bin_size': true,
+                            'future_display_name': true
+                        }
+                    }).pipe(function(r) {
+                        self.trigger('load_record', r);
+                    });
             }
         });
     },
@@ -3371,7 +3380,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                 if (self.get("effective_readonly")) {
                     $(".oe_form_buttons", controller.$el).children().remove();
                 }
-                controller.on("record_load", self, function(){
+                controller.on("load_record", self, function(){
                      once.resolve();
                  });
                 controller.on_pager_action.add_first(function() {
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 892221a347b..fe0f525fe3f 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -626,7 +626,7 @@ openerp.web.list_editable = function (instance) {
         },
         start: function () {
             var self = this;
-            var _super = this._super();
+            var _super = this._super();            
             this.form.embedded_view = this._validate_view(
                     this.delegate.edition_view(this));
             var form_ready = this.form.appendTo(this.$el).then(
@@ -708,10 +708,9 @@ openerp.web.list_editable = function (instance) {
             var self = this;
             var form = self.form;
             var loaded = record
-                ? form.on_record_loaded(_.extend({}, record))
+                ? form.trigger('load_record', _.extend({}, record))
                 : form.load_defaults();
-
-            return loaded.pipe(function () {
+            return $.when(loaded).pipe(function () {
                 return form.do_show({reload: false});
             }).pipe(function () {
                 self.record = form.datarecord;
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 3b9e81fdf6e..9fd74853c3c 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -246,7 +246,7 @@ instance.web.DiagramView = instance.web.View.extend({
         var form_fields = [self.parent_field];
         var form_controller = pop.view_form;
 
-       form_controller.on("record_load", self, function(){
+       form_controller.on("load_record", self, function(){
             _.each(form_fields, function(fld) {
                 if (!(fld in form_controller.fields)) { return; }
                 var field = form_controller.fields[fld];
@@ -280,7 +280,7 @@ instance.web.DiagramView = instance.web.View.extend({
         var form_controller = pop.view_form;
         var form_fields = [this.parent_field];
 
-        form_controller.on("record_load", self, function(){
+        form_controller.on("load_record", self, function(){
             _.each(form_fields, function(fld) {
                 if (!(fld in form_controller.fields)) { return; }
                 var field = form_controller.fields[fld];
@@ -340,7 +340,7 @@ instance.web.DiagramView = instance.web.View.extend({
         var form_controller = pop.view_form;
 
 
-       form_controller.on("record_load", self, function(){
+       form_controller.on("load_record", self, function(){
             form_controller.fields[self.connectors.attrs.source].set_value(node_source_id);
             form_controller.fields[self.connectors.attrs.source].dirty = true;
             form_controller.fields[self.connectors.attrs.destination].set_value(node_dest_id);
diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js
index 8c146644372..bc7d16913fb 100644
--- a/addons/web_tests/static/src/js/web_tests.js
+++ b/addons/web_tests/static/src/js/web_tests.js
@@ -23,14 +23,14 @@ openerp.web_tests = function (instance) {
         on_everything_loaded: function (slice) {
             var records = slice[0].records;
             if (!records.length) {
-                this.form.trigger("record_load",{});
+                this.form.trigger("load_record", {});
                 return;
             }
-            this.form.trigger("record_load", records[0])
+            this.form.trigger("load_record", records[0]);
             _(records.slice(1)).each(function (record, index) {
                 this.dataset.index = index+1;
                 this.form.reposition($('<div>').appendTo(this.$el));
-                this.form.trigger("record_load", record)
+                this.form.trigger("load_record", record);
             }, this);
         }
     });

From 5f8c1b4907f7bf448fc37eda679398153c6a6772 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 10 Oct 2012 12:08:32 +0200
Subject: [PATCH 46/56] [REV] revert revision 7730 that will be pushed to trunk
 via another branch (a dedicated one)

bzr revid: qdp-launchpad@openerp.com-20121010100832-asu2rj6j7x5328f0
---
 addons/account/account_bank_statement.py | 5 ++---
 addons/account/account_view.xml          | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 549363ce269..8b2a9aff257 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -461,10 +461,9 @@ class account_bank_statement(osv.osv):
             return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
-        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context)
+        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id'], context=context)
         company_id = journal_data['company_id']
-        currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id
-        return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}}
+        return {'value': {'balance_start': balance_start, 'company_id': company_id}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d2680a8456f..1c40bebba52 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -633,10 +633,13 @@
                                 <field name="period_id" class="oe_inline"/>
                             </div>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                            <field name="currency" invisible="1"/>
                         </group><group>
-                            <field name="balance_start" widget="monetary" options="{'currency_field' : 'currency'}"/>
-                            <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
+                            <label for="balance_start"/>
+                            <div>
+                                <field name="balance_start" class="oe_inline"/>
+                                <field name="currency" class="oe_inline"/>
+                            </div>
+                            <field name="balance_end_real"/>
                         </group>
                     </group>
 

From bbbc6a304dca2b58aef7e47e2bba9e155de160f9 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 12:12:00 +0200
Subject: [PATCH 47/56] [FIX] Fixed event name on_write_complete.

bzr revid: vta@openerp.com-20121010101200-1lwcqae44bb88ffa
---
 addons/process/static/src/js/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index c593c1569fc..386a9653c02 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -239,7 +239,7 @@ instance.web.ViewManager.include({
                 title: _t('Process')
             });
         var form_controller = pop.view_form;
-        pop.on('on_write_complete', self, self.initialize_process_view);
+        pop.on('write_completed', self, self.initialize_process_view);
     }
 });
 };

From a8bf5bfbab84fdc278a9481a493b44adbaf0676c Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 12:12:46 +0200
Subject: [PATCH 48/56] [FIX] Fixed event name on_write_complete.

bzr revid: vta@openerp.com-20121010101246-1ht2npz6l75ah06e
---
 addons/web/static/src/js/view_form.js   | 6 +++---
 addons/web_gantt/static/src/js/gantt.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d635ab7e640..1478ae6e4ac 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2982,7 +2982,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                     title: _t("Open: ") + self.string
                 }
             );
-            pop.on('on_write_complete', self, function(){
+            pop.on('write_completed', self, function(){
                 self.display_value = {};
                 self.render_value();
                 self.focus();
@@ -4134,7 +4134,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
             title: _t("Open: ") + this.m2m_field.string,
             readonly: this.getParent().get("effective_readonly")
         });
-        pop.on('on_write_complete', self, self.reload_content);
+        pop.on('write_completed', self, self.reload_content);
     }
 });
 
@@ -4382,7 +4382,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
         this.dataset.write_function = function(id, data, options, sup) {
             var fct = self.options.write_function || sup;
             return fct.call(this, id, data, options).then(function() {
-                self.trigger('on_write_complete');
+                self.trigger('write_completed');
             });
         };
         this.dataset.parent_view = this.options.parent_view;
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 0d600712d4a..66d699c2cde 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -211,7 +211,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
     on_task_display: function(task) {
         var self = this;
         var pop = new instance.web.form.FormOpenPopup(self);
-        pop.on('on_write_complete',self,self.reload);
+        pop.on('write_completed',self,self.reload);
         pop.show_element(
             self.dataset.model,
             task.id,

From f4f3d6fa153bc3bb446cf841fc3844614f5103dc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 10 Oct 2012 12:42:20 +0200
Subject: [PATCH 49/56] [REF] code review by odo

bzr revid: qdp-launchpad@openerp.com-20121010104220-nqi6c12ua7tnaejt
---
 openerp/osv/orm.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index a6d192240a2..4f717e69dad 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1733,11 +1733,13 @@ class BaseModel(object):
                 field = model_fields.get(node.get('name'))
                 if field:
                     transfer_field_to_modifiers(field, modifiers)
+                #evaluate the options as python code, but send it as json to the client
                 if node.get('options'):
                     try:
                         node.set('options', simplejson.dumps(literal_eval(node.get('options'))))
-                    except Exception, msg:
-                        raise except_orm('Invalide Python code in %s'%(node.get('options')), msg[0])
+                    except Exception, e:
+                        _logger.exception('Invalid `options´ attribute, should be a valid python expression: %r', node.get('options'))
+                        raise except_orm('Invalid options', 'Invalid options: %r %s' % (node.get('options'), e))
 
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)

From 21dcc15a2ca38725d963fd16f57f5c9f4b1c5afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 10 Oct 2012 12:44:33 +0200
Subject: [PATCH 50/56] [FIX] previous 'forgot now' error message was a bit
 crappy

bzr revid: fva@openerp.com-20121010104433-cb03lb11fi15qrzd
---
 addons/web/static/src/js/corelib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 21d593069e7..7a9af79b4fb 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -122,7 +122,7 @@ openerp.web.corelib = function(instance) {
         // The dummy class constructor
         function Class() {
             if(this.constructor !== instance.web.Class){
-                throw new Error("You need a 'new' to instanciate an object");
+                throw new Error("You can only instanciate objects with the 'new' operator");
                 return null;
             }
             // All construction is actually done in the init method

From 42b2412782ea665217fb3652665c762ca45ef054 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 10 Oct 2012 13:15:38 +0200
Subject: [PATCH 51/56] [REV] revert the previous 'bugfix' which is not a
 bugfix; removing a bugged feature doesn't fix anything also remove
 whitespaces

bzr revid: abo@openerp.com-20121010111538-03xm67fpc3tljfd4
---
 addons/project/report/project_cumulative.xml | 26 +++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index dc556be22e7..75bfe3b8879 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -18,10 +18,12 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_task_history_graph" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.graph</field>
             <field name="model">project.task.history.cumulative</field>
             <field name="arch" type="xml">
+                <!-- <field name="project_id"/> -->
                 <graph string="Project Tasks" type="bar">
                     <field name="date"/>
                     <field name="planned_hours" operator="+"/>
@@ -36,16 +38,18 @@
             <field name="arch" type="xml">
                 <search string="Task's Analysis">
                     <field name="date"/>
-                    <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
-                    <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                    <separator/>
-                    <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
-                    <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
-                    <separator/>
-                    <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-" />
-                    <separator/>
+                    <field name="project_id"/>
                     <field name="user_id"/>
+                    <filter name="open" string="In Progress Tasks" domain="[('state','in',('open','draft'))]"/>
+                    <filter string="Pending Tasks" domain="[('state','=','pending')]" context="{'show_delegated':False}"/>
+                    <separator/>
+                    <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]"/>
+                    <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]"/>
+                    <separator/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
+                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"/>
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id','=',uid)]"/>
                 </search>
             </field>
         </record>
@@ -56,12 +60,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_task_history_graph"/>
-            <field eval="False" name="filter"/>
+            <field name="filter" eval="False"/>
             <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
-            parent="base.menu_project_report" />
+            parent="base.menu_project_report"/>
 
     </data>
 </openerp>

From 9fa829ebcad8a0bcd68617f9553ebe24b66747c5 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 10 Oct 2012 13:16:49 +0200
Subject: [PATCH 52/56] [FIX] replace the related field with a m2o field and
 adapt the requet in init() method

bzr revid: abo@openerp.com-20121010111649-11p1h305w6j7dwqf
---
 addons/project/project.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 6b02a018293..1bdbd34c575 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1099,7 +1099,7 @@ class task(base_stage, osv.osv):
         task_record = self.browse(cr, uid, task_id, context=context)
         if task_record.project_id:
             project_follower_ids = [follower.id for follower in task_record.project_id.message_follower_ids]
-            self.message_subscribe(cr, uid, [task_id], project_follower_ids, 
+            self.message_subscribe(cr, uid, [task_id], project_follower_ids,
                 context=context)
         self._store_history(cr, uid, [task_id], context=context)
         self.create_send_note(cr, uid, [task_id], context=context)
@@ -1353,16 +1353,15 @@ class project_project(osv.osv):
         'use_tasks': True
     }
 
-
-#
-# Tasks History, used for cumulative flow charts (Lean/Agile)
-#
-
 class project_task_history(osv.osv):
+    """
+    Tasks History, used for cumulative flow charts (Lean/Agile)
+    """
     _name = 'project.task.history'
     _description = 'History of Tasks'
     _rec_name = 'task_id'
     _log_access = False
+
     def _get_date(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for history in self.browse(cr, uid, ids, context=context):
@@ -1414,35 +1413,38 @@ class project_task_history(osv.osv):
         'date': fields.date.context_today,
     }
 
-
 class project_task_history_cumulative(osv.osv):
     _name = 'project.task.history.cumulative'
     _table = 'project_task_history_cumulative'
     _inherit = 'project.task.history'
     _auto = False
+
     _columns = {
         'end_date': fields.date('End Date'),
-        'project_id': fields.related('task_id', 'project_id', string='Project', type='many2one', relation='project.project')
+        'project_id': fields.many2one('project.project', 'Project'),
     }
+
     def init(self, cr):
         cr.execute(""" CREATE OR REPLACE VIEW project_task_history_cumulative AS (
             SELECT
-                history.date::varchar||'-'||history.history_id::varchar as id,
-                history.date as end_date,
+                history.date::varchar||'-'||history.history_id::varchar AS id,
+                history.date AS end_date,
                 *
             FROM (
                 SELECT
-                    id as history_id,
-                    date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
-                    task_id, type_id, user_id, kanban_state, state,
-                    greatest(remaining_hours,1) as remaining_hours, greatest(planned_hours,1) as planned_hours
+                    h.id AS history_id,
+                    h.date+generate_series(0, CAST((coalesce(h.end_date, DATE 'tomorrow')::date - h.date) AS integer)-1) AS date,
+                    h.task_id, h.type_id, h.user_id, h.kanban_state, h.state,
+                    greatest(h.remaining_hours, 1) AS remaining_hours, greatest(h.planned_hours, 1) AS planned_hours,
+                    t.project_id
                 FROM
-                    project_task_history
-            ) as history
+                    project_task_history AS h
+                    JOIN project_task AS t ON (h.task_id = t.id)
+
+            ) AS history
         )
         """)
 
-
 class project_category(osv.osv):
     """ Category of project's task (or issue) """
     _name = "project.category"

From 550d7905b55423cc8b7d3931cc1ff23a46b14cd5 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 10 Oct 2012 13:25:53 +0200
Subject: [PATCH 53/56] [FIX] domain in view

bzr revid: abo@openerp.com-20121010112553-no3nhdvaj5kun1a8
---
 addons/project/report/project_cumulative.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 75bfe3b8879..c30c91fe6c0 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -49,7 +49,7 @@
                     <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
                     <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"/>
                     <separator/>
-                    <filter string="My Projects" domain="[('project_id','=',uid)]"/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                 </search>
             </field>
         </record>

From 4c7f416dd4b2689a38a6be14a4bcaeeb44583ca7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Oct 2012 13:30:25 +0200
Subject: [PATCH 54/56] [FIX] switch_view

bzr revid: al@openerp.com-20121010113025-qpz12d28uob7hab9
---
 addons/web/static/src/js/view_form.js |  2 +-
 addons/web/static/src/js/views.js     | 35 +++++++++++----------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1478ae6e4ac..9315ce15d1a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3565,7 +3565,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
         });
         this.__ignore_blur = false;
     },
-    switch_view: function(mode, unused) {
+    do_switch_view: function(mode, unused) {
         if (mode !== 'form') {
             return this._super(mode, unused);
         }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0474e43bee3..f985e5f6dc8 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -417,7 +417,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         this._super();
         var self = this;
         this.$el.find('.oe_view_manager_switch a').click(function() {
-            self.trigger('switch_mode', $(this).data('view-type'));
+            self.switch_mode($(this).data('view-type'));
         }).tipsy();
         var views_ids = {};
         _.each(this.views_src, function(view) {
@@ -439,8 +439,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         }
         // If no default view defined, switch to the first one in sequence
         var default_view = this.flags.default_view || this.views_src[0].view_type;
-        this.on('switch_mode', self, self.switch_mode);
-        return this.trigger('switch_mode', default_view);
+        return this.switch_mode(default_view);
     },
     switch_mode: function(view_type, no_store, view_options) {
         var self = this;
@@ -448,9 +447,9 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         var view_promise;
         var form = this.views['form'];
         if (!view || (form && form.controller && !form.controller.can_be_discarded())) {
+            self.trigger('switch_mode', view_type, no_store, view_options);
             return $.Deferred().reject();
         }
-
         if (!no_store) {
             this.views_history.push(view_type);
         }
@@ -468,13 +467,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             this.searchview[(view.controller.searchable === false || this.searchview.hidden) ? 'hide' : 'show']();
         }
 
-        this.$el
-            .find('.oe_view_manager_switch a').parent().removeClass('active');
+        this.$el.find('.oe_view_manager_switch a').parent().removeClass('active');
         this.$el
             .find('.oe_view_manager_switch a').filter('[data-view-type="' + view_type + '"]')
             .parent().addClass('active');
 
-        return $.when(view_promise).then(function () {
+        r = $.when(view_promise).then(function () {
             _.each(_.keys(self.views), function(view_name) {
                 var controller = self.views[view_name].controller;
                 if (controller) {
@@ -495,7 +493,9 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                     }
                 }
             });
+            self.trigger('switch_mode', view_type, no_store, view_options);
         });
+        return r;
     },
     do_create_view: function(view_type) {
         // Lazy loading of views
@@ -524,7 +524,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         if (view.embedded_view) {
             controller.set_embedded_view(view.embedded_view);
         }
-        controller.do_switch_view.add_last(_.bind(this.switch_view, this));
+        controller.on('switch_mode', self, this.switch_mode);
 
         controller.do_prev_view.add_last(this.on_prev_view);
         var container = this.$el.find(".oe_view_manager_view_" + view_type);
@@ -562,7 +562,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                 var view_to_select = views[index];
                 self.$el.show();
                 if (self.active_view !== view_to_select) {
-                    self.trigger('switch_mode', view_to_select);
+                    self.switch_mode(view_to_select);
                 }
             },
             get_title: function() {
@@ -592,14 +592,6 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             on_reverse_breadcrumb: on_reverse_breadcrumb,
         });
     },
-    /**
-     * Method used internally when a view asks to switch view. This method is meant
-     * to be extended by child classes to change the default behavior, which simply
-     * consist to switch to the asked view.
-     */
-    switch_view: function(view_type, no_store, options) {
-        return this.trigger('switch_mode', view_type, no_store, options);
-    },
     /**
      * Returns to the view preceding the caller view in this manager's
      * navigation history (the navigation history is appended to via
@@ -617,12 +609,12 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         if (options.created && current_view === 'form' && previous_view === 'list') {
             // APR special case: "If creation mode from list (and only from a list),
             // after saving, go to page view (don't come back in list)"
-            return this.trigger('switch_mode', 'form');
+            return this.switch_mode('form');
         } else if (options.created && !previous_view && this.action && this.action.flags.default_view === 'form') {
             // APR special case: "If creation from dashboard, we have no previous view
-            return this.trigger('switch_mode', 'form');
+            return this.switch_mode('form');
         }
-        return this.trigger('switch_mode', previous_view, true);
+        return this.switch_mode(previous_view, true);
     },
     /**
      * Sets up the current viewmanager's search view.
@@ -926,7 +918,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
         if (state.view_type && state.view_type !== this.active_view) {
             defs.push(
                 this.views[this.active_view].deferred.pipe(function() {
-                    return self.trigger('switch_mode', state.view_type, true)
+                    return self.switch_mode(state.view_type, true);
                 })
             );
         } 
@@ -1265,6 +1257,7 @@ instance.web.View = instance.web.Widget.extend({
      * @param {String} view view type to switch to
      */
     do_switch_view: function(view) { 
+        this.trigger('switch_mode',view);
     },
     /**
      * Cancels the switch to the current view, switches to the previous one

From 46b5ac9a377c9470b20aae0e8bdbdf0d359871af Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 10 Oct 2012 13:40:07 +0200
Subject: [PATCH 55/56] [FIX] Fixed on_button_cancel.

bzr revid: vta@openerp.com-20121010114007-3cw3qlxu2zwt1k0s
---
 addons/web/static/src/js/view_form.js               | 9 +++++----
 addons/web_kanban/static/src/js/kanban.js           | 4 ++--
 addons/web_view_editor/static/src/js/view_editor.js | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b41039361c0..b2faa93889e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -172,10 +172,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         } else {
             this.$el.find('.oe_form_buttons').replaceWith(this.$buttons);
         }
-        this.$buttons.on('click','.oe_form_button_create',this.on_button_create);
-        this.$buttons.on('click','.oe_form_button_edit',this.on_button_edit);
-        this.$buttons.on('click','.oe_form_button_save',this.on_button_save);
-        this.$buttons.on('click','.oe_form_button_cancel',this.on_button_cancel);
+        this.$buttons.on('click', '.oe_form_button_create', this.on_button_create);
+        this.$buttons.on('click', '.oe_form_button_edit', this.on_button_edit);
+        this.$buttons.on('click', '.oe_form_button_save', this.on_button_save);
+        this.$buttons.on('click', '.oe_form_button_cancel', this.on_button_cancel);
 
         this.$sidebar = this.options.$sidebar || this.$el.find('.oe_form_sidebar');
         if (!this.sidebar && this.options.$sidebar) {
@@ -755,6 +755,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 this.on_record_loaded(this.datarecord);
             }
         }
+        this.trigger('on_button_cancel');
         return false;
     },
     on_button_new: function() {
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index dae3d7b214d..d95546dfe41 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -194,7 +194,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel",self,am.dialog.on_close);
+        form.on("on_button_cancel", self, am.dialog.on_close);
         form.on_created.add_last(function(r) {
             (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r.result]).then(function(new_record) {
                 am.dialog.on_close();
@@ -672,7 +672,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel",self,am.dialog.on_close);
+        form.on("on_button_cancel", self, am.dialog.on_close);
         form.on_saved.add_last(function() {
             am.dialog.on_close();
             self.view.do_reload();
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index b3a4f0dcfac..40d333afa0f 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -1014,7 +1014,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         var action_manager = new instance.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_widget.views['form'].controller;
-            controller.on("on_button_cancel",self,function(){
+            controller.on("on_button_cancel", self, function(){
                 action_manager.destroy();
             });
             controller.do_save.add_last(function(){

From f486bf1c9f7f4908e667576c45f07146c459e599 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 10 Oct 2012 14:08:49 +0200
Subject: [PATCH 56/56] [FIX] o2m switch_view

bzr revid: al@openerp.com-20121010120849-8qekbmy570zozicn
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4bdc122b690..a095ab129c1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3566,7 +3566,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
         });
         this.__ignore_blur = false;
     },
-    do_switch_view: function(mode, unused) {
+    switch_mode: function(mode, unused) {
         if (mode !== 'form') {
             return this._super(mode, unused);
         }
@@ -4204,7 +4204,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             self.initial_is_loaded.resolve();
             loaded.resolve();
         });
-        this.kanban_view.do_switch_view.add_last(_.bind(this.open_popup, this));
+        this.kanban_view.on('switch_mode', this, this.open_popup);
         $.async_when().then(function () {
             self.kanban_view.appendTo(self.$el);
         });