Merge remote-tracking branch 'odoo/7.0' into 7.0

diff --cc addons/mrp/mrp.py
Simple merge

diff --cc addons/web/static/src/css/base.css
index ea0e2e2,2c439c3..d65661f
--- 1/addons/web/static/src/css/base.css
--- 2/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -2060,15 -2060,9 +2060,15 @@@
    position: relative;
    display: inline-block;
  }
 +.openerp .oe_form_editable .oe_form_required.oe_form_field_one2many table.oe_list_content, .openerp .oe_form_editable .oe_form_required.oe_form_field_many2many table.oe_list_content {
 +  background-color: #d2d2ff !important;
 +}
 +.openerp .oe_form_editable .oe_form_invalid.oe_form_field_one2many table.oe_list_content, .openerp .oe_form_editable .oe_form_invalid.oe_form_field_many2many table.oe_list_content {
 +  background-color: #ff6666 !important;
 +}
  .openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea {
-   background-color: #ff6666 !important;
-   border: 1px solid #dd0000 !important;
+   background-color: #F66 !important;
+   border: 1px solid #D00 !important;
  }
  .openerp .oe_view_manager_current .oe_form_editable .oe_highlight {
    color: #404040;

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

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

diff --cc openerp/tools/translate.py
Simple merge