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

[nomail]

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

date: 2004/04/30 17:35:57;  author: sigurdne;  state: Exp;  lines: +5 -5

Log Message:
no message
=====================================================================
Index: property/class.uiinvoice.php
diff -u property/class.uiinvoice.php:1.1.1.10 
property/class.uiinvoice.php:1.1.1.11
--- property/class.uiinvoice.php:1.1.1.10       Fri Apr 30 09:52:25 2004
+++ property/class.uiinvoice.php        Fri Apr 30 17:35:57 2004
@@ -115,7 +115,7 @@
 
                        if(!$end_date)
                        {
-                               $end_date = 
$this->bocommon->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_data']['user']['preferences']['common']['dateformat']);
                                $start_date = $end_date;
                        }
 
@@ -240,7 +240,7 @@
 
                        if(!$this->allrows)
                        {
-                               $record_limit   = 15; 
//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+                               $record_limit   = 15; 
//$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'];
                        }
                        else
                        {
@@ -514,7 +514,7 @@
                                'links'                                         
        => $links,
                                'allow_allrows'                                 
=> false,
                                'start_record'                                  
=> $this->start,
-                               'record_limit'                                  
=> count($content),//15, 
//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+                               'record_limit'                                  
=> count($content),//15, 
//$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'],
                                'num_records'                                   
=> count($content),
                                'all_records'                                   
=> $this->bo->total_records,
                                'link_url'                                      
        => $this->bocommon->link('/index.php',$link_data),
@@ -633,7 +633,7 @@
 //html_print_r($values);
                        if(!$submit_search)
                        {
-                               $start_date = 
$this->bocommon->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_data']['user']['preferences']['common']['dateformat']);
                                $end_date       = $start_date;
                        }
                        else
@@ -686,7 +686,7 @@
                        $data['links']                                          
        = $links;
                        $data['allow_allrows']                                  
= false;
                        $data['start_record']                                   
= $this->start;
-                       $data['record_limit']                                   
= 15; //$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+                       $data['record_limit']                                   
= 15; //$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'];
                        $data['num_records']                                    
= count($content);
                        $data['all_records']                                    
= $this->bo->total_records;
                        $data['link_url']                                       
        = $this->bocommon->link('/index.php',$link_data);