[Fmsystem-commits] [11014] property: inventory

[Sigurd Nes]

Revision: 11014
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11014
Author:   sigurdne
Date:     2013-03-22 14:33:08 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
property: inventory

Modified Paths:
--------------
    trunk/property/inc/class.soentity.inc.php
    trunk/property/inc/class.uientity.inc.php
    trunk/property/js/yahoo/entity.edit.js

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2013-03-22 09:03:41 UTC (rev 
11013)
+++ trunk/property/inc/class.soentity.inc.php   2013-03-22 14:33:08 UTC (rev 
11014)
@@ -2377,6 +2377,7 @@
                        {
                                $inventory[] = array
                                (
+                                       'id'                    => 
$this->db->f('id'),
                                        'inventory'             => 
$this->db->f('inventory'),
                                        'unit_id'               => 
$this->db->f('unit_id'),
                                        'unit'                  => 
$this->db->f('unit', true),

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2013-03-22 09:03:41 UTC (rev 
11013)
+++ trunk/property/inc/class.uientity.inc.php   2013-03-22 14:33:08 UTC (rev 
11014)
@@ -2149,6 +2149,8 @@
                                                'name'          => "3",
                                                'values'        =>      
json_encode(array(      
                                                                array('key' => 
'where','label'=>lang('where'),'sortable'=>false,'resizeable'=>true),
+                                                               array('key' => 
'edit','label'=>lang('edit'),'sortable'=>false,'resizeable'=>true, 'formatter' 
=> 'FormatterEdit'),
+                                                               array('key' => 
'delete','label'=>lang('delete'),'sortable'=>false,'resizeable'=>true, 
'formatter' => 'FormatterCenter'),
                                                                array('key' => 
'unit','label'=>lang('unit'),'sortable'=>false,'resizeable'=>true),
                                                                array('key' => 
'inventory','label'=>lang('count'),'sortable'=>false,'resizeable'=>true, 
'formatter' => 'FormatterAmount0'),
                                                                array('key' => 
'bookable','label'=>lang('bookable'),'sortable'=>false,'resizeable'=>true, 
'formatter' => 'FormatterCenter'),

Modified: trunk/property/js/yahoo/entity.edit.js
===================================================================
--- trunk/property/js/yahoo/entity.edit.js      2013-03-22 09:03:41 UTC (rev 
11013)
+++ trunk/property/js/yahoo/entity.edit.js      2013-03-22 14:33:08 UTC (rev 
11014)
@@ -17,6 +17,13 @@
        }
 
 
+
+       var FormatterCenter = function(elCell, oRecord, oColumn, oData)
+       {
+               var amount = YAHOO.util.Number.format(oData, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});
+               elCell.innerHTML = "<div align=\"right\">"+amount+"</div>";
+       }       
+
        var FormatterAmount0 = function(elCell, oRecord, oColumn, oData)
        {
                var amount = YAHOO.util.Number.format(oData, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});