[Merge]with trunk

bzr revid: mba@tinyerp.com-20140507104547-p7pmav8pez08zf1h

diff --cc addons/web/static/src/css/base.css
index 7fae47d,8534927..49c9573
--- 1/addons/web/static/src/css/base.css
--- 2/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -3319,90 -3297,84 +3297,144 @@@ body.oe_single_form .oe_single_form_con
      overflow: hidden !important;
    }
  }
+ .tooltip {
+   padding: 0;
+   margin: 0;
+   font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+   color: #4c4c4c;
+   font-size: 12px;
+   background: white;
+   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+   background-color: transparent;
+ }
+ .tooltip .tooltip-inner {
+   text-align: left !important;
+   max-width: 350px;
+ }
+ .tooltip .tooltip-inner .oe_tooltip_string {
+   color: #ffdd55;
+   font-weight: bold;
+   font-size: 13px;
+ }
++
+ .tooltip .tooltip-inner .oe_tooltip_help {
+   white-space: pre-wrap;
+ }
+ .tooltip .tooltip-inner .oe_tooltip_technical {
+   padding: 0 0 4px 0;
+   margin: 5px 0 0 15px;
+ }
+ .tooltip .tooltip-inner .oe_tooltip_technical li {
+   list-style: circle;
+ }
+ .tooltip .tooltip-inner .oe_tooltip_technical_title {
+   font-weight: bold;
+ }
+ .tooltip .tooltip-inner .oe_tooltip_close {
+   margin: -5px 0 0 2px;
+   cursor: default;
+   float: right;
+   color: white;
+ }
+ .tooltip .tooltip-inner .oe_tooltip_close:hover {
+   color: #999999;
+   cursor: pointer;
+ }
+ .tooltip .tooltip-inner .oe_tooltip_message {
+   max-width: 310px;
+ }
+ 
+ .ui-icon {
+   width: 18px;
+   height: 18px;
+ }
+ 
+ .modal .modal-header button.close {
+   border: none;
+   background: none;
+   padding: 1px;
+   height: 18px;
+   font-size: 20px;
+ }
+ .modal .modal-footer {
+   text-align: left;
+ }
+ .modal .oe_button {
+   margin: 0 4px 0 0;
+ }
+ .modal .oe_act_window.modal-body {
+   padding: 0;
+ }
+ 
+ .ui-datepicker {
+   z-index: 1500 !important;
+ }
+ 
+ input[type="radio"], input[type="checkbox"] {
+   margin-right: 4px;
+   margin-left: 4px;
+ }
+ 
+ .blockUI.blockOverlay {
+   background-color: black;
+   opacity: 0.6;
+ }
 +.openerp .dropdown-menu.state {
 +  background: white;
 +  background: white !important;
 +  min-width: 100%;
 +  padding-right: 10px !important;
 +}
 +.openerp .dropdown-menu.state li a, .openerp .dropdown-menu.state li a:hover, .openerp .dropdown-menu.state li a:focus {
 +  text-decoration: none;
 +  color: #333333;
 +  padding-left: 5px;
 +  padding-right: 0px;
-   font-size: 13px;
 +}
 +.openerp .btn-group.state {
 +  padding-top: 3px;
 +}
 +.openerp .btn-group.state a {
 +  color: #333333;
 +}
 +.openerp .btn-group.state a:hover {
 +  text-decoration: none;
 +  color: #333333;
 +}
 +.openerp .btn-group.state .dropdown-toggle {
 +  -webkit-box-shadow: None;
 +}
 +.openerp .status {
 +  display: inline-block;
 +  position: relative;
 +  height: 12px;
 +  width: 12px;
 +  -moz-border-radius: 6px;
 +  -webkit-border-radius: 6px;
 +  border-radius: 6px;
 +  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
 +  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
 +  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
 +  background-position: center center;
 +  background-image: radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%);
 +  background-image: -moz-radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%);
 +  background-image: -webkit-radial-gradient(circle, #dddddd 0%, #aaaaaa 40%, #999999 100%);
 +}
 +.openerp .status.error {
 +  background: #cc3333;
 +  background-position: center center;
 +  background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 +  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 +  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
 +}
 +.openerp .status.ok {
 +  background: #44dd44;
 +  background-position: center center;
 +  background-image: radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%);
 +  background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%);
 +  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%);
 +}
 +.openerp .oe_star_left {
 +  float: left;
 +  margin-right: 8px;
 +}
- 
- .ui-icon {
-   width: 18px;
-   height: 18px;
- }
- .modal .modal-header button.close {
-   border: none;
-   background: none;
-   padding: 1px;
-   height: 18px;
-   font-size: 20px;
- }
- .modal .modal-footer {
-   text-align: left;
- }
- .modal .oe_act_window.modal-body{
-   padding: 0;
- }
- input[type="radio"], input[type="checkbox"] {
-   margin-right: 4px;
-   margin-left: 4px;
- }
- 
- .blockUI.blockOverlay {
-   background-color: black;
-   opacity: 0.6;
- }

diff --cc addons/web/static/src/css/base.sass
index 92fb4c0,f1a92f4..a73bf02
--- 1/addons/web/static/src/css/base.sass
--- 2/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@@ -2697,88 -2681,76 +2681,129 @@@ body.oe_single_for
              overflow: hidden !important
  // }}}
  
+ // End of customize
+ 
+ // Customize bootstrap3 for tooltip
+ .tooltip
+     padding: 0
+     margin: 0
+     font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
+     color: #4c4c4c
+     font-size: 12px
+     background: white
+     text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5)
+     background-color: transparent
+     .tooltip-inner
+         text-align: left !important
+         max-width: 350px
+         .oe_tooltip_string
+             color: #FD5
+             font-weight: bold
+             font-size: 13px
+         .oe_tooltip_help
+             white-space: pre-wrap
+         .oe_tooltip_technical
+             padding: 0 0 4px 0
+             margin: 5px 0 0 15px
+             li
+                 list-style: circle
+         .oe_tooltip_technical_title
+             font-weight: bold
+         .oe_tooltip_close
+             margin: -5px 0 0 2px
+             cursor: default
+             float: right
+             color: white
+             &:hover
+                 color: #999
+                 cursor: pointer
+         .oe_tooltip_message
+             max-width: 310px
+ 
+ // Hack for ui icon {{{
+ .ui-icon
+     width: 18px
+     height: 18px
+ // End hack}}}
+ 
+ // Customized modal according bootstrap3
+ .modal
+     .modal-header button.close
+         border: none
+         background: none
+         padding: 1px
+         height: 18px
+         font-size: 20px
+     .modal-footer
+         text-align: left
+     .oe_button
+         margin: 0 4px 0 0
+     .oe_act_window.modal-body
+         padding: 0
+ 
+ .ui-datepicker
+     z-index: 1500 !important
+ 
+ input[type="radio"], input[type="checkbox"]
+     margin-right: 4px
+     margin-left: 4px
+ 
+ .blockUI.blockOverlay
+     background-color: black
+     opacity: 0.6000000238418579
 -
 +.openerp
 +    .dropdown-menu.state
 +        background: white
 +        background: white !important
 +        min-width: 100%
 +        padding-right: 10px !important
 +    .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus
 +        text-decoration: none
 +        color: #333
 +        padding-left: 5px
 +        padding-right: 0px
 +        font-size: 13px
 +    .btn-group.state
 +        padding-top: 3px
 +    .btn-group.state a
 +        color: #333333
 +    .btn-group.state a:hover
 +        text-decoration: none
 +        color: #333333
 +    .btn-group.state .dropdown-toggle 
 +        -webkit-box-shadow: None
 +    .status
 +        display: inline-block
 +        position: relative
 +        height: 12px
 +        width: 12px
 +        -moz-border-radius: 6px
 +        -webkit-border-radius: 6px
 +        border-radius: 6px
 +        -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6)
 +        -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6)
 +        -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6)
 +        background-position: center center
 +        background-image: radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%)
 +        background-image: -moz-radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%)
 +        background-image: -webkit-radial-gradient(circle, #dddddd 0%, #aaaaaa 40%, #999999 100%)
 +
 +    .status.error
 +        background: #cc3333
 +        background-position: center center
 +        background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%)
 +        background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%)
 +        background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%)
 +
 +    .status.ok
 +        background: #44dd44
 +        background-position: center center
 +        background-image: radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%)
 +        background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%)
 +        background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%)
 +
 +    .oe_star_left
 +        float: left
 +        margin-right: 8px
- // End hack }}}
- 
- // Hack for ui icon {{{
- .ui-icon
-     width: 18px
-     height: 18px
- // End hack}}}
- 
- // Customized modal according bootstrap3
- .modal
-     .modal-header button.close
-         border: none
-         background: none
-         padding: 1px
-         height: 18px
-         font-size: 20px
-     .modal-footer
-         text-align: left
-     .oe_act_window.modal-body
-         padding: 0
- 
- input[type="radio"], input[type="checkbox"]
-     margin-right: 4px
-     margin-left: 4px
- 
- .blockUI.blockOverlay
-     background-color: black
-     opacity: 0.6000000238418579
- 
  // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
  // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/xml/base.xml
Simple merge

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge