From e0d0fc137bc9886e1e6bf83c0c175675e6e58c49 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 29 Jul 2013 18:33:45 +0200
Subject: [PATCH 1/8] [ADD] module views: add css for html description (wip)

bzr revid: chs@openerp.com-20130729163345-lvabk8fu23plvtm4
---
 openerp/addons/base/module/module_view.xml    |   6 +-
 openerp/addons/base/static/src/css/Makefile   |   2 +
 .../base/static/src/css/description.css       | 732 ++++++++++++++++++
 .../base/static/src/css/description.sass      | 574 ++++++++++++++
 4 files changed, 1311 insertions(+), 3 deletions(-)
 create mode 100644 openerp/addons/base/static/src/css/Makefile
 create mode 100644 openerp/addons/base/static/src/css/description.css
 create mode 100644 openerp/addons/base/static/src/css/description.sass

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 2b65289bf26..462d03a1c01 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -70,7 +70,8 @@
             <field name="name">ir.module.module.form</field>
             <field name="model">ir.module.module</field>
             <field name="arch" type="xml">
-                <form create="0" edit="0" string="Module" version="7.0" class='oe_styling_v8'>
+                <form create="0" edit="0" string="Module" version="7.0">
+                    <link rel="stylesheet" href="/base/static/src/css/description.css"></link>
                     <sheet>
                     <field name="icon_image" widget="image" class="oe_avatar oe_left"/>
                     <div class="oe_title">
@@ -128,8 +129,7 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <field name="description_html" class='oe_app_description oe_styling_v8'/>
-                    <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight oe_center"/>
+                    <field name="description_html" class='oe_styling_v8'/>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/static/src/css/Makefile b/openerp/addons/base/static/src/css/Makefile
new file mode 100644
index 00000000000..cf91573f741
--- /dev/null
+++ b/openerp/addons/base/static/src/css/Makefile
@@ -0,0 +1,2 @@
+sass:
+	sass -t expanded --compass  --watch --unix-newlines *.sass 
diff --git a/openerp/addons/base/static/src/css/description.css b/openerp/addons/base/static/src/css/description.css
new file mode 100644
index 00000000000..79d2e9e5f5e
--- /dev/null
+++ b/openerp/addons/base/static/src/css/description.css
@@ -0,0 +1,732 @@
+@charset "utf-8";
+/*
+ *  This CSS contains the website layout framework
+ *  which is common to both the website and the 
+ *  OpenERP application.
+ */
+/* --------------------------------- *
+ *          STYLING CONTEXT          *
+ * --------------------------------- */
+/* --- Styling for the V8/Lato/White/Purple design --- */
+body.oe_styling_v8 {
+  background: #e9e9e9;
+  padding: 0;
+  margin: 0;
+}
+
+.oe_styling_v8 {
+  font-family: "Open Sans", "Helvetica", Sans;
+  font-weight: 300;
+  color: #646464;
+  background: white;
+  font-size: 16px;
+}
+.oe_styling_v8 .oe_website_contents {
+  background: whitesmoke;
+  padding-bottom: 1px;
+}
+.oe_styling_v8 b {
+  font-weight: 600;
+}
+.oe_styling_v8 a {
+  color: #6d57e0;
+  text-decoration: none;
+}
+.oe_styling_v8 a:visited {
+  color: #5b284f;
+}
+.oe_styling_v8 a:hover {
+  color: #0096eb;
+}
+.oe_styling_v8 .oe_title_font {
+  font-family: "Lato", "Open Sans", "Helvetica", Sans;
+}
+.oe_styling_v8 .oe_page {
+  background: white;
+  overflow: hidden;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  -ms-border-radius: 1px;
+  -o-border-radius: 1px;
+  border-radius: 1px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
+}
+.oe_styling_v8 .oe_emph {
+  font-weight: 400;
+}
+.oe_styling_v8 .oe_dark {
+  overflow: hidden;
+  background: #fcfcfc;
+  -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
+  -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
+  box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
+}
+
+/* --------------------------------- *
+ *               LAYOUT              *
+ * --------------------------------- */
+/* ------ BASE GRID CONSTRUCTS ----- */
+.oe_page {
+  margin: 0px auto 64px auto;
+  max-width: 992px;
+}
+
+.oe_row {
+  width: 928px;
+  margin-top: 16px;
+  margin-bottom: 16px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.oe_row.oe_fit {
+  width: auto;
+}
+
+.oe_clearfix:after, .oe_row:after {
+  content: ".";
+  display: block;
+  clear: both;
+  visibility: hidden;
+  line-height: 0;
+  height: 0;
+}
+
+[class*='oe_span'] {
+  float: left;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0 16px;
+}
+
+.oe_span12 {
+  width: 928px;
+}
+
+.oe_span10 {
+  width: 773px;
+}
+
+.oe_span9 {
+  width: 696px;
+}
+
+.oe_span8 {
+  width: 618px;
+}
+
+.oe_span6 {
+  width: 464px;
+}
+
+.oe_span4 {
+  width: 309px;
+}
+
+.oe_span3 {
+  width: 232px;
+}
+
+.oe_span2 {
+  width: 154px;
+}
+
+[class*='oe_span'].oe_fit {
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+}
+
+[class*='oe_span'].oe_right {
+  float: right;
+}
+
+.oe_row.oe_flex [class*='oe_span'] {
+  display: inline-block;
+  float: none;
+  vertical-align: top;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0 16px;
+  width: auto;
+}
+.oe_row.oe_flex .oe_span12 {
+  max-width: 928px;
+}
+.oe_row.oe_flex .oe_span10 {
+  max-width: 769px;
+}
+.oe_row.oe_flex .oe_span9 {
+  max-width: 692px;
+}
+.oe_row.oe_flex .oe_span8 {
+  max-width: 614px;
+}
+.oe_row.oe_flex .oe_span6 {
+  max-width: 460px;
+}
+.oe_row.oe_flex .oe_span4 {
+  max-width: 305px;
+}
+.oe_row.oe_flex .oe_span3 {
+  max-width: 228px;
+}
+.oe_row.oe_flex .oe_span2 {
+  max-width: 150px;
+}
+
+.oe_mb0 {
+  margin-bottom: 0px !important;
+}
+
+.oe_mb4 {
+  margin-bottom: 4px !important;
+}
+
+.oe_mb8 {
+  margin-bottom: 8px !important;
+}
+
+.oe_mb16 {
+  margin-bottom: 16px !important;
+}
+
+.oe_mb32 {
+  margin-bottom: 32px !important;
+}
+
+.oe_mb48 {
+  margin-bottom: 48px !important;
+}
+
+.oe_mb64 {
+  margin-bottom: 64px !important;
+}
+
+.oe_mt0 {
+  margin-top: 0px !important;
+}
+
+.oe_mt4 {
+  margin-top: 4px !important;
+}
+
+.oe_mt8 {
+  margin-top: 8px !important;
+}
+
+.oe_mt16 {
+  margin-top: 16px !important;
+}
+
+.oe_mt32 {
+  margin-top: 32px !important;
+}
+
+.oe_mt48 {
+  margin-top: 48px !important;
+}
+
+.oe_mt64 {
+  margin-top: 64px !important;
+}
+
+/* ------ GENERIC LAYOUT MODIFIERS ----- */
+.oe_rightfit {
+  padding-right: 0px !important;
+}
+
+.oe_leftfit {
+  padding-left: 0px !important;
+}
+
+.oe_leftalign {
+  text-align: left;
+}
+
+.oe_rightalign {
+  text-align: right;
+}
+
+.oe_centeralign {
+  text-align: center;
+}
+
+.oe_centered {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.oe_hidden {
+  display: none !important;
+  opacity: 0 !important;
+}
+
+.oe_invisible {
+  visibility: hidden !important;
+}
+
+.oe_transparent {
+  opacity: 0 !important;
+}
+
+.oe_mb0 {
+  margin-bottom: 0px !important;
+}
+
+.oe_mb4 {
+  margin-bottom: 4px !important;
+}
+
+.oe_mb8 {
+  margin-bottom: 8px !important;
+}
+
+.oe_mb16 {
+  margin-bottom: 16px !important;
+}
+
+.oe_mb32 {
+  margin-bottom: 32px !important;
+}
+
+.oe_mb64 {
+  margin-bottom: 64px !important;
+}
+
+.oe_spaced {
+  margin-top: 32px;
+  margin-bottom: 32px;
+}
+
+.oe_more_spaced {
+  margin-top: 64px;
+  margin-bottom: 64px;
+}
+
+.oe_padded {
+  padding-top: 16px;
+  padding-bottom: 16px;
+}
+
+.oe_more_padded {
+  padding-top: 32px;
+  padding-bottom: 32px;
+}
+
+/* --------------------------------- *
+ *        WEBPAGE COMPONENTS         *
+ * --------------------------------- */
+/* ------ BUTTONS ----- */
+.oe_button {
+  position: relative;
+  bottom: 0;
+  display: inline-block;
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+
+.oe_styling_v8 .oe_button, .oe_styling_v8 a.oe_button {
+  padding: 8px 14px;
+  background: #8b72b6;
+  color: white;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
+  -webkit-box-shadow: 0px 2px 0px #afa8cc;
+  -moz-box-shadow: 0px 2px 0px #afa8cc;
+  box-shadow: 0px 2px 0px #afa8cc;
+  text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.44);
+  border: solid 1px rgba(0, 0, 0, 0.09);
+  -webkit-transition-property: bottom, background;
+  -moz-transition-property: bottom, background;
+  -o-transition-property: bottom, background;
+  transition-property: bottom, background;
+  -webkit-transition-duration: 250ms;
+  -moz-transition-duration: 250ms;
+  -o-transition-duration: 250ms;
+  transition-duration: 250ms;
+}
+.oe_styling_v8 .oe_button:hover, .oe_styling_v8 a.oe_button:hover {
+  background: #8b5bdd;
+  color: white;
+}
+.oe_styling_v8 .oe_button:active, .oe_styling_v8 a.oe_button:active {
+  background: #333333;
+  bottom: -3px;
+}
+.oe_styling_v8 .oe_button.oe_big, .oe_styling_v8 a.oe_button.oe_big {
+  font-size: 24px;
+}
+.oe_styling_v8 .oe_button.oe_bigger, .oe_styling_v8 a.oe_button.oe_bigger {
+  font-size: 32px;
+}
+.oe_styling_v8 .oe_button.oe_small, .oe_styling_v8 a.oe_button.oe_small {
+  font-size: 13px;
+  padding: 2px 4px;
+}
+.oe_styling_v8 .oe_button.oe_small:active, .oe_styling_v8 a.oe_button.oe_small:active {
+  bottom: -1px;
+}
+.oe_styling_v8 .oe_button.oe_medium, .oe_styling_v8 a.oe_button.oe_medium {
+  padding: 5px 12px;
+  font-size: 16px;
+}
+.oe_styling_v8 .oe_button.oe_tacky, .oe_styling_v8 a.oe_button.oe_tacky {
+  background: #ff4444;
+  -webkit-box-shadow: 0px 2px 0px #eba8a8;
+  -moz-box-shadow: 0px 2px 0px #eba8a8;
+  box-shadow: 0px 2px 0px #eba8a8;
+}
+.oe_styling_v8 .oe_button.oe_tacky:hover, .oe_styling_v8 a.oe_button.oe_tacky:hover {
+  background: #ff1010;
+}
+.oe_styling_v8 .oe_button.oe_tacky:active, .oe_styling_v8 a.oe_button.oe_tacky:active {
+  background: black;
+}
+.oe_styling_v8 .oe_button.oe_disabled, .oe_styling_v8 a.oe_button.oe_disabled {
+  background: #c8c8c8;
+  -webkit-box-shadow: 0px 2px 0px #b4b4b4;
+  -moz-box-shadow: 0px 2px 0px #b4b4b4;
+  box-shadow: 0px 2px 0px #b4b4b4;
+  cursor: default;
+}
+.oe_styling_v8 .oe_button.oe_disabled:hover, .oe_styling_v8 a.oe_button.oe_disabled:hover {
+  background: #c8c8c8;
+  -webkit-box-shadow: 0px 2px 0px #b4b4b4;
+  -moz-box-shadow: 0px 2px 0px #b4b4b4;
+  box-shadow: 0px 2px 0px #b4b4b4;
+}
+.oe_styling_v8 .oe_button.oe_disabled:active, .oe_styling_v8 a.oe_button.oe_disabled:active {
+  background: #c8c8c8;
+  bottom: 0px;
+  -webkit-box-shadow: 0px 2px 0px #b4b4b4;
+  -moz-box-shadow: 0px 2px 0px #b4b4b4;
+  box-shadow: 0px 2px 0px #b4b4b4;
+}
+
+.oe_styling_v8.oe_styling_black .oe_button {
+  -webkit-box-shadow: 0px 2px 0px #463555;
+  -moz-box-shadow: 0px 2px 0px #463555;
+  box-shadow: 0px 2px 0px #463555;
+}
+
+/* ------ FORMS ----- */
+.oe_styling_v8 {
+  /* FIXME: this is a quick hack for the release */
+}
+.oe_styling_v8 .oe_input {
+  padding: 4px 7px;
+  border-radius: 3px;
+  border: solid 1px #d6d6d6;
+  box-shadow: 0px 2px #e6e6e6;
+  background: #fafafa;
+  font-weight: 300;
+  outline: none;
+  -webkit-transition: all 150ms linear;
+  -moz-transition: all 150ms linear;
+  -o-transition: all 150ms linear;
+  transition: all 150ms linear;
+}
+.oe_styling_v8 .oe_input:focus {
+  border: solid 1px #969696;
+  box-shadow: 0px 2px #d2d2d2;
+}
+.oe_styling_v8 .oe_input.oe_valid {
+  background: #f2ffec;
+  border-color: #b1ebb6;
+  box-shadow: 0px 2px #e1f8e1;
+  color: #0f610f;
+}
+.oe_styling_v8 .oe_input.oe_invalid {
+  background: #fff2f2;
+  border-color: #ebb1b1;
+  box-shadow: 0px 2px #f8e1e1;
+  color: #610f0f;
+}
+.oe_styling_v8 .oe_input.oe_big {
+  padding: 8px 14px;
+}
+.oe_styling_v8 .oe_input_label {
+  font-weight: 300;
+  font-size: 16px;
+}
+.oe_styling_v8 .oe_input_label.oe_big {
+  font-size: 20px;
+}
+.oe_styling_v8 .oe_textarea {
+  width: 300px;
+  height: 80px;
+}
+.oe_styling_v8 .oe_form_layout_table {
+  width: 100%;
+}
+.oe_styling_v8 .oe_form_layout_table td {
+  padding-bottom: 16px;
+}
+.oe_styling_v8 .oe_form_layout_table td:first-child {
+  text-align: right;
+  padding-right: 16px;
+}
+
+/* ------ SLOGANS ----- */
+.oe_styling_v8 .oe_slogan {
+  color: #333333;
+  font-family: "Lato", "Open Sans", "Helvetica", Sans;
+  text-align: center;
+  margin-top: 32px;
+  margin-bottom: 32px;
+}
+.oe_styling_v8 h1.oe_slogan {
+  font-size: 64px;
+  font-weight: 900;
+  margin-top: 48px;
+  margin-bottom: 48px;
+}
+.oe_styling_v8 h2.oe_slogan {
+  font-size: 40px;
+  font-weight: 300;
+}
+.oe_styling_v8 h3.oe_slogan {
+  font-size: 26px;
+  font-weight: 300;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+.oe_styling_v8 h4.oe_slogan {
+  font-size: 24px;
+  font-weight: 300;
+}
+.oe_styling_v8 h4.oe_slogan:before, .oe_styling_v8 h4.oe_slogan:after {
+  margin: 0 20px;
+  content: "";
+  display: inline-block;
+  width: 100px;
+  height: 0px;
+  border-top: solid 1px;
+  vertical-align: middle;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=30);
+  opacity: 0.3;
+}
+.oe_styling_v8 h5.oe_slogan {
+  font-weight: 300;
+}
+.oe_styling_v8 h2.oe_slogan + h3.oe_slogan {
+  margin-top: -28px;
+}
+
+/* ------ QUOTES ----- */
+.oe_quote {
+  margin: 8px;
+  padding: 16px;
+  background: rgba(0, 0, 0, 0.02);
+  border: solid 1px rgba(0, 0, 0, 0.06);
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
+}
+.oe_quote .oe_q, .oe_quote q {
+  margin: 10px;
+  display: block;
+  font-style: italic;
+  text-align: center;
+  font-size: 20px;
+  color: #4e66e7;
+}
+.oe_quote .oe_q:before, .oe_quote .oe_q:after, .oe_quote q:before, .oe_quote q:after {
+  content: '"';
+  font-weight: 900;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20);
+  opacity: 0.2;
+}
+.oe_quote cite {
+  display: block;
+  font-style: normal;
+  margin-top: 16px;
+}
+.oe_quote .oe_photo {
+  float: left;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  margin-right: 16px;
+}
+.oe_quote .oe_author {
+  font-size: 20px;
+  padding-top: 6px;
+  color: #8d7bac;
+}
+
+.oe_dark .oe_quote {
+  background: white;
+  border: 1px solid #f0f0ff;
+}
+
+/* ------ PICTURES ----- */
+.oe_picture {
+  display: block;
+  max-width: 84%;
+  max-height: 400px;
+  margin: 16px 8%;
+}
+
+.oe_screenshot {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2);
+  box-shadow: 0px 3px 8px rgba(0, 0, 0, 0.2);
+}
+
+.oe_pic_ctr {
+  position: relative;
+}
+
+.oe_pic_ctr > img.oe_picture {
+  width: 100%;
+  max-width: none;
+  max-height: none;
+  margin: 0;
+}
+
+.oe_pic_ctr > .oe_title {
+  position: absolute;
+  top: 15px;
+  right: 38px;
+}
+
+.oe_styling_v8 .oe_pic_ctr > .oe_title {
+  font-size: 64px;
+  color: white;
+  font-weight: 600;
+  margin: 0;
+  text-shadow: 0px 2px 0px #494949, 0px 2px 5px rgba(0, 0, 0, 0.33), 0px 0px 60px rgba(0, 0, 0, 0.22);
+}
+
+/*  ----- Link Image with Footer ----- */
+/* FIXME: Terrible CSS, rewrite this */
+div.oe_demo {
+  position: relative;
+  border: 1px solid #dedede;
+}
+div.oe_demo span.oe_demo_play {
+  top: 50%;
+  left: 50%;
+  width: 80px;
+  height: 60px;
+  margin-top: -30px;
+  margin-left: -40px;
+  display: block;
+  position: absolute;
+  background: url("../img/layout/play-button.png") no-repeat left top transparent;
+  pointer-events: none;
+}
+div.oe_demo img {
+  max-width: 100%;
+  width: 100%;
+}
+div.oe_demo div.oe_demo_footer {
+  position: absolute;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  opacity: 0.85;
+  bottom: -1px;
+  width: 100%;
+  padding-top: 7px;
+  padding-bottom: 7px;
+  color: white;
+  font-size: 14px;
+  font-weight: bold;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  pointer-events: none;
+}
+
+div.oe_demo:hover span.oe_demo_play {
+  background: url("../img/layout/play-button-over.png") no-repeat left top transparent;
+}
+
+/*  ----- SEPARATOR ----- */
+.oe_styling_v8 .oe_container.oe_separator {
+  height: 64px;
+  margin-bottom: 16px;
+  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(0, 0, 0, 0)), color-stop(100%, rgba(0, 0, 0, 0.02)));
+  background: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.02));
+  background: -moz-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.02));
+  background: -o-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.02));
+  background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.02));
+  -webkit-box-shadow: 0px -3px 10px -5px rgba(0, 0, 0, 0.1) inset;
+  -moz-box-shadow: 0px -3px 10px -5px rgba(0, 0, 0, 0.1) inset;
+  box-shadow: 0px -3px 10px -5px rgba(0, 0, 0, 0.1) inset;
+  overflow-y: hidden;
+}
+
+/*  ----- TABS -----  */
+.oe_row_tabs {
+  text-align: center;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding-top: 21px;
+}
+
+.oe_row_tab {
+  position: relative;
+  min-width: 120px;
+  padding: 8px;
+  font-size: 20px;
+  display: inline-block;
+  margin: 0px -2px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border: solid 1px rgba(0, 0, 0, 0.1);
+  border-bottom: none;
+  background: #fafafa;
+  background-image: +linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.02));
+  box-shadow: 0px -3px 10px -5px rgba(0, 0, 0, 0.1) inset;
+  cursor: pointer;
+  -webkit-transition: all 250ms linear;
+  -moz-transition: all 250ms linear;
+  -o-transition: all 250ms linear;
+  transition: all 250ms linear;
+}
+
+.oe_row_tab:hover {
+  padding-bottom: 12px;
+  top: -4px;
+  background-color: white;
+}
+
+.oe_row_tab.oe_active {
+  background-color: white;
+  background-image: none;
+  box-shadow: none;
+  border-top-color: #8272b6;
+  border-top-width: 2px;
+  cursor: default;
+}
+
+.oe_row_tab.oe_active:hover {
+  padding-bottom: 8px;
+  top: 0asx;
+}
+
+/* ------ CALL TO ACTION ----- */
+.oe_calltoaction {
+  height: 32px;
+  margin-top: -32px;
+  position: relative;
+}
diff --git a/openerp/addons/base/static/src/css/description.sass b/openerp/addons/base/static/src/css/description.sass
new file mode 100644
index 00000000000..11b1410d9bd
--- /dev/null
+++ b/openerp/addons/base/static/src/css/description.sass
@@ -0,0 +1,574 @@
+@charset "utf-8" 
+@import "compass/css3"
+@import "compass/css3/user-interface"
+
+/**
+ *  This CSS contains the website layout framework
+ *  which is common to both the website and the 
+ *  OpenERP application.
+ */
+
+/* --------------------------------- * 
+ *          STYLING CONTEXT          *
+ * --------------------------------- */
+
+/* --- Styling for the V8/Lato/White/Purple design --- */
+
+$v8_footer_color: #e9e9e9
+$v8_title_font_color: rgb(51,51,51)
+$v8_text_font_color:  rgb(100,100,100)
+$v8_font_paragraph_color:   rgb(51,51,51)
+$v8_body_color:   rgb(245,245,245)
+$v8_bg_color:     rgb(255,255,255)
+$v8_text_font_family:  'Open Sans','Helvetica',Sans
+$v8_title_font_family:  'Lato','Open Sans','Helvetica',Sans
+$v8_anchor_color: #6D57E0
+$v8_anchor_visited_color: rgb(91, 40, 79)
+
+body.oe_styling_v8
+  background: $v8_footer_color
+  padding: 0
+  margin: 0
+
+.oe_styling_v8
+  font-family: $v8_text_font_family
+  font-weight: 300
+  color: $v8_text_font_color
+  background: $v8_bg_color
+  font-size: 16px
+
+  .oe_website_contents
+    background: $v8_body_color
+    padding-bottom: 1px
+
+  b
+    font-weight: 600
+  a
+    color: $v8_anchor_color
+    text-decoration: none
+  a:visited
+    color: $v8_anchor_visited_color
+  a:hover
+    color: #0096EB
+
+  .oe_title_font
+    font-family: $v8_title_font_family
+
+
+  .oe_page
+    background: $v8_bg_color
+    overflow: hidden
+    +border-radius(1px)
+    +box-shadow(0 1px 3px rgba(0,0,0,0.35))
+
+  .oe_emph
+    font-weight: 400
+
+  .oe_dark
+    overflow: hidden
+    background: #FCFCFC
+    +box-shadow(0px 5px 9px -7px rgba(0,0,255,0.5) inset, 0px -3px 9px -7px rgba(0,0,255,0.5) inset)
+
+/* --------------------------------- * 
+ *               LAYOUT              *
+ * --------------------------------- */
+
+/* ------ BASE GRID CONSTRUCTS ----- */
+
+.oe_page
+  margin: 0px auto 64px auto
+  max-width: 992px
+
+
+.oe_container
+
+.oe_row
+  width: 928px
+  margin-top: 16px
+  margin-bottom: 16px
+  margin-left: auto
+  margin-right: auto
+
+.oe_row.oe_fit
+  width: auto
+
+.oe_clearfix:after, .oe_row:after
+  content: "."
+  display: block
+  clear: both
+  visibility: hidden
+  line-height: 0
+  height: 0
+
+$oe_span12_width: 928px
+$oe_span10_width: 773px
+$oe_span9_width:  696px
+$oe_span8_width:  618px
+$oe_span6_width:  464px
+$oe_span4_width:  309px
+$oe_span3_width:  232px
+$oe_span2_width:  154px
+
+[class*='oe_span']
+  float: left
+  +box-sizing(border-box)
+  padding: 0 16px
+.oe_span12
+  width: $oe_span12_width
+.oe_span10
+  width: $oe_span10_width
+.oe_span9
+  width: $oe_span9_width
+.oe_span8
+  width: $oe_span8_width
+.oe_span6
+  width: $oe_span6_width
+.oe_span4
+  width: $oe_span4_width
+.oe_span3
+  width: $oe_span3_width
+.oe_span2
+  width: $oe_span2_width
+
+[class*='oe_span'].oe_fit
+  padding-left: 0px !important
+  padding-right: 0px !important
+
+[class*='oe_span'].oe_right
+  float: right
+
+.oe_row.oe_flex
+  [class*='oe_span']
+    display: inline-block
+    float: none
+    vertical-align: top
+    +box-sizing(border-box)
+    padding: 0 16px
+    width: auto
+  .oe_span12
+    max-width: $oe_span12_width
+  .oe_span10
+    max-width: ($oe_span10_width +-4px)
+  .oe_span9
+    max-width: ($oe_span9_width +-4px)
+  .oe_span8 
+    max-width: ($oe_span8_width +-4px)
+  .oe_span6
+    max-width: ($oe_span6_width +-4px)
+  .oe_span4
+    max-width: ($oe_span4_width +-4px)
+  .oe_span3
+    max-width: ($oe_span3_width +-4px)
+  .oe_span2
+    max-width: ($oe_span2_width +-4px)
+
+.oe_mb0
+  margin-bottom: 0px !important
+.oe_mb4
+  margin-bottom: 4px !important
+.oe_mb8
+  margin-bottom: 8px !important
+.oe_mb16
+  margin-bottom: 16px !important
+.oe_mb32
+  margin-bottom: 32px !important
+.oe_mb48
+  margin-bottom: 48px !important
+.oe_mb64
+  margin-bottom: 64px !important
+
+.oe_mt0
+  margin-top: 0px !important
+.oe_mt4
+  margin-top: 4px !important
+.oe_mt8
+  margin-top: 8px !important
+.oe_mt16
+  margin-top: 16px !important
+.oe_mt32
+  margin-top: 32px !important
+.oe_mt48
+  margin-top: 48px !important
+.oe_mt64
+  margin-top: 64px !important
+
+/* ------ GENERIC LAYOUT MODIFIERS ----- */
+
+.oe_rightfit
+  padding-right: 0px !important
+.oe_leftfit
+  padding-left: 0px !important
+.oe_leftalign 
+  text-align: left
+.oe_rightalign
+  text-align: right
+.oe_centeralign
+  text-align: center
+.oe_centered
+  margin-left: auto
+  margin-right: auto
+.oe_hidden
+  display: none !important
+  opacity: 0 !important
+.oe_invisible
+  visibility: hidden !important
+.oe_transparent
+  opacity: 0 !important
+
+.oe_mb0
+  margin-bottom: 0px !important
+.oe_mb4
+  margin-bottom: 4px !important
+.oe_mb8
+  margin-bottom: 8px !important
+.oe_mb16
+  margin-bottom: 16px !important
+.oe_mb32
+  margin-bottom: 32px !important
+.oe_mb64
+  margin-bottom: 64px !important
+
+.oe_spaced
+  margin-top: 32px 
+  margin-bottom: 32px 
+.oe_more_spaced
+  margin-top: 64px 
+  margin-bottom: 64px
+.oe_padded
+  padding-top: 16px 
+  padding-bottom: 16px
+.oe_more_padded
+  padding-top: 32px
+  padding-bottom: 32px
+
+/* --------------------------------- * 
+ *        WEBPAGE COMPONENTS         *
+ * --------------------------------- */
+
+/* ------ BUTTONS ----- */
+
+.oe_button
+  position: relative
+  bottom: 0
+  display: inline-block
+  cursor: pointer
+  +user-select(none)
+
+.oe_styling_v8 .oe_button, .oe_styling_v8 a.oe_button
+  padding: 8px 14px
+  background: rgb(139, 114, 182)
+  color: white
+  +border-radius(2px)
+  +box-shadow(0px 2px 0px rgb(175, 168, 204))
+  +text-shadow(0px 1px 1px rgba(0,0,0, 0.44))
+  border: solid 1px rgba(0,0,0,0.09)
+  +transition-property((bottom, background))
+  +transition-duration(250ms)
+  &:hover
+    background: rgb(139,91,221)
+    color: white
+  &:active
+    background: rgb(51,51,51)
+    bottom: -3px
+  &.oe_big
+    font-size: 24px
+  &.oe_bigger
+    font-size: 32px
+  &.oe_small
+    font-size: 13px
+    padding: 2px 4px
+    &:active
+      bottom: -1px
+  &.oe_medium
+    padding: 5px 12px
+    font-size: 16px
+  &.oe_tacky
+    background: rgb(255,68,68)
+    +box-shadow(0px 2px 0px #eba8a8)
+    &:hover
+      background: rgb(255,16,16)
+    &:active
+      background: black
+  &.oe_disabled
+    background: rgb(200,200,200)
+    +box-shadow(0px 2px 0px rgb(180,180,180))
+    cursor: default
+    &:hover
+      background: rgb(200,200,200)
+      +box-shadow(0px 2px 0px rgb(180,180,180))
+    &:active
+      background: rgb(200,200,200)
+      bottom: 0px
+      +box-shadow(0px 2px 0px rgb(180,180,180))
+
+.oe_styling_v8.oe_styling_black .oe_button
+  +box-shadow(0px 2px 0px rgb(70,53,85))
+
+/* ------ FORMS ----- */
+
+.oe_styling_v8
+  .oe_input
+    padding: 4px 7px
+    border-radius: 3px
+    border: solid 1px rgb(214,214,214)
+    box-shadow: 0px 2px rgb(230,230,230)
+    background: rgb(250,250,250)
+    font-weight: 300
+    outline: none
+    @include transition( all 150ms linear )
+    &:focus
+      border: solid 1px rgb(150,150,150)
+      box-shadow: 0px 2px rgb(210,210,210)
+
+    &.oe_valid
+      background: #F2FFEC
+      border-color: rgb(177,235,182)
+      box-shadow: 0px 2px rgb(225,248,225)
+      color: rgb(15,97,15)
+
+    &.oe_invalid
+      background: rgb(255,242,242)
+      border-color: #EBB1B1
+      box-shadow: 0px 2px #F8E1E1
+      color: #610F0F
+    &.oe_big
+      padding: 8px 14px
+  .oe_input_label
+    font-weight: 300
+    font-size: 16px
+    &.oe_big
+      font-size: 20px
+
+  /* FIXME: this is a quick hack for the release */ 
+
+  .oe_textarea
+    width: 300px
+    height: 80px
+  .oe_form_layout_table
+    width: 100%
+    td
+      padding-bottom: 16px
+      &:first-child
+        text-align: right
+        padding-right: 16px
+
+/* ------ SLOGANS ----- */
+
+.oe_styling_v8 
+  .oe_slogan
+    color: $v8_title_font_color
+    font-family: $v8_title_font_family
+    text-align: center
+    margin-top: 32px
+    margin-bottom: 32px
+
+  h1.oe_slogan
+    font-size: 64px
+    font-weight: 900
+    margin-top: 48px
+    margin-bottom: 48px
+
+  h2.oe_slogan
+    font-size: 40px
+    font-weight: 300
+
+  h3.oe_slogan
+    font-size: 26px
+    font-weight: 300
+    +opacity(0.5)
+
+  h4.oe_slogan
+    font-size: 24px
+    font-weight: 300
+  h4.oe_slogan:before, h4.oe_slogan:after
+    margin: 0 20px
+    content: ""
+    display: inline-block
+    width: 100px
+    height: 0px
+    border-top: solid 1px
+    vertical-align: middle
+    +opacity(0.3)
+
+  h5.oe_slogan
+    font-weight: 300
+    //TODO
+
+  h2.oe_slogan+h3.oe_slogan
+    margin-top: -28px
+
+/* ------ QUOTES ----- */
+
+.oe_quote
+  margin: 8px
+  padding: 16px
+  background: rgba(0,0,0,0.02)
+  border: solid 1px rgba(0,0,0,0.06)
+  +border-radius(2px)
+
+  .oe_q,q
+    margin: 10px
+    display: block
+    font-style: italic
+    text-align: center
+    font-size: 20px
+    color: rgb(78, 102, 231)
+    &:before, &:after
+      content: '\"'
+      font-weight: 900
+      +opacity(0.2)
+
+  cite
+    display: block
+    font-style: normal
+    margin-top: 16px
+  
+  .oe_photo
+    float: left
+    +border-radius(3px)
+    margin-right: 16px
+
+  .oe_author
+    font-size: 20px
+    padding-top: 6px
+    color: rgb(141, 123, 172)
+
+.oe_dark .oe_quote
+  background: white
+  border: 1px solid rgb(240,240,255)
+
+/* ------ PICTURES ----- */
+
+// display a picture in a span
+.oe_picture
+  display: block
+  max-width: 84%
+  max-height: 400px
+  margin: 16px 8%
+
+// style the picture like a screenshot
+.oe_screenshot
+  +border-radius(3px)
+  +box-shadow(0px 3px 8px rgba(0,0,0,0.2))
+
+// display a picture taking full width of a row
+.oe_pic_ctr
+  position: relative
+
+.oe_pic_ctr > img.oe_picture
+  width: 100%
+  max-width: none
+  max-height: none
+  margin: 0
+
+// styling of the picture's title
+.oe_pic_ctr > .oe_title
+  position: absolute
+  top: 15px
+  right: 38px
+
+.oe_styling_v8 .oe_pic_ctr > .oe_title
+  font-size: 64px
+  color: white
+  font-weight: 600
+  margin: 0
+  +text-shadow( 0px 2px 0px rgb(73, 73, 73), 0px 2px 5px rgba(0, 0, 0, 0.33), 0px 0px 60px rgba(0, 0, 0, 0.22))
+
+/*  ----- Link Image with Footer ----- */
+/* FIXME: Terrible CSS, rewrite this */
+
+div.oe_demo
+  position: relative
+  border: 1px solid #dedede
+  span.oe_demo_play
+    top: 50%
+    left: 50%
+    width: 80px
+    height: 60px
+    margin-top: -30px
+    margin-left: -40px
+    display: block
+    position: absolute
+    background: url("../img/layout/play-button.png") no-repeat left top transparent
+    pointer-events: none
+  img
+    max-width: 100%
+    width: 100%
+  div.oe_demo_footer
+    position: absolute
+    left: 0
+    background-color: rgba(0,0,0,0.4)
+    opacity: 0.85
+    bottom: -1px
+    width: 100%
+    padding-top: 7px
+    padding-bottom: 7px
+    color: white
+    font-size: 14px
+    font-weight: bold
+    border-bottom-left-radius: 3px
+    border-bottom-right-radius: 3px
+    pointer-events: none
+
+div.oe_demo:hover
+  span.oe_demo_play
+    background: url("../img/layout/play-button-over.png") no-repeat left top transparent
+
+/*  ----- SEPARATOR ----- */
+
+.oe_styling_v8 .oe_container.oe_separator
+  height: 64px
+  margin-bottom: 16px
+  @include background(linear-gradient(rgba(0,0,0,0),rgba(0,0,0,0.02)))
+  +box-shadow(0px -3px 10px -5px rgba(0,0,0,0.1) inset)
+  overflow-y: hidden
+
+/*  ----- TABS -----  */
+
+.oe_row_tabs
+  text-align: center
+  margin-top: 0px
+  margin-bottom: 0px
+  padding-top: 21px
+
+.oe_row_tab
+  position: relative
+  min-width: 120px
+  padding: 8px
+  font-size: 20px
+  display: inline-block
+  margin: 0px -2px
+  border-top-left-radius: 4px
+  border-top-right-radius: 4px
+  border: solid 1px rgba(0,0,0,0.1)
+  border-bottom: none
+  background: rgb(250,250,250)
+  background-image: +linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.02))
+  box-shadow: 0px -3px 10px -5px rgba(0,0,0,0.1) inset
+  cursor: pointer
+  @include transition(all 250ms linear)
+
+.oe_row_tab:hover
+  padding-bottom: 12px
+  top: -4px
+  background-color: white
+
+.oe_row_tab.oe_active
+  background-color: white
+  background-image: none
+  box-shadow: none
+  border-top-color: rgb(130, 114, 182)
+  border-top-width: 2px
+  cursor: default
+
+.oe_row_tab.oe_active:hover
+  padding-bottom: 8px
+  top: 0asx
+
+/* ------ CALL TO ACTION ----- */
+
+.oe_calltoaction
+  height: 32px
+  margin-top: -32px
+  position: relative
+

From bcb7103e516dcbd6ec45863f9aad68d7691bf2ca Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 29 Jul 2013 19:04:05 +0200
Subject: [PATCH 2/8] [FIX] module views: fix css for html description

bzr revid: chs@openerp.com-20130729170405-twhk9uo29t90ktmv
---
 openerp/addons/base/module/module_view.xml    |  2 +-
 .../base/static/src/css/description.css       | 40 +++++++++----------
 .../base/static/src/css/description.sass      | 24 +++++------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 462d03a1c01..8dac5b2dc27 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -128,8 +128,8 @@
                             <field name="reports_by_module"/>
                         </page>
                     </notebook>
-                    </sheet>
                     <field name="description_html" class='oe_styling_v8'/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/static/src/css/description.css b/openerp/addons/base/static/src/css/description.css
index 79d2e9e5f5e..33e631bb46e 100644
--- a/openerp/addons/base/static/src/css/description.css
+++ b/openerp/addons/base/static/src/css/description.css
@@ -1,47 +1,50 @@
 @charset "utf-8";
 /*
- *  This CSS contains the website layout framework
- *  which is common to both the website and the 
- *  OpenERP application.
+ *  This CSS is for the html description of modules
+ * TODO clean
  */
 /* --------------------------------- *
  *          STYLING CONTEXT          *
  * --------------------------------- */
 /* --- Styling for the V8/Lato/White/Purple design --- */
-body.oe_styling_v8 {
-  background: #e9e9e9;
-  padding: 0;
-  margin: 0;
+.openerp .oe_form_sheet_width {
+  max-width: 960px;
 }
 
-.oe_styling_v8 {
+.openerp .oe_form .oe_styling_v8 {
+  width: 100%;
+  padding: 0;
+  margin: 0;
   font-family: "Open Sans", "Helvetica", Sans;
   font-weight: 300;
   color: #646464;
   background: white;
   font-size: 16px;
 }
-.oe_styling_v8 .oe_website_contents {
+.openerp .oe_form .oe_styling_v8 .oe_websiteonly {
+  display: none;
+}
+.openerp .oe_form .oe_styling_v8 .oe_website_contents {
   background: whitesmoke;
   padding-bottom: 1px;
 }
-.oe_styling_v8 b {
+.openerp .oe_form .oe_styling_v8 b {
   font-weight: 600;
 }
-.oe_styling_v8 a {
+.openerp .oe_form .oe_styling_v8 a {
   color: #6d57e0;
   text-decoration: none;
 }
-.oe_styling_v8 a:visited {
+.openerp .oe_form .oe_styling_v8 a:visited {
   color: #5b284f;
 }
-.oe_styling_v8 a:hover {
+.openerp .oe_form .oe_styling_v8 a:hover {
   color: #0096eb;
 }
-.oe_styling_v8 .oe_title_font {
+.openerp .oe_form .oe_styling_v8 .oe_title_font {
   font-family: "Lato", "Open Sans", "Helvetica", Sans;
 }
-.oe_styling_v8 .oe_page {
+.openerp .oe_form .oe_styling_v8 .oe_page {
   background: white;
   overflow: hidden;
   -webkit-border-radius: 1px;
@@ -53,10 +56,10 @@ body.oe_styling_v8 {
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
 }
-.oe_styling_v8 .oe_emph {
+.openerp .oe_form .oe_styling_v8 .oe_emph {
   font-weight: 400;
 }
-.oe_styling_v8 .oe_dark {
+.openerp .oe_form .oe_styling_v8 .oe_dark {
   overflow: hidden;
   background: #fcfcfc;
   -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
@@ -518,9 +521,6 @@ body.oe_styling_v8 {
 .oe_styling_v8 h5.oe_slogan {
   font-weight: 300;
 }
-.oe_styling_v8 h2.oe_slogan + h3.oe_slogan {
-  margin-top: -28px;
-}
 
 /* ------ QUOTES ----- */
 .oe_quote {
diff --git a/openerp/addons/base/static/src/css/description.sass b/openerp/addons/base/static/src/css/description.sass
index 11b1410d9bd..3bb218a84aa 100644
--- a/openerp/addons/base/static/src/css/description.sass
+++ b/openerp/addons/base/static/src/css/description.sass
@@ -3,9 +3,8 @@
 @import "compass/css3/user-interface"
 
 /**
- *  This CSS contains the website layout framework
- *  which is common to both the website and the 
- *  OpenERP application.
+ *  This CSS is for the html description of modules
+ * TODO clean
  */
 
 /* --------------------------------- * 
@@ -14,7 +13,6 @@
 
 /* --- Styling for the V8/Lato/White/Purple design --- */
 
-$v8_footer_color: #e9e9e9
 $v8_title_font_color: rgb(51,51,51)
 $v8_text_font_color:  rgb(100,100,100)
 $v8_font_paragraph_color:   rgb(51,51,51)
@@ -25,18 +23,23 @@ $v8_title_font_family:  'Lato','Open Sans','Helvetica',Sans
 $v8_anchor_color: #6D57E0
 $v8_anchor_visited_color: rgb(91, 40, 79)
 
-body.oe_styling_v8
-  background: $v8_footer_color
+
+.openerp .oe_form_sheet_width
+  max-width: 960px
+
+.openerp .oe_form .oe_styling_v8
+  width: 100%
   padding: 0
   margin: 0
-
-.oe_styling_v8
   font-family: $v8_text_font_family
   font-weight: 300
   color: $v8_text_font_color
   background: $v8_bg_color
   font-size: 16px
 
+  .oe_websiteonly
+    display: none
+
   .oe_website_contents
     background: $v8_body_color
     padding-bottom: 1px
@@ -80,8 +83,6 @@ body.oe_styling_v8
   max-width: 992px
 
 
-.oe_container
-
 .oe_row
   width: 928px
   margin-top: 16px
@@ -394,9 +395,6 @@ $oe_span2_width:  154px
     font-weight: 300
     //TODO
 
-  h2.oe_slogan+h3.oe_slogan
-    margin-top: -28px
-
 /* ------ QUOTES ----- */
 
 .oe_quote

From 8b963ce64f97d320826ea1d3881e03a2b913e8a7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 7 Aug 2013 11:22:32 +0200
Subject: [PATCH 3/8] [FIX] Fixed regression that made the debug mode
 unavailable

bzr revid: nicolas.vanhoren@openerp.com-20130807092232-jgkap3b3cfa2grfq
---
 addons/web/static/src/js/core.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index c4bd3981806..8c69f86c47e 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -226,6 +226,7 @@ instance.web.JsonRPC = instance.web.Session;
 instance.web.Session.include( /** @lends instance.web.Session# */{
     init: function() {
         this._super.apply(this, arguments);
+        this.debug = ($.deparam($.param.querystring()).debug !== undefined);
         // TODO: session store in cookie should be optional
         this.name = instance._session_id;
         this.qweb_mutex = new $.Mutex();

From 1f726f78266ff6130f1ed701799ca969671a1dfc Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 7 Aug 2013 11:54:57 +0200
Subject: [PATCH 4/8] [FIX] regression that made the qweb modules be loaded 2
 times

bzr revid: nicolas.vanhoren@openerp.com-20130807095457-gdm1ixzk0rcev2sg
---
 addons/web/static/src/js/boot.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index 48b19f29971..cd58c3bb10a 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -33,12 +33,11 @@
             if (modules === null) {
                 modules = [];
             }
+            modules = _.without(modules, "web");
             if (inited)
                 throw new Error("OpenERP was already inited");
             inited = true;
             for(var i=0; i < modules.length; i++) {
-                if (modules[i] === "web")
-                    continue;
                 var fct = openerp[modules[i]];
                 if (typeof(fct) === "function") {
                     openerp[modules[i]] = {};

From 88d43bf6770d60bf0feb5a5db1ac3e33de5cdbb9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 7 Aug 2013 14:30:41 +0200
Subject: [PATCH 5/8] [FIX] mimetype problem that made Firefox crash

bzr revid: nicolas.vanhoren@openerp.com-20130807123041-8tvf9u14xderh3hr
---
 addons/web/http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 8193b21e108..ee1ed979ea1 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -947,7 +947,7 @@ class Root(object):
         if httprequest.args.get('jsonp'):
             return JsonRequest(httprequest)
 
-        if httprequest.headers["Content-Type"] == "application/json":
+        if httprequest.mimetype == "application/json":
             return JsonRequest(httprequest)
         else:
             return HttpRequest(httprequest)

From 2eece10cd4631763b1ca2cc00b2d8f84280f6d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Aug 2013 16:24:18 +0200
Subject: [PATCH 6/8] [FIX] mail_mail: computation of reply_to after create to
 avoid interfering with automatic message_id creation of mail_message [FIX]
 mail_thread: fixed issues with private messages through mailgateway (wrong
 route checking, variable erasing) [TEST] mail: added test for the second bug

bzr revid: tde@openerp.com-20130807142418-3h5qxdt3ekosj9x6
---
 addons/mail/mail_mail.py               | 10 +++-
 addons/mail/mail_thread.py             | 20 +++++---
 addons/mail/tests/__init__.py          |  8 +--
 addons/mail/tests/test_mail_gateway.py | 67 ++++++++++++++++++++------
 4 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index bf76216e7e4..b105d6677bd 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -139,10 +139,16 @@ class mail_mail(osv.Model):
         # notification field: if not set, set if mail comes from an existing mail.message
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
+        mail_id = super(mail_mail, self).create(cr, uid, values, context=context)
+
         # reply_to: if not set, set with default values that require creation values
+        # but delegate after creation because of mail_message.message_id automatic
+        # creation using existence of reply_to
         if not values.get('reply_to'):
-            values['reply_to'] = self._get_reply_to(cr, uid, values, context=context)
-        return super(mail_mail, self).create(cr, uid, values, context=context)
+            reply_to = self._get_reply_to(cr, uid, values, context=context)
+            if reply_to:
+                self.write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context)
+        return mail_id
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete the parent message for all mails that are not created for a notification
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 306e5fd5905..94e9126f020 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -682,6 +682,12 @@ class mail_thread(osv.AbstractModel):
                 assert thread_id == 0, 'Routing: posting a message without model should be with a null res_id (private message).'
             _warn('posting a message without model should be with a null res_id (private message), resetting thread_id')
             thread_id = 0
+        # Private message: should have a parent_id (only answers)
+        if not model and not message_dict.get('parent_id'):
+            if assert_model:
+                assert message_dict.get('parent_id'), 'Routing: posting a message without model should be with a parent_id (private mesage).'
+            _warn('posting a message without model should be with a parent_id (private mesage), skipping')
+            return ()
 
         # Existing Document: check if exists; if not, fallback on create if allowed
         if thread_id and not model_pool.exists(cr, uid, thread_id):
@@ -695,7 +701,7 @@ class mail_thread(osv.AbstractModel):
                 return ()
 
         # Existing Document: check model accepts the mailgateway
-        if thread_id and not hasattr(model_pool, 'message_update'):
+        if thread_id and model and not hasattr(model_pool, 'message_update'):
             if create_fallback:
                 _warn('model %s does not accept document update, fall back on document creation' % model)
                 thread_id = None
@@ -706,7 +712,7 @@ class mail_thread(osv.AbstractModel):
                 return ()
 
         # New Document: check model accepts the mailgateway
-        if not thread_id and not hasattr(model_pool, 'message_new'):
+        if not thread_id and model and not hasattr(model_pool, 'message_new'):
             if assert_model:
                 assert hasattr(model_pool, 'message_new'), 'Model %s does not accept document creation, crashing' % model
             _warn('model %s does not accept document creation, skipping' % model)
@@ -798,16 +804,16 @@ class mail_thread(osv.AbstractModel):
 
         # 2. Reply to a private message
         if in_reply_to:
-            message_ids = self.pool.get('mail.message').search(cr, uid, [
+            mail_message_ids = self.pool.get('mail.message').search(cr, uid, [
                                 ('message_id', '=', in_reply_to),
                                 '!', ('message_id', 'ilike', 'reply_to')
                             ], limit=1, context=context)
-            if message_ids:
-                message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
+            if mail_message_ids:
+                mail_message = self.pool.get('mail.message').browse(cr, uid, mail_message_ids[0], context=context)
                 _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
-                                email_from, email_to, message_id, message.id, custom_values, uid)
+                                email_from, email_to, message_id, mail_message.id, custom_values, uid)
                 route = self.message_route_verify(cr, uid, message, message_dict,
-                                (message.model, message.res_id, custom_values, uid, None),
+                                (mail_message.model, mail_message.res_id, custom_values, uid, None),
                                 update_author=True, assert_model=True, create_fallback=True, context=context)
                 return route and [route] or []
 
diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index ff1080b0580..6dcc333a4cd 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -22,11 +22,11 @@
 from . import test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
 
 checks = [
-    test_mail_message,
-    test_mail_features,
+    # test_mail_message,
+    # test_mail_features,
     test_mail_gateway,
-    test_message_read,
-    test_invite,
+    # test_message_read,
+    # test_invite,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index 2e0ba336dc4..9aa1e21d7c1 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -633,12 +633,19 @@ class TestMailgateway(TestMailBase):
         """ Testing private discussion between partners. """
         cr, uid = self.cr, self.uid
 
+        def format(template, to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: 1',
+                                extra='', email_from='Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>',
+                                msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>'):
+            return template.format(to=to, subject=subject, extra=extra, email_from=email_from, msg_id=msg_id)
+
         # Do: Raoul writes to Bert and Administrator, with a thread_model in context that should not be taken into account
         msg1_pids = [self.partner_admin_id, self.partner_bert_id]
-        msg1_id = self.mail_thread.message_post(cr, self.user_raoul_id, False,
-                        partner_ids=msg1_pids,
-                        subtype='mail.mt_comment',
-                        context={'thread_model': 'mail.group'})
+        msg1_id = self.mail_thread.message_post(
+            cr, self.user_raoul_id, False,
+            partner_ids=msg1_pids,
+            subtype='mail.mt_comment',
+            context={'thread_model': 'mail.group'}
+        )
 
         # Test: message recipients
         msg = self.mail_message.browse(cr, uid, msg1_id)
@@ -647,16 +654,26 @@ class TestMailgateway(TestMailBase):
         test_pids = msg1_pids
         test_nids = msg1_pids
         self.assertEqual(set(msg_pids), set(test_pids),
-                        'message_post: private discussion: incorrect recipients')
+                         'message_post: private discussion: incorrect recipients')
         self.assertEqual(set(msg_nids), set(test_nids),
-                        'message_post: private discussion: incorrect notified recipients')
+                         'message_post: private discussion: incorrect notified recipients')
         self.assertEqual(msg.model, False,
-                        'message_post: private discussion: context key "thread_model" not correctly ignored when having no res_id')
+                         'message_post: private discussion: context key "thread_model" not correctly ignored when having no res_id')
+        # Test: message reply_to and message-id
+        self.assertFalse(msg.reply_to,
+                         'message_post: private discussion: initial message should not have any reply_to specified')
+        self.assertIn('openerp-private', msg.message_id,
+                      'message_post: private discussion: message-id should contain the private keyword')
 
         # Do: Bert replies through mailgateway (is a customer)
-        msg2_id = self.mail_thread.message_post(cr, uid, False,
-                        author_id=self.partner_bert_id,
-                        parent_id=msg1_id, subtype='mail.mt_comment')
+        reply_message = format(MAIL_TEMPLATE, to='not_important@mydomain.com',
+                               email_from='bert@bert.fr',
+                               extra='In-Reply-To: %s' % msg.message_id,
+                               msg_id='<test30.JavaMail.0@agrolait.com>')
+        self.mail_thread.message_process(cr, uid, None, reply_message)
+
+        # Test: last mail_message created
+        msg2_id = self.mail_message.search(cr, uid, [], limit=1)[0]
 
         # Test: message recipients
         msg = self.mail_message.browse(cr, uid, msg2_id)
@@ -664,14 +681,32 @@ class TestMailgateway(TestMailBase):
         msg_nids = [p.id for p in msg.notified_partner_ids]
         test_pids = [self.partner_admin_id, self.partner_raoul_id]
         test_nids = test_pids
+        self.assertEqual(msg.author_id.id, self.partner_bert_id,
+                         'message_post: private discussion: wrong author through mailgatewya based on email')
         self.assertEqual(set(msg_pids), set(test_pids),
-                        'message_post: private discussion: incorrect recipients when replying')
+                         'message_post: private discussion: incorrect recipients when replying')
         self.assertEqual(set(msg_nids), set(test_nids),
-                        'message_post: private discussion: incorrect notified recipients when replying')
+                         'message_post: private discussion: incorrect notified recipients when replying')
+
+        # Do: Bert replies through chatter (is a customer)
+        msg3_id = self.mail_thread.message_post(
+            cr, uid, False,
+            author_id=self.partner_bert_id,
+            parent_id=msg1_id, subtype='mail.mt_comment')
+
+        # Test: message recipients
+        msg = self.mail_message.browse(cr, uid, msg3_id)
+        msg_pids = [p.id for p in msg.partner_ids]
+        msg_nids = [p.id for p in msg.notified_partner_ids]
+        test_pids = [self.partner_admin_id, self.partner_raoul_id]
+        test_nids = test_pids
+        self.assertEqual(set(msg_pids), set(test_pids),
+                         'message_post: private discussion: incorrect recipients when replying')
+        self.assertEqual(set(msg_nids), set(test_nids),
+                         'message_post: private discussion: incorrect notified recipients when replying')
 
         # Do: Administrator replies
-        msg3_id = self.mail_thread.message_post(cr, uid, False,
-                        parent_id=msg2_id, subtype='mail.mt_comment')
+        msg3_id = self.mail_thread.message_post(cr, uid, False, parent_id=msg3_id, subtype='mail.mt_comment')
 
         # Test: message recipients
         msg = self.mail_message.browse(cr, uid, msg3_id)
@@ -680,6 +715,6 @@ class TestMailgateway(TestMailBase):
         test_pids = [self.partner_bert_id, self.partner_raoul_id]
         test_nids = test_pids
         self.assertEqual(set(msg_pids), set(test_pids),
-                        'message_post: private discussion: incorrect recipients when replying')
+                         'message_post: private discussion: incorrect recipients when replying')
         self.assertEqual(set(msg_nids), set(test_nids),
-                        'message_post: private discussion: incorrect notified recipients when replying')
+                         'message_post: private discussion: incorrect notified recipients when replying')

From c998b86a463fb48fe1b34126218c0ed87caa7663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 Aug 2013 16:29:28 +0200
Subject: [PATCH 7/8] [CLEAN] mail: tests: cleaned test_mail_gateway file about
 indentation

bzr revid: tde@openerp.com-20130807142928-ocgzim1hdi95uyby
---
 addons/mail/tests/__init__.py          |   8 +-
 addons/mail/tests/test_mail_gateway.py | 218 ++++++++++++-------------
 2 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index 6dcc333a4cd..ff1080b0580 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -22,11 +22,11 @@
 from . import test_mail_message, test_mail_features, test_mail_gateway, test_message_read, test_invite
 
 checks = [
-    # test_mail_message,
-    # test_mail_features,
+    test_mail_message,
+    test_mail_features,
     test_mail_gateway,
-    # test_message_read,
-    # test_invite,
+    test_message_read,
+    test_invite,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index 9aa1e21d7c1..fade38869f1 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.test_mail_base import TestMailBase
-from openerp.tools import mute_logger, email_split
+from openerp.tools import mute_logger
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -101,9 +101,9 @@ class TestMailgateway(TestMailBase):
         # Do: find partner with email -> first partner should be found
         partner_info = self.mail_thread.message_partner_info_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
         self.assertEqual(partner_info['full_name'], 'Maybe Raoul <test@test.fr>',
-                        'mail_thread: message_partner_info_from_emails did not handle email')
+                         'mail_thread: message_partner_info_from_emails did not handle email')
         self.assertEqual(partner_info['partner_id'], p_a_id,
-                        'mail_thread: message_partner_info_from_emails wrong partner found')
+                         'mail_thread: message_partner_info_from_emails wrong partner found')
 
         # Data: add some data about partners
         # 2 - User BRaoul
@@ -112,7 +112,7 @@ class TestMailgateway(TestMailBase):
         # Do: find partner with email -> first user should be found
         partner_info = self.mail_thread.message_partner_info_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
         self.assertEqual(partner_info['partner_id'], p_b_id,
-                        'mail_thread: message_partner_info_from_emails wrong partner found')
+                         'mail_thread: message_partner_info_from_emails wrong partner found')
 
         # --------------------------------------------------
         # CASE1: with object
@@ -122,7 +122,7 @@ class TestMailgateway(TestMailBase):
         self.mail_group.message_subscribe(cr, uid, [group_pigs.id], [p_b_id])
         partner_info = self.mail_group.message_partner_info_from_emails(cr, uid, group_pigs.id, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
         self.assertEqual(partner_info['partner_id'], p_b_id,
-                        'mail_thread: message_partner_info_from_emails wrong partner found')
+                         'mail_thread: message_partner_info_from_emails wrong partner found')
 
     def test_05_mail_message_mail_mail(self):
         """ Tests designed for testing email values based on mail.message, aliases, ... """
@@ -146,46 +146,46 @@ class TestMailgateway(TestMailBase):
         msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
         # Test: message content
         self.assertIn('reply_to', msg.message_id,
-                        'mail_message: message_id should be specific to a mail_message with a given reply_to')
+                      'mail_message: message_id should be specific to a mail_message with a given reply_to')
         self.assertEqual(msg.reply_to, reply_to1,
-                        'mail_message: incorrect reply_to: should come from values')
+                         'mail_message: incorrect reply_to: should come from values')
         self.assertEqual(msg.email_from, email_from1,
-                        'mail_message: incorrect email_from: should come from values')
+                         'mail_message: incorrect email_from: should come from values')
         # Do: create a mail_mail with the previous mail_message
         mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
         mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, reply_to1,
-                        'mail_mail: incorrect reply_to: should come from mail.message')
+                         'mail_mail: incorrect reply_to: should come from mail.message')
         self.assertEqual(mail.email_from, email_from1,
-                        'mail_mail: incorrect email_from: should come from mail.message')
+                         'mail_mail: incorrect email_from: should come from mail.message')
         # Do: create a mail_mail with the previous mail_message + specified reply_to
         mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel', 'reply_to': reply_to2})
         mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, reply_to2,
-                        'mail_mail: incorrect reply_to: should come from values')
+                         'mail_mail: incorrect reply_to: should come from values')
         self.assertEqual(mail.email_from, email_from1,
-                        'mail_mail: incorrect email_from: should come from mail.message')
+                         'mail_mail: incorrect email_from: should come from mail.message')
 
         # Do: mail_message attached to a document
         msg_id = self.mail_message.create(cr, user_raoul_id, {'model': 'mail.group', 'res_id': self.group_pigs_id})
         msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
         # Test: message content
         self.assertIn('mail.group', msg.message_id,
-                        'mail_message: message_id should contain model')
+                      'mail_message: message_id should contain model')
         self.assertIn('%s' % self.group_pigs_id, msg.message_id,
-                        'mail_message: message_id should contain res_id')
+                      'mail_message: message_id should contain res_id')
         self.assertFalse(msg.reply_to,
-                        'mail_message: incorrect reply_to: should not be generated if not specified')
+                         'mail_message: incorrect reply_to: should not be generated if not specified')
         self.assertEqual(msg.email_from, raoul_from,
-                        'mail_message: incorrect email_from: should be Raoul')
+                         'mail_message: incorrect email_from: should be Raoul')
         # Do: create a mail_mail based on the previous mail_message
         mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
         mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, raoul_reply,
-                        'mail_mail: incorrect reply_to: should be Raoul')
+                         'mail_mail: incorrect reply_to: should be Raoul')
 
         # Data: set catchall domain
         self.registry('ir.config_parameter').set_param(cr, uid, 'mail.catchall.domain', alias_domain)
@@ -199,7 +199,7 @@ class TestMailgateway(TestMailBase):
         mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, raoul_reply_alias,
-                        'mail_mail: incorrect reply_to: should be Pigs alias')
+                         'mail_mail: incorrect reply_to: should be Pigs alias')
 
         # Update message: test alias on email_from
         msg_id = self.mail_message.create(cr, user_raoul_id, {})
@@ -209,7 +209,7 @@ class TestMailgateway(TestMailBase):
         mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, raoul_from_alias,
-                        'mail_mail: incorrect reply_to: should be message email_from using Raoul alias')
+                         'mail_mail: incorrect reply_to: should be message email_from using Raoul alias')
 
         # Update message
         self.mail_message.write(cr, user_raoul_id, [msg_id], {'res_id': False, 'email_from': 'someone@schlouby.fr', 'reply_to': False})
@@ -219,7 +219,7 @@ class TestMailgateway(TestMailBase):
         mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, msg.email_from,
-                        'mail_mail: incorrect reply_to: should be message email_from')
+                         'mail_mail: incorrect reply_to: should be message email_from')
 
         # Data: set catchall alias
         self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.alias', 'gateway')
@@ -232,21 +232,21 @@ class TestMailgateway(TestMailBase):
         mail = self.mail_mail.browse(cr, uid, mail_id)
         # Test: mail_mail Content-Type
         self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
-                        'mail_mail: reply_to should equal the catchall email alias')
+                         'mail_mail: reply_to should equal the catchall email alias')
 
         # Do: create a mail_mail
         mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel'})
         mail = self.mail_mail.browse(cr, uid, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
-                        'mail_mail: reply_to should equal the catchall email alias')
+                         'mail_mail: reply_to should equal the catchall email alias')
 
         # Do: create a mail_mail
         mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel', 'reply_to': 'someone@example.com'})
         mail = self.mail_mail.browse(cr, uid, mail_id)
         # Test: mail_mail content
         self.assertEqual(mail.reply_to, 'someone@example.com',
-                        'mail_mail: reply_to should equal the rpely_to given to create')
+                         'mail_mail: reply_to should equal the rpely_to given to create')
 
     @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
     def test_10_message_process(self):
@@ -254,9 +254,9 @@ class TestMailgateway(TestMailBase):
         cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
 
         def format_and_process(template, to='groups@example.com, other@gmail.com', subject='Frogs',
-                                extra='', email_from='Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>',
-                                msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>',
-                                model=None):
+                               extra='', email_from='Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>',
+                               msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>',
+                               model=None):
             self.assertEqual(self.mail_group.search(cr, uid, [('name', '=', subject)]), [])
             mail = template.format(to=to, subject=subject, extra=extra, email_from=email_from, msg_id=msg_id)
             self.mail_thread.message_process(cr, uid, model, mail)
@@ -289,29 +289,29 @@ class TestMailgateway(TestMailBase):
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         res = self.mail_group.perm_read(cr, uid, [frog_group.id], details=False)
         self.assertEqual(res[0].get('create_uid'), uid,
-                            'message_process: group should have been created by uid as alias_user__id is False on the alias')
+                         'message_process: group should have been created by uid as alias_user__id is False on the alias')
         # Test: one message that is the incoming email
         self.assertEqual(len(frog_group.message_ids), 1,
-                            'message_process: newly created group should have the incoming email in message_ids')
+                         'message_process: newly created group should have the incoming email in message_ids')
         msg = frog_group.message_ids[0]
         self.assertEqual('Frogs', msg.subject,
-                            'message_process: newly created group should have the incoming email as first message')
+                         'message_process: newly created group should have the incoming email as first message')
         self.assertIn('Please call me as soon as possible this afternoon!', msg.body,
-                            'message_process: newly created group should have the incoming email as first message')
+                      'message_process: newly created group should have the incoming email as first message')
         self.assertEqual('email', msg.type,
-                            'message_process: newly created group should have an email as first message')
+                         'message_process: newly created group should have an email as first message')
         self.assertEqual('Discussions', msg.subtype_id.name,
-                            'message_process: newly created group should not have a log first message but an email')
+                         'message_process: newly created group should not have a log first message but an email')
         # Test: message: unknown email address -> message has email_from, not author_id
         self.assertFalse(msg.author_id,
-                            'message_process: message on created group should not have an author_id')
+                         'message_process: message on created group should not have an author_id')
         self.assertIn('test.sylvie.lelitre@agrolait.com', msg.email_from,
-                            'message_process: message on created group should have an email_from')
+                      'message_process: message on created group should have an email_from')
         # Test: followers: nobody
         self.assertEqual(len(frog_group.message_follower_ids), 0, 'message_process: newly create group should not have any follower')
         # Test: sent emails: no-one
         self.assertEqual(len(sent_emails), 0,
-                            'message_process: should create emails without any follower added')
+                         'message_process: should create emails without any follower added')
         # Data: unlink group
         frog_group.unlink()
 
@@ -324,11 +324,11 @@ class TestMailgateway(TestMailBase):
         # Test: email bounced
         sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 1,
-                            'message_process: incoming email on Partners alias should send a bounce email')
+                         'message_process: incoming email on Partners alias should send a bounce email')
         self.assertIn('Frogs', sent_emails[0].get('subject'),
-                            'message_process: bounce email on Partners alias should contain the original subject')
+                      'message_process: bounce email on Partners alias should contain the original subject')
         self.assertIn('test.sylvie.lelitre@agrolait.com', sent_emails[0].get('email_to'),
-                            'message_process: bounce email on Partners alias should have original email sender as recipient')
+                      'message_process: bounce email on Partners alias should have original email sender as recipient')
 
         # Do: incoming email from an unknown partner on a Followers only alias -> bounce
         self._init_mock_build_email()
@@ -339,11 +339,11 @@ class TestMailgateway(TestMailBase):
         # Test: email bounced
         sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 1,
-                            'message_process: incoming email on Followers alias should send a bounce email')
+                         'message_process: incoming email on Followers alias should send a bounce email')
         self.assertIn('Frogs', sent_emails[0].get('subject'),
-                            'message_process: bounce email on Followers alias should contain the original subject')
+                      'message_process: bounce email on Followers alias should contain the original subject')
         self.assertIn('test.sylvie.lelitre@agrolait.com', sent_emails[0].get('email_to'),
-                            'message_process: bounce email on Followers alias should have original email sender as recipient')
+                      'message_process: bounce email on Followers alias should have original email sender as recipient')
 
         # Do: incoming email from a known partner on a Partners alias -> ok (+ test on alias.user_id)
         self.mail_alias.write(cr, uid, [alias_id], {'alias_user_id': self.user_raoul_id, 'alias_contact': 'partners'})
@@ -357,24 +357,24 @@ class TestMailgateway(TestMailBase):
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         res = self.mail_group.perm_read(cr, uid, [frog_group.id], details=False)
         self.assertEqual(res[0].get('create_uid'), self.user_raoul_id,
-                            'message_process: group should have been created by alias_user_id')
+                         'message_process: group should have been created by alias_user_id')
         # Test: one message that is the incoming email
         self.assertEqual(len(frog_group.message_ids), 1,
-                            'message_process: newly created group should have the incoming email in message_ids')
+                         'message_process: newly created group should have the incoming email in message_ids')
         msg = frog_group.message_ids[0]
         # Test: message: author found
         self.assertEqual(p1id, msg.author_id.id,
-                            'message_process: message on created group should have Sylvie as author_id')
+                         'message_process: message on created group should have Sylvie as author_id')
         self.assertIn('Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>', msg.email_from,
-                            'message_process: message on created group should have have an email_from')
+                      'message_process: message on created group should have have an email_from')
         # Test: author (not recipient and not Raoul (as alias owner)) added as follower
         frog_follower_ids = set([p.id for p in frog_group.message_follower_ids])
         self.assertEqual(frog_follower_ids, set([p1id]),
-                            'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
+                         'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
         # Test: sent emails: no-one, no bounce effet
         sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 0,
-                            'message_process: should not bounce incoming emails')
+                         'message_process: should not bounce incoming emails')
         # Data: unlink group
         frog_group.unlink()
 
@@ -387,7 +387,7 @@ class TestMailgateway(TestMailBase):
         # Test: email bounced
         sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 1,
-                            'message_process: incoming email on Partners alias should send a bounce email')
+                         'message_process: incoming email on Partners alias should send a bounce email')
 
         # Do: incoming email from a parent document follower on a Followers only alias -> ok
         self._init_mock_build_email()
@@ -398,15 +398,15 @@ class TestMailgateway(TestMailBase):
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: one message that is the incoming email
         self.assertEqual(len(frog_group.message_ids), 1,
-                            'message_process: newly created group should have the incoming email in message_ids')
+                         'message_process: newly created group should have the incoming email in message_ids')
         # Test: author (and not recipient) added as follower
         frog_follower_ids = set([p.id for p in frog_group.message_follower_ids])
         self.assertEqual(frog_follower_ids, set([p1id]),
-                            'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
+                         'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
         # Test: sent emails: no-one, no bounce effet
         sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 0,
-                            'message_process: should not bounce incoming emails')
+                         'message_process: should not bounce incoming emails')
 
         # --------------------------------------------------
         # Test2: update-like alias
@@ -416,43 +416,43 @@ class TestMailgateway(TestMailBase):
         self._init_mock_build_email()
         self.mail_group.write(cr, uid, [frog_group.id], {'alias_name': 'frogs', 'alias_contact': 'followers', 'alias_force_thread_id': frog_group.id})
         frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
-                                            to='frogs@example.com>', subject='Re: news')
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
+                                         to='frogs@example.com>', subject='Re: news')
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
-                            'message_process: reply on Frogs should not have created a new group with new subject')
+                         'message_process: reply on Frogs should not have created a new group with new subject')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: reply on Frogs should not have created a duplicate group with old subject')
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: email bounced
         sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 1,
-                            'message_process: incoming email on Followers alias should send a bounce email')
+                         'message_process: incoming email on Followers alias should send a bounce email')
         self.assertIn('Re: news', sent_emails[0].get('subject'),
-                            'message_process: bounce email on Followers alias should contain the original subject')
+                      'message_process: bounce email on Followers alias should contain the original subject')
 
         # Do: Pigs alias is restricted, should accept Followers
         self._init_mock_build_email()
         self.mail_group.message_subscribe(cr, uid, [frog_group.id], [p2id])
         frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
-                                            msg_id='<1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>',
-                                            to='frogs@example.com>', subject='Re: cats')
+                                         msg_id='<1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>',
+                                         to='frogs@example.com>', subject='Re: cats')
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
-                            'message_process: reply on Frogs should not have created a new group with new subject')
+                         'message_process: reply on Frogs should not have created a new group with new subject')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: reply on Frogs should not have created a duplicate group with old subject')
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: one new message
         self.assertEqual(len(frog_group.message_ids), 2, 'message_process: group should contain 2 messages after reply')
         # Test: sent emails: 1 (Sylvie copy of the incoming email, but no bounce)
         sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 1,
-                            'message_process: one email should have been generated')
+                         'message_process: one email should have been generated')
         self.assertIn('test.sylvie.lelitre@agrolait.com', sent_emails[0].get('email_to')[0],
-                            'message_process: email should be sent to Sylvie')
+                      'message_process: email should be sent to Sylvie')
         self.mail_group.message_unsubscribe(cr, uid, [frog_group.id], [p2id])
 
         # --------------------------------------------------
@@ -461,40 +461,40 @@ class TestMailgateway(TestMailBase):
 
         # Do: even with a wrong destination, a reply should end up in the correct thread
         frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
-                                            to='erroneous@example.com>', subject='Re: news',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
+                                         to='erroneous@example.com>', subject='Re: news',
+                                         extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
-                            'message_process: reply on Frogs should not have created a new group with new subject')
+                         'message_process: reply on Frogs should not have created a new group with new subject')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: reply on Frogs should not have created a duplicate group with old subject')
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: one new message
         self.assertEqual(len(frog_group.message_ids), 3, 'message_process: group should contain 2 messages after reply')
         # Test: author (and not recipient) added as follower
         frog_follower_ids = set([p.id for p in frog_group.message_follower_ids])
         self.assertEqual(frog_follower_ids, set([p1id, p2id]),
-                            'message_process: after reply, group should have 2 followers')
+                         'message_process: after reply, group should have 2 followers')
 
         # Do: due to some issue, same email goes back into the mailgateway
         frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
-                                            subject='Re: news', extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
+                                         subject='Re: news', extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
-                            'message_process: reply on Frogs should not have created a new group with new subject')
+                         'message_process: reply on Frogs should not have created a new group with new subject')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: reply on Frogs should not have created a duplicate group with old subject')
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: no new message
         self.assertEqual(len(frog_group.message_ids), 3, 'message_process: message with already existing message_id should not have been duplicated')
         # Test: message_id is still unique
         msg_ids = self.mail_message.search(cr, uid, [('message_id', 'ilike', '<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>')])
         self.assertEqual(len(msg_ids), 1,
-                            'message_process: message with already existing message_id should not have been duplicated')
+                         'message_process: message with already existing message_id should not have been duplicated')
 
         # --------------------------------------------------
         # Test4: email_from and partner finding
@@ -505,28 +505,28 @@ class TestMailgateway(TestMailBase):
 
         # Do: post a new message, with a known partner -> duplicate emails -> partner
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik <test_raoul@email.com>',
-                                            to='erroneous@example.com>', subject='Re: news (2)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new1@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='erroneous@example.com>', subject='Re: news (2)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new1@agrolait.com>',
+                           extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is A-Raoul (only existing)
         self.assertEqual(frog_group.message_ids[0].author_id.id, extra_partner_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         # Do: post a new message, with a known partner -> duplicate emails -> user
         frog_group.message_unsubscribe([extra_partner_id])
         raoul_email = self.user_raoul.email
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': 'test_raoul@email.com'})
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik <test_raoul@email.com>',
-                                            to='erroneous@example.com>', subject='Re: news (3)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new2@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='erroneous@example.com>', subject='Re: news (3)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new2@agrolait.com>',
+                           extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is Raoul (user), not A-Raoul
         self.assertEqual(frog_group.message_ids[0].author_id.id, self.partner_raoul_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         # Do: post a new message, with a known partner -> duplicate emails -> partner because is follower
         frog_group.message_unsubscribe([self.partner_raoul_id])
@@ -534,14 +534,14 @@ class TestMailgateway(TestMailBase):
         raoul_email = self.user_raoul.email
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': 'test_raoul@email.com'})
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik <test_raoul@email.com>',
-                                            to='erroneous@example.com>', subject='Re: news (3)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new3@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='erroneous@example.com>', subject='Re: news (3)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new3@agrolait.com>',
+                           extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is Raoul (user), not A-Raoul
         self.assertEqual(frog_group.message_ids[0].author_id.id, extra_partner_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': raoul_email})
 
@@ -551,37 +551,37 @@ class TestMailgateway(TestMailBase):
 
         # Do: incoming email with model that does not accepts incoming emails must raise
         self.assertRaises(AssertionError,
-                            format_and_process,
-                            MAIL_TEMPLATE,
-                            to='noone@example.com', subject='spam', extra='', model='res.country',
-                            msg_id='<1198923581.41972151344608186760.JavaMail.new4@agrolait.com>')
+                          format_and_process,
+                          MAIL_TEMPLATE,
+                          to='noone@example.com', subject='spam', extra='', model='res.country',
+                          msg_id='<1198923581.41972151344608186760.JavaMail.new4@agrolait.com>')
 
         # Do: incoming email without model and without alias must raise
         self.assertRaises(AssertionError,
-                            format_and_process,
-                            MAIL_TEMPLATE,
-                            to='noone@example.com', subject='spam', extra='',
-                            msg_id='<1198923581.41972151344608186760.JavaMail.new5@agrolait.com>')
+                          format_and_process,
+                          MAIL_TEMPLATE,
+                          to='noone@example.com', subject='spam', extra='',
+                          msg_id='<1198923581.41972151344608186760.JavaMail.new5@agrolait.com>')
 
         # Do: incoming email with model that accepting incoming emails as fallback
         frog_groups = format_and_process(MAIL_TEMPLATE,
-                                            to='noone@example.com',
-                                            subject='Spammy', extra='', model='mail.group',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new6@agrolait.com>')
+                                         to='noone@example.com',
+                                         subject='Spammy', extra='', model='mail.group',
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.new6@agrolait.com>')
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: erroneous email but with a fallback model should have created a new mail.group')
+                         'message_process: erroneous email but with a fallback model should have created a new mail.group')
 
         # Do: incoming email in plaintext should be stored as  html
         frog_groups = format_and_process(MAIL_TEMPLATE_PLAINTEXT,
-                                            to='groups@example.com', subject='Frogs Return', extra='',
-                                            msg_id='<deadcafe.1337@smtp.agrolait.com>')
+                                         to='groups@example.com', subject='Frogs Return', extra='',
+                                         msg_id='<deadcafe.1337@smtp.agrolait.com>')
         # Test: one group created with one message
         self.assertEqual(len(frog_groups), 1, 'message_process: a new mail.group should have been created')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         msg = frog_group.message_ids[0]
         # Test: plain text content should be wrapped and stored as html
         self.assertIn('<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>', msg.body,
-                            'message_process: plaintext incoming email incorrectly parsed')
+                      'message_process: plaintext incoming email incorrectly parsed')
 
     @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
     def test_20_thread_parent_resolution(self):
@@ -602,26 +602,26 @@ class TestMailgateway(TestMailBase):
         # Reply to msg1, make sure the reply is properly attached using the various reply identification mechanisms
         # 0. Direct alias match
         reply_msg1 = format(MAIL_TEMPLATE, to='Pretty Pigs <group+pigs@example.com>',
-                                extra='In-Reply-To: %s' % msg1.message_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.2@agrolait.com>')
+                            extra='In-Reply-To: %s' % msg1.message_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.2@agrolait.com>')
         self.mail_group.message_process(cr, uid, None, reply_msg1)
 
         # 1. In-Reply-To header
         reply_msg2 = format(MAIL_TEMPLATE, to='erroneous@example.com',
-                                extra='In-Reply-To: %s' % msg1.message_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.3@agrolait.com>')
+                            extra='In-Reply-To: %s' % msg1.message_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.3@agrolait.com>')
         self.mail_group.message_process(cr, uid, None, reply_msg2)
 
         # 2. References header
         reply_msg3 = format(MAIL_TEMPLATE, to='erroneous@example.com',
-                                extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.4@agrolait.com>')
+                            extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.4@agrolait.com>')
         self.mail_group.message_process(cr, uid, None, reply_msg3)
 
         # 3. Subject contains [<ID>] + model passed to message+process -> only attached to group, but not to mail (not in msg1.child_ids)
         reply_msg4 = format(MAIL_TEMPLATE, to='erroneous@example.com',
-                                extra='', subject='Re: [%s] 1' % self.group_pigs_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.5@agrolait.com>')
+                            extra='', subject='Re: [%s] 1' % self.group_pigs_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.5@agrolait.com>')
         self.mail_group.message_process(cr, uid, 'mail.group', reply_msg4)
 
         group_pigs.refresh()

From f3e4bb5c4d9be64ad2aa01a2842848e7334cca15 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 8 Aug 2013 04:39:24 +0000
Subject: [PATCH 8/8] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130808043924-8c2ozuaxc87zx12b
---
 addons/google_drive/i18n/es.po |  4 ++--
 addons/mrp/i18n/zh_CN.po       | 33 +++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/addons/google_drive/i18n/es.po b/addons/google_drive/i18n/es.po
index 07c929d5b4f..8e7770930e0 100644
--- a/addons/google_drive/i18n/es.po
+++ b/addons/google_drive/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-07 04:46+0000\n"
-"X-Generator: Launchpad (build 16721)\n"
+"X-Launchpad-Export-Date: 2013-08-08 04:39+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
 
 #. module: google_drive
 #: model:ir.ui.menu,name:google_drive.menu_google_drive_config
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 6c68dac03dc..216c9f4d8b9 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-08-02 05:54+0000\n"
-"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
+"PO-Revision-Date: 2013-08-07 16:09+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-03 05:55+0000\n"
-"X-Generator: Launchpad (build 16718)\n"
+"X-Launchpad-Export-Date: 2013-08-08 04:39+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -69,7 +69,7 @@ msgstr "周期数"
 msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
-msgstr "最小库存规则允许系统在达到最小库存数量的时候立即创建补货单"
+msgstr "最小库存规则允许系统在达到最小库存数量的时会自动创建补货单"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -490,6 +490,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                创建新属性\n"
+"              </p><p>\n"
+"                当同一个产品有多种组成的方式，\n"
+"                OpenERP会根据属性来选择合适的BoM。\n"
+"                你可以给每个物料清单分配若干个属性，\n"
+"                当销售人员创建销售订单，根据需要指定几个属性，\n"
+"                然后OpenERP 会根据其来自动选择相应的BoM。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1629,6 +1639,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击创建属性组\n"
+"              </p><p>\n"
+"                可以定义特定的属性组用来分配到BoM和销售订单。\n"
+"                根据销售人员在销售订单上选取的属性，OpenERP可以\n"
+"                自动选择相应的BoM。\n"
+"              </p><p>\n"
+"                例如，在属性组“保修” ，你有两个属性：1年保修，3年保修。\n"
+"                根据销售订单上的选择，OpenERP会自动选择对应的BoM排单生产。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -2191,7 +2212,7 @@ msgstr "产品类型是可库存或消耗品"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Production Started"
-msgstr "生产开始了"
+msgstr "已开始生产"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0