[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.2,1.18.2.3 class.uideliveries.inc.php,1.21.2.2,1.21.2.3

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        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.18.2.2
retrieving revision 1.18.2.3
diff -C2 -r1.18.2.2 -r1.18.2.3
*** class.uibilling.inc.php     1 Feb 2002 02:33:28 -0000       1.18.2.2
--- class.uibilling.inc.php     1 Feb 2002 17:04:21 -0000       1.18.2.3
***************
*** 640,644 ****
                                        $select = '<input type="checkbox" 
name="select[' . $inv['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($inv['descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
--- 640,644 ----
                                        $select = '<input type="checkbox" 
name="select[' . $inv['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($inv['act_descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
***************
*** 718,722 ****
                                                $select = '<input 
type="checkbox" name="select[' . $inv['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($inv['descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
  
--- 718,722 ----
                                                $select = '<input 
type="checkbox" name="select[' . $inv['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($inv['act_descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
  
***************
*** 910,914 ****
                                        $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);
--- 910,914 ----
                                        $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.21.2.2
retrieving revision 1.21.2.3
diff -C2 -r1.21.2.2 -r1.21.2.3
*** class.uideliveries.inc.php  1 Feb 2002 02:33:28 -0000       1.21.2.2
--- class.uideliveries.inc.php  1 Feb 2002 17:04:21 -0000       1.21.2.3
***************
*** 504,508 ****
                                        $select = '<input type="checkbox" 
name="select[' . $note['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($note['descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
--- 504,508 ----
                                        $select = '<input type="checkbox" 
name="select[' . $note['hours_id'] . ']" value="True" checked>';
  
!                                       $activity = 
$GLOBALS['phpgw']->strip_html($note['act_descr']);
                                        if (! $activity)  $activity  = '&nbsp;';
  
***************
*** 573,577 ****
                                                $select = '<input 
type="checkbox" name="select[' . $note['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($note['descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
        
--- 573,577 ----
                                                $select = '<input 
type="checkbox" name="select[' . $note['hours_id'] . ']" value="True">';
  
!                                               $activity = 
$GLOBALS['phpgw']->strip_html($note['act_descr']);
                                                if (! $activity)  $activity  = 
'&nbsp;';
        
***************
*** 856,860 ****
  
                                        $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);
--- 856,860 ----
  
                                        $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);