[Fmsystem-commits] [6932] property: new import filter

[Sigurd Nes]

Revision: 6932
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6932
Author:   sigurdne
Date:     2011-02-04 15:03:18 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
property: new import filter

Modified Paths:
--------------
    trunk/property/inc/class.uiXport.inc.php
    trunk/property/inc/class.uiinvoice.inc.php
    trunk/property/templates/base/invoice.xsl

Modified: trunk/property/inc/class.uiXport.inc.php
===================================================================
--- trunk/property/inc/class.uiXport.inc.php    2011-02-04 15:02:06 UTC (rev 
6931)
+++ trunk/property/inc/class.uiXport.inc.php    2011-02-04 15:03:18 UTC (rev 
6932)
@@ -474,9 +474,9 @@
                                        'vendor_name'                           
        => $vendor_name,
                                        'spvend_code'                           
        => $invoice_common['vendor_id'],
                                        'lang_fakturadato'                      
        => lang('invoice date'),
-                                       'fakturadato'                           
        => $invoice_common['invoice_date'],
+                                       'fakturadato'                           
        => 
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],strtotime($table[0]['fakturadato'])),
                                        'lang_forfallsdato'                     
        => lang('Payment date'),
-                                       'forfallsdato'                          
        => $table[0]['forfallsdato'],
+                                       'forfallsdato'                          
        => 
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],strtotime($table[0]['forfallsdato'])),
                                        'lang_janitor'                          
        => lang('Janitor'),
                                        'oppsynsmannid'                         
        => $invoice_common['janitor'],
                                        'lang_supervisor'                       
        => lang('Supervisor'),

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2011-02-04 15:02:06 UTC (rev 
6931)
+++ trunk/property/inc/class.uiinvoice.inc.php  2011-02-04 15:03:18 UTC (rev 
6932)
@@ -1965,19 +1965,25 @@
                        $id     = phpgw::get_var('id', 'int');
                        $paid   = phpgw::get_var('paid', 'bool');
 
+                       $text = $this->bo->read_remark($id,$paid);
+                       
+                       $html = '';
+                       if(stripos($text, '<table') )
+                       {
+                               $html = 1;
+                       }
+                       
                        $data = array
-                               (
-                                       'remark' => 
$this->bo->read_remark($id,$paid)
-                               );
+                       (
+                               'remark' => $text,
+                               'html'  => $html
+                       );
 
-                       //_debug_array($data);
-
                        $appname        = lang('invoice');
                        $function_msg   = lang('remark');
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('property') . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('remark' => $data));
-                       //      $GLOBALS['phpgw']->xslttpl->pp();
                }
 
                function consume()

Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl   2011-02-04 15:02:06 UTC (rev 
6931)
+++ trunk/property/templates/base/invoice.xsl   2011-02-04 15:03:18 UTC (rev 
6932)
@@ -34,15 +34,20 @@
                                </td>
                        </tr>
                        <tr>
-                               <td align="center">
-                                       <textarea cols="60" rows="15" 
name="remark" readonly="readonly" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_content_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                               <xsl:value-of select="remark"/>
-                                       </textarea>
+                               <td align="left">
+                                       <xsl:choose>
+                                               <xsl:when test="html = ''">
+                                                       <textarea cols="60" 
rows="15" name="remark" readonly="readonly">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="lang_content_statustext"/>
+                                                               </xsl:attribute>
+                                                               <xsl:value-of 
select="remark"/>
+                                                       </textarea>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
disable-output-escaping="yes" select="remark"/>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
                                </td>
                        </tr>