fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [6699] Property: formatting


From: Sigurd Nes
Subject: [Fmsystem-commits] [6699] Property: formatting
Date: Thu, 23 Dec 2010 23:12:50 +0000

Revision: 6699
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6699
Author:   sigurdne
Date:     2010-12-23 23:12:49 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Property: formatting

Modified Paths:
--------------
    trunk/property/inc/class.uitenant_claim.inc.php

Modified: trunk/property/inc/class.uitenant_claim.inc.php
===================================================================
--- trunk/property/inc/class.uitenant_claim.inc.php     2010-12-23 15:45:51 UTC 
(rev 6698)
+++ trunk/property/inc/class.uitenant_claim.inc.php     2010-12-23 23:12:49 UTC 
(rev 6699)
@@ -45,13 +45,13 @@
                var $filter;
 
                var $public_functions = array
-               (
-                       'index'  => true,
-                       'check'  => true,
-                       'view'   => true,
-                       'edit'   => true,
-                       'delete' => true
-               );
+                       (
+                               'index'  => true,
+                               'check'  => true,
+                               'view'   => true,
+                               'edit'   => true,
+                               'delete' => true
+                       );
 
                function property_uitenant_claim()
                {
@@ -84,26 +84,26 @@
                function save_sessiondata()
                {
                        $data = array
-                       (
-                               'start'                 => $this->start,
-                               'query'                 => $this->query,
-                               'sort'                  => $this->sort,
-                               'order'                 => $this->order,
-                               'user_id'               => $this->user_id,
-                               'district_id'   => $this->district_id,
-                               'status'                => $this->status,
-                               'cat_id'                => $this->cat_id,
-                               'allrows'               => $this->allrows
-                       );
+                               (
+                                       'start'                 => $this->start,
+                                       'query'                 => $this->query,
+                                       'sort'                  => $this->sort,
+                                       'order'                 => $this->order,
+                                       'user_id'               => 
$this->user_id,
+                                       'district_id'   => $this->district_id,
+                                       'status'                => 
$this->status,
+                                       'cat_id'                => 
$this->cat_id,
+                                       'allrows'               => 
$this->allrows
+                               );
                        $this->bo->save_sessiondata($data);
                }
 
                function index($project_id='')
                {
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('tenant_claim',
-                                                                               
'receipt',
-                                                                               
'search_field',
-                                                                               
'nextmatchs'));
+                               'receipt',
+                               'search_field',
+                               'nextmatchs'));
 
                        if(!$this->acl_read)
                        {
@@ -118,38 +118,38 @@
                        if( phpgw::get_var('phpgw_return_as') != 'json' )
                        {
                                $datatable['menu']                              
        = $this->bocommon->get_menu();
-                       $datatable['config']['base_url'] = 
$GLOBALS['phpgw']->link('/index.php', array
-                       (
-                               'menuaction'                    => 
'property.uitenant_claim.index',
-                               'query'                         => $this->query,
-                       'cat_id'                                => 
$this->cat_id,
-                       'order'                                 => $this->order,
-                                       'user_id'                               
=> $this->user_id,
-                                       'district_id'                   => 
$this->district_id
-                               ));
+                               $datatable['config']['base_url'] = 
$GLOBALS['phpgw']->link('/index.php', array
+                                       (
+                                               'menuaction'                    
=> 'property.uitenant_claim.index',
+                                               'query'                         
=> $this->query,
+                                               'cat_id'                        
        => $this->cat_id,
+                                               'order'                         
        => $this->order,
+                                               'user_id'                       
        => $this->user_id,
+                                               'district_id'                   
=> $this->district_id
+                                       ));
 
                                $datatable['config']['base_java_url'] = 
"menuaction:'property.uitenant_claim.index',"
-                                                                               
                ."sort: '{$this->sort}',"
-                                                                               
."order: '{$this->order}',"
-                                                                               
."status: '{$this->status}',"
-                                                                               
."project_id: '{$this->project_id}',"
-                                                                               
."user_id: '{$this->user_id}',"
-                                                                               
."district_id: '{$this->district_id}',"
-                                                                               
."query: '{$this->query}'";
+                                       ."sort: '{$this->sort}',"
+                                       ."order: '{$this->order}',"
+                                       ."status: '{$this->status}',"
+                                       ."project_id: '{$this->project_id}',"
+                                       ."user_id: '{$this->user_id}',"
+                                       ."district_id: '{$this->district_id}',"
+                                       ."query: '{$this->query}'";
 
                                $datatable['config']['allow_allrows'] = true;
 
                                $link_data = array
-                               (
-                                       'menuaction'    => 
'property.uitenant_claim.index',
-                                       'sort'          => $this->sort,
-                                       'order'         => $this->order,
-                                       'cat_id'        => $this->cat_id,
-                                       'user_id'       => $this->user_id,
-                                       'status_id'     => $this->status_id,
-                                       'project_id'=> $this->project_id,
-                                       'query'         => $this->query
-                               );
+                                       (
+                                               'menuaction'    => 
'property.uitenant_claim.index',
+                                               'sort'          => $this->sort,
+                                               'order'         => $this->order,
+                                               'cat_id'        => 
$this->cat_id,
+                                               'user_id'       => 
$this->user_id,
+                                               'status_id'     => 
$this->status_id,
+                                               'project_id'=> 
$this->project_id,
+                                               'query'         => $this->query
+                                       );
 
                                $values_combo_box[0] = 
$this->bocommon->select_category_list(array('format'=>'filter','selected' => 
$this->cat_id,'type' =>'tenant_claim','order'=>'descr'));
                                $default_value = array ('id'=>'','name'=> 
lang('no category'));
@@ -169,104 +169,104 @@
                                array_unshift 
($values_combo_box[3],$default_value);
 
                                $datatable['actions']['form'] = array(
-                               array(
-                                       'action'        => 
$GLOBALS['phpgw']->link('/index.php',
+                                       array(
+                                               'action'        => 
$GLOBALS['phpgw']->link('/index.php',
+                                               array(
+                                                       'menuaction'            
=> 'property.uitenant_claim.index',
+                                                       'query'                 
        => $this->query,
+                                                       'cat_id'                
                => $this->cat_id
+                                               )
+                                       ),
+                                       'fields'        => array(
+                                               'field' => array(
+                                                       array( //boton  CATEGORY
+                                                               'id' => 
'btn_cat_id',
+                                                               'name' => 
'cat_id',
+                                                               'value' => 
lang('Category'),
+                                                               'type' => 
'button',
+                                                               'style' => 
'filter',
+                                                               'tab_index' => 1
+
+                                                       ),
+                                                       array
+                                                       ( //boton       STATUS
+                                                               'id' => 
'btn_district_id',
+                                                               'name' => 
'district_id',
+                                                               'value' => 
lang('District'),
+                                                               'type' => 
'button',
+                                                               'style' => 
'filter',
+                                                               'tab_index' => 2
+                                                       ),
+                                                       array( //boton  STATUS
+                                                               'id' => 
'btn_status_id',
+                                                               'name' => 
'status_id',
+                                                               'value' => 
lang('Status'),
+                                                               'type' => 
'button',
+                                                               'style' => 
'filter',
+                                                               'tab_index' => 3
+                                                       ),
+                                                       array
+                                                       ( //boton       USER
+                                                               'id' => 
'sel_user_id',
+                                                               'name' => 
'user_id',
+                                                               'value' => 
lang('User'),
+                                                               'type' => 
'select',
+                                                               'style' => 
'filter',
+                                                               'values' => 
$values_combo_box[3],
+                                                               'onchange'=> 
'onChangeSelect();',
+                                                               'tab_index' => 4
+                                                       ),
                                                        array(
-                                                               'menuaction'    
        => 'property.uitenant_claim.index',
-                                                               'query'         
                => $this->query,
-                                               'cat_id'                        
        => $this->cat_id
-                                                       )
+                                                               'type'  => 
'button',
+                                                               'id'    => 
'btn_new',
+                                                               'value' => 
lang('add'),
+                                                               'tab_index' => 7
+                                                       ),
+                                                       array( //boton     
SEARCH
+                                                               'id' => 
'btn_search',
+                                                               'name' => 
'search',
+                                                               'value'    => 
lang('search'),
+                                                               'type' => 
'button',
+                                                               'tab_index' => 6
+                                                       ),
+                                                       array( // TEXT INPUT
+                                                               'name'     => 
'query',
+                                                               'id'     => 
'txt_query',
+                                                               'value'    => 
'',//$query,
+                                                               'type' => 
'text',
+                                                               'onkeypress' => 
'return pulsar(event)',
+                                                               'size'    => 28,
+                                                               'tab_index' => 5
+                                                       ),
                                                ),
-                                       'fields'        => array(
-                                           'field' => array(
-                                                                       array( 
//boton  CATEGORY
-                                                                           
'id' => 'btn_cat_id',
-                                                                           
'name' => 'cat_id',
-                                                                           
'value'     => lang('Category'),
-                                                                           
'type' => 'button',
-                                                                           
'style' => 'filter',
-                                                                           
'tab_index' => 1
+                                               'hidden_value' => array
+                                               (
+                                                       array
+                                                       ( //div values  
combo_box_0
+                                                               'id' => 
'values_combo_box_0',
+                                                               'value' => 
$this->bocommon->select2String($values_combo_box[0])
+                                                       ),
+                                                       array
+                                                       ( //div values  
combo_box_1
+                                                               'id' => 
'values_combo_box_1',
+                                                               'value' => 
$this->bocommon->select2String($values_combo_box[1])
+                                                       ),
+                                                       array
+                                                       ( //div values  
combo_box_2
+                                                               'id' => 
'values_combo_box_2',
+                                                               'value' => 
$this->bocommon->select2String($values_combo_box[2])
+                                                       ),
+                                                       array
+                                                       ( //div values  
combo_box_3
+                                                               'id' => 
'values_combo_box_3',
+                                                               'value' => 
$this->bocommon->select2String($values_combo_box[3])
+                                                       ),
 
-                                                                       ),
-                                                                       array
-                                                                               
( //boton       STATUS
-                                                                               
'id' => 'btn_district_id',
-                                                                               
'name' => 'district_id',
-                                                                               
'value' => lang('District'),
-                                                                               
'type' => 'button',
-                                                                               
'style' => 'filter',
-                                                                               
        'tab_index' => 2
-                                                                       ),
-                                                                       array( 
//boton  STATUS
-                                                                           
'id' => 'btn_status_id',
-                                                                           
'name' => 'status_id',
-                                                                           
'value'     => lang('Status'),
-                                                                           
'type' => 'button',
-                                                                           
'style' => 'filter',
-                                                                           
'tab_index' => 3
-                                                                       ),
-                                                                       array
-                                                                       ( 
//boton       USER
-                                                                               
'id' => 'sel_user_id',
-                                                                               
'name' => 'user_id',
-                                                                               
'value' => lang('User'),
-                                                                               
'type' => 'select',
-                                                                               
'style' => 'filter',
-                                                                               
'values' => $values_combo_box[3],
-                                                                               
'onchange'=> 'onChangeSelect();',
-                                                                               
'tab_index' => 4
-                                                                       ),
-                                                                       array(
-                                                                               
        'type'  => 'button',
-                                                                               
        'id'    => 'btn_new',
-                                                                               
        'value' => lang('add'),
-                                                                               
        'tab_index' => 7
-                                                                               
    ),
-                                                                       array( 
//boton     SEARCH
-                                                                           
'id' => 'btn_search',
-                                                                           
'name' => 'search',
-                                                                           
'value'    => lang('search'),
-                                                                           
'type' => 'button',
-                                                                           
'tab_index' => 6
-                                                                       ),
-                                                                               
                                array( // TEXT INPUT
-                                                                           
'name'     => 'query',
-                                                                           
'id'     => 'txt_query',
-                                                                           
'value'    => '',//$query,
-                                                                           
'type' => 'text',
-                                                                           
'onkeypress' => 'return pulsar(event)',
-                                                                           
'size'    => 28,
-                                                                           
'tab_index' => 5
-                                                                       ),
-                                                                               
),
-                                                       'hidden_value' => array
-                                                                               
          (
-                                                                               
        array
-                                                                               
        ( //div values  combo_box_0
-                                                                               
                        'id' => 'values_combo_box_0',
-                                                                               
                    'value'     => 
$this->bocommon->select2String($values_combo_box[0])
-                                                                               
                ),
-                                                                       array
-                                                                       ( //div 
values  combo_box_1
-                                                                               
'id' => 'values_combo_box_1',
-                                                                               
'value' => $this->bocommon->select2String($values_combo_box[1])
-                                                                       ),
-                                                                               
                array
-                                                                               
                ( //div values  combo_box_2
-                                                                               
                        'id' => 'values_combo_box_2',
-                                                                               
                    'value'     => 
$this->bocommon->select2String($values_combo_box[2])
-                                                                               
                ),
-                                                                       array
-                                                                       ( //div 
values  combo_box_3
-                                                                               
'id' => 'values_combo_box_3',
-                                                                               
'value' => $this->bocommon->select2String($values_combo_box[3])
-                                                                       ),
+                                               )
+                                       )
+                               )
+                       );
 
-                                                                               
          )
-                                                                               
)
-                                        )
-                               );
-
                        }
 
 
@@ -330,46 +330,46 @@
                        }
 
                        $parameters = array
-                       (
-                               'parameter' => array
                                (
-                                       array
+                                       'parameter' => array
                                        (
-                                               'name'          => 'claim_id',
-                                               'source'        => 'claim_id'
-                                       ),
-                               )
-                       );
+                                               array
+                                               (
+                                                       'name'          => 
'claim_id',
+                                                       'source'        => 
'claim_id'
+                                               ),
+                                       )
+                               );
 
                        if($this->acl_read)
                        {
                                $datatable['rowactions']['action'][] = array
-                               (
-                                       'my_name'               => 'view',
-                                       'statustext'    => lang('view the 
claim'),
-                                       'text'                  => lang('view'),
-                                       'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
                                        (
-                                               'menuaction'    => 
'property.uitenant_claim.view'
-                                       )
-                               ),
-                               'parameters'    => $parameters
+                                               'my_name'               => 
'view',
+                                               'statustext'    => lang('view 
the claim'),
+                                               'text'                  => 
lang('view'),
+                                               'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
+                                               (
+                                                       'menuaction'    => 
'property.uitenant_claim.view'
+                                               )
+                                       ),
+                                       'parameters'    => $parameters
                                );
                        }
 
                        if ($this->acl_edit)
                        {
                                $datatable['rowactions']['action'][] = array
-                               (
-                                       'my_name'                       => 
'edit',
-                                       'statustext'            => lang('edit 
the claim'),
-                                       'text'                          => 
lang('edit'),
-                                       'action'                        => 
$GLOBALS['phpgw']->link('/index.php',array
                                        (
-                                               'menuaction'    => 
'property.uitenant_claim.edit'
-                                       )
-                               ),
-                               'parameters'    => $parameters
+                                               'my_name'                       
=> 'edit',
+                                               'statustext'            => 
lang('edit the claim'),
+                                               'text'                          
=> lang('edit'),
+                                               'action'                        
=> $GLOBALS['phpgw']->link('/index.php',array
+                                               (
+                                                       'menuaction'    => 
'property.uitenant_claim.edit'
+                                               )
+                                       ),
+                                       'parameters'    => $parameters
                                );
                        }
 
@@ -378,43 +378,43 @@
                        foreach ($jasper as $report)
                        {
                                $datatable['rowactions']['action'][] = array(
-                                               'my_name'               => 
'edit',
-                                               'text'                  => 
lang('open JasperReport %1 in new window', $report['title']),
-                                               'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
-                                                                               
                                (
-                                                                               
                                                'menuaction'    => 
'property.uijasper.view',
-                                                                               
                                                'jasper_id'                     
=> $report['id'],
-                                                                               
                                                'target'                => 
'_blank'
-                                                                               
                                )),
-                                               'parameters'                    
=> $parameters
+                                       'my_name'               => 'edit',
+                                       'text'                  => lang('open 
JasperReport %1 in new window', $report['title']),
+                                       'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
+                                       (
+                                               'menuaction'    => 
'property.uijasper.view',
+                                               'jasper_id'                     
=> $report['id'],
+                                               'target'                => 
'_blank'
+                                       )),
+                                       'parameters'                    => 
$parameters
                                );
                        }
 
                        if ($this->acl_delete)
                        {
                                $datatable['rowactions']['action'][] = array
-                               (
-                                       'my_name'                       => 
'delete',
-                                       'statustext'            => lang('delete 
the claim'),
-                                       'text'                          => 
lang('delete'),
-                                       'confirm_msg'           => lang('do you 
really want to delete this entry'),
-                                       'action'                        => 
$GLOBALS['phpgw']->link('/index.php',array
                                        (
-                                               'menuaction'    => 
'property.uitenant_claim.delete'
-                                       )
-                               ),
-                               'parameters'    => $parameters
+                                               'my_name'                       
=> 'delete',
+                                               'statustext'            => 
lang('delete the claim'),
+                                               'text'                          
=> lang('delete'),
+                                               'confirm_msg'           => 
lang('do you really want to delete this entry'),
+                                               'action'                        
=> $GLOBALS['phpgw']->link('/index.php',array
+                                               (
+                                                       'menuaction'    => 
'property.uitenant_claim.delete'
+                                               )
+                                       ),
+                                       'parameters'    => $parameters
                                );
                        }
                        $datatable['rowactions']['action'][] = array(
-                                       'my_name'               => 'add',
-                                       'text'                  => lang('add'),
-                                       'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
-                                       (
-                                               'menuaction'    => 
'property.uiproject.index',
-                                               'lookup'                =>      
1,
-                                               'from'                  =>  
'tenant_claim'
-                                       )));
+                               'my_name'               => 'add',
+                               'text'                  => lang('add'),
+                               'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
+                               (
+                                       'menuaction'    => 
'property.uiproject.index',
+                                       'lookup'                =>      1,
+                                       'from'                  =>  
'tenant_claim'
+                               )));
 
                        unset($parameters);
 
@@ -478,77 +478,77 @@
                        }
 
                        phpgwapi_yui::load_widget('dragdrop');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('menu');
-                       phpgwapi_yui::load_widget('connection');
-                       phpgwapi_yui::load_widget('loader');
+                       phpgwapi_yui::load_widget('datatable');
+                       phpgwapi_yui::load_widget('menu');
+                       phpgwapi_yui::load_widget('connection');
+                       phpgwapi_yui::load_widget('loader');
                        phpgwapi_yui::load_widget('tabview');
                        phpgwapi_yui::load_widget('paginator');
                        phpgwapi_yui::load_widget('animation');
 
-                       //-- BEGIN----------------------------- JSON CODE 
------------------------------
-               //values for Pagination
-                       $json = array
-                       (
-                               'recordsReturned'       => 
$datatable['pagination']['records_returned'],
-                               'totalRecords'          => 
(int)$datatable['pagination']['records_total'],
-                               'startIndex'            => 
$datatable['pagination']['records_start'],
+                       //-- BEGIN----------------------------- JSON CODE 
------------------------------
+                       //values for Pagination
+                       $json = array
+                               (
+                                       'recordsReturned'       => 
$datatable['pagination']['records_returned'],
+                                       'totalRecords'          => 
(int)$datatable['pagination']['records_total'],
+                                       'startIndex'            => 
$datatable['pagination']['records_start'],
                                        'sort'                          => 
$datatable['sorting']['order'],
-                               'dir'                           => 
$datatable['sorting']['sort'],
+                                       'dir'                           => 
$datatable['sorting']['sort'],
                                        'records'                       => 
array()
-                       );
+                               );
 
-                               // values for datatable
-                       if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row'])){
-                               foreach( $datatable['rows']['row'] as $row )
-                               {
-                                       $json_row = array();
-                                       foreach( $row['column'] as $column)
-                                       {
-                                               if(isset($column['format']) && 
$column['format']== "link" && $column['java_link']==true)
-                                               {
-                                                       
$json_row[$column['name']] = "<a href='#' id='".$column['link']."' 
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
-                                               }
-                                               elseif(isset($column['format']) 
&& $column['format']== "link")
-                                               {
-                                                 $json_row[$column['name']] = 
"<a href='".$column['link']."'>" .$column['value']."</a>";
-                                               }else
-                                               {
-                                                 $json_row[$column['name']] = 
$column['value'];
-                                               }
-                                       }
-                                       $json['records'][] = $json_row;
-                               }
-                       }
-
-                               // right in datatable
-                               if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
+                       // values for datatable
+                       if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row'])){
+                               foreach( $datatable['rows']['row'] as $row )
                                {
-                                       $json ['rights'] = 
$datatable['rowactions']['action'];
+                                       $json_row = array();
+                                       foreach( $row['column'] as $column)
+                                       {
+                                               if(isset($column['format']) && 
$column['format']== "link" && $column['java_link']==true)
+                                               {
+                                                       
$json_row[$column['name']] = "<a href='#' id='".$column['link']."' 
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
+                                               }
+                                               elseif(isset($column['format']) 
&& $column['format']== "link")
+                                               {
+                                                       
$json_row[$column['name']] = "<a href='".$column['link']."'>" 
.$column['value']."</a>";
+                                               }else
+                                               {
+                                                       
$json_row[$column['name']] = $column['value'];
+                                               }
+                                       }
+                                       $json['records'][] = $json_row;
                                }
+                       }
 
-                               if( phpgw::get_var('phpgw_return_as') == 'json' 
)
-                               {
-                               return $json;
-                               }
+                       // right in datatable
+                       if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
+                       {
+                               $json ['rights'] = 
$datatable['rowactions']['action'];
+                       }
 
+                       if( phpgw::get_var('phpgw_return_as') == 'json' )
+                       {
+                               return $json;
+                       }
 
+
                        $datatable['json_data'] = json_encode($json);
                        //-------------------- JSON CODE ----------------------
 
                        $template_vars = array();
                        $template_vars['datatable'] = $datatable;
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('datatable'));
-               $GLOBALS['phpgw']->xslttpl->set_var('phpgw', $template_vars);
+                       $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
$template_vars);
 
-               if ( !isset($GLOBALS['phpgw']->css) || 
!is_object($GLOBALS['phpgw']->css) )
-               {
-                       $GLOBALS['phpgw']->css = createObject('phpgwapi.css');
-               }
+                       if ( !isset($GLOBALS['phpgw']->css) || 
!is_object($GLOBALS['phpgw']->css) )
+                       {
+                               $GLOBALS['phpgw']->css = 
createObject('phpgwapi.css');
+                       }
 
-               $GLOBALS['phpgw']->css->validate_file('datatable');
-                       $GLOBALS['phpgw']->css->validate_file('property');
-                       
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
+                       $GLOBALS['phpgw']->css->validate_file('datatable');
+                       $GLOBALS['phpgw']->css->validate_file('property');
+                       
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
@@ -656,12 +656,12 @@
                                $values = $this->bo->read_single($claim_id);
                        }
 
-//_debug_array($values);
+                       //_debug_array($values);
 
                        $project_values = 
$this->boproject->read_single($values['project_id']);
 
                        $soinvoice      = CreateObject('property.soinvoice');
-                       
+
                        foreach ($project_values['workorder_budget'] as 
&$workorder)
                        {
                                $vouchers = 
$soinvoice->read_invoice(array('paid'=>'1','workorder_id' => 
$workorder['workorder_id'], 'user_lid' => 'all'));
@@ -677,29 +677,29 @@
                        }
 
 
-//_debug_array($project_values);die();
+                       //_debug_array($project_values);die();
 
                        $table_header_workorder[] = array
-                       (
-                               'lang_workorder_id'     => lang('Workorder'),
-                               'lang_budget'           => lang('Budget'),
-                               'lang_calculation'      => lang('Calculation'),
-                               'lang_vendor'           => lang('Vendor'),
-                               'lang_charge_tenant'    => lang('Charge 
tenant'),
-                               'lang_select'           => lang('Select')
-                       );
+                               (
+                                       'lang_workorder_id'     => 
lang('Workorder'),
+                                       'lang_budget'           => 
lang('Budget'),
+                                       'lang_calculation'      => 
lang('Calculation'),
+                                       'lang_vendor'           => 
lang('Vendor'),
+                                       'lang_charge_tenant'    => lang('Charge 
tenant'),
+                                       'lang_select'           => 
lang('Select')
+                               );
 
                        $bolocation                     = 
CreateObject('property.bolocation');
 
                        $location_data=$bolocation->initiate_ui_location(array(
-                                               'values'        => 
$project_values['location_data'],
-                                               'type_id'       => 
count(explode('-',$project_values['location_data']['location_code'])),
-                                               'no_link'       => false, // 
disable lookup links for location type less than type_id
-                                               'tenant'        => 
$project_values['location_data']['tenant_id'],
-                                               'lookup_type'   => 'view',
-                                               'lookup_entity' => 
$this->bocommon->get_lookup_entity('project'),
-                                               'entity_data'   => 
$project_values['p']
-                                               ));
+                               'values'        => 
$project_values['location_data'],
+                               'type_id'       => 
count(explode('-',$project_values['location_data']['location_code'])),
+                               'no_link'       => false, // disable lookup 
links for location type less than type_id
+                               'tenant'        => 
$project_values['location_data']['tenant_id'],
+                               'lookup_type'   => 'view',
+                               'lookup_entity' => 
$this->bocommon->get_lookup_entity('project'),
+                               'entity_data'   => $project_values['p']
+                       ));
 
                        if($project_values['contact_phone'])
                        {
@@ -713,19 +713,18 @@
                        }
 
 
-                       if($project_values['location_data']['tenant_id'] && 
!$values['tenant_id']):
+                       if($project_values['location_data']['tenant_id'] && 
!$values['tenant_id'])
                        {
                                $values['tenant_id']            = 
$project_values['location_data']['tenant_id'];
                                $values['last_name']            = 
$project_values['location_data']['last_name'];
                                $values['first_name']           = 
$project_values['location_data']['first_name'];
                        }
-                       elseif($values['tenant_id']):
+                       else if($values['tenant_id'])
                        {
                                $tenant= 
$this->bocommon->read_single_tenant($values['tenant_id']);
                                $values['last_name']            = 
$tenant['last_name'];
                                $values['first_name']           = 
$tenant['first_name'];
                        }
-                       endif;
 
 
                        if($values['workorder'] && 
$project_values['workorder_budget'])
@@ -753,19 +752,19 @@
                                }
                        }
 
-*/
+ */
 
                        $this->cat_id = 
($values['cat_id']?$values['cat_id']:$this->cat_id);
                        
$b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array(
-                                               'b_account_id'          => 
$values['b_account_id'],
-                                               'b_account_name'        => 
$values['b_account_name']));
+                               'b_account_id'          => 
$values['b_account_id'],
+                               'b_account_name'        => 
$values['b_account_name']));
 
                        $link_data = array
-                       (
-                               'menuaction'    => 
'property.uitenant_claim.edit',
-                               'claim_id'              => $claim_id,
-                               'project_id'    => $values['project_id']
-                       );
+                               (
+                                       'menuaction'    => 
'property.uitenant_claim.edit',
+                                       'claim_id'              => $claim_id,
+                                       'project_id'    => $values['project_id']
+                               );
 
                        $cats                           = 
CreateObject('phpgwapi.categories', -1,  'property', '.project');
                        $cats->supress_info     = true;
@@ -796,141 +795,141 @@
                        //---datatable0 
settings---------------------------------------------------
 
                        $datavalues[0] = array
-                       (
-                               'name'                  => "0",
-                               'values'                => 
json_encode($project_values['workorder_budget']),
-                               'total_records' => 
count($project_values['workorder_budget']),
-                               'edit_action'   => 
json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.edit'))),
-                               'is_paginator'  => 1,
-                               'footer'                => 0
-                       );
+                               (
+                                       'name'                  => "0",
+                                       'values'                => 
json_encode($project_values['workorder_budget']),
+                                       'total_records' => 
count($project_values['workorder_budget']),
+                                       'edit_action'   => 
json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.edit'))),
+                                       'is_paginator'  => 1,
+                                       'footer'                => 0
+                               );
 
-//_debug_array($project_values['workorder_budget']);die();
+                       
//_debug_array($project_values['workorder_budget']);die();
 
                        $myColumnDefs[0] = array
-                       (
-                               'name'                  => "0",
-                               'values'                =>      
json_encode(array(      array('key' => 'workorder_id',  'label'=>'Workorder',   
'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
-                                                                               
                        array('key' => 'budget',        'label'=>'Budget',      
'sortable'=>true,'resizeable'=>true),
-                                                                               
                        array('key' => 'calculation',   'label'=>'Calculation', 
'sortable'=>true,'resizeable'=>true),
-                                                                               
                array('key' => 
'vendor_name','label'=>'Vendor','sortable'=>true,'resizeable'=>true),
-                                                                               
                array('key' => 'charge_tenant','label'=>'Charge 
tenant','sortable'=>true,'resizeable'=>true),
-                                                                               
                array('key' => 
'status','label'=>'Status','sortable'=>true,'resizeable'=>true),
-                                                                               
                array('key' => 'actual_cost','label'=>lang('actual 
cost'),'sortable'=>true,'resizeable'=>true),
-                                                                               
                array('key' => 
'voucher_id','label'=>lang('voucher'),'sortable'=>true,'resizeable'=>true),
-                                                                               
                array('key' => 'selected','label'=>'select',    
'sortable'=>false,'resizeable'=>false)))
-                       );
+                               (
+                                       'name'                  => "0",
+                                       'values'                =>      
json_encode(array(      array('key' => 'workorder_id',  'label'=>'Workorder',   
'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
+                                       array('key' => 'budget',        
'label'=>'Budget',      'sortable'=>true,'resizeable'=>true),
+                                       array('key' => 'calculation',   
'label'=>'Calculation', 'sortable'=>true,'resizeable'=>true),
+                                       array('key' => 
'vendor_name','label'=>'Vendor','sortable'=>true,'resizeable'=>true),
+                                       array('key' => 
'charge_tenant','label'=>'Charge tenant','sortable'=>true,'resizeable'=>true),
+                                       array('key' => 
'status','label'=>'Status','sortable'=>true,'resizeable'=>true),
+                                       array('key' => 
'actual_cost','label'=>lang('actual cost'),'sortable'=>true,'resizeable'=>true),
+                                       array('key' => 
'voucher_id','label'=>lang('voucher'),'sortable'=>true,'resizeable'=>true),
+                                       array('key' => 
'selected','label'=>'select',    'sortable'=>false,'resizeable'=>false)))
+                               );
 
                        $data = array
-                       (
-                               'table_header_workorder'                => 
$table_header_workorder,
-                               'lang_no_workorders'                    => 
lang('No workorder budget'),
-                               'workorder_link'                        => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.view')),
-                               'lang_start_date'                       => 
lang('Project start date'),
-                               'value_start_date'                      => 
$project_values['start_date'],
+                               (
+                                       'table_header_workorder'                
=> $table_header_workorder,
+                                       'lang_no_workorders'                    
=> lang('No workorder budget'),
+                                       'workorder_link'                        
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.view')),
+                                       'lang_start_date'                       
=> lang('Project start date'),
+                                       'value_start_date'                      
=> $project_values['start_date'],
 
-                               'property_js'                                   
                => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
-                               'base_java_url'                                 
                => json_encode(array(menuaction => 
"property.uitenant_claim.edit",claim_id=>$claim_id)),
-                               'datatable'                                     
                        => $datavalues,
-                               'myColumnDefs'                                  
                => $myColumnDefs,
-                               //'myButtons'                                   
                        => $myButtons,
+                                       'property_js'                           
                        => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+                                       'base_java_url'                         
                        => json_encode(array(menuaction => 
"property.uitenant_claim.edit",claim_id=>$claim_id)),
+                                       'datatable'                             
                                => $datavalues,
+                                       'myColumnDefs'                          
                        => $myColumnDefs,
+                                       //'myButtons'                           
                                => $myButtons,
 
-                               'lang_end_date'                         => 
lang('Project end date'),
-                               'value_end_date'                        => 
$project_values['end_date'],
+                                       'lang_end_date'                         
=> lang('Project end date'),
+                                       'value_end_date'                        
=> $project_values['end_date'],
 
-                               'lang_charge_tenant'                    => 
lang('Charge tenant'),
-                               'charge_tenant'                         => 
$project_values['charge_tenant'],
+                                       'lang_charge_tenant'                    
=> lang('Charge tenant'),
+                                       'charge_tenant'                         
=> $project_values['charge_tenant'],
 
-                               'lang_power_meter'                      => 
lang('Power meter'),
-                               'value_power_meter'                     => 
$project_values['power_meter'],
+                                       'lang_power_meter'                      
=> lang('Power meter'),
+                                       'value_power_meter'                     
=> $project_values['power_meter'],
 
-                               'lang_budget'                           => 
lang('Budget'),
-                               'value_budget'                          => 
$project_values['budget'],
+                                       'lang_budget'                           
=> lang('Budget'),
+                                       'value_budget'                          
=> $project_values['budget'],
 
-                               'lang_reserve'                          => 
lang('reserve'),
-                               'value_reserve'                         => 
$project_values['reserve'],
-                               'lang_reserve_statustext'               => 
lang('Enter the reserve'),
+                                       'lang_reserve'                          
=> lang('reserve'),
+                                       'value_reserve'                         
=> $project_values['reserve'],
+                                       'lang_reserve_statustext'               
=> lang('Enter the reserve'),
 
-                               'lang_reserve_remainder'                => 
lang('reserve remainder'),
-                               'value_reserve_remainder'               => 
$reserve_remainder,
-                               'value_reserve_remainder_percent'       => 
$remainder_percent,
+                                       'lang_reserve_remainder'                
=> lang('reserve remainder'),
+                                       'value_reserve_remainder'               
=> $reserve_remainder,
+                                       'value_reserve_remainder_percent'       
=> $remainder_percent,
 
-                               'vendor_data'                           => 
$vendor_data,
-                               'location_data'                         => 
$location_data,
-                               'location_type'                         => 
'view',
+                                       'vendor_data'                           
=> $vendor_data,
+                                       'location_data'                         
=> $location_data,
+                                       'location_type'                         
=> 'view',
 
-                               'lang_project_id'                       => 
lang('Project ID'),
-                               'value_project_id'                      => 
$project_values['project_id'],
-                               'lang_name'                             => 
lang('Name'),
-                               'value_name'                            => 
$project_values['name'],
+                                       'lang_project_id'                       
=> lang('Project ID'),
+                                       'value_project_id'                      
=> $project_values['project_id'],
+                                       'lang_name'                             
=> lang('Name'),
+                                       'value_name'                            
=> $project_values['name'],
 
-                               'lang_descr'                            => 
lang('Description'),
+                                       'lang_descr'                            
=> lang('Description'),
 
-                               'sum_workorder_budget'                  => 
$project_values['sum_workorder_budget'],
-                               'sum_workorder_calculation'             => 
$project_values['sum_workorder_calculation'],
-                               'workorder_budget'                      => 
$project_values['workorder_budget'],
-                               'sum_workorder_actual_cost'             => 
$project_values['sum_workorder_actual_cost'],
-                               'lang_actual_cost'                      => 
lang('Actual cost'),
-                               'lang_coordinator'                      => 
lang('Coordinator'),
-                               'lang_sum'                              => 
lang('Sum'),
-                               'select_user_name'                      => 
'project_values[coordinator]',
-                               'lang_no_user'                          => 
lang('Select coordinator'),
-                               'user_list'                             => 
$this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
+                                       'sum_workorder_budget'                  
=> $project_values['sum_workorder_budget'],
+                                       'sum_workorder_calculation'             
=> $project_values['sum_workorder_calculation'],
+                                       'workorder_budget'                      
=> $project_values['workorder_budget'],
+                                       'sum_workorder_actual_cost'             
=> $project_values['sum_workorder_actual_cost'],
+                                       'lang_actual_cost'                      
=> lang('Actual cost'),
+                                       'lang_coordinator'                      
=> lang('Coordinator'),
+                                       'lang_sum'                              
=> lang('Sum'),
+                                       'select_user_name'                      
=> 'project_values[coordinator]',
+                                       'lang_no_user'                          
=> lang('Select coordinator'),
+                                       'user_list'                             
=> 
$this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
 
-                               'status_list'                           => 
$this->boproject->select_status_list('select',$project_values['status']),
-                               'lang_no_status'                        => 
lang('Select status'),
-                               'lang_status'                           => 
lang('Status'),
+                                       'status_list'                           
=> $this->boproject->select_status_list('select',$project_values['status']),
+                                       'lang_no_status'                        
=> lang('Select status'),
+                                       'lang_status'                           
=> lang('Status'),
 
-                               'currency'                              => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
+                                       'currency'                              
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
 
-                               'lang_contact_phone'                    => 
lang('Contact phone'),
-                               'contact_phone'                         => 
$project_values['contact_phone'],
+                                       'lang_contact_phone'                    
=> lang('Contact phone'),
+                                       'contact_phone'                         
=> $project_values['contact_phone'],
 
-                               'b_account_data'                        => 
$b_account_data,
+                                       'b_account_data'                        
=> $b_account_data,
 
-                               'lang_select_workorder_statustext'      => 
lang('Include the workorder to this claim'),
+                                       'lang_select_workorder_statustext'      
=> lang('Include the workorder to this claim'),
 
-                               'cat_list_project'                              
        => $cat_list_project,
-//------------------
-                               'lang_status'                           => 
lang('Status'),
-                               'lang_status_statustext'                => 
lang('Select status'),
-                               'status_list'                           => 
$this->bo->get_status_list(array('format' => 'select', 'selected' => 
$values['status'],'default' => 'open')),
-                               'lang_no_status'                        => 
lang('No status'),
-                               'status_name'                           => 
'values[status]',
+                                       'cat_list_project'                      
                => $cat_list_project,
+                                       //------------------
+                                       'lang_status'                           
=> lang('Status'),
+                                       'lang_status_statustext'                
=> lang('Select status'),
+                                       'status_list'                           
=> $this->bo->get_status_list(array('format' => 'select', 'selected' => 
$values['status'],'default' => 'open')),
+                                       'lang_no_status'                        
=> lang('No status'),
+                                       'status_name'                           
=> 'values[status]',
 
-                               'lang_amount'                           => 
lang('amount'),
-                               'lang_amount_statustext'                => 
lang('The total amount to claim'),
-                               'value_amount'                          => 
$values['amount'],
+                                       'lang_amount'                           
=> lang('amount'),
+                                       'lang_amount_statustext'                
=> lang('The total amount to claim'),
+                                       'value_amount'                          
=> $values['amount'],
 
-                               'tenant_link'                           => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uilookup.tenant')),
-                               'lang_tenant'                           => 
lang('tenant'),
-                               'value_tenant_id'                       => 
$values['tenant_id'],
-                               'value_last_name'                       => 
$values['last_name'],
-                               'value_first_name'                      => 
$values['first_name'],
-                               'lang_tenant_statustext'                => 
lang('Select a tenant'),
-                               'size_last_name'                        => 
strlen($values['last_name']),
-                               'size_first_name'                       => 
strlen($values['first_name']),
+                                       'tenant_link'                           
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uilookup.tenant')),
+                                       'lang_tenant'                           
=> lang('tenant'),
+                                       'value_tenant_id'                       
=> $values['tenant_id'],
+                                       'value_last_name'                       
=> $values['last_name'],
+                                       'value_first_name'                      
=> $values['first_name'],
+                                       'lang_tenant_statustext'                
=> lang('Select a tenant'),
+                                       'size_last_name'                        
=> strlen($values['last_name']),
+                                       'size_first_name'                       
=> strlen($values['first_name']),
 
-                               'msgbox_data'                           => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
-                               'edit_url'                              => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
-                               'lang_claim_id'                         => 
lang('ID'),
-                               'value_claim_id'                        => 
$claim_id,
-                               'lang_remark'                           => 
lang('remark'),
-                               'lang_category'                         => 
lang('category'),
-                               'lang_save'                             => 
lang('save'),
-                               'lang_cancel'                           => 
lang('cancel'),
-                               'lang_apply'                            => 
lang('apply'),
-                               'value_remark'                          => 
$values['remark'],
-                               'value_cat'                             => 
$values['cat'],
-                               'lang_remark_statustext'                => 
lang('Enter a remark for this claim'),
-                               'lang_apply_statustext'                 => 
lang('Apply the values'),
-                               'lang_cancel_statustext'                => 
lang('Leave the claim untouched and return back to the list'),
-                               'lang_save_statustext'                  => 
lang('Save the claim and return back to the list'),
-                               'lang_no_cat'                           => 
lang('no category'),
-                               'lang_cat_statustext'                   => 
lang('Select the category the claim belongs to. To do not use a category select 
NO CATEGORY'),
-                               'select_name'                           => 
'values[cat_id]',
-                               'cat_list'                              => 
$this->bocommon->select_category_list(array('format'=>'select','selected' => 
$this->cat_id,'type' =>'tenant_claim','order'=>'descr')),
-                       );
+                                       'msgbox_data'                           
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+                                       'edit_url'                              
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+                                       'lang_claim_id'                         
=> lang('ID'),
+                                       'value_claim_id'                        
=> $claim_id,
+                                       'lang_remark'                           
=> lang('remark'),
+                                       'lang_category'                         
=> lang('category'),
+                                       'lang_save'                             
=> lang('save'),
+                                       'lang_cancel'                           
=> lang('cancel'),
+                                       'lang_apply'                            
=> lang('apply'),
+                                       'value_remark'                          
=> $values['remark'],
+                                       'value_cat'                             
=> $values['cat'],
+                                       'lang_remark_statustext'                
=> lang('Enter a remark for this claim'),
+                                       'lang_apply_statustext'                 
=> lang('Apply the values'),
+                                       'lang_cancel_statustext'                
=> lang('Leave the claim untouched and return back to the list'),
+                                       'lang_save_statustext'                  
=> lang('Save the claim and return back to the list'),
+                                       'lang_no_cat'                           
=> lang('no category'),
+                                       'lang_cat_statustext'                   
=> lang('Select the category the claim belongs to. To do not use a category 
select NO CATEGORY'),
+                                       'select_name'                           
=> 'values[cat_id]',
+                                       'cat_list'                              
=> $this->bocommon->select_category_list(array('format'=>'select','selected' => 
$this->cat_id,'type' =>'tenant_claim','order'=>'descr')),
+                               );
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('Tenant claim') . ': ' . ($claim_id?lang('edit claim'):lang('add claim'));
 
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
@@ -939,23 +938,23 @@
 
                        //---datatable settings--------------------
                        phpgwapi_yui::load_widget('dragdrop');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('menu');
-                       phpgwapi_yui::load_widget('connection');
-                       phpgwapi_yui::load_widget('loader');
+                       phpgwapi_yui::load_widget('datatable');
+                       phpgwapi_yui::load_widget('menu');
+                       phpgwapi_yui::load_widget('connection');
+                       phpgwapi_yui::load_widget('loader');
                        phpgwapi_yui::load_widget('tabview');
                        phpgwapi_yui::load_widget('paginator');
                        phpgwapi_yui::load_widget('animation');
 
                        $GLOBALS['phpgw']->css->validate_file('datatable');
-                       $GLOBALS['phpgw']->css->validate_file('property');
-                       
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
+                       $GLOBALS['phpgw']->css->validate_file('property');
+                       
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
                        $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'uitenant.edit', 'property' );
                        //-----------------------datatable settings---
-               //      $GLOBALS['phpgw']->xslttpl->pp();
+                       //      $GLOBALS['phpgw']->xslttpl->pp();
                }
 
 
@@ -978,29 +977,29 @@
                        }
 
                        $link_data = array
-                       (
-                               'menuaction' => 'property.uitenant_claim.index'
-                       );
+                               (
+                                       'menuaction' => 
'property.uitenant_claim.index'
+                               );
 
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
 
                        $data = array
-                       (
-                               'done_action'           => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
-                               'delete_action'         => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uitenant_claim.delete', 'claim_id'=> $claim_id)),
-                               'lang_confirm_msg'      => lang('do you really 
want to delete this entry'),
-                               'lang_yes'              => lang('yes'),
-                               'lang_yes_statustext'   => lang('Delete the 
entry'),
-                               'lang_no_statustext'    => lang('Back to the 
list'),
-                               'lang_no'               => lang('no')
-                       );
+                               (
+                                       'done_action'           => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
+                                       'delete_action'         => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uitenant_claim.delete', 'claim_id'=> $claim_id)),
+                                       'lang_confirm_msg'      => lang('do you 
really want to delete this entry'),
+                                       'lang_yes'              => lang('yes'),
+                                       'lang_yes_statustext'   => lang('Delete 
the entry'),
+                                       'lang_no_statustext'    => lang('Back 
to the list'),
+                                       'lang_no'               => lang('no')
+                               );
 
                        $appname        = lang('Tenant claim');
                        $function_msg   = lang('delete claim');
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('property') . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
-               //      $GLOBALS['phpgw']->xslttpl->pp();
+                       //      $GLOBALS['phpgw']->xslttpl->pp();
                }
 
                function view()
@@ -1020,26 +1019,26 @@
                        $project_values = 
$this->boproject->read_single($values['project_id']);
 
                        $table_header_workorder[] = array
-                       (
-                               'lang_workorder_id'     => lang('Workorder'),
-                               'lang_budget'           => lang('Budget'),
-                               'lang_calculation'      => lang('Calculation'),
-                               'lang_vendor'           => lang('Vendor'),
-                               'lang_charge_tenant'    => lang('Charge 
tenant'),
-                               'lang_select'           => lang('Select')
-                       );
+                               (
+                                       'lang_workorder_id'     => 
lang('Workorder'),
+                                       'lang_budget'           => 
lang('Budget'),
+                                       'lang_calculation'      => 
lang('Calculation'),
+                                       'lang_vendor'           => 
lang('Vendor'),
+                                       'lang_charge_tenant'    => lang('Charge 
tenant'),
+                                       'lang_select'           => 
lang('Select')
+                               );
 
                        $bolocation                     = 
CreateObject('property.bolocation');
 
                        $location_data=$bolocation->initiate_ui_location(array(
-                                               'values'        => 
$project_values['location_data'],
-                                               'type_id'       => 
count(explode('-',$project_values['location_data']['location_code'])),
-                                               'no_link'       => false, // 
disable lookup links for location type less than type_id
-                                               'tenant'        => 
$project_values['location_data']['tenant_id'],
-                                               'lookup_type'   => 'view',
-                                               'lookup_entity' => 
$this->bocommon->get_lookup_entity('project'),
-                                               'entity_data'   => 
$project_values['p']
-                                               ));
+                               'values'        => 
$project_values['location_data'],
+                               'type_id'       => 
count(explode('-',$project_values['location_data']['location_code'])),
+                               'no_link'       => false, // disable lookup 
links for location type less than type_id
+                               'tenant'        => 
$project_values['location_data']['tenant_id'],
+                               'lookup_type'   => 'view',
+                               'lookup_entity' => 
$this->bocommon->get_lookup_entity('project'),
+                               'entity_data'   => $project_values['p']
+                       ));
 
                        if($project_values['contact_phone'])
                        {
@@ -1053,19 +1052,18 @@
                        }
 
 
-                       if($project_values['location_data']['tenant_id'] && 
!$values['tenant_id']):
+                       if($project_values['location_data']['tenant_id'] && 
!$values['tenant_id'])
                        {
                                $values['tenant_id']            = 
$project_values['location_data']['tenant_id'];
                                $values['last_name']            = 
$project_values['location_data']['last_name'];
                                $values['first_name']           = 
$project_values['location_data']['first_name'];
                        }
-                       elseif($values['tenant_id']):
+                       else if($values['tenant_id'])
                        {
                                $tenant= 
$this->bocommon->read_single_tenant($values['tenant_id']);
                                $values['last_name']            = 
$tenant['last_name'];
                                $values['first_name']           = 
$tenant['first_name'];
                        }
-                       endif;
 
 
                        if($values['workorder'] && 
$project_values['workorder_budget'])
@@ -1093,12 +1091,12 @@
                                }
                        }
 
-*/
+ */
 
                        
$b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array(
-                                               'b_account_id'          => 
$values['b_account_id'],
-                                               'b_account_name'        => 
$values['b_account_name'],
-                                               'type'  => 'view'));
+                               'b_account_id'          => 
$values['b_account_id'],
+                               'b_account_name'        => 
$values['b_account_name'],
+                               'type'  => 'view'));
 
 
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -1110,102 +1108,101 @@
                        $cat_list_project       = 
$this->bocommon->select_list($project_values['cat_id'],$cat_list_project);
 
                        $data = array
-                       (
-                               'table_header_workorder'                => 
$table_header_workorder,
-                               'lang_no_workorders'                    => 
lang('No workorder budget'),
-                               'workorder_link'                        => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.view')),
-                               'lang_start_date'                       => 
lang('Project start date'),
-                               'value_start_date'                      => 
$project_values['start_date'],
+                               (
+                                       'table_header_workorder'                
=> $table_header_workorder,
+                                       'lang_no_workorders'                    
=> lang('No workorder budget'),
+                                       'workorder_link'                        
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.view')),
+                                       'lang_start_date'                       
=> lang('Project start date'),
+                                       'value_start_date'                      
=> $project_values['start_date'],
 
-                               'lang_end_date'                         => 
lang('Project end date'),
-                               'value_end_date'                        => 
$project_values['end_date'],
+                                       'lang_end_date'                         
=> lang('Project end date'),
+                                       'value_end_date'                        
=> $project_values['end_date'],
 
-                               'lang_charge_tenant'                    => 
lang('Charge tenant'),
-                               'charge_tenant'                         => 
$project_values['charge_tenant'],
+                                       'lang_charge_tenant'                    
=> lang('Charge tenant'),
+                                       'charge_tenant'                         
=> $project_values['charge_tenant'],
 
-                               'lang_power_meter'                      => 
lang('Power meter'),
-                               'value_power_meter'                     => 
$project_values['power_meter'],
+                                       'lang_power_meter'                      
=> lang('Power meter'),
+                                       'value_power_meter'                     
=> $project_values['power_meter'],
 
-                               'lang_budget'                           => 
lang('Budget'),
-                               'value_budget'                          => 
$project_values['budget'],
+                                       'lang_budget'                           
=> lang('Budget'),
+                                       'value_budget'                          
=> $project_values['budget'],
 
-                               'lang_reserve'                          => 
lang('reserve'),
-                               'value_reserve'                         => 
$project_values['reserve'],
-                               'lang_reserve_statustext'               => 
lang('Enter the reserve'),
+                                       'lang_reserve'                          
=> lang('reserve'),
+                                       'value_reserve'                         
=> $project_values['reserve'],
+                                       'lang_reserve_statustext'               
=> lang('Enter the reserve'),
 
-                               'lang_reserve_remainder'                => 
lang('reserve remainder'),
-                               'value_reserve_remainder'               => 
$reserve_remainder,
-                               'value_reserve_remainder_percent'       => 
$remainder_percent,
+                                       'lang_reserve_remainder'                
=> lang('reserve remainder'),
+                                       'value_reserve_remainder'               
=> $reserve_remainder,
+                                       'value_reserve_remainder_percent'       
=> $remainder_percent,
 
-                               'location_data'                         => 
$location_data,
-                               'location_type'                         => 
'view',
+                                       'location_data'                         
=> $location_data,
+                                       'location_type'                         
=> 'view',
 
-                               'lang_project_id'                       => 
lang('Project ID'),
-                               'value_project_id'                      => 
$project_values['project_id'],
-                               'lang_name'                             => 
lang('Name'),
-                               'value_name'                            => 
$project_values['name'],
+                                       'lang_project_id'                       
=> lang('Project ID'),
+                                       'value_project_id'                      
=> $project_values['project_id'],
+                                       'lang_name'                             
=> lang('Name'),
+                                       'value_name'                            
=> $project_values['name'],
 
-                               'lang_descr'                            => 
lang('Description'),
+                                       'lang_descr'                            
=> lang('Description'),
 
-                               'sum_workorder_budget'                  => 
$project_values['sum_workorder_budget'],
-                               'sum_workorder_calculation'             => 
$project_values['sum_workorder_calculation'],
-                               'workorder_budget'                      => 
$project_values['workorder_budget'],
-                               'sum_workorder_actual_cost'             => 
$project_values['sum_workorder_actual_cost'],
-                               'lang_actual_cost'                      => 
lang('Actual cost'),
-                               'lang_coordinator'                      => 
lang('Coordinator'),
-                               'lang_sum'                              => 
lang('Sum'),
-                               'select_user_name'                      => 
'project_values[coordinator]',
-                               'lang_no_user'                          => 
lang('Select coordinator'),
-                               'user_list'                             => 
$this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
+                                       'sum_workorder_budget'                  
=> $project_values['sum_workorder_budget'],
+                                       'sum_workorder_calculation'             
=> $project_values['sum_workorder_calculation'],
+                                       'workorder_budget'                      
=> $project_values['workorder_budget'],
+                                       'sum_workorder_actual_cost'             
=> $project_values['sum_workorder_actual_cost'],
+                                       'lang_actual_cost'                      
=> lang('Actual cost'),
+                                       'lang_coordinator'                      
=> lang('Coordinator'),
+                                       'lang_sum'                              
=> lang('Sum'),
+                                       'select_user_name'                      
=> 'project_values[coordinator]',
+                                       'lang_no_user'                          
=> lang('Select coordinator'),
+                                       'user_list'                             
=> 
$this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1),
 
-                               'status_list'                           => 
$this->boproject->select_status_list('select',$project_values['status']),
-                               'lang_no_status'                        => 
lang('Select status'),
-                               'lang_status'                           => 
lang('Status'),
+                                       'status_list'                           
=> $this->boproject->select_status_list('select',$project_values['status']),
+                                       'lang_no_status'                        
=> lang('Select status'),
+                                       'lang_status'                           
=> lang('Status'),
 
-                               'currency'                              => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
+                                       'currency'                              
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
 
-                               'lang_contact_phone'                    => 
lang('Contact phone'),
-                               'contact_phone'                         => 
$project_values['contact_phone'],
+                                       'lang_contact_phone'                    
=> lang('Contact phone'),
+                                       'contact_phone'                         
=> $project_values['contact_phone'],
 
-                               'b_account_data'                        => 
$b_account_data,
+                                       'b_account_data'                        
=> $b_account_data,
 
-                               'cat_list_project'                      => 
$cat_list_project,
+                                       'cat_list_project'                      
=> $cat_list_project,
 
-//------------------
+                                       //------------------
 
-                               'lang_status'                           => 
lang('Status'),
-                               'status_list'                           => 
$this->bo->get_status_list(array('format' => 'select', 'selected' => 
$values['status'],'default' => 'open')),
+                                       'lang_status'                           
=> lang('Status'),
+                                       'status_list'                           
=> $this->bo->get_status_list(array('format' => 'select', 'selected' => 
$values['status'],'default' => 'open')),
 
-                               'lang_amount'                           => 
lang('amount'),
-                               'value_amount'                          => 
$values['amount'],
+                                       'lang_amount'                           
=> lang('amount'),
+                                       'value_amount'                          
=> $values['amount'],
 
-                               'lang_tenant'                           => 
lang('tenant'),
-                               'value_tenant_id'                       => 
$values['tenant_id'],
-                               'value_last_name'                       => 
$values['last_name'],
-                               'value_first_name'                      => 
$values['first_name'],
-                               'size_last_name'                        => 
strlen($values['last_name']),
-                               'size_first_name'                       => 
strlen($values['first_name']),
+                                       'lang_tenant'                           
=> lang('tenant'),
+                                       'value_tenant_id'                       
=> $values['tenant_id'],
+                                       'value_last_name'                       
=> $values['last_name'],
+                                       'value_first_name'                      
=> $values['first_name'],
+                                       'size_last_name'                        
=> strlen($values['last_name']),
+                                       'size_first_name'                       
=> strlen($values['first_name']),
 
-                               'lang_claim_id'                         => 
lang('ID'),
-                               'value_claim_id'                        => 
$claim_id,
-                               'lang_remark'                           => 
lang('remark'),
-                               'lang_category'                         => 
lang('category'),
-                               'lang_save'                             => 
lang('save'),
-                               'lang_cancel'                           => 
lang('cancel'),
-                               'lang_apply'                            => 
lang('apply'),
-                               'value_remark'                          => 
$values['remark'],
-                               'value_cat'                             => 
$values['cat'],
-                               'cat_list'                              => 
$this->bocommon->select_category_list(array('format'=>'select','selected' => 
$values['cat_id'],'type' =>'tenant_claim','order'=>'descr')),
+                                       'lang_claim_id'                         
=> lang('ID'),
+                                       'value_claim_id'                        
=> $claim_id,
+                                       'lang_remark'                           
=> lang('remark'),
+                                       'lang_category'                         
=> lang('category'),
+                                       'lang_save'                             
=> lang('save'),
+                                       'lang_cancel'                           
=> lang('cancel'),
+                                       'lang_apply'                            
=> lang('apply'),
+                                       'value_remark'                          
=> $values['remark'],
+                                       'value_cat'                             
=> $values['cat'],
+                                       'cat_list'                              
=> $this->bocommon->select_category_list(array('format'=>'select','selected' => 
$values['cat_id'],'type' =>'tenant_claim','order'=>'descr')),
 
-                               'done_action'                           => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uitenant_claim.index')),
-                               'lang_done'                             => 
lang('done'),
-                               'value_date'                            => 
$GLOBALS['phpgw']->common->show_date($tenant_claim['entry_date'])
+                                       'done_action'                           
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uitenant_claim.index')),
+                                       'lang_done'                             
=> lang('done'),
+                                       'value_date'                            
=> $GLOBALS['phpgw']->common->show_date($tenant_claim['entry_date'])
 
-                       );
+                               );
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('Tenant claim') . '::' . lang('view claim');
 
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
-               //      $GLOBALS['phpgw']->xslttpl->pp();
+                       //      $GLOBALS['phpgw']->xslttpl->pp();
                }
        }
-




reply via email to

[Prev in Thread] Current Thread [Next in Thread]