[Phpgroupware-cvs] property inc/class.soinvoice.inc.php inc/class....

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/01/03 10:40:16

Modified files:
        inc            : class.soinvoice.inc.php class.uiinvoice.inc.php 
        templates/base : invoice.xsl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soinvoice.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiinvoice.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/invoice.xsl?cvsroot=phpgroupware&r1=1.21&r2=1.22

Patches:
Index: inc/class.soinvoice.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- inc/class.soinvoice.inc.php 2 Jan 2007 14:43:03 -0000       1.30
+++ inc/class.soinvoice.inc.php 3 Jan 2007 10:40:16 -0000       1.31
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage eco
-       * @version $Id: class.soinvoice.inc.php,v 1.30 2007/01/02 14:43:03 
sigurdne Exp $
+       * @version $Id: class.soinvoice.inc.php,v 1.31 2007/01/03 10:40:16 
sigurdne Exp $
        */
 
        /**
@@ -690,6 +690,7 @@
                                {
                                        $id                     = 
$values['id'][$n];
                                        $tax_code       = 
$values['tax_code'][$n];
+                                       $dimb           = 
isset($values['dimb'][$n]) && $values['dimb'][$n] ? (int)$values['dimb'][$n] : 
'NULL';
                                        
$workorder_id=$values['workorder_id'][$n];
                                        if($values['close_order'][$n] && 
!$values['close_order_orig'][$n])
                                        {
@@ -701,7 +702,7 @@
                                                
$update_status[$workorder_id]='R';
                                        }
 
-                                       $GLOBALS['phpgw']->db->query("UPDATE 
fm_ecobilag set $dima_field ,$kostra_field,$dimd_field, mvakode = 
'$tax_code',spbudact_code = '$budget_account' where id='$id'");
+                                       $GLOBALS['phpgw']->db->query("UPDATE 
fm_ecobilag set $dima_field ,$kostra_field,$dimd_field, mvakode = 
'$tax_code',spbudact_code = '$budget_account',dimb = $dimb where id='$id'");
 
                                        $receipt['message'][] = 
array('msg'=>lang('Voucher is updated '));
                                }

Index: inc/class.uiinvoice.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- inc/class.uiinvoice.inc.php 27 Dec 2006 10:37:59 -0000      1.44
+++ inc/class.uiinvoice.inc.php 3 Jan 2007 10:40:16 -0000       1.45
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage eco
-       * @version $Id: class.uiinvoice.inc.php,v 1.44 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uiinvoice.inc.php,v 1.45 2007/01/03 10:40:16 
sigurdne Exp $
        */
 
        /**
@@ -541,6 +541,8 @@
                                        $content[$i]['amount']                  
                = number_format($content[$i]['amount'], 2, ',', '');
                                        $content[$i]['paid']                    
                = $paid;
                                        
$content[$i]['lang_tax_code_statustext']= lang('select the appropriate tax 
code');
+                                       $content[$i]['lang_dimb_statustext']= 
lang('select the appropriate dim code');
+                                       $content[$i]['dimb_list']               
                = $this->bo->select_dimb_list($content[$i]['dimb']);
                                        $content[$i]['tax_code_list']           
        = $this->bo->tax_code_list($content[$i]['tax_code']);
                                        $content[$i]['lang_remark']             
        = lang('Remark');
                                        $content[$i]['link_remark']             
        = $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uiinvoice.remark'));

Index: templates/base/invoice.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/invoice.xsl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- templates/base/invoice.xsl  22 Dec 2006 14:43:54 -0000      1.21
+++ templates/base/invoice.xsl  3 Jan 2007 10:40:16 -0000       1.22
@@ -1,4 +1,4 @@
-<!-- $Id: invoice.xsl,v 1.21 2006/12/22 14:43:54 sigurdne Exp $ -->
+<!-- $Id: invoice.xsl,v 1.22 2007/01/03 10:40:16 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -2500,7 +2500,18 @@
                                        </xsl:choose>
                                </td>
                                <td class="small_text" align="right">
+                                       <xsl:choose>
+                                               <xsl:when test="paid='true'">
                                        <xsl:value-of select="dimb"/>           
                
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:variable 
name="lang_dimb_statustext"><xsl:value-of 
select="lang_dimb_statustext"/></xsl:variable>
+                                                       <select 
name="values[dimb][{$counter}]" class="forms" 
onMouseover="window.status='{$lang_dimb_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                               <option 
value=""></option>
+                                                               
<xsl:apply-templates select="dimb_list"/>
+                                                       </select>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
                                </td>
                                <td class="small_text" align="center">
                                        <xsl:choose>