phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] CVS: property/inc class.bob_account.inc.php,NONE,1.1


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/inc class.bob_account.inc.php,NONE,1.1 class.sob_account.inc.php,NONE,1.1 class.uib_account.inc.php,NONE,1.1 class.soadmin.inc.php,1.5,1.6 class.soadmin_location.inc.php,1.12,1.13 class.socategory.inc.php,1.4,1.5 class.socommon.inc.php,1.30,1.31 class.sodocument.inc.php,1.9,1.10 class.sodrawing.inc.php,1.8,1.9 class.soinvoice.inc.php,1.24,1.25 class.uicategory.inc.php,1.4,1.5 hook_admin.inc.php,1.36,1.37
Date: Sun, 29 Jun 2003 06:12:55 -0400

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

Modified Files:
        class.soadmin.inc.php class.soadmin_location.inc.php 
        class.socategory.inc.php class.socommon.inc.php 
        class.sodocument.inc.php class.sodrawing.inc.php 
        class.soinvoice.inc.php class.uicategory.inc.php 
        hook_admin.inc.php 
Added Files:
        class.bob_account.inc.php class.sob_account.inc.php 
        class.uib_account.inc.php 
Log Message:
no message

--- NEW FILE ---
<?php
        
/***************************************************************************\
        * This program is free software; you can redistribute it and/or modify 
it   *
        * under the terms of the GNU General Public License as published by the 
    *
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/

        class bob_account
        {
                var $start;
                var $query;
                var $filter;
                var $sort;
                var $order;
                var $cat_id;

                var $public_functions = array
                (
                        'read'                          => True,
                        'read_single'           => True,
                        'save'                          => True,
                        'delete'                        => True,
                        'check_perms'           => True
                );

                var $soap_functions = array(
                        'list' => array(
                                'in'  => 
array('int','int','struct','string','int'),
                                'out' => array('array')
                        ),
                        'read' => array(
                                'in'  => array('int','struct'),
                                'out' => array('array')
                        ),
                        'save' => array(
                                'in'  => array('int','struct'),
                                'out' => array()
                        ),
                        'delete' => array(
                                'in'  => array('int','struct'),
                                'out' => array()
                        )
                );

                function bob_account($session=False)
                {
                        $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->so               = 
CreateObject($this->currentapp.'.sob_account');
                        $this->socommon = 
CreateObject($this->currentapp.'.socommon');

                        if ($session)
                        {
                                $this->read_sessiondata();
                                $this->use_session = True;
                        }

                        $start  = get_var('start',array('POST','GET'));
                        $query  = get_var('query',array('POST','GET'));
                        $sort   = get_var('sort',array('POST','GET'));
                        $order  = get_var('order',array('POST','GET'));
                        $filter = get_var('filter',array('POST','GET'));
                        $cat_id = get_var('cat_id',array('POST','GET'));
                        $allrows= get_var('allrows',array('POST','GET'));

                        if ($start)
                        {
                                $this->start=$start;
                        }
                        else
                        {
                                $this->start=0;
                        }

                        if(isset($query))
                        {
                                $this->query = $query;
                        }
                        if(!empty($filter))
                        {
                                $this->filter = $filter;
                        }
                        if(isset($sort))
                        {
                                $this->sort = $sort;
                        }
                        if(isset($order))
                        {
                                $this->order = $order;
                        }
                        if(isset($cat_id))
                        {
                                $this->cat_id = $cat_id;
                        }
                        if(isset($allrows))
                        {
                                $this->allrows = $allrows;
                        }
                }


                function save_sessiondata($data)
                {
                        if ($this->use_session)
                        {
                                
$GLOBALS['phpgw']->session->appsession('session_data','b_account',$data);
                        }
                }

                function read_sessiondata()
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','b_account');

                        //_debug_array($data);

                        $this->start    = $data['start'];
                        $this->query    = $data['query'];
                        $this->filter   = $data['filter'];
                        $this->sort             = $data['sort'];
                        $this->order    = $data['order'];
                        $this->cat_id   = $data['cat_id'];
                        $this->allrows  = $data['allrows'];
                }


                function read()
                {
                        $b_account = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
                                                                                
        'allrows'=>$this->allrows));

                        $this->total_records = $this->so->total_records;

                        return $b_account;
                }

                function read_single($id)
                {
                        return $this->so->read_single($id);
                }

                function select_part_of_town($part_of_town_id)
                {
                        return 
$this->socommon->select_part_of_town($part_of_town_id);
                }

                function save($b_account,$action='')
                {
                        if ($action=='edit')
                        {
                                if ($b_account['id'] != '')
                                {

                                        $receipt = $this->so->edit($b_account);
                                }
                        }
                        else
                        {
                                $receipt = $this->so->add($b_account);
                        }

                        return $receipt;
                }

                function delete($id)
                {
                        $this->so->delete($id);
                }
        }
?>

--- NEW FILE ---
<?php
        
/***************************************************************************\
        * This program is free software; you can redistribute it and/or modify 
it   *
        * under the terms of the GNU General Public License as published by the 
    *
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/

        class sob_account
        {
                var $grants;

                function sob_account()
                {
                        $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->db               = $GLOBALS['phpgw']->db;
                        $this->db2              = $this->db;
                        $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
                }

                function read($data)
                {
                        if(is_array($data))
                        {
                                if ($data['start'])
                                {
                                        $start=$data['start'];
                                }
                                else
                                {
                                        $start=0;
                                }
                                $query          = 
(isset($data['query'])?$data['query']:'');
                                $sort           = 
(isset($data['sort'])?$data['sort']:'DESC');
                                $order          = 
(isset($data['order'])?$data['order']:'');
                                $allrows        = 
(isset($data['allrows'])?$data['allrows']:'');
                        }

                        if ($order)
                        {
                                $ordermethod = " order by $order $sort";

                        }
                        else
                        {
                                $ordermethod = ' order by id asc';
                        }

                        $table = 'fm_b_account';

                        if($query)
                        {
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);

                                $querymethod = " where id LIKE '%$query%' or 
descr LIKE '%$query%'";
                        }

                        $sql = "SELECT * FROM $table $querymethod";

                        $this->db2->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db2->num_rows();

                        if(!$allrows)
                        {
                                $this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
                        }
                        else
                        {
                                $this->db->query($sql . 
$ordermethod,__LINE__,__FILE__);
                        }

                        while ($this->db->next_record())
                        {
                                $b_account[] = array
                                (
                                        'id'    => $this->db->f('id'),
                                        'descr'                 => 
$this->db->f('descr')
                                );
                        }
                        return $b_account;
                }

                function read_single($id)
                {

                        $table = 'fm_b_account';

                        $sql = "SELECT * FROM $table  where id='$id'";

                        $this->db->query($sql,__LINE__,__FILE__);

                        if ($this->db->next_record())
                        {
                                $b_account['id']                        = 
$this->db->f('id');
                                $b_account['descr']                     = 
$this->db->f('descr');
                                $b_account['group']                     = 
$this->db->f('grouping');

                                return $b_account;
                        }
                }

                function add($b_account)
                {
                        $table = 'fm_b_account';

                        $b_account['descr'] = 
$this->db->db_addslashes($b_account['descr']);

                        $this->db->query("INSERT INTO $table (id, 
descr,grouping) "
                                . "VALUES (" . $b_account['id'] . ",'" . 
$b_account['descr']. "'," . substr($b_account['id'],0,2) . 
")",__LINE__,__FILE__);

                        $receipt['message'][]=array('msg'=>lang('budget account 
%1 has been saved',$b_account['id']));
                        return $receipt;
                }

                function edit($b_account)
                {

                        $table = 'fm_b_account';

                        $b_account['descr'] = 
$this->db->db_addslashes($b_account['descr']);

                        $this->db->query("UPDATE $table set descr='" . 
$b_account['descr']
                                                        . "' WHERE id='" . 
$b_account['id']. "'",__LINE__,__FILE__);


                        $receipt['message'][]=array('msg'=>lang('budget account 
%1 has been edited',$b_account['id']));
                        return $receipt;
                }

                function delete($id)
                {
                        $table = 'fm_b_account';

                        $this->db->query("DELETE FROM $table WHERE id='" . $id 
. "'",__LINE__,__FILE__);
                }
        }
?>

--- NEW FILE ---
<?php
        
/***************************************************************************\
        * -------------------------------------------------                     
    *
        * This program is free software; you can redistribute it and/or modify 
it   *
        * under the terms of the GNU General Public License as published by the 
    *
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
        class uib_account
        {
                var $grants;
                var $start;
                var $query;
                var $sort;
                var $order;
                var $sub;
                var $currentapp;

                var $public_functions = array
                (
                        'index'  => True,
                        'edit'   => True,
                        'delete' => True
                );

                function uib_account()
                {
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];

                        $this->bo                                       = 
CreateObject($this->currentapp.'.bob_account',true);
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon');

                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;
                        $this->sort                                     = 
$this->bo->sort;
                        $this->order                            = 
$this->bo->order;
                        $this->allrows                          = 
$this->bo->allrows;
                }

                function save_sessiondata()
                {
                        $data = array
                        (
                                'start'         => $this->start,
                                'query'         => $this->query,
                                'sort'          => $this->sort,
                                'order'         => $this->order,
                                'allrows'       => $this->allrows
                        );
                        $this->bo->save_sessiondata($data);
                }

                function index()
                {
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('b_account','nextmatchs',
                                                                                
'search_field'));

                        $b_account_list = $this->bo->read($type);

                        while (is_array($b_account_list) && list(,$b_account) = 
each($b_account_list))
                        {
                                $words = split(' ',$b_account['descr']);
                                $first = "$words[0] $words[1] $words[2] 
$words[3]";

                                $content[] = array
                                (
                                        'id'                                    
=> $b_account['id'],
                                        'first'                                 
        => $first,
                                        'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.edit&id='
 . $b_account['id']),
                                        'link_delete'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.delete&id='
 . $b_account['id']),
                                        'lang_view_b_accounttext'       => 
lang('view the budget account'),
                                        'lang_edit_b_accounttext'       => 
lang('edit the budget account'),
                                        'lang_delete_b_accounttext'     => 
lang('delete the budget account'),
                                        'text_view'                             
        => lang('view'),
                                        'text_edit'                             
        => lang('edit'),
                                        'text_delete'                           
=> lang('delete')
                                );
                        }

//_debug_array($content);

                        $table_header[] = array
                        (

                                'lang_descr'            => lang('Descr'),
                                'lang_edit'                     => lang('edit'),
                                'lang_delete'           => lang('delete'),
                                'sort_id'       => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
                                                                                
        'sort'  => $this->sort,
                                                                                
        'var'   =>      'id',
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra' => array('menuaction'   => 
$this->currentapp.'.uib_account.index')
                                                                                
)),
                                'lang_id'       => lang('budget account'),
                        );

                        $table_add[] = array
                        (
                                'lang_add'                                      
=> lang('add'),
                                'lang_add_b_accounttext'        => lang('add a 
budget account'),
                                'add_action'                            => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.edit'),
                                'lang_done'                                     
=> lang('done'),
                                'lang_done_b_accounttext'       => lang('back 
to admin'),
                                'done_action'                           => 
$GLOBALS['phpgw']->link('/admin/index.php')
                        );

                        if(!$this->allrows)
                        {
                                $record_limit   = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
                        }
                        else
                        {
                                $record_limit   = $this->bo->total_records;
                        }


                        $data = array
                        (
                                'allow_allrows'                                 
=> True,
                                'allrows'                                       
        => $this->allrows,
                                'start_record'                                  
=> $this->start,
                                'record_limit'                                  
=> $record_limit,
                                'num_records'                                   
=> count($b_account_list),
                                'all_records'                                   
=> $this->bo->total_records,
                                'link_url'                                      
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.index&type='.$type),
                                'img_path'                                      
        => $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
                                'lang_searchfield_b_accounttext'        => 
lang('Enter the search string. To show all entries, empty this field and press 
the SUBMIT button again'),
                                'lang_searchbutton_b_accounttext'       => 
lang('Submit the search string'),
                                'query'                                         
        => $this->query,
                                'lang_search'                                   
=> lang('search'),
                                'table_header'                                  
=> $table_header,
                                'values'                                        
        => $content,
                                'table_add'                                     
        => $table_add
                        );

                        $appname                                                
= lang('budget account');
                        $function_msg                                   = 
lang('list budget account');

                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
                        $this->save_sessiondata();
                }

                function edit()
                {
                        $id     = get_var('id',array('POST','GET'));
                        $values                 = 
get_var('values',array('POST'));

                        
$GLOBALS['phpgw']->xslttpl->add_file(array('b_account'));

                        if ($values['save'])
                        {
                                if(!$id && !ctype_digit($values['id']))
                                {
                                        
$receipt['error'][]=array('msg'=>lang('Please enter an integer !'));
                                        unset($values['id']);
                                }

                                if($id)
                                {
                                        $values['id']=$id;
                                        $action='edit';
                                }
                                else
                                {
                                        $id =   $values['id'];
                                }

                                if(!$receipt['error'])
                                {
                                        $receipt = 
$this->bo->save($values,$action);
                                }
                        }

                        if ($id)
                        {
                                $b_account = $this->bo->read_single($id);
                                $function_msg = lang('edit budget account');
                                $action='edit';
                        }
                        else
                        {
                                $function_msg = lang('add budget account');
                                $action='add';
                        }


                        $link_data = array
                        (
                                'menuaction'    => 
$this->currentapp.'.uib_account.edit',
                                'id'    => $id
                        );
//_debug_array($link_data);

                        $msgbox_data = $this->bocommon->msgbox_data($receipt);

                        $data = array
                        (
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.index&type='.$type),
                                'lang_id'                                       
        => lang('budget account'),
                                'lang_descr'                                    
=> lang('Descr'),
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
                                'value_id'                                      
        => $id,
                                'lang_group'                                    
=> lang('group'),
                                'value_group'                                   
=> $b_account['group'],
                                'lang_id_b_accounttext'                 => 
lang('Enter the budget account'),
                                'lang_descr_b_accounttext'              => 
lang('Enter a description the budget account'),
                                'lang_done_b_accounttext'               => 
lang('Back to the list'),
                                'lang_save_b_accounttext'               => 
lang('Save the budget account'),
                                'value_descr'                                   
=> $b_account['descr']

                        );

                        $appname                                                
= lang('budget account');

                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
                }

                function delete()
                {
                        $id             = get_var('id',array('POST','GET'));
                        $confirm                = 
get_var('confirm',array('POST'));

                        $link_data = array
                        (
                                'menuaction' => 
$this->currentapp.'.uib_account.index'
                        );

                        if (get_var('confirm',array('POST')))
                        {
                                $this->bo->delete($id);
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                        }

                        
$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','menuaction='.$this->currentapp.'.uib_account.delete&id='
 . $id),
                                'lang_confirm_msg'              => lang('do you 
really want to delete this entry'),
                                'lang_yes'                              => 
lang('yes'),
                                'lang_yes_b_accounttext'        => lang('Delete 
the entry'),
                                'lang_no_b_accounttext' => lang('Back to the 
list'),
                                'lang_no'                               => 
lang('no')
                        );

                        $appname                                                
= lang('budget account');
                        $function_msg                                   = 
lang('delete budget account');

                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
                }

        }
?>

Index: class.soadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.soadmin.inc.php       21 May 2003 12:46:39 -0000      1.5
--- class.soadmin.inc.php       29 Jun 2003 10:12:52 -0000      1.6
***************
*** 18,32 ****
                        $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
!                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
!                       {
!                               $this->join = " JOIN ";
!                       }
!                       else
!                       {
!                               $this->join = " LEFT JOIN ";
!                       }
! 
! 
                }
  
--- 18,24 ----
                        $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
+                       $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
  
!                       $this->join                     = $this->socommon->join;
                }
  

Index: class.soadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.soadmin_location.inc.php      28 Jun 2003 20:29:53 -0000      1.12
--- class.soadmin_location.inc.php      29 Jun 2003 10:12:52 -0000      1.13
***************
*** 17,29 ****
                        $this->db2                      = $this->db;
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
!                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
!                       {
!                               $this->join = " JOIN ";
!                       }
!                       else
!                       {
!                               $this->join = " LEFT JOIN ";
!                       }
  
                }
--- 17,23 ----
                        $this->db2                      = $this->db;
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
+                       $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
  
!                       $this->join                     = $this->socommon->join;
  
                }

Index: class.socategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socategory.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.socategory.inc.php    17 May 2003 17:49:03 -0000      1.4
--- class.socategory.inc.php    29 Jun 2003 10:12:52 -0000      1.5
***************
*** 18,31 ****
                        $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
!                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
!                       {
!                               $this->join = " JOIN ";
!                       }
!                       else
!                       {
!                               $this->join = " LEFT JOIN ";
!                       }
! 
  
                }
--- 18,24 ----
                        $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
+                       $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
  
!                       $this->join                     = $this->socommon->join;
  
                }
***************
*** 101,107 ****
                        switch($type)
                        {
-                               case 'accounting':
-                                       $table='fm_b_account';
-                                       break;
                                case 'dim_d':
                                        $table='fm_dim_d';
--- 94,97 ----

Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.socommon.inc.php      28 Jun 2003 16:11:47 -0000      1.30
--- class.socommon.inc.php      29 Jun 2003 10:12:52 -0000      1.31
***************
*** 26,31 ****
                        else
                        {
! //                            $this->join = " INNER JOIN ";
!                               $this->join = " LEFT JOIN ";
                        }
  
--- 26,31 ----
                        else
                        {
!                               $this->join = " INNER JOIN ";
! //                            $this->join = " LEFT JOIN ";
                        }
  

Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sodocument.inc.php    28 Jun 2003 16:11:47 -0000      1.9
--- class.sodocument.inc.php    29 Jun 2003 10:12:52 -0000      1.10
***************
*** 23,34 ****
                        $this->fakebase         = $this->vfs->fakebase;
  
!                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
!                       {
!                               $this->join = " JOIN ";
!                       }
!                       else
!                       {
!                               $this->join = " LEFT JOIN ";
!                       }
                }
  
--- 23,29 ----
                        $this->fakebase         = $this->vfs->fakebase;
  
!                       $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
! 
!                       $this->join                     = $this->socommon->join;
                }
  

Index: class.sodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodrawing.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.sodrawing.inc.php     27 Jun 2003 11:14:51 -0000      1.8
--- class.sodrawing.inc.php     29 Jun 2003 10:12:52 -0000      1.9
***************
*** 23,35 ****
                        $this->rootdir          = $this->vfs->basedir;
                        $this->fakebase         = $this->vfs->fakebase;
  
!                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
!                       {
!                               $this->join = " JOIN ";
!                       }
!                       else
!                       {
!                               $this->join = " LEFT JOIN ";
!                       }
                }
  
--- 23,29 ----
                        $this->rootdir          = $this->vfs->basedir;
                        $this->fakebase         = $this->vfs->fakebase;
+                       $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
  
!                       $this->join                     = $this->socommon->join;
                }
  

Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.soinvoice.inc.php     28 Jun 2003 16:11:47 -0000      1.24
--- class.soinvoice.inc.php     29 Jun 2003 10:12:52 -0000      1.25
***************
*** 804,808 ****
                function select_account_class()
                {
!                       $sql = "SELECT  distinct left(id,2) as id from 
fm_b_account ";
                        $this->db->query($sql,__LINE__,__FILE__);
  
--- 804,808 ----
                function select_account_class()
                {
!                       $sql = "SELECT  distinct grouping as id from 
fm_b_account ";
                        $this->db->query($sql,__LINE__,__FILE__);
  

Index: class.uicategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uicategory.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uicategory.inc.php    23 May 2003 08:40:19 -0000      1.4
--- class.uicategory.inc.php    29 Jun 2003 10:12:52 -0000      1.5
***************
*** 213,233 ****
                                'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type),
                                'lang_id'                               => 
lang('category ID'),
-                               'lang_name'                                     
        => lang('name'),
                                'lang_descr'                                    
=> lang('Descr'),
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
                                'value_id'                              => $id,
-                               'value_name'                                    
=> $category['name'],
-                               'value_generaladdress'                  => 
$category['general_address'],
                                'lang_id_categorytext'  => lang('Enter the 
category ID'),
                                'lang_descr_categorytext'                       
=> lang('Enter a description the category'),
-                               'lang_generaladdress_categorytext'=> 
lang('Enter the general address'),
                                'lang_done_categorytext'                        
=> lang('Back to the list'),
                                'lang_save_categorytext'                        
=> lang('Save the category'),
                                'type_id'                               => 
$category['type_id'],
-                               'location_code'                                 
=> $category['location_code'],
                                'value_descr'                                   
=> $category['descr']
- 
- 
                        );
  
--- 213,226 ----

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** hook_admin.inc.php  28 Jun 2003 17:57:57 -0000      1.36
--- hook_admin.inc.php  29 Jun 2003 10:12:52 -0000      1.37
***************
*** 46,50 ****
                                'Key location'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=key_location'),
                                'Branch'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=branch'),
!                               'Accounting'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=accounting'),
                                'Accounting extra'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=dim_d'),
                                'Import'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiXport.import'),
--- 46,50 ----
                                'Key location'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=key_location'),
                                'Branch'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=branch'),
!                               'Accounting'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uib_account.index'),
                                'Accounting extra'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=dim_d'),
                                'Import'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiXport.import'),





reply via email to

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