From 7921e449957080b5327f6a5faee8f90ebf96a165 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 09:38:37 +0100
Subject: [PATCH 01/56] [IMP] mail: break-word, css, help, button name

bzr revid: chm@openerp.com-20121122083837-578ffj6wcu5hs0z4
---
 addons/mail/static/src/css/mail.css | 2 ++
 addons/mail/static/src/js/mail.js   | 1 -
 addons/mail/static/src/xml/mail.xml | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 94a5c2d1f41..9785a9c1bc8 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -93,6 +93,8 @@
 
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p {
     margin-bottom: 0px;
+    text-overflow:ellipsis;
+    word-wrap: break-word;
 }
 
 /* a) Indented Messages */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 44bb4e9ae09..ce7db3d101d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -508,7 +508,6 @@ openerp.mail = function (session) {
                 res_model: 'mail.compose.message',
                 view_mode: 'form',
                 view_type: 'form',
-                action_from: 'mail.ThreadComposeMessage',
                 views: [[false, 'form']],
                 target: 'new',
                 context: context,
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bb787c9a21b..ad78c993695 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -34,14 +34,14 @@
                     <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
                     <!--<a class="oe_cancel oe_e">X</a>-->
-                    <button class="oe_full"><span class='oe_e'>&amp;ograve</span></button>
+                    <button class="oe_full" title="Open the full mail composer"><span class='oe_e'>&amp;ograve</span></button>
                 </div>
             </div>
         </div>
         <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea t-if="widget.options.compose_placeholder" class="field_text oe_compact" t-att-placeholder="widget.options.compose_placeholder"/>
             <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write an internal note..."/>
-            <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share to my followers..."/>
+            <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share with my followers..."/>
         </div>
         <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
     </t>
@@ -197,7 +197,7 @@
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">X</a></span>
+                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">W</a></span>
                     <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span>
                     <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.options.show_reply_button"><a title="Reply" class="oe_e">(</a></span>

From dddb611df94f8e12284bece8f32d0c02787e5984 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 09:49:52 +0100
Subject: [PATCH 02/56] [IMP] mail: break-word for all html tag content

bzr revid: chm@openerp.com-20121122084952-7cpf5817igua9fkj
---
 addons/mail/static/src/css/mail.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9785a9c1bc8..f9426e983bb 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -93,6 +93,8 @@
 
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p {
     margin-bottom: 0px;
+}
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body * {
     text-overflow:ellipsis;
     word-wrap: break-word;
 }

From 5d4b5824677266d0998a73c62307d2739be39d69 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 10:02:01 +0100
Subject: [PATCH 03/56] [FIX] mail: auto-focus for composer

bzr revid: chm@openerp.com-20121122090201-gbpr2f9bmad6aw0k
---
 addons/mail/static/src/js/mail.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ce7db3d101d..5a846940652 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -590,11 +590,11 @@ openerp.mail = function (session) {
         */
         on_compose_expandable: function (event) {
 
-            if (!this.stay_open && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
+            if ((!this.stay_open || event.type == 'click') && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
                 this.show_composer = !this.show_composer || this.stay_open;
                 this.reinit();
             }
-            if (!this.stay_open && this.show_composer) {
+            if (!this.stay_open && this.show_composer && event.type != 'blur') {
                 this.$('textarea:not(.oe_compact):first').focus();
             }
             return true;
@@ -724,7 +724,7 @@ openerp.mail = function (session) {
         on_message_reply:function (event) {
             event.stopPropagation();
             this.create_thread();
-            this.thread.on_compose_message();
+            this.thread.on_compose_message(event);
             return false;
         },
 
@@ -1135,9 +1135,9 @@ openerp.mail = function (session) {
         * Call the on_compose_expandable method to allow the user to write his message.
         * (Is call when a user click on "Reply" button)
         */
-        on_compose_message: function () {
+        on_compose_message: function (event) {
             this.instantiate_compose_message();
-            this.compose_message.on_compose_expandable();
+            this.compose_message.on_compose_expandable(event);
             return false;
         },
 

From 1111869325be07700ea0471ede19fff0abc52503 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 10:52:20 +0100
Subject: [PATCH 04/56] [IMP] mail: cursor=pointer for attachment input

bzr revid: chm@openerp.com-20121122095220-jbwh8rcnfa4fuy2o
---
 addons/mail/static/src/css/mail.css | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index f9426e983bb..3ee86dd5e18 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -70,7 +70,7 @@
     margin-left: 40px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
-    padding-left: 4px;
+    margin-left: 4px;
     padding-top: 3px;
     overflow: hidden;
     margin-bottom: 4px;
@@ -384,6 +384,10 @@
     line-height: 12px;
     vertical-align: middle;
 }
+.openerp .oe_mail .oe_msg_footer button.oe_post{
+    position: relative;
+    z-index: 2;
+}
 .openerp .oe_mail .oe_msg_footer button.oe_attach{
     width: 24px;
     overflow: hidden;
@@ -422,13 +426,17 @@
     color: #7C7BAD;
     margin-left: -3px;
 }
+.openerp .oe_mail .oe_msg_footer .oe_attachment_file{
+    cursor: pointer;
+}
 .openerp .oe_mail .oe_msg_footer .oe_attachment_file .oe_form_binary_file{
     display: inline-block;
-    margin-left: -47px;
-    height: 28px;
-    width: 52px;
-    margin-top: -6px;
+    margin-left: -122px;
+    height: 22px;
+    width: 128px;
+    margin-top: -4px;
     filter:none;
+    cursor: pointer;
 }
 .openerp .oe_mail .oe_mail_list_recipients{
     font-size: 12px;

From 70bfb1453871b2f00371ffdd25c0959537ada0f5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 10:59:42 +0100
Subject: [PATCH 05/56] [IMP] mail: cursor=pointer for attachment input

bzr revid: chm@openerp.com-20121122095942-fktfff4xrt0krxtv
---
 addons/web/static/src/css/base.css  | 10 ++++++----
 addons/web/static/src/css/base.sass | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index f361a3c879d..3392a2ae817 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2367,6 +2367,7 @@
   width: 100%;
   left: 2px;
   top: 7px;
+  overflow: hidden;
 }
 .openerp .oe_fileupload .oe_add button {
   display: inline;
@@ -2393,10 +2394,11 @@
 }
 .openerp .oe_fileupload .oe_add input.oe_form_binary_file {
   display: inline-block;
-  margin-left: -5px;
-  height: 28px;
-  width: 52px;
-  margin-top: -26px;
+  margin-left: -85px;
+  height: 22px;
+  width: 152px;
+  margin-top: -24px;
+  cursor: pointer;
 }
 .openerp .oe_fileupload .oe_add .oe_attach_label {
   color: #7c7bad;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b2f71befbaa..5b89f4e8185 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1893,6 +1893,7 @@ $sheet-padding: 16px
             width: 100%
             left: +2px
             top: +7px
+            overflow: hidden
             button
                 display: inline
                 height: 24px
@@ -1915,10 +1916,11 @@ $sheet-padding: 16px
                     left: -9px
             input.oe_form_binary_file
                 display: inline-block
-                margin-left: -5px
-                height: 28px
-                width: 52px
-                margin-top: -26px
+                margin-left: -85px
+                height: 22px
+                width: 152px
+                margin-top: -24px
+                cursor: pointer
             .oe_attach_label
                 color: #7C7BAD
                 margin-left: -3px

From 5fe04e7ce47d3eb5d1fe2e36706875f923c9c58f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 11:04:48 +0100
Subject: [PATCH 06/56] [IMP] mail: add fadeIn

bzr revid: chm@openerp.com-20121122100448-10szzpxz5o5dif4b
---
 addons/mail/static/src/js/mail.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5a846940652..ab79b14cc42 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1240,6 +1240,7 @@ openerp.mail = function (session) {
             } else {
                 message.appendTo(self.$el);
             }
+            message.$el.hide().fadeIn(500);
 
             return message
         },

From 22fe97c509246d41796fd99d9a95bb1fdb0ad687 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 14:18:27 +0100
Subject: [PATCH 07/56] [FIX] mail: concatenation of expandable messages

bzr revid: chm@openerp.com-20121122131827-cap2xfzgjh6ajoss
---
 addons/mail/static/src/js/mail.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ab79b14cc42..da03bf53df4 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -573,12 +573,7 @@ openerp.mail = function (session) {
                             var message = thread.create_message_object( data[0] );
                             // insert the message on dom
                             thread.insert_message( message, root ? undefined : self.$el, root );
-                            if (thread.parent_message) {
-                                self.$el.remove();
-                                self.parent_thread.compose_message = null;
-                            } else {
-                                self.on_cancel();
-                            }
+                            self.on_cancel();
                         });
                         //session.web.unblockUI();
                     });
@@ -1291,8 +1286,10 @@ openerp.mail = function (session) {
             var messages = _.sortBy( this.messages, function (val) { return val.id; });
             var it = _.indexOf( messages, message );
 
-            var msg_up = messages[it-1];
-            var msg_down = messages[it+1];
+            var msg_up = message.$el.prev('.oe_msg');
+            var msg_down = message.$el.next('.oe_msg');
+            var msg_up = msg_up.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_up[0]; }) : false;
+            var msg_down = msg_down.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_down[0]; }) : false;
 
             var message_dom = [ ["id", "=", message.id] ];
 

From 21f21df84e9bb957bbdc9a6e9b50d3414da4e978 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 14:37:54 +0100
Subject: [PATCH 08/56] [FIX] mail: position of icons for firefox

bzr revid: chm@openerp.com-20121122133754-tatgu6zw8fix6gld
---
 addons/mail/static/src/css/mail.css | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 3ee86dd5e18..96679503664 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -395,8 +395,9 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{
     position: relative;
-    top: -1px;
-    left: -9px;
+    top: -4px;
+    margin-left: -9px;
+    vertical-align: middle;
     filter:none;
 }
 .openerp .oe_mail .oe_hidden_input_file, .openerp .oe_mail .oe_hidden_input_file form{
@@ -410,8 +411,9 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_full .oe_e{
     position: relative;
-    top: -1px;
-    left: -9px;
+    top: -4px;
+    margin-left: -9px;
+    vertical-align: middle;
     filter:none;
 }
 .openerp .oe_mail button.oe_attach, .openerp .oe_mail button.oe_full{

From eb5d37bc8e3c07a8615494fa8683d997c5f1deea Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 14:53:06 +0100
Subject: [PATCH 09/56] [IMP] mail: a little more contrast between message and
 parent message

bzr revid: chm@openerp.com-20121122135306-j4vt4s0sg9pegvvr
---
 addons/mail/static/src/css/mail.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 96679503664..1d8cc808e38 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -48,7 +48,7 @@
 
 .openerp .oe_mail .oe_msg{
     position: relative;
-    background: #F4F5FA;
+    background: #EAEAFD;
     border-radius: 2px;
     margin-bottom: 2px;
     min-height: 42px;

From 4cd4d6f2844c4b2883132db0901db5ad843f8215 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 15:03:49 +0100
Subject: [PATCH 10/56] [FIX] mail: oppen attachment when the user click on the
 image and on the name

bzr revid: chm@openerp.com-20121122140349-33n811gc67h0ubdv
---
 addons/mail/static/src/xml/mail.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ad78c993695..a2072ef24ae 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -75,9 +75,11 @@
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
             <t t-if="attachment.filetype !== 'webimage'">
                 <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img></a>
+                    <a t-att-href='attachment.url'>
+                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
+                        <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    </a>
                     <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
-                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -85,9 +87,11 @@
             </t>
             <t t-if="attachment.filetype === 'webimage'">
                 <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img></a>
+                    <a t-att-href='attachment.url'>
+                        <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
+                        <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    </a>
                     <div class='oe_delete oe_e'>[</div>
-                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>

From 81a9ce4aa4cca44b5fb5f127275dc084512400d7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 15:30:07 +0100
Subject: [PATCH 11/56] [IMP] mail: add show_compose_message for the button on
 wall (for custom portal)

bzr revid: chm@openerp.com-20121122143007-xae6er8c5ui63uz2
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a2072ef24ae..8c79b6508b5 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -152,7 +152,7 @@
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
-            <tr class="oe_header_row" t-if="widget.action.params.view_inbox" >
+            <tr class="oe_header_row" t-if="widget.action.params.view_inbox and widget.action.params.show_compose_message" >
                 <td colspan="2">
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message

From 18ec2c978e8982624173fe10b6643a70f2d83c72 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 22 Nov 2012 16:47:12 +0100
Subject: [PATCH 12/56] [IMP] mail: add an show_link_partner params to display
 partner (authors, followers...) on link or not, for portal

bzr revid: chm@openerp.com-20121122154712-4wmjfy0v8trwq4cw
---
 addons/mail/static/src/js/mail.js   |  2 ++
 addons/mail/static/src/xml/mail.xml | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da03bf53df4..ba26cc9d580 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1394,6 +1394,7 @@ openerp.mail = function (session) {
          *...  @param {Array} [message_ids] List of ids to fetch by the root thread.
          *      When you use this option, the domain is not used for the fetch root.
          *     @param {String} [no_message] Message to display when there are no message
+         *     @param {Boolean} [show_link_partner] Display partner (authors, followers...) on link or not
          */
         init: function (parent, action) {
             this._super(parent, action);
@@ -1411,6 +1412,7 @@ openerp.mail = function (session) {
                 'show_compose_message' : false,
                 'show_compact_message' : false,
                 'compose_placeholder': false,
+                'show_link_partner': true,
                 'view_inbox': false,
                 'message_ids': undefined,
             }, this.action.params);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 8c79b6508b5..cb24406152f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -115,7 +115,11 @@
             </t>
             <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
             <t t-set="inc" t-value="0"/>
-            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner">
+                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
+                    <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
+                    <t t-if="!widget.options.show_link_partner" t-raw="partner[1]"/>
+                </span><t t-set="inc" t-value="inc+1"/>
             </t>
             <t t-if="widget.partner_ids.length>=3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
@@ -194,9 +198,10 @@
         <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type}">
 
             <div class='oe_msg_left'>
-                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
                     <img class="oe_msg_icon" t-att-src="widget.avatar"/>
                 </a>
+                <img t-if="!widget.options.show_link_partner" class="oe_msg_icon" t-att-src="widget.avatar"/>
             </div>
 
             <div class="oe_msg_center">
@@ -221,7 +226,8 @@
                     <t t-if="widget.attachment_ids.length > 0">
                         <div class="oe_msg_attachment_list"></div>
                     </t>
-                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> 
+                    <a t-if="widget.author_id and widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-if="widget.author_id and !widget.options.show_link_partner"><t t-raw="widget.author_id[1]"/></span>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                     <span class='oe_subtle'>•</span>

From a0fd0a7233261a45ecca927a8851aeef56b391da Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 23 Nov 2012 11:38:45 +0100
Subject: [PATCH 13/56] [IMP] note: remove default fancy mode

bzr revid: chm@openerp.com-20121123103845-1wwcfhm9g98g9gue
---
 addons/note/security/note_security.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
index 8f6aa5b3d01..5136ab95708 100644
--- a/addons/note/security/note_security.xml
+++ b/addons/note/security/note_security.xml
@@ -7,9 +7,9 @@
 	<field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="base.group_user" model="res.groups">
+    <!--record id="base.group_user" model="res.groups">
 	<field name="implied_ids" eval="[(4, ref('group_note_fancy'))]"/>
-    </record>
+    </record-->
 
 </data>
 </openerp>

From 83ed2c955be069f2ef8e63318cede6416dd97bf2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 23 Nov 2012 12:01:56 +0100
Subject: [PATCH 14/56] [FIX] mail: event click on compose button on wall for
 firefox

bzr revid: chm@openerp.com-20121123110156-kz32k4871slnlxa4
---
 addons/mail/static/src/js/mail.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ba26cc9d580..bb1a8067644 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -585,11 +585,11 @@ openerp.mail = function (session) {
         */
         on_compose_expandable: function (event) {
 
-            if ((!this.stay_open || event.type == 'click') && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
+            if ((!this.stay_open || (event && event.type == 'click')) && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
                 this.show_composer = !this.show_composer || this.stay_open;
                 this.reinit();
             }
-            if (!this.stay_open && this.show_composer && event.type != 'blur') {
+            if (!this.stay_open && this.show_composer && (!event || event.type != 'blur')) {
                 this.$('textarea:not(.oe_compact):first').focus();
             }
             return true;

From 1e928df1ff88fba1d9d701e961feff9016e29927 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 23 Nov 2012 13:18:51 +0100
Subject: [PATCH 15/56] [IMP] mail: change placeholder message

bzr revid: chm@openerp.com-20121123121851-smh2dra04gv3bd9w
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cb24406152f..cca908a5d98 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -40,7 +40,7 @@
         </div>
         <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea t-if="widget.options.compose_placeholder" class="field_text oe_compact" t-att-placeholder="widget.options.compose_placeholder"/>
-            <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write an internal note..."/>
+            <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this document..."/>
             <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share with my followers..."/>
         </div>
         <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>

From 89fce592833ffab07aa1f0baf7c49d96f77bfdfb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 28 Nov 2012 12:34:21 +0100
Subject: [PATCH 16/56] [IMP] mail: not display the 'no message' before to
 fetch the wall messages.

bzr revid: chm@openerp.com-20121128113421-rcoo4003npxtnfzb
---
 addons/mail/static/src/js/mail.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index bb1a8067644..9fcf8cbb7c5 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1257,6 +1257,9 @@ openerp.mail = function (session) {
                 // insert the message on dom
                 thread.insert_message( message, typeof dom_insert_after == 'object' ? dom_insert_after : false);
             });
+            if (!records.length && this.options.root_thread == this) {
+                this.no_message();
+            }
         },
 
         /**
@@ -1440,7 +1443,6 @@ openerp.mail = function (session) {
             });
 
             this.thread.appendTo( this.$el );
-            this.thread.no_message();
 
             if (this.action.params.show_compose_message) {
                 this.thread.instantiate_compose_message();

From 6b5bdc7e845aa05dcb8c39e8a41988ed6f9bbc4a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 28 Nov 2012 15:51:01 +0100
Subject: [PATCH 17/56] [IMP] mail: add option copose_as_todo, to mark as todo
 the messages wrote by the composer of the root thread

bzr revid: chm@openerp.com-20121128145101-7lnw7zfrjp5k8fg3
---
 addons/mail/mail_thread_view.xml  | 9 ++++++---
 addons/mail/static/src/js/mail.js | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a232aa12642..4106eb2e024 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -42,7 +42,8 @@
             <field name="params" eval="&quot;{
                 'domain': [('partner_ids.user_ids', 'in', [uid])],
                 'view_mailbox': True,
-                'read_action': 'read', }&quot;"/>
+                'read_action': 'read',
+                'show_compose_message': False }&quot;"/>
             <field name="help" type="html">
                 <p>
                     <b>No private message.</b>
@@ -64,7 +65,8 @@
             <field name="params" eval="&quot;{
                 'domain': [('favorite_user_ids', 'in', [uid])],
                 'view_mailbox': True,
-                'read_action': 'read', }&quot;"/>
+                'read_action': 'read',
+                'compose_as_todo': True }&quot;"/>
             <field name="help" type="html">
                 <p>
                     <b>No todo.</b>
@@ -84,7 +86,8 @@
             }</field>
             <field name="params" eval="&quot;{
                 'domain': ['|', ('notification_ids.partner_id.user_ids', 'in', [uid]), ('author_id.user_ids', 'in', [uid])],
-                'view_mailbox': True, }&quot;"/>
+                'view_mailbox': True,
+                'show_compose_message': False }&quot;"/>
             <field name="help" type="html">
                 <p>
                     No message found and no message sent yet.
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9fcf8cbb7c5..155b379b2e2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -952,7 +952,7 @@ openerp.mail = function (session) {
 
             this.options = options.options;
             this.options.root_thread = (options.options.root_thread != undefined ? options.options.root_thread : this);
-            this.options.show_compose_message = this.options.show_compose_message && (this.options.display_indented_thread >= this.thread_level || !this.thread_level);
+            this.options.show_compose_message = this.options.show_compose_message && !this.thread_level;
             
             // record options and data
             this.parent_message= parent.thread!= undefined ? parent : false ;
@@ -989,7 +989,7 @@ openerp.mail = function (session) {
             // add message composition form view
             if (!this.compose_message) {
                 this.compose_message = new mail.ThreadComposeMessage(this, this, {
-                    'context': this.context,
+                    'context': this.options.compose_as_todo && !this.thread_level ? _.extend(this.context, { 'default_favorite_user_ids': [this.session.uid] }) : this.context,
                     'options': this.options,
                 });
                 if (!this.thread_level || this.thread_level > this.options.display_indented_thread) {
@@ -1398,6 +1398,7 @@ openerp.mail = function (session) {
          *      When you use this option, the domain is not used for the fetch root.
          *     @param {String} [no_message] Message to display when there are no message
          *     @param {Boolean} [show_link_partner] Display partner (authors, followers...) on link or not
+         *     @param {Boolean} [compose_as_todo] The root composer mark automatically the message as todo
          */
         init: function (parent, action) {
             this._super(parent, action);
@@ -1418,6 +1419,7 @@ openerp.mail = function (session) {
                 'show_link_partner': true,
                 'view_inbox': false,
                 'message_ids': undefined,
+                'compose_as_todo' : false,
             }, this.action.params);
 
             this.action.params.help = this.action.help || false;

From a293a948a68805ee2fff5c0a57116abcd870c3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 28 Nov 2012 16:19:39 +0100
Subject: [PATCH 18/56] [IMP] mail: when starring a message, create an unread
 notification if it does not exist; otherwise, set the notification as unread.

bzr revid: tde@openerp.com-20121128151939-v24cfx8k2aul8veg
---
 addons/mail/mail_message.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index ba6d101541c..3273870f5e0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -206,6 +206,14 @@ class mail_message(osv.Model):
             new_is_favorite = not (uid in message.get('favorite_user_ids'))
             if new_is_favorite:
                 self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(4, uid)]}, context=context)
+                # when setting a favorite, set the related notification as unread, or create an unread notification if not existing
+                notification_obj = self.pool.get('mail.notification')
+                pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+                notif_id = notification_obj.search(cr, SUPERUSER_ID, [('message_id', '=', message.get('id')), ('partner_id', '=', pid)], context=context)
+                if notif_id:
+                    notification_obj.write(cr, SUPERUSER_ID, notif_id, {'read': False}, context=context)
+                else:
+                    notification_obj.create(cr, SUPERUSER_ID, {'message_id': message.get('id'), 'partner_id': pid, 'read': False}, context=context)
             else:
                 self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(3, uid)]}, context=context)
         return new_is_favorite or False

From 37e7d2048b3882f512b684a36b04d77333bd5b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 28 Nov 2012 16:38:43 +0100
Subject: [PATCH 19/56] [DOC] mail.js: updated the comment of
 on_message_read_unread.

bzr revid: tde@openerp.com-20121128153843-4p24erdrkpzmrhnu
---
 addons/mail/static/src/js/mail.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 155b379b2e2..84b27b00da7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -827,9 +827,10 @@ openerp.mail = function (session) {
             return false;
         },
 
-        /*The selected thread and all childs (messages/thread) became read
-        * @param {object} mouse envent
-        */
+        /* Set the selected thread and all childs as read or unread, based on
+         * read parameter.
+         * @param {boolean} read_value
+         */
         on_message_read_unread: function (read_value) {
             var self = this;
             var messages = [this].concat(this.get_childs());

From c491c532c0d3968588d03fc8304abe4bf2745fa5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 28 Nov 2012 17:01:34 +0100
Subject: [PATCH 20/56] [FIX] mail: don't display false value as body

bzr revid: chm@openerp.com-20121128160134-kbjfov5vvuxtcow6
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 84b27b00da7..63f80fd4678 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -204,7 +204,7 @@ openerp.mail = function (session) {
             this.subject = datasets.subject ||  false,
             this.name = datasets.name ||  false,
             this.record_name = datasets.record_name ||  false,
-            this.body = datasets.body ||  false,
+            this.body = datasets.body || '',
             this.vote_nb = datasets.vote_nb || 0,
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,

From 3e0cc5ee13d8b1475c1103085bd3e5322835e378 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 28 Nov 2012 17:06:49 +0100
Subject: [PATCH 21/56] [IMP] mail: change contrast for messages in thread and
 parent message

bzr revid: chm@openerp.com-20121128160649-6mo704133jjhzr6j
---
 addons/mail/static/src/css/mail.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 1d8cc808e38..638d016921b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -48,7 +48,7 @@
 
 .openerp .oe_mail .oe_msg{
     position: relative;
-    background: #EAEAFD;
+    background: #EDEDF6;
     border-radius: 2px;
     margin-bottom: 2px;
     min-height: 42px;

From 92e87f7e6fa762af05b03a6a82d1e135f78172cb Mon Sep 17 00:00:00 2001
From: tsabi <>
Date: Thu, 29 Nov 2012 01:22:00 +0100
Subject: [PATCH 22/56] Mark strings to be translated. Maybe some missed, but
 most of them marked.

bzr revid: tsabi-20121129002200-20tppzvh0ap5tfwe
---
 addons/web/controllers/main.py                | 23 +++++++------
 addons/web/static/src/js/chrome.js            | 34 +++++++++----------
 addons/web/static/src/js/dates.js             | 13 +++----
 addons/web/static/src/js/formats.js           | 14 ++++----
 addons/web/static/src/js/view_form.js         | 24 ++++++-------
 addons/web/static/src/js/view_list.js         | 14 ++++----
 .../web/static/src/js/view_list_editable.js   |  6 ++--
 addons/web/static/src/js/views.js             | 12 +++----
 addons/web_calendar/static/src/js/calendar.js |  4 +--
 addons/web_kanban/static/src/js/kanban.js     |  2 +-
 .../static/src/js/view_editor.js              | 10 +++---
 11 files changed, 80 insertions(+), 76 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index e36b46ed51a..def93c16ea4 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -28,6 +28,7 @@ except ImportError:
     xlwt = None
 
 import openerp
+from openerp.tools.translate import _
 
 from .. import http
 from .. import nonliterals
@@ -821,7 +822,7 @@ class Database(openerpweb.Controller):
         except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Drop Database'}
-        return {'error': 'Could not drop database !', 'title': 'Drop Database'}
+        return {'error': _('Could not drop database !'), 'title': _('Drop Database')}
 
     @openerpweb.httprequest
     def backup(self, req, backup_db, backup_pwd, token):
@@ -839,7 +840,7 @@ class Database(openerpweb.Controller):
                {'fileToken': int(token)}
             )
         except xmlrpclib.Fault, e:
-            return simplejson.dumps([[],[{'error': e.faultCode, 'title': 'backup Database'}]])
+            return simplejson.dumps([[],[{'error': e.faultCode, 'title': _('Backup Database')}]])
 
     @openerpweb.httprequest
     def restore(self, req, db_file, restore_pwd, new_db):
@@ -860,8 +861,8 @@ class Database(openerpweb.Controller):
             return req.session.proxy("db").change_admin_password(old_password, new_password)
         except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
-                return {'error': e.faultCode, 'title': 'Change Password'}
-        return {'error': 'Error, password not changed !', 'title': 'Change Password'}
+                return {'error': e.faultCode, 'title': _('Change Password')}
+        return {'error': _('Error, password not changed !'), 'title': _('Change Password')}
 
 class Session(openerpweb.Controller):
     _cp_path = "/web/session"
@@ -897,16 +898,16 @@ class Session(openerpweb.Controller):
         old_password, new_password,confirm_password = operator.itemgetter('old_pwd', 'new_password','confirm_pwd')(
                 dict(map(operator.itemgetter('name', 'value'), fields)))
         if not (old_password.strip() and new_password.strip() and confirm_password.strip()):
-            return {'error':'You cannot leave any password empty.','title': 'Change Password'}
+            return {'error':_('You cannot leave any password empty.'),'title': _('Change Password')}
         if new_password != confirm_password:
-            return {'error': 'The new password and its confirmation must be identical.','title': 'Change Password'}
+            return {'error': _('The new password and its confirmation must be identical.'),'title': _('Change Password')}
         try:
             if req.session.model('res.users').change_password(
                 old_password, new_password):
                 return {'new_password':new_password}
         except Exception:
-            return {'error': 'The old password you provided is incorrect, your password was not changed.', 'title': 'Change Password'}
-        return {'error': 'Error, password not changed !', 'title': 'Change Password'}
+            return {'error': _('The old password you provided is incorrect, your password was not changed.'), 'title': _('Change Password')}
+        return {'error': _('Error, password not changed !'), 'title': _('Change Password')}
 
     @openerpweb.jsonrequest
     def sc_list(self, req):
@@ -918,7 +919,7 @@ class Session(openerpweb.Controller):
         try:
             return req.session.proxy("db").list_lang() or []
         except Exception, e:
-            return {"error": e, "title": "Languages"}
+            return {"error": e, "title": _("Languages")}
 
     @openerpweb.jsonrequest
     def modules(self, req):
@@ -1450,7 +1451,7 @@ class SearchView(View):
                         if not isinstance(parsed_domain, nonliterals.BaseDomain)
                         else req.session.eval_domain(parsed_domain))
             except Exception:
-                logger.exception("Failed to parse custom filter %s in %s",
+                logger.exception(_("Failed to parse custom filter %s in %s"),
                                  filter['name'], model)
                 filter['disabled'] = True
                 del filter['context']
@@ -1571,7 +1572,7 @@ class Binary(openerpweb.Controller):
             res = Model.default_get(fields, context)
         filecontent = base64.b64decode(res.get(field, ''))
         if not filecontent:
-            raise ValueError("No content found for field '%s' on '%s:%s'" %
+            raise ValueError(_("No content found for field '%s' on '%s:%s'") %
                 (field, model, id))
         else:
             filename = '%s_%s' % (model.replace('.', '_'), id)
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 940bf800851..91cca8468d1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -289,7 +289,7 @@ instance.web.CrashManager = instance.web.Class.extend({
 });
 
 instance.web.Loading = instance.web.Widget.extend({
-    template: 'Loading',
+    template: _t("Loading"),
     init: function(parent) {
         this._super(parent);
         this.count = 0;
@@ -390,11 +390,11 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
         self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore });
         self.$el.find("form[name=change_pwd_form]").validate({
             messages: {
-                old_pwd: "Please enter your previous password",
-                new_pwd: "Please enter your new password",
+                old_pwd: _t("Please enter your previous password"),
+                new_pwd: _t("Please enter your new password"),
                 confirm_pwd: {
-                    required: "Please confirm your new password",
-                    equalTo: "The confirmation does not match the password"
+                    required: _t("Please confirm your new password"),
+                    equalTo: _t("The confirmation does not match the password")
                 }
             },
             submitHandler: self.do_change_password
@@ -478,7 +478,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
                 self.display_error(result);
                 return;
             }
-            self.do_notify("Duplicating database", "The database has been duplicated.");
+            self.do_notify(_t("Duplicating database"), _t("The database has been duplicated."));
             self.start();
         });
     },
@@ -488,7 +488,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
             fields = $form.serializeArray(),
             $db_list = $form.find('[name=drop_db]'),
             db = $db_list.val();
-        if (!db || !confirm("Do you really want to delete the database: " + db + " ?")) {
+        if (!db || !confirm(_.str.sprintf(_t("Do you really want to delete the database: %s ?"), db))) {
             return;
         }
         self.rpc("/web/database/drop", {'fields': fields}).done(function(result) {
@@ -496,7 +496,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
                 self.display_error(result);
                 return;
             }
-            self.do_notify("Dropping database", "The database '" + db + "' has been dropped");
+            self.do_notify(_t("Dropping database"), _.str.sprintf(_t("The database %s has been dropped"), db));
             self.start();
         });
     },
@@ -511,7 +511,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
             error: function(error){
                if(error){
                   self.display_error({
-                        title: 'Backup Database',
+                        title: _t("Backup Database"),
                         error: 'AccessDenied'
                   });
                }
@@ -534,13 +534,13 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
 
                 if (body.indexOf('403 Forbidden') !== -1) {
                     self.display_error({
-                        title: 'Access Denied',
-                        error: 'Incorrect super-administrator password'
+                        title: _t("Access Denied"),
+                        error: _t("Incorrect super-administrator password")
                     });
                 } else {
                     self.display_error({
-                        title: 'Restore Database',
-                        error: 'Could not restore the database'
+                        title: _t("Restore Database"),
+                        error: _t("Could not restore the database")
                     });
                 }
             },
@@ -560,7 +560,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
                 return;
             }
             self.unblockUI();
-            self.do_notify("Changed Password", "Password has been changed successfully");
+            self.do_notify(_t("Changed Password"), _t("Password has been changed successfully"));
         });
     },
     do_exit: function () {
@@ -642,7 +642,7 @@ instance.web.Login =  instance.web.Widget.extend({
         }
         var db = this.$("form [name=db]").val();
         if (!db) {
-            this.do_warn("Login", "No database selected !");
+            this.do_warn(_t("Login"), _t("No database selected !"));
             return false;
         }
         var login = this.$("form input[name=login]").val();
@@ -678,7 +678,7 @@ instance.web.Login =  instance.web.Widget.extend({
             self.trigger('login_successful');
         }, function () {
             self.$(".oe_login_pane").fadeIn("fast", function() {
-                self.show_error("Invalid username or password");
+                self.show_error(_t("Invalid username or password"));
             });
         });
     },
@@ -765,7 +765,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
     template: "ChangePassword",
     start: function() {
         var self = this;
-        this.getParent().dialog_title = "Change Password";
+        this.getParent().dialog_title = _t("Change Password");
         var $button = self.$el.find('.oe_form_button');
         $button.appendTo(this.getParent().$buttons);
         $button.eq(2).click(function(){
diff --git a/addons/web/static/src/js/dates.js b/addons/web/static/src/js/dates.js
index 3db48c8412a..1a48463df2c 100644
--- a/addons/web/static/src/js/dates.js
+++ b/addons/web/static/src/js/dates.js
@@ -1,5 +1,6 @@
 
 openerp.web.dates = function(instance) {
+var _t = instance.web._t;
 
 /**
  * Converts a string to a Date javascript object using OpenERP's
@@ -18,11 +19,11 @@ instance.web.str_to_datetime = function(str) {
     var regex = /^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)(?:\.\d+)?$/;
     var res = regex.exec(str);
     if ( !res ) {
-        throw new Error("'" + str + "' is not a valid datetime");
+        throw new Error(_.str.sprintf(_t("'%s' is not a valid datetime"), str));
     }
     var obj = Date.parseExact(res[1] + " UTC", 'yyyy-MM-dd HH:mm:ss zzz');
     if (! obj) {
-        throw new Error("'" + str + "' is not a valid datetime");
+        throw new Error(_.str.sprintf(_t("'%s' is not a valid datetime"), str));
     }
     return obj;
 };
@@ -45,11 +46,11 @@ instance.web.str_to_date = function(str) {
     var regex = /^\d\d\d\d-\d\d-\d\d$/;
     var res = regex.exec(str);
     if ( !res ) {
-        throw new Error("'" + str + "' is not a valid date");
+        throw new Error(_.str.sprintf(_t("'%s' is not a valid date"), str));
     }
     var obj = Date.parseExact(str, 'yyyy-MM-dd');
     if (! obj) {
-        throw new Error("'" + str + "' is not a valid date");
+        throw new Error(_.str.sprintf(_t("'%s' is not a valid date"), str));
     }
     return obj;
 };
@@ -72,11 +73,11 @@ instance.web.str_to_time = function(str) {
     var regex = /^(\d\d:\d\d:\d\d)(?:\.\d+)?$/;
     var res = regex.exec(str);
     if ( !res ) {
-        throw new Error("'" + str + "' is not a valid time");
+        throw new Error(_.str.sprintf(_t("'%s' is not a valid time"), str));
     }
     var obj = Date.parseExact("1970-01-01 " + res[1], 'yyyy-MM-dd HH:mm:ss');
     if (! obj) {
-        throw new Error("'" + str + "' is not a valid time");
+        throw new Error(_.str.sprintf(_t("'%s' is not a valid time"), str));
     }
     return obj;
 };
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index e586b94db6b..9432b02826f 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -224,7 +224,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             } while(tmp !== value);
             tmp = Number(value);
             if (isNaN(tmp))
-                throw new Error(value + " is not a correct integer");
+                throw new Error(_.str.sprintf(_t("'%s' is not a correct integer"), value));
             return tmp;
         case 'float':
             var tmp = Number(value);
@@ -239,7 +239,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             var reformatted_value = tmp.replace(instance.web._t.database.parameters.decimal_point, ".");
             var parsed = Number(reformatted_value);
             if (isNaN(parsed))
-                throw new Error(value + " is not a correct float");
+                throw new Error(_.str.sprintf(_t("'%s' is not a correct float"), value));
             return parsed;
         case 'float_time':
             var factor = 1;
@@ -263,7 +263,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             datetime = Date.parse(value);
             if (datetime !== null)
                 return instance.web.datetime_to_str(datetime);
-            throw new Error(value + " is not a valid datetime");
+            throw new Error(_.str.sprintf(_t("'%s' is not a correct datetime"), value));
         case 'date':
             var date = Date.parseExact(value, date_pattern);
             if (date !== null)
@@ -271,7 +271,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             date = Date.parse(value);
             if (date !== null)
                 return instance.web.date_to_str(date);
-            throw new Error(value + " is not a valid date");
+            throw new Error(_.str.sprintf(_t("'%s' is not a correct date"), value));
         case 'time':
             var time = Date.parseExact(value, time_pattern);
             if (time !== null)
@@ -279,7 +279,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             time = Date.parse(value);
             if (time !== null)
                 return instance.web.time_to_str(time);
-            throw new Error(value + " is not a valid time");
+            throw new Error(_.str.sprintf(_t("'%s' is not a correct time"), value));
     }
     return value;
 };
@@ -294,7 +294,7 @@ instance.web.auto_str_to_date = function(value, type) {
     try {
         return instance.web.str_to_time(value);
     } catch(e) {}
-    throw new Error("'" + value + "' is not a valid date, datetime nor time");
+    throw new Error(_.str.sprintf(_t("'%s' is not a correct date, datetime nor time"), value));
 };
 
 instance.web.auto_date_to_str = function(value, type) {
@@ -306,7 +306,7 @@ instance.web.auto_date_to_str = function(value, type) {
         case 'time':
             return instance.web.time_to_str(value);
         default:
-            throw new Error(type + " is not convertible to date, datetime nor time");
+            throw new Error(_.str.sprintf(_t("'%s' is not convertible to date, datetime nor time"), type));
     }
 };
 
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 927d585a5be..dd9b2be5fb0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -148,7 +148,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     load_form: function(data) {
         var self = this;
         if (!data) {
-            throw new Error("No data provided.");
+            throw new Error(_t("No data provided."));
         }
         if (this.arch) {
             throw "Form view does not support multiple calls to load_form";
@@ -316,12 +316,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         var self = this, set_values = [];
         if (!record) {
             this.set({ 'title' : undefined });
-            this.do_warn("Form", "The record could not be found in the database.", true);
+            this.do_warn(_t("Form"), _t("The record could not be found in the database."), true);
             return $.Deferred().reject();
         }
         this.datarecord = record;
         this._actualize_mode();
-        this.set({ 'title' : record.id ? record.display_name : "New" });
+        this.set({ 'title' : record.id ? record.display_name : _t("New") });
 
         _(this.fields).each(function (field, f) {
             field._dirty_flag = false;
@@ -431,7 +431,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         var onchange = _.str.trim(on_change);
         var call = onchange.match(/^\s?(.*?)\((.*?)\)\s?$/);
         if (!call) {
-            throw new Error("Wrong on change format: " + onchange);
+            throw new Error(_.str.sprintf( _t("Wrong on change format: %s"), onchange ));
         }
 
         var method = call[1];
@@ -872,7 +872,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             }).value();
         warnings.unshift('<ul>');
         warnings.push('</ul>');
-        this.do_warn("The following fields are invalid :", warnings.join(''));
+        this.do_warn(_t("The following fields are invalid:", warnings.join(''));
     },
     /**
      * Reload the form after saving
@@ -1241,11 +1241,11 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         _.each(this.fields_to_init, function($elem) {
             var name = $elem.attr("name");
             if (!self.fvg.fields[name]) {
-                throw new Error("Field '" + name + "' specified in view could not be found.");
+                throw new Error(_.str.sprintf(_t("Field '%s' specified in view could not be found."), name));
             }
             var obj = self.fields_registry.get_any([$elem.attr('widget'), self.fvg.fields[name].type]);
             if (!obj) {
-                throw new Error("Widget type '"+ $elem.attr('widget') + "' is not implemented");
+                throw new Error(_.str.sprintf(_t("Widget type '%s' is not implemented"), $elem.attr('widget')));
             }
             var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             var $label = self.labels[$elem.attr("name")];
@@ -2319,7 +2319,7 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
     },
     on_button_clicked: function() {
         if (!this.get('value') || !this.is_syntax_valid()) {
-            this.do_warn("E-mail error", "Can't send email to invalid e-mail address");
+            this.do_warn(_t("E-mail error"), _t("Can't send email to invalid e-mail address"));
         } else {
             location.href = 'mailto:' + this.get('value');
         }
@@ -2348,7 +2348,7 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
     },
     on_button_clicked: function() {
         if (!this.get('value')) {
-            this.do_warn("Resource error", "This resource is empty");
+            this.do_warn(_t("Resource error"), _t("This resource is empty"));
         } else {
             var url = $.trim(this.get('value'));
             if(/^www\./i.test(url))
@@ -3385,7 +3385,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
         var views = [];
         _.each(modes, function(mode) {
             if (! _.include(["list", "tree", "graph", "kanban"], mode)) {
-                throw new Error(_.str.sprintf("View type '%s' is not supported in One2Many.", mode));
+                throw new Error(_.str.sprintf(_t("View type '%s' is not supported in One2Many."), mode));
             }
             var view = {
                 view_id: false,
@@ -4840,7 +4840,7 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
     },
     on_file_uploaded: function(size, name, content_type, file_base64) {
         if (size === false) {
-            this.do_warn("File Upload", "There was a problem while uploading your file");
+            this.do_warn(_t("File Upload"), _t("There was a problem while uploading your file"));
             // TODO: use openerp web crashmanager
             console.warn("Error while uploading file : ", name);
         } else {
@@ -5009,7 +5009,7 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie
         this.field_manager = field_manager;
         this.node = node;
         if(this.field.type != "many2many" || this.field.relation != 'ir.attachment') {
-            throw "The type of the field '"+this.field.string+"' must be a many2many field with a relation to 'ir.attachment' model.";
+            throw _.str.sprintf(_t("The type of the field '%s' must be a many2many field with a relation to 'ir.attachment' model."), this.field.string);
         }
         this.ds_file = new instance.web.DataSetSearch(this, 'ir.attachment');
         this.fileupload_id = _.uniqueId('oe_fileupload_temp');
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 13c41d48599..5008d1765a6 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -389,7 +389,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             if (range_stop > total) {
                 range_stop = total;
             }
-            spager = _.str.sprintf('%d-%d of %d', range_start, range_stop, total);
+            spager = _.str.sprintf(_t("%d-%d of %d"), range_start, range_stop, total);
         }
 
         this.$pager.find('.oe_list_pager_state').text(spager);
@@ -887,8 +887,8 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                 var $row;
                 if (attribute === 'id') {
                     if (old_value) {
-                        throw new Error("Setting 'id' attribute on existing record "
-                            + JSON.stringify(record.attributes));
+                        throw new Error(_.str.sprintf( _t("Setting 'id' attribute on existing record %s"),
+                            JSON.stringify(record.attributes) ));
                     }
                     if (!_.contains(self.dataset.ids, value)) {
                         // add record to dataset if not already in (added by
@@ -956,7 +956,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                 if (row_id) {
                     e.stopPropagation();
                     if (!self.dataset.select_id(row_id)) {
-                        throw new Error("Could not find id in dataset");
+                        throw new Error(_t("Could not find id in dataset"));
                     }
                     self.row_clicked(e);
                 }
@@ -1016,7 +1016,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                     var command = value[0];
                     // 1. an array of m2m commands (usually (6, false, ids))
                     if (command[0] !== 6) {
-                        throw new Error(_t("Unknown m2m command ") + command[0]);
+                        throw new Error(_.str.sprintf( _t("Unknown m2m command %s"), command[0]));
                     }
                     ids = command[2];
                 } else {
@@ -1324,7 +1324,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                 }
                 // group_label is html-clean (through format or explicit
                 // escaping if format failed), can inject straight into HTML
-                $group_column.html(_.str.sprintf("%s (%d)",
+                $group_column.html(_.str.sprintf(_t("%s (%d)"),
                     group_label, group.length));
 
                 if (group.length && group.openable) {
@@ -1743,7 +1743,7 @@ var Record = instance.web.Class.extend(/** @lends Record# */{
             } else if (val instanceof Array) {
                 output[k] = val[0];
             } else {
-                throw new Error("Can't convert value " + val + " to context");
+                throw new Error(_.str.sprintf(_t("Can't convert value %s to context"), val));
             }
         }
         return output;
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 7fe6a8ec42b..e3f35e2068c 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -3,7 +3,9 @@
  * @namespace
  */
 openerp.web.list_editable = function (instance) {
-    // editability status of list rows
+	var _t = instance.web._t;
+
+	// editability status of list rows
     instance.web.ListView.prototype.defaults.editable = null;
 
     // TODO: not sure second @lends on existing item is correct, to check
@@ -775,7 +777,7 @@ openerp.web.list_editable = function (instance) {
         cancel: function (force) {
             if (!(force || this.form.can_be_discarded())) {
                 return $.Deferred().reject({
-                    message: "The form's data can not be discarded"}).promise();
+                    message: _t("The form's data can not be discarded")}).promise();
             }
             var record = this.record;
             this.record = null;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index ddedcdd2ff6..600a0b065c1 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -786,7 +786,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
                 break;
             case 'tests':
                 this.do_action({
-                    name: "JS Tests",
+                    name: _t("JS Tests"),
                     target: 'new',
                     type : 'ir.actions.act_url',
                     url: '/web/tests?mod=*'
@@ -814,7 +814,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
                 break;
             case 'translate':
                 this.do_action({
-                    name: "Technical Translation",
+                    name: _t("Technical Translation"),
                     res_model : 'ir.translation',
                     domain : [['type', '!=', 'object'], '|', ['name', '=', this.dataset.model], ['name', 'ilike', this.dataset.model + ',']],
                     views: [[false, 'list'], [false, 'form']],
@@ -1395,7 +1395,7 @@ instance.web.json_node_to_xml = function(node, human_readable, indent) {
         return sindent + node;
     } else if (typeof(node.tag) !== 'string' || !node.children instanceof Array || !node.attrs instanceof Object) {
         throw new Error(
-            _.str.sprintf("Node [%s] is not a JSONified XML node",
+            _.str.sprintf(_t("Node [%s] is not a JSONified XML node"),
                           JSON.stringify(node)));
     }
     for (var attr in node.attrs) {
@@ -1429,7 +1429,7 @@ instance.web.xml_to_str = function(node) {
     } else if (window.ActiveXObject) {
         return node.xml;
     } else {
-        throw new Error("Could not serialize XML");
+        throw new Error(_t("Could not serialize XML"));
     }
 };
 instance.web.str_to_xml = function(s) {
@@ -1437,7 +1437,7 @@ instance.web.str_to_xml = function(s) {
         var dp = new DOMParser();
         var r = dp.parseFromString(s, "text/xml");
         if (r.body && r.body.firstChild && r.body.firstChild.nodeName == 'parsererror') {
-            throw new Error("Could not parse string to xml");
+            throw new Error(_t("Could not parse string to xml"));
         }
         return r;
     }
@@ -1445,7 +1445,7 @@ instance.web.str_to_xml = function(s) {
     try {
         xDoc = new ActiveXObject("MSXML2.DOMDocument");
     } catch (e) {
-        throw new Error("Could not find a DOM Parser: " + e.message);
+        throw new Error(_.str.sprintf( _t("Could not find a DOM Parser: %s"), e.message));
     }
     xDoc.async = false;
     xDoc.preserveWhiteSpace = true;
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 5fd9b6677a0..46d25e749a2 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -88,7 +88,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
         this.fields =  this.fields_view.fields;
 
         if (!this.date_start) {
-            throw new Error("Calendar view has not defined 'date_start' attribute.");
+            throw new Error(_t("Calendar view has not defined 'date_start' attribute."));
         }
 
         //* Calendar Fields *
@@ -96,7 +96,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
 
         if (this.date_delay) {
             if (this.fields[this.date_delay].type != 'float') {
-                throw new Error("Calendar view has a 'date_delay' type != float");
+                throw new Error(_t("Calendar view has a 'date_delay' type != float"));
             }
             this.calendar_fields.date_delay = {'name': this.date_delay, 'kind': this.fields[this.date_delay].type};
         }
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 4e9157e1d75..c93d7d333e4 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -409,7 +409,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                 new_group.do_save_sequences();
             }).fail(function(error, evt) {
                 evt.preventDefault();
-                alert("An error has occured while moving the record to this group.");
+                alert(_t("An error has occured while moving the record to this group."));
                 self.do_reload(); // TODO: use draggable + sortable in order to cancel the dragging when the rcp fails
             });
         }
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 a844c0f3be8..6b70914f332 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -161,7 +161,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
             }
         });
         msg += "</ul>";
-        this.do_warn("The following fields are invalid :", msg);
+        this.do_warn(_t("The following fields are invalid :"), msg);
     },
     add_node_name : function(node) {
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
@@ -260,7 +260,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
                         "arch": view_arch_list});
                 });
             } else {
-                self.do_warn("Please select view in list :");
+                self.do_warn(_t("Please select view in list :"));
             }
         });
     },
@@ -387,10 +387,10 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
                                 self.inherited_view(selected_row);
                             }
                         }else{
-                            alert("Can't Update View");
+                            alert(_t("Can't Update View"));
                         }
                     }else{
-                        alert("Select an element");
+                        alert(_t("Select an element"));
                     }
                 }},
                 {text: _t("Preview"), click: function() {
@@ -983,7 +983,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
             } else {
                 table_selector.append('<td align="right">' + node.string + '</td>' + type_widget.render() );
                 if (node.name == "field_value") {
-                    table_selector.append('<td id="new_field" align="right"  width="100px"> <button>New Field</button></td>');
+                    table_selector.append('<td id="new_field" align="right"  width="100px"> <button>' + _t("New Field") + '</button></td>');
                 }
             }
             type_widget.start();

From e2435d4f004a20636aef8a8ee2cc03c8cfc3e78c Mon Sep 17 00:00:00 2001
From: tsabi <>
Date: Thu, 29 Nov 2012 02:18:22 +0100
Subject: [PATCH 23/56] fixed a typo that maked javascript error

bzr revid: tsabi-20121129011822-fv9v0l72231y0093
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dd9b2be5fb0..06c1a3d989b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -872,7 +872,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             }).value();
         warnings.unshift('<ul>');
         warnings.push('</ul>');
-        this.do_warn(_t("The following fields are invalid:", warnings.join(''));
+        this.do_warn(_t("The following fields are invalid:"), warnings.join(''));
     },
     /**
      * Reload the form after saving

From f7933378aa0ed7c05af27e47b07c4f3ed7e6c5ed Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Nov 2012 10:44:12 +0100
Subject: [PATCH 24/56] [IMP] note: remove fancy mode

bzr revid: chm@openerp.com-20121129094412-s5g8uffx8j7q4xpg
---
 addons/note/security/note_security.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
index 5136ab95708..9d45b6233ef 100644
--- a/addons/note/security/note_security.xml
+++ b/addons/note/security/note_security.xml
@@ -6,10 +6,5 @@
         <field name="name">Notes / Fancy mode</field>
 	<field name="category_id" ref="base.module_category_hidden"/>
     </record>
-
-    <!--record id="base.group_user" model="res.groups">
-	<field name="implied_ids" eval="[(4, ref('group_note_fancy'))]"/>
-    </record-->
-
 </data>
 </openerp>

From bf29cecca3d412add5d764137835a5028de44c95 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 11:11:37 +0100
Subject: [PATCH 25/56] [FIX] if an action descriptor is precisely ``false``,
 treat it as an ir_action_close                                               
                                    ~/projects/tiny/web/current

Can be seen in e.g. Quotations > [More sidebar] > Sale: Mark Unread:
it's a server action which just returns ``False``, the handler
resulted in a noop but also produced an error message in the browser
console ("No type for action false").

Convert ``false`` (identity-tested) into an ir_action_close in
do_action, before actually mucking into the action descriptor.

bzr revid: xmo@openerp.com-20121129101137-g01nd49hnlg2odfs
---
 addons/web/static/src/js/views.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index def265db0bb..7b58818bec0 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -256,7 +256,9 @@ instance.web.ActionManager = instance.web.Widget.extend({
             on_close: function() {},
             action_menu_id: null,
         });
-        if (_.isString(action) && instance.web.client_actions.contains(action)) {
+        if (action === false) {
+            action = { type: 'ir.actions.act_window_close' };
+        } else if (_.isString(action) && instance.web.client_actions.contains(action)) {
             var action_client = { type: "ir.actions.client", tag: action, params: {} };
             return this.do_action(action_client, options);
         } else if (_.isNumber(action) || _.isString(action)) {

From 7a50367e840ac4eedd195e8682d20387178cac35 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 11:12:28 +0100
Subject: [PATCH 26/56] [IMP] account: optimized the account invoice analysis
 report to lower the response time. Removed the fields due_delay and
 delay_to_pay that were the reasons of the bad performances besides being a
 bit useless and having wrong values computed

bzr revid: qdp-launchpad@openerp.com-20121129101228-6cxv07svxnbabfr0
---
 addons/account/account_invoice.py             |   4 +-
 .../account/report/account_invoice_report.py  | 219 +++++++-----------
 .../report/account_invoice_report_view.xml    |   4 +-
 addons/product/product.py                     |   2 +-
 4 files changed, 93 insertions(+), 136 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 6804d5116f1..8d13ec9dc8f 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1381,8 +1381,8 @@ class account_invoice_line(osv.osv):
         'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
         'sequence': fields.integer('Sequence', help="Gives the sequence of this line when displaying the invoice."),
         'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
-        'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
-        'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
+        'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null', select=True),
+        'product_id': fields.many2one('product.product', 'Product', ondelete='set null', select=True),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 68eaedb20a6..d1f78ab7b0f 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -98,150 +98,109 @@ class account_invoice_report(osv.osv):
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
         'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
-        'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
-        'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
     }
     _order = 'date desc'
 
 
     def _select(self):
         select_str = """
-            SELECT min(ail.id) as id,
-                    ai.date_invoice as date,
-                    to_char(ai.date_invoice, 'YYYY') as year,
-                    to_char(ai.date_invoice, 'MM') as month,
-                    to_char(ai.date_invoice, 'YYYY-MM-DD') as day,
-                    ail.product_id,
-                    ai.partner_id as partner_id,
-                    ai.payment_term as payment_term,
-                    ai.period_id as period_id,
-                    (case when u.uom_type not in ('reference') then
-                        (select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
-                    else
-                        u.name
-                    end) as uom_name,
-                    ai.currency_id as currency_id,
-                    ai.journal_id as journal_id,
-                    ai.fiscal_position as fiscal_position,
-                    ai.user_id as user_id,
-                    ai.company_id as company_id,
-                    count(ail.*) as nbr,
-                    ai.type as type,
-                    ai.state,
-                    pt.categ_id,
-                    ai.date_due as date_due,
-                    ai.account_id as account_id,
-                    ail.account_id as account_line_id,
-                    ai.partner_bank_id as partner_bank_id,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         -ail.quantity / u.factor
-                        else
-                         ail.quantity / u.factor
-                        end) as product_qty,
-
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         -ail.price_subtotal
-                        else
-                          ail.price_subtotal
-                        end) / cr.rate as price_total,
-
-                    (case when ai.type in ('out_refund','in_invoice') then
-                      sum(-ail.price_subtotal)
-                    else
-                      sum(ail.price_subtotal)
-                    end) / (CASE WHEN sum(ail.quantity/u.factor) <> 0
-                       THEN
-                         (case when ai.type in ('out_refund','in_invoice')
-                          then sum(-ail.quantity/u.factor)
-                          else sum(ail.quantity/u.factor) end)
-                       ELSE 1
-                       END)
-                     / cr.rate as price_average,
-
-                    cr.rate as currency_rate,
-                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
-                        from account_move_line as aml
-                        left join account_invoice as a ON (a.move_id=aml.move_id)
-                        left join account_invoice_line as l ON (a.id=l.invoice_id)
-                        where a.id=ai.id)) as delay_to_pay,
-                    sum((select extract(epoch from avg(date_trunc('day',a.date_due)-date_trunc('day',a.date_invoice)))/(24*60*60)::decimal(16,2)
-                        from account_move_line as aml
-                        left join account_invoice as a ON (a.move_id=aml.move_id)
-                        left join account_invoice_line as l ON (a.id=l.invoice_id)
-                        where a.id=ai.id)) as due_delay,
-                    (case when ai.type in ('out_refund','in_invoice') then
-                      -ai.residual
-                    else
-                      ai.residual
-                    end)/ (CASE WHEN
-                        (select count(l.id) from account_invoice_line as l
-                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id) <> 0
-                       THEN
-                        (select count(l.id) from account_invoice_line as l
-                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id)
-                       ELSE 1
-                       END) / cr.rate as residual
+            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,
+                sub.payment_term, sub.period_id, sub.uom_name, sub.currency_id, sub.journal_id,
+                sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
+                sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
+                sub.product_qty, sub.price_total / cr.rate as price_total, sub.price_average /cr.rate as price_average,
+                cr.rate as currency_rate, sub.residual / cr.rate as residual, sub.section_id
+            FROM (
+                SELECT min(ail.id) AS id,
+                    ai.date_invoice AS date,
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text) AS year,
+                    to_char(ai.date_invoice::timestamp with time zone, 'MM'::text) AS month,
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text) AS day,
+                    ail.product_id, ai.partner_id, ai.payment_term, ai.period_id,
+                    CASE
+                     WHEN u.uom_type::text <> 'reference'::text
+                        THEN ( SELECT product_uom.name
+                               FROM product_uom
+                               WHERE product_uom.uom_type::text = 'reference'::text
+                                AND product_uom.active
+                                AND product_uom.category_id = u.category_id LIMIT 1)
+                        ELSE u.name
+                    END AS uom_name,
+                    ai.currency_id, ai.journal_id, ai.fiscal_position, ai.user_id, ai.company_id,
+                    count(ail.*) AS nbr,
+                    ai.type, ai.state, pt.categ_id, ai.date_due, ai.account_id, ail.account_id AS account_line_id,
+                    ai.partner_bank_id,
+                    SUM(CASE
+                         WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                            THEN (- ail.quantity) / u.factor
+                            ELSE ail.quantity / u.factor
+                        END) AS product_qty,
+                    SUM(CASE
+                         WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                            THEN - ail.price_subtotal
+                            ELSE ail.price_subtotal
+                        END) AS price_total,
+                    CASE
+                     WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                        THEN SUM(- ail.price_subtotal)
+                        ELSE SUM(ail.price_subtotal)
+                    END / CASE
+                           WHEN SUM(ail.quantity / u.factor) <> 0::numeric
+                               THEN CASE
+                                     WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                                        THEN SUM((- ail.quantity) / u.factor)
+                                        ELSE SUM(ail.quantity / u.factor)
+                                    END
+                               ELSE 1::numeric
+                          END AS price_average,
+                    CASE
+                     WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                        THEN - ai.residual
+                        ELSE ai.residual
+                    END / CASE
+                           WHEN (( SELECT count(l.id) AS count
+                                   FROM account_invoice_line l
+                                   LEFT JOIN account_invoice a ON a.id = l.invoice_id
+                                   WHERE a.id = ai.id)) <> 0
+                               THEN ( SELECT count(l.id) AS count
+                                      FROM account_invoice_line l
+                                      LEFT JOIN account_invoice a ON a.id = l.invoice_id
+                                      WHERE a.id = ai.id)
+                               ELSE 1::bigint
+                          END::numeric AS residual,
+                    ai.section_id
+                FROM account_invoice_line ail
+                JOIN account_invoice ai ON ai.id = ail.invoice_id
+                LEFT JOIN product_product pr ON pr.id = ail.product_id
+                left JOIN product_template pt ON pt.id = pr.product_tmpl_id
+                LEFT JOIN product_uom u ON u.id = ail.uos_id
+                GROUP BY ail.product_id, ai.date_invoice, ai.id,
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text),
+                    to_char(ai.date_invoice::timestamp with time zone, 'MM'::text),
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text),
+                    ai.partner_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
+                    ai.fiscal_position, ai.user_id, ai.company_id, ai.type, ai.state, pt.categ_id,
+                    ai.date_due, ai.account_id, ail.account_id, ai.partner_bank_id, ai.residual,
+                    ai.amount_total, u.uom_type, u.category_id, ai.section_id
+            ) AS sub
+            JOIN res_currency_rate cr ON (cr.currency_id = sub.currency_id)
+            WHERE
+                cr.id IN (SELECT id
+                          FROM res_currency_rate cr2
+                          WHERE (cr2.currency_id = sub.currency_id)
+                              AND ((sub.date IS NOT NULL AND cr.name <= sub.date)
+                                    OR (sub.date IS NULL AND cr.name <= NOW()))
+                          ORDER BY name DESC LIMIT 1);
         """
         return select_str
 
-    def _where(self):
-        where_str = """
-            WHERE cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
-                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
-        """
-        return where_str
-
-    def _from(self):
-        from_str = """
-            FROM account_invoice_line as ail
-                left join account_invoice as ai ON (ai.id=ail.invoice_id)
-                left join product_product pr on (pr.id=ail.product_id)
-                left join product_template pt on (pt.id=pr.product_tmpl_id)
-                left join product_uom u on (u.id=ail.uos_id),
-                res_currency_rate cr
-        """
-        return from_str
-
-    def _group_by(self):
-        group_by_str = """
-            GROUP BY ail.product_id,
-                    ai.date_invoice,
-                    ai.id,
-                    cr.rate,
-                    to_char(ai.date_invoice, 'YYYY'),
-                    to_char(ai.date_invoice, 'MM'),
-                    to_char(ai.date_invoice, 'YYYY-MM-DD'),
-                    ai.partner_id,
-                    ai.payment_term,
-                    ai.period_id,
-                    u.name,
-                    ai.currency_id,
-                    ai.journal_id,
-                    ai.fiscal_position,
-                    ai.user_id,
-                    ai.company_id,
-                    ai.type,
-                    ai.state,
-                    pt.categ_id,
-                    ai.date_due,
-                    ai.account_id,
-                    ail.account_id,
-                    ai.partner_bank_id,
-                    ai.residual,
-                    ai.amount_total,
-                    u.uom_type,
-                    u.category_id
-        """
-        return group_by_str
 
     def init(self, cr):
         # self._table = account_invoice_report
         tools.drop_view_if_exists(cr, self._table)
-        cr.execute("CREATE or REPLACE VIEW %s as (%s %s %s %s)" % (
+        cr.execute("CREATE or REPLACE VIEW %s as (%s %s)" % (
                     self._table, 
-                    self._select(), self._from(), self._where(), self._group_by()))
+                    self._select()))
 
 account_invoice_report()
 
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 289db376e5d..66e17560bde 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -30,8 +30,6 @@
                 <!-- <field name="reconciled"  sum="# Reconciled"/> -->
                 <field name="user_currency_price_total" sum="Total Without Tax"/>
                 <field name="user_currency_residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
-                <field name="due_delay"  sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
-                <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
             </tree>
         </field>
     </record>
@@ -93,7 +91,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
-        <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
+        <field name="help">From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
     </record>
 
diff --git a/addons/product/product.py b/addons/product/product.py
index 1333c9581a7..fb28f85b10f 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -546,7 +546,7 @@ class product_product(osv.osv):
         'default_code' : fields.char('Internal Reference', size=64, select=True),
         'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
-        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),

From c7772fdd82105ddf60cbec2517753bf927ce19ed Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 11:38:41 +0100
Subject: [PATCH 27/56] [FIX] server-sourced fields_get has no indirection to
 the model's fields

previous searchview-controller wrapper method did. Remove leftover indirection deref

bzr revid: xmo@openerp.com-20121129103841-6qcl4sctekqmrt2q
---
 addons/web/static/src/js/search.js | 2 +-
 addons/web/static/test/search.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 29fa71b5a97..5b59c7d6912 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1708,7 +1708,7 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
             new instance.web.Model(this.view.model).call('fields_get').done(function(data) {
                 self.fields = _.extend({
                     id: { string: 'ID', type: 'id' }
-                }, data.fields);
+                }, data);
         })).done(function () {
             self.append_proposition();
         });
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 870ce241d15..45f6d2c715b 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -178,9 +178,9 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
         return [];
     };
     instance.session.responses['dummy.model:fields_get'] = function () {
-        return {fields: {
+        return {
             dummy: {type: 'char', string: 'Dummy'}
-        }};
+        };
     };
 
     var dataset = {model: 'dummy.model', get_context: function () { return {}; }};

From c4a845b50e2ca2c6750a512e1980282e4d6d57a3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 29 Nov 2012 11:40:39 +0100
Subject: [PATCH 28/56] [FIX] auth_signup on token

bzr revid: al@openerp.com-20121129104039-0pv8mls0f55pet2l
---
 addons/auth_signup/static/src/js/auth_signup.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index a6b401a4c7b..241c2406d56 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -52,6 +52,8 @@ openerp.auth_signup = function(instance) {
             if (result.token) {
                 // switch to signup mode, set user name and login
                 this.$el.addClass("oe_login_signup");
+                self.$(".oe_signup_show").show();
+                self.$(".oe_signup_hide").hide();
                 this.$("form input[name=name]").val(result.name).attr("readonly", "readonly");
                 if (result.login) {
                     this.$("form input[name=login]").val(result.login).attr("readonly", "readonly");

From fa7db1d68b62fb3b6b3fc1ec37851245942f41d3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 12:22:29 +0100
Subject: [PATCH 29/56] [IMP] crm: optimized the crm lead analysis report to
 lower the response time. Removed the field email that was the reason of the
 bad performances besides being a bit useless

bzr revid: qdp-launchpad@openerp.com-20121129112229-b4n9cb23b7e10n41
---
 addons/crm/report/crm_lead_report.py       | 2 --
 addons/crm/report/crm_lead_report_view.xml | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index da5167da1e6..25598abc3ea 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -81,7 +81,6 @@ class crm_lead_report(osv.osv):
         'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'email': fields.integer('# Emails', size=128, readonly=True),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
@@ -137,7 +136,6 @@ class crm_lead_report(osv.osv):
                     c.planned_revenue,
                     c.planned_revenue*(c.probability/100) as probable_revenue,
                     1 as nbr,
-                    (SELECT count(id) FROM mail_message WHERE model='crm.lead' AND res_id=c.id AND email_from is not null) AS email,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
                     abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as  delay_expected,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index a17633d0ef6..0e5df8837f1 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -25,7 +25,6 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
                 <field name="nbr" sum="# Leads"/>
-                <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
                 <field name="planned_revenue"/>
@@ -148,7 +147,6 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
                 <field name="planned_revenue" sum="Planned Revenues"/>
-                <field name="email" sum="# of Emails"/>
                 <field name="delay_open" sum='Delay to open'/>
                 <field name="delay_close" sum='Delay to close'/>
                 <field name="delay_expected"/>
@@ -167,7 +165,7 @@
            <field name="context">{'search_default_year': 1,'search_default_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
            <field name="view_mode">tree,graph</field>
            <field name="domain">[]</field>
-           <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
+           <field name="help">Leads Analysis allows you to check different CRM related information like the treatment delays or number of leads per state. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
        </record>
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
             <field name="sequence" eval="1"/>

From a2b23a1ca71a25f912c5f92e8a1dbfdde69bc568 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 12:23:50 +0100
Subject: [PATCH 30/56] [REM] merge conflict file committed

bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6
---
 addons/web/static/test/test.html.THIS | 63 ---------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 addons/web/static/test/test.html.THIS

diff --git a/addons/web/static/test/test.html.THIS b/addons/web/static/test/test.html.THIS
deleted file mode 100644
index f5f29f88d7c..00000000000
--- a/addons/web/static/test/test.html.THIS
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html style="height: 100%">
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>OpenERP Web Test Suite</title>
-    <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
-
-    <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css">
-    <script src="/web/static/lib/qunit/qunit.js" type="text/javascript"></script>
-
-    <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script>
-    <script src="/web/static/lib/underscore/underscore.string.js" type="text/javascript"></script>
-    <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script>
-
-    <!-- jquery -->
-    <script src="/web/static/lib/jquery/jquery-1.7.2.js"></script>
-    <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script>
-    <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
-    
-    <script src="/web/static/lib/datejs/globalization/en-US.js"></script>
-    <script src="/web/static/lib/datejs/core.js"></script>
-    <script src="/web/static/lib/datejs/parser.js"></script>
-    <script src="/web/static/lib/datejs/sugarpak.js"></script>
-    <script src="/web/static/lib/datejs/extras.js"></script>
-
-    <script src="/web/static/lib/qweb/qweb2.js"></script>
-
-    <script src="/web/static/lib/py.js/lib/py.js"></script>
-
-    <script src="/web/static/src/js/boot.js"></script>
-    <script src="/web/static/src/js/pyeval.js"></script>
-    <script src="/web/static/src/js/corelib.js"></script>
-    <script src="/web/static/src/js/coresetup.js"></script>
-    <script src="/web/static/src/js/dates.js"></script>
-    <script src="/web/static/src/js/formats.js"></script>
-    <script src="/web/static/src/js/chrome.js"></script>
-    <script src="/web/static/src/js/data.js"></script>
-    <script src="/web/static/src/js/views.js"></script>
-    <script src="/web/static/src/js/search.js"></script>
-    <script src="/web/static/src/js/view_form.js"></script>
-    <script src="/web/static/src/js/view_list.js"></script>
-    <script src="/web/static/src/js/view_list_editable.js"></script>
-
-    <script src="/web/static/test/testing.js"></script>
-    <script type="text/javascript">
-        QUnit.config.testTimeout = 2000;
-    </script>
-</head>
-    <body id="oe" class="openerp">
-        <div id="qunit"></div>
-        <div id="qunit-fixture"></div>
-    </body>
-    <script type="text/javascript" src="/web/static/test/class.js"></script>
-    <script type="text/javascript" src="/web/static/test/registry.js"></script>
-    <script type="text/javascript" src="/web/static/test/form.js"></script>
-    <script type="text/javascript" src="/web/static/test/list-utils.js"></script>
-    <script type="text/javascript" src="/web/static/test/formats.js"></script>
-    <script type="text/javascript" src="/web/static/test/rpc.js"></script>
-    <script type="text/javascript" src="/web/static/test/evals.js"></script>
-    <script type="text/javascript" src="/web/static/test/search.js"></script>
-    <script type="text/javascript" src="/web/static/test/Widget.js"></script>
-    <script type="text/javascript" src="/web/static/test/list-editable.js"></script>
-</html>

From fe3d493cc84583fbdd8da4917f9199fdef751dc0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 12:24:13 +0100
Subject: [PATCH 31/56] [FIX] searches with filters using "empty"
 domain/context values (but not attributes)

e.g. @domain="[]" would be seen as non-empty by the search view, and
if multiple domains the search view would generate a nonliteral
``['|', '[]', '[]]`` which would just yield ``['|']`` after evaluation
and concatenation, which is an invalid domain and would blow up the
server.

Specifically filter out the values ``[]`` and ``{}`` from filters

bzr revid: xmo@openerp.com-20121129112413-yrgncnesqs093jwf
---
 addons/web/static/src/js/search.js |  3 +++
 addons/web/static/test/search.js   | 36 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 5b59c7d6912..3917f342391 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1009,6 +1009,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     get_context: function (facet) {
         var contexts = facet.values.chain()
             .map(function (f) { return f.get('value').attrs.context; })
+            .without('{}')
             .reject(_.isEmpty)
             .value();
 
@@ -1027,6 +1028,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     get_groupby: function (facet) {
         return  facet.values.chain()
             .map(function (f) { return f.get('value').attrs.context; })
+            .without('{}')
             .reject(_.isEmpty)
             .value();
     },
@@ -1039,6 +1041,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
     get_domain: function (facet) {
         var domains = facet.values.chain()
             .map(function (f) { return f.get('value').attrs.domain; })
+            .without('[]')
             .reject(_.isEmpty)
             .value();
 
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 45f6d2c715b..db9e7aa3ed9 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -845,6 +845,42 @@ openerp.testing.section('search-serialization', {
                 ok(!context.get_eval_context(), "context should have no evaluation context");
             });
     });
+    test('Empty filter domains', {asserts: 4}, function (instance) {
+        var view = {inputs: [], query: {on: function () {}}};
+        var filter_a = new instance.web.search.Filter(
+            {attrs: {name: 'a', context: '{}', domain: '[]'}}, view);
+        var filter_b = new instance.web.search.Filter(
+            {attrs: {name: 'b', context: '{}', domain: '[]'}}, view);
+        var filter_c = new instance.web.search.Filter(
+            {attrs: {name: 'c', context: '{b: 42}', domain: '[["a", "=", 3]]'}}, view);
+        var group = new instance.web.search.FilterGroup(
+            [filter_a, filter_b, filter_c], view);
+        var t1 = group.facet_for_defaults({a: true, c: true})
+        .done(function (facet) {
+            var model = facet;
+            if (!(model instanceof instance.web.search.Facet)) {
+                model = new instance.web.search.Facet(facet);
+            }
+
+            var domain = group.get_domain(model);
+            deepEqual(domain, '[["a", "=", 3]]', "domain should ignore empties");
+            var context = group.get_context(model);
+            deepEqual(context, '{b: 42}', "context should ignore empties");
+        });
+        var t2 = group.facet_for_defaults({a: true, b: true})
+        .done(function (facet) {
+            var model = facet;
+            if (!(model instanceof instance.web.search.Facet)) {
+                model = new instance.web.search.Facet(facet);
+            }
+
+            var domain = group.get_domain(model);
+            equal(domain, null, "domain should ignore empties");
+            var context = group.get_context(model);
+            equal(context, null, "context should ignore empties");
+        });
+        return $.when(t1, t2);
+    });
 });
 openerp.testing.section('removal', {
     dependencies: ['web.search'],

From 93eddbd4a8e60522c209761da08b7b4d200e7f00 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 29 Nov 2012 12:27:37 +0100
Subject: [PATCH 32/56] [IMP] fixes for kanban column visible in tasks & issues

bzr revid: fp@tinyerp.com-20121129112737-w3h80e7nbxs0l5lp
---
 addons/project/project.py             | 14 +++-----------
 addons/project_issue/project_issue.py |  8 +++-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 68122d1a614..c6577b00e6a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -603,18 +603,13 @@ class task(base_stage, osv.osv):
         stage_obj = self.pool.get('project.task.type')
         order = stage_obj._order
         access_rights_uid = access_rights_uid or uid
-        # lame way to allow reverting search, should just work in the trivial case
         if read_group_order == 'stage_id desc':
             order = '%s desc' % order
-        # retrieve section_id from the context and write the domain
-        # - ('id', 'in', 'ids'): add columns that should be present
-        # - OR ('case_default', '=', True), ('fold', '=', False): add default columns that are not folded
-        # - OR ('project_ids', 'in', project_id), ('fold', '=', False) if project_id: add project columns that are not folded
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
+        search_domain += [('id', 'in', ids)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
@@ -750,7 +745,7 @@ class task(base_stage, osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -936,14 +931,11 @@ class task(base_stage, osv.osv):
         for task in cases:
             if task.project_id:
                 section_ids.append(task.project_id.id)
-        # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain = [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain.append(('case_default', '=', True))
-        # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 90640363906..fe5ce9f325b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -89,7 +89,7 @@ class project_issue(base_stage, osv.osv):
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
+        search_domain += [('id', 'in', ids)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
@@ -244,7 +244,7 @@ class project_issue(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -442,11 +442,9 @@ class project_issue(base_stage, osv.osv):
         # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain += [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain.append(('case_default', '=', True))
-        # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)

From 72109e7541c1748e066ff4fe8b60a3cfa052d247 Mon Sep 17 00:00:00 2001
From: tsabi <csaba.toth@i3rendszerhaz.hu>
Date: Thu, 29 Nov 2012 12:53:06 +0100
Subject: [PATCH 33/56] fix tab problem

bzr revid: csaba.toth@i3rendszerhaz.hu-20121129115306-ifncjymnmuk989eq
---
 addons/web/static/src/js/view_list_editable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index e3f35e2068c..17f757d4e72 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -3,9 +3,9 @@
  * @namespace
  */
 openerp.web.list_editable = function (instance) {
-	var _t = instance.web._t;
+    var _t = instance.web._t;
 
-	// editability status of list rows
+    // editability status of list rows
     instance.web.ListView.prototype.defaults.editable = null;
 
     // TODO: not sure second @lends on existing item is correct, to check

From 83b7823f257b17403a11908c9b359244635cf0b7 Mon Sep 17 00:00:00 2001
From: tsabi <csaba.toth@i3rendszerhaz.hu>
Date: Thu, 29 Nov 2012 12:54:54 +0100
Subject: [PATCH 34/56] some more change in the new pyeval.js file

bzr revid: csaba.toth@i3rendszerhaz.hu-20121129115454-rpviywfnosjdmovm
---
 addons/web/static/src/js/pyeval.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index 265449f9f64..417459b3a63 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -2,6 +2,7 @@
  * py.js helpers and setup
  */
 openerp.web.pyeval = function (instance) {
+    var _t = instance.web._t;
     instance.web.pyeval = {};
 
     var obj = function () {};
@@ -71,7 +72,7 @@ openerp.web.pyeval = function (instance) {
     var ymd2ord = function (year, month, day) {
         var dim = days_in_month(year, month);
         if (!(1 <= day && day <= dim)) {
-            throw new Error("ValueError: day must be in 1.." + dim);
+            throw new Error(_.str.sprintf(_t("ValueError: day must be in 1..%d"), dim));
         }
         return days_before_year(year)
              + days_before_month(year, month)
@@ -277,10 +278,11 @@ openerp.web.pyeval = function (instance) {
             });
             var s = _.str.sprintf("%d:%02d:%02d", hh, mm, ss);
             if (this.days) {
-                s = _.str.sprintf("%d day%s, %s",
-                    this.days,
-                    (this.days != 1 && this.days != -1) ? 's' : '',
-                    s);
+            	if (this.days != 1 && this.days != -1) {
+            		s = _.str.sprintf(_t("%d days, %s"), this.days, s);
+            	} else {
+            		s = _.str.sprintf(_t("%d day, %s"), this.days, s);
+            	};
             }
             if (this.microseconds) {
                 s = _.str.sprintf("%s.%06d", s, this.microseconds);
@@ -726,7 +728,7 @@ openerp.web.pyeval = function (instance) {
         case 'context': case 'compound_context':
             return instance.web.pyeval.eval('contexts', [arg]);
         default:
-            throw new Error(instance.web._t("Unknown nonliteral type " + arg.__ref));
+            throw new Error(_t("Unknown nonliteral type ") + arg.__ref);
         }
     };
     /**
@@ -760,11 +762,11 @@ openerp.web.pyeval = function (instance) {
             } catch (e) {
                 d.resolve({ error: {
                     code: 400,
-                    message: instance.web._t("Evaluation Error"),
+                    message: _t("Evaluation Error"),
                     data: {
                         type: 'local_exception',
                         debug: _.str.sprintf(
-                                instance.web._t("Local evaluation failure\n%s\n\n%s"),
+                                _t("Local evaluation failure\n%s\n\n%s"),
                                 e.message, JSON.stringify(source))
                     }
                 }});

From 7bfab22e1f6699890d79512f2b7f8ac486fa52f0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Nov 2012 13:07:38 +0100
Subject: [PATCH 35/56] [FIX] Propagate context to kanban's add_group() action

bzr revid: fme@openerp.com-20121129120738-fgulo5hqib2uqeqa
---
 addons/web_kanban/static/src/js/kanban.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 4e9157e1d75..4eabcf0533b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -190,6 +190,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
             target: "new",
+            context: self.dataset.get_context(),
             flags: {
                 action_buttons: true,
             }

From b6997b7c74c4c90070439515bbbb666cda94988c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 14:03:46 +0100
Subject: [PATCH 36/56] [FIX] account: not enough argument given during format
 string

bzr revid: qdp-launchpad@openerp.com-20121129130346-ewydqj74l8h9qrby
---
 addons/account/report/account_invoice_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index d1f78ab7b0f..48f9022a8dc 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -198,7 +198,7 @@ class account_invoice_report(osv.osv):
     def init(self, cr):
         # self._table = account_invoice_report
         tools.drop_view_if_exists(cr, self._table)
-        cr.execute("CREATE or REPLACE VIEW %s as (%s %s)" % (
+        cr.execute("CREATE or REPLACE VIEW %s as (%s)" % (
                     self._table, 
                     self._select()))
 

From bd61641572949ab2c9b1a07267cd7d7344d17a7d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 29 Nov 2012 14:06:55 +0100
Subject: [PATCH 37/56] [FIX] project issue

bzr revid: fp@tinyerp.com-20121129130655-rm5hrk8m7tsy8g4v
---
 addons/project/project.py       |  6 ++++++
 addons/project/project_demo.xml | 21 +++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index c6577b00e6a..b7c88f3532b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -49,11 +49,17 @@ class project_task_type(osv.osv):
         'fold': fields.boolean('Hide in views if empty',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
+    def _get_default_project_id(self, cr, uid, ctx={}):
+        proj = ctx.get('default_project_id', False)
+        if type(proj) is int:
+            return [proj]
+        return proj
     _defaults = {
         'sequence': 1,
         'state': 'open',
         'fold': False,
         'case_default': True,
+        'project_ids': _get_default_project_id
     }
     _order = 'sequence'
 
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index ee887c2728c..d2bf7d0a2df 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -36,6 +36,10 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
+        </record>
+
+        <!-- We assign after so that default values applies -->
+        <record id="project_project_1" model="project.project">
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
         </record>
 
@@ -45,6 +49,10 @@
             <field name="privacy_visibility">public</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
+        </record>
+
+        <!-- We assign after so that default values applies -->
+        <record id="project_project_2" model="project.project">
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
 
@@ -58,6 +66,9 @@
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
+        </record>
+
+        <record id="project_project_3" model="project.project">
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
 
@@ -67,24 +78,30 @@
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
         </record>
 
+        <record id="project_project_4" model="project.project">
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
+        </record>
+
         <record id="project_project_5" model="project.project">
             <field name="priority">2</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
         </record>
 
+        <record id="project_project_5" model="project.project">
+            <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
+        </record>
+
 
         <!-- Tasks -->
         <record id="project_task_1" model="project.task">

From 9f76458404ff3d99824149d09121952c4f2fc775 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 14:13:01 +0100
Subject: [PATCH 38/56] [FIX] groupby on editable list

Because of the "meta" columns (e.g. group name column),
ListView#columns would end up with a different number of elements than
ListView#fields_view.arch.children, and when zipping them together (to
build the form view for edition) things wouldn't match anymore.

It would seem simply filtering out meta columns (and only keep those
actually specified by the view) is sufficient to fix the issue and
have everything line up again. I'm midly impressed.

bzr revid: xmo@openerp.com-20121129131301-scc38i4l55ea7lis
---
 addons/web/static/src/js/view_list_editable.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 7fe6a8ec42b..79b91a41b3c 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -383,7 +383,8 @@ openerp.web.list_editable = function (instance) {
                 version: '7.0'
             });
             _(view.arch.children).chain()
-                .zip(this.columns)
+                .zip(_(this.columns).filter(function (c) {
+                    return !(c instanceof instance.web.list.MetaColumn);}))
                 .each(function (ar) {
                     var widget = ar[0], column = ar[1];
                     var modifiers = _.extend({}, column.modifiers);

From 759f11f11077514bbf5e45ffa88a69ec1d0066ef Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 14:27:38 +0100
Subject: [PATCH 39/56] [FIX] py.js: bug in tokenization of single-quoted empty
 string

bzr revid: xmo@openerp.com-20121129132738-fcnam8bkqyt7h8ey
---
 addons/web/static/lib/py.js/.hg_archival.txt | 4 ++--
 addons/web/static/lib/py.js/lib/py.js        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/lib/py.js/.hg_archival.txt b/addons/web/static/lib/py.js/.hg_archival.txt
index 33dcdd88830..771b798ac84 100644
--- a/addons/web/static/lib/py.js/.hg_archival.txt
+++ b/addons/web/static/lib/py.js/.hg_archival.txt
@@ -1,5 +1,5 @@
 repo: 076b192d0d8ab2b92d1dbcfa3da055382f30eaea
-node: ccf62e5d0291f66a39f4049f3e880004e59c3654
+node: 2b62048dd1d86c45e4bf0442b5da4122534132bf
 branch: default
 latesttag: 0.7
-latesttagdistance: 4
+latesttagdistance: 5
diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js
index 854232a0d80..04ecd3aeb5c 100644
--- a/addons/web/static/lib/py.js/lib/py.js
+++ b/addons/web/static/lib/py.js/lib/py.js
@@ -311,7 +311,7 @@ var py = {};
                 } else if (string_pattern.test(token)) {
                     var m = string_pattern.exec(token);
                     tokens.push(create(symbols['(string)'], {
-                        value: m[2] || m[3]
+                        value: (m[2] !== undefined ? m[2] : m[3])
                     }));
                 } else if (token in symbols) {
                     var symbol;

From 184593003b3aec7d40660ae13002f4a4a205fa12 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 29 Nov 2012 14:40:51 +0100
Subject: [PATCH 40/56] [FIX] race condition problem with m2m

bzr revid: nicolas.vanhoren@openerp.com-20121129134051-5hiw9z5hi99fxtve
---
 addons/web/static/src/js/view_form.js | 76 ++++++++++++---------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 49f4e30815f..ad5fcdd29d8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4069,13 +4069,12 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
         If you see this options, do not use it, it's basically a dirty hack to make one
         precise o2m to behave the way we want.
 */
-instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
+instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     multi_selection: false,
     disable_utility_classes: true,
     init: function(field_manager, node) {
         this._super(field_manager, node);
         this.is_loaded = $.Deferred();
-        this.initial_is_loaded = this.is_loaded;
         this.dataset = new instance.web.form.Many2ManyDataSet(this, this.field.relation);
         this.dataset.m2m = this;
         var self = this;
@@ -4083,24 +4082,44 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
             self.dataset_changed();
         });
         this.set_value([]);
+        this.list_dm = new instance.web.DropMisordered();
+        this.render_value_dm = new instance.web.DropMisordered();
     },
-    start: function() {
-        this.$el.addClass('oe_form_field oe_form_field_many2many');
-
+    initialize_content: function() {
         var self = this;
 
-        self.load_view();
-        this.is_loaded.done(function() {
-            self.on("change:effective_readonly", self, function() {
-                self.is_loaded = self.is_loaded.then(function() {
-                    self.list_view.destroy();
-                    return $.when(self.load_view()).done(function() {
-                        self.render_value();
-                    });
-                });
+        this.$el.addClass('oe_form_field oe_form_field_many2many');
+
+        this.list_view = new instance.web.form.Many2ManyListView(this, this.dataset, false, {
+                    'addable': this.get("effective_readonly") ? null : _t("Add"),
+                    'deletable': this.get("effective_readonly") ? false : true,
+                    'selectable': this.multi_selection,
+                    'sortable': false,
+                    'reorderable': false,
+                    'import_enabled': false,
             });
+        var embedded = (this.field.views || {}).tree;
+        if (embedded) {
+            this.list_view.set_embedded_view(embedded);
+        }
+        this.list_view.m2m_field = this;
+        var loaded = $.Deferred();
+        this.list_view.on("list_view_loaded", this, function() {
+            loaded.resolve();
         });
-        this._super.apply(this, arguments);
+        this.list_view.appendTo(this.$el);
+
+        var old_def = self.is_loaded;
+        self.is_loaded = $.Deferred().done(function() {
+            old_def.resolve();
+        });
+        this.list_dm.add(loaded).then(function() {
+            self.is_loaded.resolve();
+        });
+    },
+    destroy_content: function() {
+        this.list_view.destroy();
+        this.list_view = undefined;
     },
     set_value: function(value_) {
         value_ = value_ || [];
@@ -4115,35 +4134,10 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
     is_false: function () {
         return _(this.get("value")).isEmpty();
     },
-    load_view: function() {
-        var self = this;
-        this.list_view = new instance.web.form.Many2ManyListView(this, this.dataset, false, {
-                    'addable': self.get("effective_readonly") ? null : _t("Add"),
-                    'deletable': self.get("effective_readonly") ? false : true,
-                    'selectable': self.multi_selection,
-                    'sortable': false,
-                    'reorderable': false,
-                    'import_enabled': false,
-            });
-        var embedded = (this.field.views || {}).tree;
-        if (embedded) {
-            this.list_view.set_embedded_view(embedded);
-        }
-        this.list_view.m2m_field = this;
-        var loaded = $.Deferred();
-        this.list_view.on("list_view_loaded", self, function() {
-            self.initial_is_loaded.resolve();
-            loaded.resolve();
-        });
-        $.async_when().done(function () {
-            self.list_view.appendTo(self.$el);
-        });
-        return loaded;
-    },
     render_value: function() {
         var self = this;
         this.dataset.set_ids(this.get("value"));
-        this.is_loaded = this.is_loaded.then(function() {
+        this.render_value_dm.add(this.is_loaded).then(function() {
             return self.list_view.reload_content();
         });
     },

From b75fde3773a2c84d31166560b045d93511ef8d8b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 14:48:42 +0100
Subject: [PATCH 41/56] [FIX] account, sale_crm: fixed invoices analysis

bzr revid: qdp-launchpad@openerp.com-20121129134842-cro77z9siesjifdm
---
 .../account/report/account_invoice_report.py  | 47 ++++++++++++-------
 .../sales_crm_account_invoice_report.py       |  5 +-
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 48f9022a8dc..a001b6b4f52 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -101,7 +101,6 @@ class account_invoice_report(osv.osv):
     }
     _order = 'date desc'
 
-
     def _select(self):
         select_str = """
             SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,
@@ -109,8 +108,12 @@ class account_invoice_report(osv.osv):
                 sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
                 sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
                 sub.product_qty, sub.price_total / cr.rate as price_total, sub.price_average /cr.rate as price_average,
-                cr.rate as currency_rate, sub.residual / cr.rate as residual, sub.section_id
-            FROM (
+                cr.rate as currency_rate, sub.residual / cr.rate as residual
+        """
+        return select_str
+
+    def _sub_select(self):
+        select_str = """
                 SELECT min(ail.id) AS id,
                     ai.date_invoice AS date,
                     to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text) AS year,
@@ -167,13 +170,22 @@ class account_invoice_report(osv.osv):
                                       LEFT JOIN account_invoice a ON a.id = l.invoice_id
                                       WHERE a.id = ai.id)
                                ELSE 1::bigint
-                          END::numeric AS residual,
-                    ai.section_id
+                          END::numeric AS residual
+        """
+        return select_str
+
+    def _from(self):
+        from_str = """
                 FROM account_invoice_line ail
                 JOIN account_invoice ai ON ai.id = ail.invoice_id
                 LEFT JOIN product_product pr ON pr.id = ail.product_id
                 left JOIN product_template pt ON pt.id = pr.product_tmpl_id
                 LEFT JOIN product_uom u ON u.id = ail.uos_id
+        """
+        return from_str
+
+    def _group_by(self):
+        group_by_str = """
                 GROUP BY ail.product_id, ai.date_invoice, ai.id,
                     to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text),
                     to_char(ai.date_invoice::timestamp with time zone, 'MM'::text),
@@ -181,7 +193,17 @@ class account_invoice_report(osv.osv):
                     ai.partner_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
                     ai.fiscal_position, ai.user_id, ai.company_id, ai.type, ai.state, pt.categ_id,
                     ai.date_due, ai.account_id, ail.account_id, ai.partner_bank_id, ai.residual,
-                    ai.amount_total, u.uom_type, u.category_id, ai.section_id
+                    ai.amount_total, u.uom_type, u.category_id
+        """
+        return group_by_str
+
+    def init(self, cr):
+        # self._table = account_invoice_report
+        tools.drop_view_if_exists(cr, self._table)
+        cr.execute("""CREATE or REPLACE VIEW %s as (
+            %s
+            FROM (
+                %s %s %s
             ) AS sub
             JOIN res_currency_rate cr ON (cr.currency_id = sub.currency_id)
             WHERE
@@ -190,17 +212,10 @@ class account_invoice_report(osv.osv):
                           WHERE (cr2.currency_id = sub.currency_id)
                               AND ((sub.date IS NOT NULL AND cr.name <= sub.date)
                                     OR (sub.date IS NULL AND cr.name <= NOW()))
-                          ORDER BY name DESC LIMIT 1);
-        """
-        return select_str
-
-
-    def init(self, cr):
-        # self._table = account_invoice_report
-        tools.drop_view_if_exists(cr, self._table)
-        cr.execute("CREATE or REPLACE VIEW %s as (%s)" % (
+                          ORDER BY name DESC LIMIT 1)
+        )""" % (
                     self._table, 
-                    self._select()))
+                    self._select(), self._sub_select(), self._from(), self._group_by()))
 
 account_invoice_report()
 
diff --git a/addons/sale_crm/report/sales_crm_account_invoice_report.py b/addons/sale_crm/report/sales_crm_account_invoice_report.py
index 8e356527536..27da7640946 100644
--- a/addons/sale_crm/report/sales_crm_account_invoice_report.py
+++ b/addons/sale_crm/report/sales_crm_account_invoice_report.py
@@ -27,7 +27,10 @@ class account_invoice_report(osv.osv):
     }
 
     def _select(self):
-        return  super(account_invoice_report, self)._select() + ", ai.section_id as section_id"
+        return  super(account_invoice_report, self)._select() + ", sub.section_id as section_id"
+
+    def _sub_select(self):
+        return  super(account_invoice_report, self)._sub_select() + ", ai.section_id as section_id"
 
     def _group_by(self):
         return super(account_invoice_report, self)._group_by() + ", ai.section_id"

From 001c45160831ea3bb7e735bad82d2d4043cc7b8b Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 29 Nov 2012 15:07:45 +0100
Subject: [PATCH 42/56] [REV] reverted install-all commit
 (vmt@openerp.com-20121128142106-pdkcruhyz0sjltk8)

bzr revid: vmt@openerp.com-20121129140745-wn2o9ek3beuf7y3y
---
 openerp/cli/server.py      | 10 ++----
 openerp/modules/graph.py   | 24 +++++++++------
 openerp/modules/loading.py | 63 +++++++++++++++++++-------------------
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 9352ad37ef0..f030f801967 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -94,11 +94,7 @@ def setup_pid_file():
 def preload_registry(dbname):
     """ Preload a registry, and start the cron."""
     try:
-        config = openerp.tools.config
-        update_module = True if config['init'] or config['update'] else False
-        db, registry = openerp.pooler.get_db_and_pool(
-            dbname, update_module=update_module, pooljobs=False,
-            force_demo=not config['without_demo'])
+        db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=openerp.tools.config['init'] or openerp.tools.config['update'], pooljobs=False)
 
         # jobs will start to be processed later, when openerp.cron.start_master_thread() is called by openerp.service.start_services()
         registry.schedule_cron_jobs()
@@ -109,9 +105,7 @@ def run_test_file(dbname, test_file):
     """ Preload a registry, possibly run a test file, and start the cron."""
     try:
         config = openerp.tools.config
-        update_module = True if config['init'] or config['update'] else False
-        db, registry = openerp.pooler.get_db_and_pool(
-            dbname, update_module=update_module, pooljobs=False, force_demo=not config['without_demo'])
+        db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
         cr = db.cursor()
         _logger.info('loading test file %s', test_file)
         openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
diff --git a/openerp/modules/graph.py b/openerp/modules/graph.py
index f7e9bc7c77a..56b17e3239a 100644
--- a/openerp/modules/graph.py
+++ b/openerp/modules/graph.py
@@ -87,19 +87,15 @@ class Graph(dict):
             for k, v in additional_data[package.name].items():
                 setattr(package, k, v)
 
-    def add_module(self, cr, module, force_demo=False):
-        self.add_modules(cr, [module], force_demo)
+    def add_module(self, cr, module, force=None):
+        self.add_modules(cr, [module], force)
 
-    def add_modules(self, cr, module_list, force_demo=False):
+    def add_modules(self, cr, module_list, force=None):
+        if force is None:
+            force = []
         packages = []
         len_graph = len(self)
         for module in module_list:
-            if force_demo:
-                cr.execute("""
-                    UPDATE ir_module_module
-                    SET demo='t'
-                    WHERE name = %s""",
-                    (module,))
             # This will raise an exception if no/unreadable descriptor file.
             # NOTE The call to load_information_from_description_file is already
             # done by db.initialize, so it is possible to not do it again here.
@@ -125,6 +121,9 @@ class Graph(dict):
                 current.remove(package)
                 node = self.add_node(package, info)
                 node.data = info
+                for kind in ('init', 'demo', 'update'):
+                    if package in tools.config[kind] or 'all' in tools.config[kind] or kind in force:
+                        setattr(node, kind, True)
             else:
                 later.add(package)
                 packages.append((package, info))
@@ -186,11 +185,18 @@ class Node(Singleton):
         node.depth = self.depth + 1
         if node not in self.children:
             self.children.append(node)
+        for attr in ('init', 'update', 'demo'):
+            if hasattr(self, attr):
+                setattr(node, attr, True)
         self.children.sort(lambda x, y: cmp(x.name, y.name))
         return node
 
     def __setattr__(self, name, value):
         super(Singleton, self).__setattr__(name, value)
+        if name in ('init', 'update', 'demo'):
+            tools.config[name][self.name] = 1
+            for child in self.children:
+                setattr(child, name, value)
         if name == 'depth':
             for child in self.children:
                 setattr(child, name, value + 1)
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 13b02bd7a6e..bcda1690c91 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -42,7 +42,6 @@ from openerp import SUPERUSER_ID
 
 from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
-from openerp.tools import assertion_report
 from openerp.modules.module import initialize_sys_path, \
     load_openerp_module, init_module_models
 
@@ -158,7 +157,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
 
         models = pool.load(cr, package)
         loaded_modules.append(package.name)
-        if package.state in ('to install', 'to upgrade'):
+        if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
             init_module_models(cr, package.name, models)
         pool._init_modules.add(package.name)
         status['progress'] = float(index) / len(graph)
@@ -172,19 +171,18 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
 
         idref = {}
 
-        if package.state == 'to install':
+        mode = 'update'
+        if hasattr(package, 'init') or package.state == 'to install':
             mode = 'init'
-        else:
-            mode = 'update'
 
-        if package.state in ('to install', 'to upgrade'):
+        if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
             if package.state=='to upgrade':
                 # upgrading the module information
                 modobj.write(cr, SUPERUSER_ID, [module_id], modobj.get_values_from_terp(package.data))
             load_init_xml(module_name, idref, mode)
             load_update_xml(module_name, idref, mode)
             load_data(module_name, idref, mode)
-            if package.dbdemo and package.state != 'installed':
+            if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'):
                 status['progress'] = (index + 0.75) / len(graph)
                 load_demo_xml(module_name, idref, mode)
                 load_demo(module_name, idref, mode)
@@ -214,6 +212,9 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
             modobj.update_translations(cr, SUPERUSER_ID, [module_id], None)
 
             package.state = 'installed'
+            for kind in ('init', 'demo', 'update'):
+                if hasattr(package, kind):
+                    delattr(package, kind)
 
         cr.commit()
     
@@ -268,7 +269,10 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         if not openerp.modules.db.is_initialized(cr):
             _logger.info("init db")
             openerp.modules.db.initialize(cr)
-            update_module = True
+            tools.config["init"]["all"] = 1
+            tools.config['update']['all'] = 1
+            if not tools.config['without_demo']:
+                tools.config["demo"]['all'] = 1
 
         # This is a brand new pool, just created in pooler.get_db_and_pool()
         pool = pooler.get_pool(cr.dbname)
@@ -278,51 +282,43 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
 
         # STEP 1: LOAD BASE (must be done before module dependencies can be computed for later steps) 
         graph = openerp.modules.graph.Graph()
-        graph.add_module(cr, 'base', force_demo)
+        graph.add_module(cr, 'base', force)
         if not graph:
             _logger.critical('module base cannot be loaded! (hint: verify addons-path)')
             raise osv.osv.except_osv(_('Could not load base module'), _('module base cannot be loaded! (hint: verify addons-path)'))
 
         # processed_modules: for cleanup step after install
         # loaded_modules: to avoid double loading
-        # After load_module_graph(), 'base' has been installed or updated and its state is 'installed'.
-        report = assertion_report.assertion_report()
-        loaded_modules, processed_modules = load_module_graph(cr, graph, status, report=report)
+        report = pool._assertion_report
+        loaded_modules, processed_modules = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
 
         if tools.config['load_language']:
             for lang in tools.config['load_language'].split(','):
                 tools.load_language(cr, lang)
 
         # STEP 2: Mark other modules to be loaded/updated
-        # This is a one-shot use of tools.config[init|update] from the command line
-        # arguments. It is directly cleared to not interfer with later create/update
-        # issued via RPC.
         if update_module:
             modobj = pool.get('ir.module.module')
-            if ('base' in tools.config['init']) or ('base' in tools.config['update']) \
-                or ('all' in tools.config['init']) or ('all' in tools.config['update']):
+            if ('base' in tools.config['init']) or ('base' in tools.config['update']):
                 _logger.info('updating modules list')
                 modobj.update_list(cr, SUPERUSER_ID)
 
-            if 'all' in tools.config['init']:
-                ids = modobj.search(cr, 1, [])
-                tools.config['init'] = dict.fromkeys([m['name'] for m in modobj.read(cr, 1, ids, ['name'])], 1)
-
             _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys()))
 
-            mods = [k for k in tools.config['init'] if tools.config['init'][k] and k not in ('base', 'all')]
-            ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
-            if ids:
-                modobj.button_install(cr, SUPERUSER_ID, ids) # goes from 'uninstalled' to 'to install'
+            mods = [k for k in tools.config['init'] if tools.config['init'][k]]
+            if mods:
+                ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_install(cr, SUPERUSER_ID, ids)
 
-            mods = [k for k in tools.config['update'] if tools.config['update'][k] and k not in ('base', 'all')]
-            ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
-            if ids:
-                modobj.button_upgrade(cr, SUPERUSER_ID, ids) # goes from 'installed' to 'to upgrade'
+            mods = [k for k in tools.config['update'] if tools.config['update'][k]]
+            if mods:
+                ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_upgrade(cr, SUPERUSER_ID, ids)
+
+            cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
 
-        # Remove that funky global one-shot thingy.
-        for kind in ('init', 'demo', 'update'):
-            tools.config[kind] = {}
 
         # STEP 3: Load marked modules (skipping base which was done in STEP 1)
         # IMPORTANT: this is done in two parts, first loading all installed or
@@ -374,6 +370,9 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
             # Cleanup orphan records
             pool.get('ir.model.data')._process_end(cr, SUPERUSER_ID, processed_modules)
 
+        for kind in ('init', 'demo', 'update'):
+            tools.config[kind] = {}
+
         cr.commit()
 
         # STEP 5: Cleanup menus 

From c166c19ed18a2737d7a885641ebb7b0d25f2b0ed Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Nov 2012 15:17:59 +0100
Subject: [PATCH 43/56] [REM] dead code from evaluation being client-side only

bzr revid: xmo@openerp.com-20121129141759-wj4je85nkrfznql1
---
 addons/web/session.py | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/addons/web/session.py b/addons/web/session.py
index 523aaa9f1fa..65e3beab84a 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -188,34 +188,4 @@ class OpenERPSession(object):
 
         context['lang'] = lang
 
-    @property
-    def base_eval_context(self):
-        """ Default evaluation context for the session.
-
-        Used to evaluate contexts and domains.
-        """
-        base = dict(
-            uid=self._uid,
-            current_date=datetime.date.today().strftime('%Y-%m-%d'),
-            time=time,
-            datetime=datetime,
-            relativedelta=dateutil.relativedelta.relativedelta
-        )
-        base.update(self.context)
-        return base
-
-    def evaluation_context(self, context=None):
-        """ Returns the session's evaluation context, augmented with the
-        provided context if any.
-
-        :param dict context: to add merge in the session's base eval context
-        :returns: the augmented context
-        :rtype: dict
-        """
-        d = dict(self.base_eval_context)
-        if context:
-            d.update(context)
-        d['context'] = d
-        return d
-
 # vim:et:ts=4:sw=4:

From 574f096fcebdb7329dce0d9c59fcfa5e063a4ef2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 15:24:28 +0100
Subject: [PATCH 44/56] [IMP] analytic: When creating new contract, select the
 Template and dates Start and are now adapted accordingly to current time

bzr revid: qdp-launchpad@openerp.com-20121129142428-zpdy567efax0s5qb
---
 addons/analytic/analytic.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 708f9b3b196..6489d8aa760 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -20,8 +20,10 @@
 ##############################################################################
 
 import time
+from datetime import datetime
 
 from osv import fields, osv
+import tools
 from tools.translate import _
 import decimal_precision as dp
 
@@ -199,8 +201,11 @@ class account_analytic_account(osv.osv):
             return {}
         res = {'value':{}}
         template = self.browse(cr, uid, template_id, context=context)
-        res['value']['date_start'] = template.date_start
-        res['value']['date'] = template.date
+        from_dt = datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATE_FORMAT)
+        to_dt = datetime.strptime(template.date, tools.DEFAULT_SERVER_DATE_FORMAT)
+        timedelta = to_dt - from_dt
+        res['value']['date_start'] = fields.date.today()
+        res['value']['date'] = datetime.strftime(datetime.now() + timedelta, tools.DEFAULT_SERVER_DATE_FORMAT)
         res['value']['quantity_max'] = template.quantity_max
         res['value']['description'] = template.description
         return res

From 81035fea58e6faae45faf763bd01846580903c8b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 15:27:12 +0100
Subject: [PATCH 45/56] [IMP] analytic: Add the parent field on the template
 form

bzr revid: qdp-launchpad@openerp.com-20121129142712-yoluy6mxeh7a6ax1
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 1277d25de71..938078b79e0 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,7 +28,7 @@
                             <group>
                                 <field name="code"/>
                                 <field name="type" invisible="context.get('default_type', False)"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
                                 <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>

From 5b71f38603fb198bce32b810ecde04276744ae6b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 29 Nov 2012 15:52:19 +0100
Subject: [PATCH 46/56] [FIX]

bzr revid: fp@tinyerp.com-20121129145219-q6wqvzy61mki2j26
---
 addons/project/project_demo.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index d2bf7d0a2df..f5fbf878fd0 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -40,7 +40,7 @@
 
         <!-- We assign after so that default values applies -->
         <record id="project_project_1" model="project.project">
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
+            <field name="type_ids" eval="[(4, ref('project_tt_analysis')) ,(4,ref('project_tt_specification')), (4,ref('project_tt_development')), (4,ref('project_tt_testing')), (4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_2" model="project.project">
@@ -53,7 +53,7 @@
 
         <!-- We assign after so that default values applies -->
         <record id="project_project_2" model="project.project">
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
+            <field name="type_ids" eval="[(4, ref('project_tt_specification')),(4,ref('project_tt_development')),(4,ref('project_tt_testing')),(4,ref('project_tt_merge')),(4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_3" model="project.project">
@@ -63,13 +63,11 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="privacy_visibility">public</field>
-            <field name="members" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
+            <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
         </record>
 
         <record id="project_project_3" model="project.project">
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
+            <field name="type_ids" eval="[(4, ref('project_tt_specification')),(4,ref('project_tt_development')),(4,ref('project_tt_testing')),(4,ref('project_tt_merge')),(4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_4" model="project.project">
@@ -78,13 +76,11 @@
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
-            <field name="members" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
+            <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
         </record>
 
         <record id="project_project_4" model="project.project">
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
+            <field name="type_ids" eval="[(4, ref('project_tt_design')),(4,ref('project_tt_development')),(4,ref('project_tt_testing'))]"/>
         </record>
 
         <record id="project_project_5" model="project.project">
@@ -99,7 +95,7 @@
         </record>
 
         <record id="project_project_5" model="project.project">
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
+            <field name="type_ids" eval="[(4, ref('project_tt_development'))]"/>
         </record>
 
 

From 64c486e59f1b093bfbf1461b7462b7fccafdcd05 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 29 Nov 2012 16:20:38 +0100
Subject: [PATCH 47/56] [FIX] setup.py: include docutils on windows

bzr revid: chs@openerp.com-20121129152038-hx3km5x55x0oj9r1
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6efec4e6125..4f1435c0603 100755
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@ def py2exe_options():
                     "skip_archive": 1,
                     "optimize": 2,
                     "dist_dir": 'dist',
-                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
+                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
                     "excludes" : ["Tkconstants","Tkinter","tcl"],
                 }
             }

From a520d65e87ed30c13f1cac48548e5abea20b678b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 16:22:33 +0100
Subject: [PATCH 48/56] [IMP] account: in account.move.line search view, allow
 to search on code of accounts as well as on the name column

bzr revid: qdp-launchpad@openerp.com-20121129152233-y5sqdyyygq76fcbi
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7732d8d8cb0..53983551f72 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1238,7 +1238,7 @@
                     <separator/>
                     <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                     <field name="move_id" string="Number (Move)"/>
-                    <field name="account_id"/>
+                    <field name="account_id" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
                     <field name="partner_id"/>
                     <field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
                     <field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->

From cd9e7a32652aeecaac15f199f25a22e21b505ca1 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Thu, 29 Nov 2012 16:24:44 +0100
Subject: [PATCH 49/56] [FIX]Hide useless columns in bank statement

bzr revid: dle@openerp.com-20121129152444-vislwoifnro7khcw
---
 .../account_bank_statement_view.xml                         | 6 +++---
 addons/account_voucher/account_voucher_view.xml             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index adc2963c803..d64eb68bc99 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -43,10 +43,10 @@
       <field name="arch" type="xml">
         <data>
           <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
-            <field name="val_date"/>
-          </xpath>
+            <field name="val_date" invisible="1"/>
+          </xpath> 
           <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-            <field name="globalisation_id" string="Glob. Id"/>
+            <field name="globalisation_id" string="Glob. Id" invisible="1"/>
             <field name="state" invisible="1"/>
           </xpath>
           <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='date']" position="after">
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4dc753deedc..1e1481c3f2b 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -213,7 +213,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
+                    <field name="voucher_id" string="" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
                 </xpath>
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
                     <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>

From cc6f0aa20a558e24886d48d5746a95994893295a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 29 Nov 2012 16:36:01 +0100
Subject: [PATCH 50/56] [FIX] potential problem with pyeval datetime/date
 today()/now() methods. Now only returns the same timezone than server (UTC).

bzr revid: nicolas.vanhoren@openerp.com-20121129153601-vtpnvkc0vylo9hux
---
 addons/web/static/src/js/pyeval.js | 10 +++++-----
 addons/web/static/test/evals.js    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index 265449f9f64..68a7453c958 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -398,14 +398,14 @@ openerp.web.pyeval = function (instance) {
         now: py.classmethod.fromJSON(function () {
             var d = new Date();
             return py.PY_call(datetime.datetime,
-                [d.getFullYear(), d.getMonth() + 1, d.getDate(),
-                 d.getHours(), d.getMinutes(), d.getSeconds(),
-                 d.getMilliseconds() * 1000]);
+                [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
+                 d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(),
+                 d.getUTCMilliseconds() * 1000]);
         }),
         today: py.classmethod.fromJSON(function () {
             var d = new Date();
             return py.PY_call(datetime.datetime,
-                [d.getFullYear(), d.getMonth() + 1, d.getDate()]);
+                [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]);
         }),
         combine: py.classmethod.fromJSON(function () {
             var args = py.PY_parseArgs(arguments, 'date time');
@@ -442,7 +442,7 @@ openerp.web.pyeval = function (instance) {
         today: py.classmethod.fromJSON(function () {
             var d = new Date();
             return py.PY_call(
-                datetime.date, [d.getFullYear(), d.getMonth() + 1, d.getDate()]);
+                datetime.date, [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]);
         }),
         __eq__: function (other) {
             return (this.year === other.year
diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js
index 8e836dade7e..ac6e1f8b0f8 100644
--- a/addons/web/static/test/evals.js
+++ b/addons/web/static/test/evals.js
@@ -16,8 +16,8 @@ openerp.testing.section('eval.types', {
         strictEqual(
             py.eval("time.strftime('%Y-%m-%d %H:%M:%S')", context),
             _.str.sprintf('%04d-%02d-%02d %02d:%02d:%02d',
-                d.getFullYear(), d.getMonth() + 1, d.getDate(),
-                d.getHours(), d.getMinutes(), d.getSeconds()));
+                d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
+                d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds()));
     });
     // Port from pypy/lib_pypy/test_datetime.py
     var makeEq = function (instance, c2) {

From f9b9e7c4cb040d6dce43e8ba3616a1453a1d0db9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 29 Nov 2012 17:07:46 +0100
Subject: [PATCH 51/56] [IMP] added context_today()

bzr revid: nicolas.vanhoren@openerp.com-20121129160746-c3c691zk5fxhzse0
---
 addons/web/static/src/js/pyeval.js | 17 ++++++++++++-----
 addons/web/static/test/evals.js    |  7 +++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index 68a7453c958..4ee9fea0584 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -402,11 +402,6 @@ openerp.web.pyeval = function (instance) {
                  d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(),
                  d.getUTCMilliseconds() * 1000]);
         }),
-        today: py.classmethod.fromJSON(function () {
-            var d = new Date();
-            return py.PY_call(datetime.datetime,
-                [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]);
-        }),
         combine: py.classmethod.fromJSON(function () {
             var args = py.PY_parseArgs(arguments, 'date time');
             return py.PY_call(datetime.datetime, [
@@ -479,6 +474,17 @@ openerp.web.pyeval = function (instance) {
             return py.PY_call(datetime.date, [year, month, day])
         }
     });
+    /**
+        Returns the current local date, which means the date on the client (which can be different
+        compared to the date of the server).
+
+        @return {datetime.date}
+    */
+    var context_today = function() {
+        var d = new Date();
+        return py.PY_call(
+            datetime.date, [d.getFullYear(), d.getMonth() + 1, d.getDate()]);
+    };
     datetime.time = py.type('time', null, {
         __init__: function () {
             var zero = py.float.fromJSON(0);
@@ -691,6 +697,7 @@ openerp.web.pyeval = function (instance) {
         return {
             uid: py.float.fromJSON(instance.session.uid),
             datetime: datetime,
+            context_today: context_today,
             time: time,
             relativedelta: relativedelta,
             current_date: py.PY_call(
diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js
index ac6e1f8b0f8..e2dab6e9a17 100644
--- a/addons/web/static/test/evals.js
+++ b/addons/web/static/test/evals.js
@@ -19,6 +19,13 @@ openerp.testing.section('eval.types', {
                 d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
                 d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds()));
     });
+    test('context_today', function (instance) {
+        var d = new Date();
+        var context = instance.web.pyeval.context();
+        strictEqual(
+            py.eval("context_today().strftime('%Y-%m-%d')", context),
+            String(_.str.sprintf('%04d-%02d-%02d', d.getFullYear(), d.getMonth() + 1, d.getDate())));
+    });
     // Port from pypy/lib_pypy/test_datetime.py
     var makeEq = function (instance, c2) {
         var ctx = instance.web.pyeval.context();

From dc298cd336596c719874f942dec8c6babd359444 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 17:08:47 +0100
Subject: [PATCH 52/56] [IMP] account_analytic_analysis: added an option to set
 the template field mandatory on contracts

bzr revid: qdp-launchpad@openerp.com-20121129160847-k4dr5hd4dh2y3gcw
---
 addons/account_analytic_analysis/__init__.py  |  1 +
 .../account_analytic_analysis/__openerp__.py  |  1 +
 .../account_analytic_analysis_view.xml        | 12 +++++++
 .../account_analytic_analysis/res_config.py   | 31 +++++++++++++++++++
 .../res_config_view.xml                       | 21 +++++++++++++
 .../account_analytic_analysis_security.xml    |  9 +++++-
 addons/sale/res_config_view.xml               |  4 +--
 7 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 addons/account_analytic_analysis/res_config.py
 create mode 100644 addons/account_analytic_analysis/res_config_view.xml

diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py
index 429aa011f31..9aae723c5cf 100644
--- a/addons/account_analytic_analysis/__init__.py
+++ b/addons/account_analytic_analysis/__init__.py
@@ -21,6 +21,7 @@
 
 import account_analytic_analysis
 import cron_account_analytic_account
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 7675ef9f38e..53ebf225de1 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -40,6 +40,7 @@ Adds menu to show relevant information to each manager.You can also view the rep
         'account_analytic_analysis_view.xml',
         'account_analytic_analysis_menu.xml',
         'account_analytic_analysis_cron.xml',
+        'res_config_view.xml',
     ],
     'css': [
         'static/src/css/analytic.css'
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index be2a504658f..d88ae44fb5e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -147,6 +147,18 @@
             </field>
         </record>
 
+        <record id="view_account_analytic_account_template_required" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.template.required</field>
+            <field name="model">account.analytic.account</field>
+            <field name="groups_id" eval="[(6, 0, [ref('group_template_required')])]"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <field name="template_id" position="attributes">
+                    <attribute name="required">True</attribute>
+                </field>
+            </field>
+        </record>
+
         <record id="template_of_contract_action" model="ir.actions.act_window">
             <field name="name">Template of Contract</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/account_analytic_analysis/res_config.py b/addons/account_analytic_analysis/res_config.py
new file mode 100644
index 00000000000..94fe769fdd4
--- /dev/null
+++ b/addons/account_analytic_analysis/res_config.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class sale_configuration(osv.osv_memory):
+    _inherit = 'sale.config.settings'
+
+    _columns = {
+        'group_template_required': fields.boolean("Mandatory use of templates.",
+            implied_group='account_analytic_analysis.group_template_required',
+            help="Allows you to set the template field as required when creating an analytic account or a contract."),
+    }
diff --git a/addons/account_analytic_analysis/res_config_view.xml b/addons/account_analytic_analysis/res_config_view.xml
new file mode 100644
index 00000000000..9c7881f2a9e
--- /dev/null
+++ b/addons/account_analytic_analysis/res_config_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_sales_config" model="ir.ui.view">
+            <field name="name">sale settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="inherit_id" ref="sale.view_sales_config"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='module_analytic_user_function']" position="inside">
+                    <div>
+                        <field name="group_template_required" class="oe_inline"/>
+                        <label for="group_template_required"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
index 8bcc7f2d7f0..948c390e039 100644
--- a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
+++ b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
@@ -6,5 +6,12 @@
         <field eval="[(4,ref('sale.group_analytic_accounting'))]" name="groups_id"/>
     </record>
 
+    <record id="group_template_required" model="res.groups">
+        <field name="name">Mandatory use of templates in contracts</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="comment">the field template of the analytic accounts and contracts will be required.</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index daf396d302b..b150fb276b7 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -86,13 +86,13 @@
                         your customer.
                     </p>
                     <group>
-                        <label for="id" string="Contract Feature"/>
+                        <label for="id" string="Contract Features"/>
                         <div>
                             <div>
                                 <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
                                 <label for="module_account_analytic_analysis"/>
                             </div>
-                            <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
+                            <div name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
                                 <field name="module_analytic_user_function" class="oe_inline"/>
                                 <label for="module_analytic_user_function"/>
                             </div>

From f56badd8252fa62726f68266567d17f5181aa73f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 29 Nov 2012 17:14:58 +0100
Subject: [PATCH 53/56] [IMP] project_issue private note for phu

bzr revid: fp@tinyerp.com-20121129161458-232bfavt2f9lln41
---
 addons/project_issue/project_issue.py       | 2 +-
 addons/project_issue/project_issue_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index fe5ce9f325b..55aa0fd557b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -225,7 +225,7 @@ class project_issue(base_stage, osv.osv):
                              Define Responsible user and Email account for mail gateway.'),
         'partner_id': fields.many2one('res.partner', 'Contact', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
-        'description': fields.text('Description'),
+        'description': fields.text('Private Note'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_ISSUE_STATE, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9e25fbca6a6..b7cdfbb0372 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -130,7 +130,7 @@
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description" placeholder="Add a description..."/>
+                            <field name="description" placeholder="Add an internal note..." groups="base.group_user"/>
                         </page>
                         <page string="Extra Info" groups="base.group_no_one">
                             <group col="4" colspan="4">

From 720f9093bcfff0996764e655a5b48bfa51062682 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 29 Nov 2012 17:25:31 +0100
Subject: [PATCH 54/56] [IMP] layout issue forms

bzr revid: fp@tinyerp.com-20121129162531-26hx9nwmq7f94kp4
---
 addons/project_issue/project_issue_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b7cdfbb0372..60cc6448a46 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -111,21 +111,21 @@
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                        </group>
-                        <group>
-                            <field name="priority" groups="base.group_user"/>
                             <label for="project_id" groups="base.group_user"/>
                             <div groups="base.group_user">
                                 <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" class="oe_inline"/>
+                                <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"/>
                             </div>
+                        </group>
+                        <group>
+                            <field name="categ_ids" widget="many2many_tags"/>
+                            <field name="version_id" groups="base.group_user"/>
+                            <field name="priority" groups="base.group_user"/>
                             <label for="task_id" groups="base.group_user"/>
                             <div groups="base.group_user">
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                             </div>
-                            <field name="categ_ids" widget="many2many_tags"/>
-                            <field name="version_id" groups="base.group_user"/>
                         </group>
                     </group>
                     <notebook>

From 219edfa80db568f37913404985bf0f4b6b027d6d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 17:25:58 +0100
Subject: [PATCH 55/56] [FIX] analytic: fixed onchange of template

bzr revid: qdp-launchpad@openerp.com-20121129162558-sotcsrchh8p772xs
---
 .../account_analytic_analysis_view.xml                 |  2 +-
 addons/analytic/analytic.py                            | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index d88ae44fb5e..2ece3a38652 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -154,7 +154,7 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <field name="template_id" position="attributes">
-                    <attribute name="required">True</attribute>
+                    <attribute name="attrs">{'required': [('type','=','contract')], 'invisible': [('type','in',['view', 'normal','template'])]}</attribute>
                 </field>
             </field>
         </record>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6489d8aa760..542acb1e88c 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -201,12 +201,14 @@ class account_analytic_account(osv.osv):
             return {}
         res = {'value':{}}
         template = self.browse(cr, uid, template_id, context=context)
-        from_dt = datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATE_FORMAT)
-        to_dt = datetime.strptime(template.date, tools.DEFAULT_SERVER_DATE_FORMAT)
-        timedelta = to_dt - from_dt
+        if template.date_start and template.date:
+            from_dt = datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATE_FORMAT)
+            to_dt = datetime.strptime(template.date, tools.DEFAULT_SERVER_DATE_FORMAT)
+            timedelta = to_dt - from_dt
+            res['value']['date'] = datetime.strftime(datetime.now() + timedelta, tools.DEFAULT_SERVER_DATE_FORMAT)
         res['value']['date_start'] = fields.date.today()
-        res['value']['date'] = datetime.strftime(datetime.now() + timedelta, tools.DEFAULT_SERVER_DATE_FORMAT)
         res['value']['quantity_max'] = template.quantity_max
+        res['value']['parent_id'] = template.parent_id and template.parent_id.id or False
         res['value']['description'] = template.description
         return res
 

From ab7d73f3e3026e1207b05bbc02d284dfd0a89ccb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 29 Nov 2012 17:33:13 +0100
Subject: [PATCH 56/56] [IMP] analytic: usability

bzr revid: qdp-launchpad@openerp.com-20121129163313-aan0if5wex8v5dsx
---
 addons/analytic/analytic_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 938078b79e0..0faca841a0f 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -26,10 +26,10 @@
                                 <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
-                                <field name="code"/>
                                 <field name="type" invisible="context.get('default_type', False)"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
                                 <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                                <field name="code"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>