[Phpgroupware-cvs] CVS: property/inc class.soinvestment.inc.php,1.9,1.10 class.uiinvestment.inc.php,1.15,1.16 class.uimeter.inc.php,1.6,1.7

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv11754/inc

Modified Files:
        class.soinvestment.inc.php class.uiinvestment.inc.php 
        class.uimeter.inc.php 
Log Message:
no message

Index: class.soinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvestment.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.soinvestment.inc.php  4 Apr 2003 19:07:33 -0000       1.9
--- class.soinvestment.inc.php  15 May 2003 11:18:21 -0000      1.10
***************
*** 161,165 ****
                                        $property_id = 
substr($investment[$i]['location_code'],0,4);
  
!                                       $this->db->query("select 
fm_part_of_town.name as part_of_town,district_id from fm_property $this->join 
fm_part_of_town on fm_property.part_of_town.name_id=fm_part_of_town.id Where 
property_id= '$property_id'");
                                        $this->db->next_record();
                                        $investment[$i]['district_id'] = 
$this->db->f('district_id');
--- 161,165 ----
                                        $property_id = 
substr($investment[$i]['location_code'],0,4);
  
!                                       $this->db->query("select 
fm_part_of_town.name as part_of_town,district_id from fm_property $this->join 
fm_part_of_town on fm_property.part_of_town_id=fm_part_of_town.id Where 
property_id= '$property_id'");
                                        $this->db->next_record();
                                        $investment[$i]['district_id'] = 
$this->db->f('district_id');

Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uiinvestment.inc.php  3 May 2003 06:02:17 -0000       1.15
--- class.uiinvestment.inc.php  15 May 2003 11:18:21 -0000      1.16
***************
*** 17,21 ****
                var $filter;
                var $part_of_town_id;
-               var $sub;
                var $currentapp;
  
--- 17,20 ----
***************
*** 32,38 ****
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
-                       $this->cats                                     = 
CreateObject('phpgwapi.categories');
-                       $this->cats->app_name           = 'investment';
-                       $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
--- 31,34 ----
***************
*** 41,44 ****
--- 37,41 ----
                        $this->bo                                       = 
CreateObject($this->currentapp.'.boinvestment',True);
                        $this->bocommon                                 = 
CreateObject($this->currentapp.'.bocommon',True);
+                       $this->acl2                             = 
CreateObject($this->currentapp.'.acl2');
  
                        $this->start                            = 
$this->bo->start;
***************
*** 50,54 ****
                        $this->part_of_town_id          = 
$this->bo->part_of_town_id;
                        $this->allrows                          = 
$this->bo->allrows;
!                       $this->admin_invoice            = 
$this->bocommon->admin_invoice;
                }
  
--- 47,52 ----
                        $this->part_of_town_id          = 
$this->bo->part_of_town_id;
                        $this->allrows                          = 
$this->bo->allrows;
!                       $this->admin_invoice            = 
$this->acl2->check('.invoice',16);
!                       
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
                }
  
***************
*** 568,576 ****
                                'lang_cat_statustext'                   => 
lang('Select the category the investment belongs to. To do not use a category 
select NO CATEGORY'),
                                'select_name'                                   
=> 'values[period]',
!                               'investment_type_id'                    => 
$investment['investment_type_id'],
!                               'location_code'                                 
=> $investment['location_code'],
!                               'value_generellinfo'                    => 
$investment['generellinfo']
! 
! 
                        );
  
--- 566,570 ----
                                'lang_cat_statustext'                   => 
lang('Select the category the investment belongs to. To do not use a category 
select NO CATEGORY'),
                                'select_name'                                   
=> 'values[period]',
!                               'investment_type_id'                    => 
$investment['investment_type_id']
                        );
  
***************
*** 627,659 ****
                }
  
-               function view()
-               {
-                       $entity_id = get_var('entity_id',array('GET'));
-                       $investment_id = get_var('investment_id',array('GET'));
- 
-                       
$GLOBALS['phpgw']->xslttpl->add_file(array('investment'));
- 
-                       $investment = 
$this->bo->read_single($entity_id,$investment_id);
- 
-                       $data = array
-                       (
-                               'done_action'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.index'),
-                               'lang_name'                     => lang('name'),
-                               'lang_category'         => lang('category'),
-                               'lang_access'           => lang('access'),
-                               'lang_time_created'     => lang('time created'),
-                               'lang_done'                     => lang('done'),
-                               'value_name'            => $investment['name'],
-                               'value_access'          => 
lang(ucfirst($investment['access'])),
-                               'value_cat'                     => 
$this->cats->id2name($investment['cat']),
-                               'value_date'            => 
$GLOBALS['phpgw']->common->show_date($investment['date'])
-                       );
- 
-                       $appname                                                
= lang('investment');
-                       $function_msg                                   = 
lang('view investment');
- 
-                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
-               }
        }
  ?>
--- 621,624 ----

Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uimeter.inc.php       29 Apr 2003 12:41:31 -0000      1.6
--- class.uimeter.inc.php       15 May 2003 11:18:21 -0000      1.7
***************
*** 306,313 ****
                                'lang_cat_statustext'                   => 
lang('Select the category the meter belongs to. To do not use a category select 
NO CATEGORY'),
                                'select_name'                                   
=> 'values[cat_id]',
!                               'cat_list'                                      
        => $this->bo->get_category_list('select',$this->cat_id),
! 
!                               'location_code'                                 
=> $values['location_code'],
!                               'value_generellinfo'                    => 
$values['generellinfo']
                        );
  
--- 306,310 ----
                                'lang_cat_statustext'                   => 
lang('Select the category the meter belongs to. To do not use a category select 
NO CATEGORY'),
                                'select_name'                                   
=> 'values[cat_id]',
!                               'cat_list'                                      
        => $this->bo->get_category_list('select',$this->cat_id)
                        );