[Phpgroupware-cvs] property/class.uiinvoice.php, 1.1.1.5

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.uiinvoice.php

date: 2004/04/24 21:36:28;  author: sigurdne;  state: Exp;  lines: +11 -6

Log Message:
no message
=====================================================================
Index: property/class.uiinvoice.php
diff -u property/class.uiinvoice.php:1.1.1.4 
property/class.uiinvoice.php:1.1.1.5
--- property/class.uiinvoice.php:1.1.1.4        Sat Apr 24 19:39:54 2004
+++ property/class.uiinvoice.php        Sat Apr 24 21:36:28 2004
@@ -84,14 +84,18 @@
                        $this->bo->save_sessiondata($data);
                }
 
+               function index2()
+               {
+//echo 'hepp';
+               }
                function index()
                {
+//echo 'hepp';
 //                     $start_time = explode(' ',microtime());
 //                     $start_time = $start_time[1]+$start_time[0];
-
                        if(!$this->acl_read)
                        {
-                               
$this->bocommon->redirect_link('/index.php','sid=cookie&op='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
 . $this->acl2_location);
+//                             
$this->bocommon->redirect_link('/index.php','sid=cookie&op='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
 . $this->acl2_location);
                        }
 
                        $this->bocommon->xsl_add_file(array('invoice','menu',
@@ -111,7 +115,7 @@
 
                        if(!$end_date)
                        {
-                               $end_date = 
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               $end_date = 
$this->bocommon->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                $start_date = $end_date;
                        }
 
@@ -323,7 +327,7 @@
                                $data['user_list']                              
                = 
$this->bo->get_invoice_user_list('filter',$this->user_lid,array('all'),$default='none');
                                $data['cat_list']                               
                = $this->bo->select_category('filter',$this->cat_id);
                                $data['table_done']                             
                = $table_done;
-                               $data['img_check']                              
                = 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.gif';
+                               $data['img_check']                              
                = 
dirname($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']).'/'.$this->currentapp. 
'/skins/default/images/check.gif';
                                $data['check_source']                           
        = './'.$this->currentapp.'/inc/check.js';
                                $data['lang_save']                              
                = lang('save');
                                $data['done_action']                            
        = 
$this->bocommon->link('/index.php','sid=cookie&op='.$this->currentapp.'.uiinvoice.index');
@@ -336,6 +340,7 @@
                                $data['values_list_voucher']                    
= $content;
                                $data['acl_delete']                             
                = $this->acl_delete;
 
+//html_print_r($data);
                                return array('list_voucher' => $data);
                        }
 
@@ -494,7 +499,7 @@
 
                        $data = array
                        (
-                               'img_check'                                     
        => 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.gif',
+                               'img_check'                                     
        => 
dirname($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']).'/'.$this->currentapp. 
'/skins/default/images/check.gif',
                                'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                //'msgbox_data'                                 
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'sum'                                           
        => number_format($sum, 2, ',', ''),
@@ -627,7 +632,7 @@
 //html_print_r($values);
                        if(!$submit_search)
                        {
-                               $start_date = 
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               $start_date = 
$this->bocommon->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                $end_date       = $start_date;
                        }
                        else