[Fmsystem-commits] [7560] property: tweak request

[Sigurd Nes]

Revision: 7560
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7560
Author:   sigurdne
Date:     2011-09-07 13:55:04 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
property: tweak request

Modified Paths:
--------------
    trunk/property/inc/class.uirequest.inc.php
    trunk/property/setup/phpgw_no.lang
    trunk/property/templates/base/request.xsl

Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php  2011-09-06 12:50:59 UTC (rev 
7559)
+++ trunk/property/inc/class.uirequest.inc.php  2011-09-07 13:55:04 UTC (rev 
7560)
@@ -1314,19 +1314,19 @@
                                );
 
 
-
-                       $_predisposed = 0;
+                       $_consume_amount = 0;
+                       $_planning_amount = 0;
                        if($this->acl_edit)
                        {
                                $_lang_delete = lang('Check to delete');
                                foreach($values['consume'] as & $consume)
                                {
-                                       $_predisposed = $_predisposed + 
$consume['amount'];
+                                       $_consume_amount = $_consume_amount + 
$consume['amount'];
                                        $consume['delete'] = "<input 
type='checkbox' name='values[delete_consume][]' value='{$consume['id']}' 
title='{$_lang_delete}'>";
                                }
                                foreach($values['planning'] as & $planning)
                                {
-                                       $_predisposed = $_predisposed + 
$planning['amount'];
+                                       $_planning_amount = $_planning_amount + 
$planning['amount'];
                                        $planning['delete'] = "<input 
type='checkbox' name='values[delete_planning][]' value='{$planning['id']}' 
title='{$_lang_delete}'>";
                                }
 
@@ -1481,7 +1481,8 @@
                                        'lang_budget'                           
                => lang('Budget'),
                                        'value_budget'                          
                => number_format($values['budget'], 0, ',', ' '),
                                        'lang_budget_statustext'                
        => lang('Enter the budget'),
-                                       'value_diff'                            
                => number_format(((int)$values['budget'] - $_predisposed), 0, 
',', ' '),
+                                       'value_diff'                            
                => number_format(((int)$values['budget'] - ($_consume_amount + 
$_planning_amount)), 0, ',', ' '),
+                                       'value_diff2'                           
                => number_format(((int)$values['budget'] - $_consume_amount), 
0, ',', ' '),
 
                                        'location_data'                         
                => $location_data,
                                        'location_type'                         
                => 'form',

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2011-09-06 12:50:59 UTC (rev 7559)
+++ trunk/property/setup/phpgw_no.lang  2011-09-07 13:55:04 UTC (rev 7560)
@@ -1098,6 +1098,7 @@
 no status      property        no      Status ikke valgt
 no such order: %1      property        no      Ordre %1 finnes ikke
 no supervisor  property        no      Attestant ikke valgt
+not allocated  property        no      Ikke disponert
 note   property        no      Notat
 nothing to do! property        no      Ingen ting å gjøre
 notify property        no      varsle
@@ -1320,6 +1321,7 @@
 reserve remainder      property        no      rest av reserve
 reset  property        no      Tilbakestill
 residential environment        property        no      Bo-miljø
+residual demand        property        no      Rest behov
 responsible    property        no      Ansvarlig
 responsibility property        no      Ansvar
 responsible matrix     property        no      Ansvarsmatrise

Modified: trunk/property/templates/base/request.xsl
===================================================================
--- trunk/property/templates/base/request.xsl   2011-09-06 12:50:59 UTC (rev 
7559)
+++ trunk/property/templates/base/request.xsl   2011-09-07 13:55:04 UTC (rev 
7560)
@@ -349,7 +349,7 @@
                                                        </tr>
                                                        <tr>
                                                                <td 
valign="top">
-                                                                       
<xsl:value-of select="php:function('lang', 'at the disposal')" />
+                                                                       
<xsl:value-of select="php:function('lang', 'not allocated')" />
                                                                </td>
                                                                <td>
                                                                        
<xsl:value-of select="value_diff"/>
@@ -357,7 +357,16 @@
                                                                </td>
                                                        </tr>
                                                        <tr>
+                                                               <td 
valign="top">
+                                                                       
<xsl:value-of select="php:function('lang', 'residual demand')" />
+                                                               </td>
                                                                <td>
+                                                                       
<xsl:value-of select="value_diff2"/>
+                                                                       
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
+                                                               </td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>
                                                                        
<xsl:value-of select="php:function('lang', 'building part')" />
                                                                </td>
                                                                <td>