← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-client-web/6.0-bug-771288-jra into lp:openobject-client-web/6.0

 

Jiten (OpenERP) has proposed merging lp:~openerp-dev/openobject-client-web/6.0-bug-771288-jra into lp:openobject-client-web/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #771288 in OpenERP Web Client: "Closing Balance on Cash Register : wrong alignement for computed total"
  https://bugs.launchpad.net/openobject-client-web/+bug/771288

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-771288-jra/+merge/59347

Improved the display of o2m to set alignment in form view.

When it is in readonly mode then some row's style set as display 'none', So below rows are unmanaged to set wrong alignment.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-771288-jra/+merge/59347
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-bug-771288-jra.
=== modified file 'addons/openerp/static/css/listgrid.css'
--- addons/openerp/static/css/listgrid.css	2011-01-10 16:33:33 +0000
+++ addons/openerp/static/css/listgrid.css	2011-04-28 10:58:25 +0000
@@ -55,8 +55,11 @@
     width: auto;
 }
 
+.grid-header {
+    background: url(../images/gradientlinebg.gif);
+}
+
 .grid-header .grid-cell {
-    background: url(../images/gradientlinebg.gif);
     border-bottom: 1px solid #E3E3E3;
     font-weight: bold;
     text-align: left;

=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js	2011-04-21 07:24:40 +0000
+++ addons/openerp/static/javascript/o2m.js	2011-04-28 10:58:25 +0000
@@ -185,7 +185,7 @@
         if (readonly) {
             jQuery('table.one2many[id$="'+this.name+'"]').addClass('m2o_readonly');
             if(btn){btn.style.display='none';}
-            MochiKit.Base.map(function (el) {el.style.display='none'},MochiKit.Selector.findChildElements(grid,['.selector']));
+            MochiKit.Base.map(function (el) {el.style.visibility='hidden'},MochiKit.Selector.findChildElements(grid,['.selector']));
             edit.value= 0;
             if (rows && rows.length) {
                 rows.each(function(index, row) {
@@ -194,7 +194,7 @@
         }
         else{
             if(btn){btn.style.display='';}
-            MochiKit.Base.map(function (el) {el.style.display=''},MochiKit.Selector.findChildElements(grid,['.selector']));
+            MochiKit.Base.map(function (el) {el.style.visibility=''},MochiKit.Selector.findChildElements(grid,['.selector']));
             edit.value = 1;
         }
     },


Follow ups