[Merge] Merge from openerp-web.

bzr revid: jra@tinyerp.com-20120209060216-7srqio91yxlu7yi0
This commit is contained in:
Jiten (OpenERP)
2012-02-09 11:32:16 +05:30
290 changed files with 47864 additions and 30888 deletions
+14 -1
View File
@@ -1235,6 +1235,8 @@ label.error {
.openerp label.oe_label_help, .openerp label.oe_label,
.openerp .oe_form_paragraph,
.openerp .oe_form_field_statusbar,
.openerp .oe_forms input[type="text"],
.openerp .oe_forms input[type="password"],
.openerp .oe_forms input[type="file"],
@@ -1305,12 +1307,23 @@ label.error {
white-space: normal;
}
.openerp .oe_forms .oe_form_paragraph.oe_multilines {
white-space: pre;
}
.openerp .oe_form_field_one2many .oe-actions h3.oe_view_title,
.openerp .oe_form_field_one2many_list .oe-actions h3.oe_view_title{
display: inline;
margin: 0 0.5em 0 0;
}
.openerp .oe_forms .oe-listview th.oe-sortable .ui-icon,
.openerp .oe_forms .oe-listview th.oe-sortable .ui-icon {
height: 100%;
margin-top: -9px;
}
/* Uneditable Form View */
.openerp .oe_form_readonly {
@@ -1891,7 +1904,7 @@ label.error {
text-align: left;
border-bottom: 1px solid #CFCCCC;
}
.oe-number{
.openerp .oe-treeview-table .oe-number {
text-align: right !important;
}
.treeview-tr span, .treeview-td span {