[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.20,1.21 class.uideliveries.inc.php,1.23,1.24

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv12373/inc

Modified Files:
        class.uibilling.inc.php class.uideliveries.inc.php 
Log Message:
fixed show activities descr in invoicing

Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uibilling.inc.php     1 Feb 2002 04:24:26 -0000       1.20
--- class.uibilling.inc.php     1 Feb 2002 17:04:45 -0000       1.21
***************
*** 637,641 ****
                                        $select = '<input type="checkbox" 
name="select[' . $inv['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($inv['descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
--- 637,641 ----
                                        $select = '<input type="checkbox" 
name="select[' . $inv['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($inv['act_descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
***************
*** 715,719 ****
                                                $select = '<input 
type="checkbox" name="select[' . $inv['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($inv['descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
  
--- 715,719 ----
                                                $select = '<input 
type="checkbox" name="select[' . $inv['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($inv['act_descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
  
***************
*** 907,911 ****
                                        $this->t->set_var('aes',$aes);
  
!                                       $act_descr = 
$GLOBALS['phpgw']->strip_html($inv['descr']);
                                        if (! $act_descr) { $act_descr  = 
'&nbsp;'; }
                                        
$this->t->set_var('act_descr',$act_descr);
--- 907,911 ----
                                        $this->t->set_var('aes',$aes);
  
!                                       $act_descr = 
$GLOBALS['phpgw']->strip_html($inv['act_descr']);
                                        if (! $act_descr) { $act_descr  = 
'&nbsp;'; }
                                        
$this->t->set_var('act_descr',$act_descr);

Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uideliveries.inc.php  1 Feb 2002 04:24:26 -0000       1.23
--- class.uideliveries.inc.php  1 Feb 2002 17:04:45 -0000       1.24
***************
*** 501,505 ****
                                        $select = '<input type="checkbox" 
name="select[' . $note['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($note['descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
--- 501,505 ----
                                        $select = '<input type="checkbox" 
name="select[' . $note['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($note['act_descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
***************
*** 570,574 ****
                                                $select = '<input 
type="checkbox" name="select[' . $note['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($note['descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
        
--- 570,574 ----
                                                $select = '<input 
type="checkbox" name="select[' . $note['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($note['act_descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
        
***************
*** 853,857 ****
  
                                        $this->t->set_var('aes',$aes);
!                                       $act_descr = 
$GLOBALS['phpgw']->strip_html($note['descr']);
                                        if (! $act_descr) { $act_descr  = 
'&nbsp;'; }
                                        
$this->t->set_var('act_descr',$act_descr);
--- 853,857 ----
  
                                        $this->t->set_var('aes',$aes);
!                                       $act_descr = 
$GLOBALS['phpgw']->strip_html($note['act_descr']);
                                        if (! $act_descr) { $act_descr  = 
'&nbsp;'; }
                                        
$this->t->set_var('act_descr',$act_descr);