[Fmsystem-commits] [11022] property: inventory

[Sigurd Nes]

Revision: 11022
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11022
Author:   sigurdne
Date:     2013-04-03 07:09:25 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
property: inventory

Modified Paths:
--------------
    trunk/property/inc/class.uientity.inc.php
    trunk/property/templates/base/entity.xsl

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2013-04-02 14:09:47 UTC (rev 
11021)
+++ trunk/property/inc/class.uientity.inc.php   2013-04-03 07:09:25 UTC (rev 
11022)
@@ -2986,7 +2986,7 @@
                                'item_id'                       => $id,
                                'unit_list'                     => 
array('options' => $unit_list),
                                'lock_unit'                     => $lock_unit,
-                               'value_inventory'       => $values['inventory'],
+                               'value_inventory'       => $values['inventory'] 
? $values['inventory'] : $inventory[0]['inventory'],
                                'value_write_off'       => $values['write_off'],
                                'bookable'                      => 
$values['bookable'] ? $values['bookable'] : $inventory[0]['bookable'],
                                'value_active_from'     => 
$values['active_from'] ? $values['active_from'] : 
$GLOBALS['phpgw']->common->show_date($inventory[0]['active_from'],$dateformat ),

Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl    2013-04-02 14:09:47 UTC (rev 
11021)
+++ trunk/property/templates/base/entity.xsl    2013-04-03 07:09:25 UTC (rev 
11022)
@@ -23,8 +23,11 @@
         <div align = 'left'>
 
                <xsl:variable name="action_url">
-                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', 'menuaction:property.uientity.add_inventory')" />
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', 'menuaction:property.uientity.edit_inventory')" />
                </xsl:variable>
+               <xsl:variable name="lang_inventory">
+                               <xsl:value-of select="php:function('lang', 
'inventory')" />
+               </xsl:variable>
 
                <form name="form" id="form" action="{$action_url}" 
method="post">
 
@@ -72,9 +75,23 @@
                                        </tr>
                                        <tr>
                                        <td>
-                                               <label 
for="inventory"><xsl:value-of select="php:function('lang', 'inventory')" 
/></label>
+                                               <label for="old_inventory">
+                                                       <xsl:value-of 
select="$lang_inventory"/>
+                                               </label>
                                        </td>
                                        <td>
+                                               <xsl:value-of 
select="value_inventory"/>
+                                       </td>
+                                       </tr>
+                                       <tr>
+                                       <td>
+                                               <label for="inventory">
+                                                       <xsl:value-of 
select="php:function('lang', 'new')" />
+                                                       <xsl:text> </xsl:text>
+                                                       <xsl:value-of 
select="$lang_inventory"/>
+                                               </label>
+                                       </td>
+                                       <td>
 
                                                <input type="text" id = 
'inventory' name="values[inventory]" value="{value_inventory}" size="12">
                                                        <xsl:attribute 
name="title">
@@ -173,9 +190,9 @@
                                        <xsl:variable name="lang_cancel">
                                                <xsl:value-of 
select="php:function('lang', 'cancel')"/>
                                        </xsl:variable>
-                                       <input type="submit" 
name="values[cancel]" value="{$lang_cancel}">
+                                       <input type="button" 
name="values[cancel]" value="{$lang_cancel}" onClick="parent.TINY.box.hide();">
                                                <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="php:function('lang', 'Back to the list')"/>
+                                                       <xsl:value-of 
select="$lang_cancel"/>
                                                </xsl:attribute>
                                        </input>
                                </td>
@@ -345,7 +362,7 @@
                                        <xsl:variable name="lang_cancel">
                                                <xsl:value-of 
select="php:function('lang', 'cancel')"/>
                                        </xsl:variable>
-                                       <input type="submit" 
name="values[cancel]" value="{$lang_cancel}">
+                                       <input type="button" 
name="values[cancel]" value="{$lang_cancel}" onClick="parent.TINY.box.hide();">
                                                <xsl:attribute name="title">
                                                        <xsl:value-of 
select="php:function('lang', 'Back to the list')"/>
                                                </xsl:attribute>