phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.89, 1.90 class


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.89, 1.90 class.uientity.inc.php, 1.5, 1.6 class.uiwo_hour.inc.php, 1.39, 1.40 class.uiworkorder.inc.php, 1.47, 1.48 class.soproject.inc.php, 1.43, 1.44 class.boworkorder.inc.php, 1.19, 1.20 class.boproject.inc.php, 1.19, 1.20 class.uiproject.inc.php, 1.53, 1.54 class.uireport.inc.php, 1.20, 1.21 class.uiinvoice.inc.php, 1.39, 1.40 class.soreport.inc.php, 1.14, 1.15 class.soinvoice.inc.php, 1.40, 1.41 class.boreport.inc.php, 1.10, 1.11
Date: Wed, 29 Oct 2003 17:28:47 +0000

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

Modified Files:
        class.bocommon.inc.php class.uientity.inc.php 
        class.uiwo_hour.inc.php class.uiworkorder.inc.php 
        class.soproject.inc.php class.boworkorder.inc.php 
        class.boproject.inc.php class.uiproject.inc.php 
        class.uireport.inc.php class.uiinvoice.inc.php 
        class.soreport.inc.php class.soinvoice.inc.php 
        class.boreport.inc.php 
Log Message:
no message

Index: class.boreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boreport.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.boreport.inc.php      29 Sep 2003 17:53:51 -0000      1.10
--- class.boreport.inc.php      29 Oct 2003 17:28:44 -0000      1.11
***************
*** 16,57 ****
                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 boreport($session=False)
                {
                        $this->currentapp               = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->so                               = 
CreateObject($this->currentapp.'.soreport');
-                       $this->socommon                 = 
CreateObject($this->currentapp.'.socommon');
                        $this->bocommon                 = 
CreateObject($this->currentapp.'.bocommon');
                        $this->vfs                              = 
CreateObject('phpgwapi.vfs');
                        $this->rootdir                  = $this->vfs->basedir;
                        $this->fakebase                 = $this->vfs->fakebase;
-                       $this->solocation               = 
CreateObject($this->currentapp.'.solocation');
  
                        if ($session)
--- 16,27 ----
***************
*** 216,220 ****
                }
  
- 
                function read($start_date='',$end_date='',$allrows='')
                {
--- 186,189 ----
***************
*** 228,244 ****
  
                        $this->uicols   = $this->so->uicols;
-                       $cols_extra             = $this->so->cols_extra;
  
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
!                       for ($i=0; $i<count($report); $i++)
                        {
-                               $report[$i]['user']             = 
$GLOBALS['phpgw']->accounts->id2name($report[$i]['user_id']);
                                $report[$i]['entry_date'] = 
$GLOBALS['phpgw']->common->show_date($report[$i]['entry_date'],$dateformat);
-                               
$location_data=$this->solocation->read_single($report[$i]['location_code']);
- 
-                               for ($j=0;$j<count($cols_extra);$j++)
-                               {
-                                       $report[$i][$cols_extra[$j]] = 
$location_data[$cols_extra[$j]];
-                               }
                        }
  
--- 197,206 ----
  
                        $this->uicols   = $this->so->uicols;
  
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
!                       $k=count($report);
!                       for ($i=0; $i<$k; $i++)
                        {
                                $report[$i]['entry_date'] = 
$GLOBALS['phpgw']->common->show_date($report[$i]['entry_date'],$dateformat);
                        }
  
***************
*** 254,258 ****
                        if($report['location_code'])
                        {
!                               $report['location_data'] 
=$this->solocation->read_single($report['location_code']);
                        }
  
--- 216,221 ----
                        if($report['location_code'])
                        {
!                               $solocation             = 
CreateObject($this->currentapp.'.solocation');
!                               $report['location_data'] 
=$solocation->read_single($report['location_code']);
                        }
  
***************
*** 292,299 ****
                }
  
-               function select_part_of_town($part_of_town_id)
-               {
-                       return 
$this->socommon->select_part_of_town($part_of_town_id);
-               }
  
                function create_home_dir()
--- 255,258 ----

Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** class.soproject.inc.php     28 Oct 2003 15:14:38 -0000      1.43
--- class.soproject.inc.php     29 Oct 2003 17:28:43 -0000      1.44
***************
*** 148,152 ****
                                $uicols['statustext'][]         = lang('Project 
name');
  
!                               $cols.= ",$entity_table.coordinator";
                                $cols_return[]                          = 
'coordinator';
                                $uicols['input_type'][]         = 'text';
--- 148,152 ----
                                $uicols['statustext'][]         = lang('Project 
name');
  
!                               $cols.= ",account_lid as coordinator";
                                $cols_return[]                          = 
'coordinator';
                                $uicols['input_type'][]         = 'text';
***************
*** 156,159 ****
--- 156,162 ----
  
                                $cols.= ",$entity_table.user_id";
+ 
+                               $joinmethod .= " $this->join  phpgw_accounts ON 
($entity_table.coordinator = phpgw_accounts.account_id))";
+                               $paranthesis .='(';
  
                                $sql    = 
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,

Index: class.boproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** class.boproject.inc.php     28 Oct 2003 15:14:39 -0000      1.19
--- class.boproject.inc.php     29 Oct 2003 17:28:43 -0000      1.20
***************
*** 296,306 ****
  
                        $this->uicols   = $this->so->uicols;
!                       $cols_extra             = $this->so->cols_extra;
  
                        for ($i=0; $i<count($project); $i++)
                        {
!                               $project[$i]['coordinator'] = 
$GLOBALS['phpgw']->accounts->id2name($project[$i]['coordinator']);
                                $project[$i]['start_date'] = 
$GLOBALS['phpgw']->common->show_date($project[$i]['start_date'],$dateformat);
!                               
$location_data=$this->solocation->read_single($project[$i]['location_code']);
  
                                for ($j=0;$j<count($cols_extra);$j++)
--- 296,306 ----
  
                        $this->uicols   = $this->so->uicols;
! //                    $cols_extra             = $this->so->cols_extra;
  
                        for ($i=0; $i<count($project); $i++)
                        {
! //                            $project[$i]['coordinator'] = 
$GLOBALS['phpgw']->accounts->id2name($project[$i]['coordinator']);
                                $project[$i]['start_date'] = 
$GLOBALS['phpgw']->common->show_date($project[$i]['start_date'],$dateformat);
! /*                            
$location_data=$this->solocation->read_single($project[$i]['location_code']);
  
                                for ($j=0;$j<count($cols_extra);$j++)
***************
*** 308,311 ****
--- 308,312 ----
                                        $project[$i][$cols_extra[$j]] = 
$location_data[$cols_extra[$j]];
                                }
+ */
                        }
  

Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** class.uireport.inc.php      28 Oct 2003 15:14:40 -0000      1.20
--- class.uireport.inc.php      29 Oct 2003 17:28:43 -0000      1.21
***************
*** 37,46 ****
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
-                       $this->config                           = 
CreateObject('phpgwapi.config',$this->currentapp);
  
                        $this->bo                                       = 
CreateObject($this->currentapp.'.boreport',True);
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon');
                        $this->menu                                     = 
CreateObject($this->currentapp.'.menu');
-                       $this->bolocation                       = 
CreateObject($this->currentapp.'.bolocation');
  
                        $this->acl2                             = 
CreateObject($this->currentapp.'.acl2');
--- 37,44 ----
***************
*** 178,181 ****
--- 176,180 ----
                                'lang_columns'          => lang('columns'),
                                'lang_save'                     => lang('save'),
+                               'lang_none'                     => lang('None'),
                                'select_name'           => 'period'
                        );
***************
*** 428,432 ****
                                'link_columns'                          => 
$GLOBALS['phpgw']->link('/index.php',$link_columns),
                                'lang_columns_help'                     => 
lang('Choose columns'),
- 
                                'start_date'                            => 
$start_date,
                                'end_date'                                      
=> $end_date,
--- 427,430 ----
***************
*** 534,537 ****
--- 532,537 ----
                                
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
 . $this->acl2_location);
                        }
+                       $this->config                           = 
CreateObject('phpgwapi.config',$this->currentapp);
+                       $this->bolocation                       = 
CreateObject($this->currentapp.'.bolocation');
  
                        $id                             = 
get_var('id',array('POST','GET'));
***************
*** 886,889 ****
--- 886,891 ----
                        }
  
+                       $this->config                           = 
CreateObject('phpgwapi.config',$this->currentapp);
+                       $this->bolocation                       = 
CreateObject($this->currentapp.'.bolocation');
                        $id     = get_var('id',array('POST','GET'));
                        $values         = $this->bo->read_single($id);

Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** class.boworkorder.inc.php   28 Oct 2003 15:14:38 -0000      1.19
--- class.boworkorder.inc.php   29 Oct 2003 17:28:43 -0000      1.20
***************
*** 305,321 ****
  
                        $this->uicols   = $this->so->uicols;
- //                    $cols_extra             = $this->so->cols_extra;
  
                        for ($i=0; $i<count($workorder); $i++)
                        {
                                $workorder[$i]['entry_date'] = 
$GLOBALS['phpgw']->common->show_date($workorder[$i]['entry_date'],$dateformat);
- 
- /*                            $solocation = 
CreateObject($this->currentapp.'.solocation');
-                               
$location_data=$solocation->read_single($workorder[$i]['location_code']);
-                               for ($j=0;$j<count($cols_extra);$j++)
-                               {
-                                       $workorder[$i][$cols_extra[$j]] = 
$location_data[$cols_extra[$j]];
-                               }
- */
                        }
  
--- 305,312 ----

Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** class.uiwo_hour.inc.php     28 Oct 2003 15:14:41 -0000      1.39
--- class.uiwo_hour.inc.php     29 Oct 2003 17:28:42 -0000      1.40
***************
*** 347,353 ****
                                'total_hours_records'                   => 
$common_data['total_hours_records'],
                                'lang_total_records'                    => 
lang('Total records'),
- 
-                               'total_hours_records'                   => 
$common_data['total_hours_records'],
-                               'lang_total_records'                    => 
lang('Total records'),
                                'table_header_hour'                             
=> $common_data['table_header'],
                                'values_hour'                                   
=> $common_data['content'],
--- 347,350 ----

Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** class.soinvoice.inc.php     29 Sep 2003 17:53:50 -0000      1.40
--- class.soinvoice.inc.php     29 Oct 2003 17:28:44 -0000      1.41
***************
*** 28,35 ****
                        $this->account_id       = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        $this->acl2             = 
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
-                       $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
  
!                       $this->join                     = $this->socommon->join;
!                       $this->left_join        = $this->socommon->left_join;
  
                }
--- 28,34 ----
                        $this->account_id       = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        $this->acl2             = 
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
  
!                       $this->join                     = $this->bocommon->join;
!                       $this->left_join        = $this->bocommon->left_join;
  
                }

Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** class.uiworkorder.inc.php   28 Oct 2003 15:14:38 -0000      1.47
--- class.uiworkorder.inc.php   29 Oct 2003 17:28:42 -0000      1.48
***************
*** 523,527 ****
                                        $function_msg = lang('Edit Workorder');
  
!                                       if ($values['approval'])
                                        {
                                                
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
--- 523,527 ----
                                        $function_msg = lang('Edit Workorder');
  
!                                       if ($values['approval'] && 
$values['mail_address'])
                                        {
                                                
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** class.bocommon.inc.php      28 Oct 2003 15:14:36 -0000      1.89
--- class.bocommon.inc.php      29 Oct 2003 17:28:42 -0000      1.90
***************
*** 461,464 ****
--- 461,496 ----
  
  
+               function initiate_ab_lookup($data)
+               {
+ //_debug_array($data);
+                       $contacts                       = 
CreateObject('phpgwapi.contacts');
+ 
+                       if($data['type']=='view')
+                       {
+                               
$GLOBALS['phpgw']->xslttpl->add_file(array('ab_view'));
+                       }
+                       else
+                       {
+                               
$GLOBALS['phpgw']->xslttpl->add_file(array('ab_form'));
+                       }
+ 
+                       $contact['ab_id']                       = 
$data['ab_id'];
+                       $contact['org_name']            = $data['org_name'];
+ 
+                       if($data['ab_id'] && !$data['ab_name'])
+                       {
+                               $ab_data                                        
= 
$contacts->read_single_entry($data['ab_id'],array('org_name'=>'org_name','email'=>'email'));
+                               $contact['org_name']            = 
$ab_data[0]['org_name'];
+                       }
+ 
+                       $contact['contact_link']                                
= 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook');
+                       $contact['input_text']                                  
= $data['input_text'];
+                       $contact['status_text']                                 
= $data['status_text'];
+ 
+                       unset($contacts);
+ //_debug_array($contact);
+                       return $contact;
+               }
+ 
                function initiate_ui_vendorlookup($data)
                {
***************
*** 494,497 ****
--- 526,530 ----
                }
  
+ 
                function initiate_ui_budget_account_lookup($data)
                {
***************
*** 849,853 ****
                                $uicols['statustext'][]         = 
$location_types[$i]['descr'];
                        }
! 
                        $location_cols_count    = count($fm_location_cols);
  
--- 882,886 ----
                                $uicols['statustext'][]         = 
$location_types[$i]['descr'];
                        }
! /*
                        $location_cols_count    = count($fm_location_cols);
  
***************
*** 856,860 ****
                                if($fm_location_cols[$i]['list']==1)
                                {
!                                       $cols_extra[]                           
= $fm_location_cols[$i]['column_name'];
                                        $cols_return[]                          
= $fm_location_cols[$i]['column_name'];
                                        $uicols['input_type'][]         = 
'text';
--- 889,893 ----
                                if($fm_location_cols[$i]['list']==1)
                                {
!                                       $cols_extra[]                           
= $fm_location_cols[$i]['column_name']; // only for lookup
                                        $cols_return[]                          
= $fm_location_cols[$i]['column_name'];
                                        $uicols['input_type'][]         = 
'text';
***************
*** 865,869 ****
                        }
  
! 
                        for ($i=0; $i< $this->type_id; $i++)
                        {
--- 898,902 ----
                        }
  
! */
                        for ($i=0; $i< $this->type_id; $i++)
                        {
***************
*** 909,913 ****
  
                                                $cols_return[]                  
        = 'street_name';
!                                               $cols_extra[]                   
        = 'street_name';
                                                $uicols['input_type'][]         
= 'hidden';
                                                $uicols['name'][]               
        = 'street_name';
--- 942,946 ----
  
                                                $cols_return[]                  
        = 'street_name';
!       //                                      $cols_extra[]                   
        = 'street_name';
                                                $uicols['input_type'][]         
= 'hidden';
                                                $uicols['name'][]               
        = 'street_name';
***************
*** 916,920 ****
  
                                                $cols_return[]                  
        = 'street_number';
!                                               $cols_extra[]                   
        = 'street_number';
                                                $uicols['input_type'][]         
= 'hidden';
                                                $uicols['name'][]               
        = 'street_number';
--- 949,953 ----
  
                                                $cols_return[]                  
        = 'street_number';
!       //                                      $cols_extra[]                   
        = 'street_number';
                                                $uicols['input_type'][]         
= 'hidden';
                                                $uicols['name'][]               
        = 'street_number';
***************
*** 923,927 ****
  
                                                $cols_return[]                  
        = $config[$i]['column_name'];
!                                               $cols_extra[]                   
        = $config[$i]['column_name'];
                                                $uicols['input_type'][]         
= 'hidden';
                                                $uicols['name'][]               
        = $config[$i]['column_name'];
--- 956,960 ----
  
                                                $cols_return[]                  
        = $config[$i]['column_name'];
!       //                                      $cols_extra[]                   
        = $config[$i]['column_name'];
                                                $uicols['input_type'][]         
= 'hidden';
                                                $uicols['name'][]               
        = $config[$i]['column_name'];
***************
*** 932,936 ****
                                        {
                                                $cols_return[]                  
        = $config[$i]['column_name'];
!                                               $cols_extra[]                   
        = $config[$i]['column_name'];
                                                $uicols['input_type'][]         
= 'text';
                                                $uicols['name'][]               
        = $config[$i]['column_name'];
--- 965,969 ----
                                        {
                                                $cols_return[]                  
        = $config[$i]['column_name'];
!       //                                      $cols_extra[]                   
        = $config[$i]['column_name'];
                                                $uicols['input_type'][]         
= 'text';
                                                $uicols['name'][]               
        = $config[$i]['column_name'];

Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** class.uiproject.inc.php     28 Oct 2003 15:14:38 -0000      1.53
--- class.uiproject.inc.php     29 Oct 2003 17:28:43 -0000      1.54
***************
*** 623,627 ****
                                        }
  
!                                       if ($values['approval'])
                                        {
                                                
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
--- 623,627 ----
                                        }
  
!                                       if ($values['approval'] && 
$values['mail_address'])
                                        {
                                                
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
***************
*** 633,637 ****
  
                                                $subject = lang(Approval).": ". 
$values['project_id'];
!                                               $message = lang(Project) . " " 
. $values['project_id'] ." ". lang(needs_approval);
  
                                                $mail_method= 
$config->config_data['fmwrkorder_mail'];
--- 633,637 ----
  
                                                $subject = lang(Approval).": ". 
$values['project_id'];
!                                               $message = lang(Project) . " " 
. $values['project_id'] ." ". lang('needs approval');
  
                                                $mail_method= 
$config->config_data['fmwrkorder_mail'];
***************
*** 640,648 ****
                                                        $bcc = 
$coordinator_email;
                                                        $send = 
CreateObject('phpgwapi.send');
!                                                       $rcpt = 
$send->msg('email', $to_approval_from_email, $subject, stripslashes($message), 
'', $cc, $bcc, $coordinator_email, $coordinator_name, 'plain');
                                                }
                                                elseif 
($mail_method=='sendmail'):
                                                {
!                                                       
$rcpt=mail($to_approval_from_email,$subject,$message, $headers);
                                                }
                                                else:
--- 640,648 ----
                                                        $bcc = 
$coordinator_email;
                                                        $send = 
CreateObject('phpgwapi.send');
!                                                       $rcpt = 
$send->msg('email',$values['mail_address'], $subject, stripslashes($message), 
'', $cc, $bcc, $coordinator_email, $coordinator_name, 'plain');
                                                }
                                                elseif 
($mail_method=='sendmail'):
                                                {
!                                                       
$rcpt=mail($values['mail_address'],$subject,$message, $headers);
                                                }
                                                else:

Index: class.soreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soreport.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** class.soreport.inc.php      22 Oct 2003 17:01:09 -0000      1.14
--- class.soreport.inc.php      29 Oct 2003 17:28:44 -0000      1.15
***************
*** 121,125 ****
                        {
                                
$user_columns=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['report_columns_'.$cat_id];
!                               if (isset($user_columns) AND 
is_array($user_columns))
                                {
                                        foreach($user_columns as $column_id)
--- 121,127 ----
                        {
                                
$user_columns=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['report_columns_'.$cat_id];
! //_debug_array($user_columns);
! 
!                               if (isset($user_columns) AND 
is_array($user_columns) AND $user_columns[0])
                                {
                                        foreach($user_columns as $column_id)
***************
*** 135,143 ****
                                                        'name'  => 
$this->db->f('name'),
                                                        'datatype'      => 
$this->db->f('datatype'),
!                                                       'attrib_id'     => 
$this->db->f('id')
                                                );
                                        }
                                }
                        }
  
                        $joinmethod .= " $this->join  fm_report_type ON 
($entity_table.report_type_id = fm_report_type.id))";
--- 137,147 ----
                                                        'name'  => 
$this->db->f('name'),
                                                        'datatype'      => 
$this->db->f('datatype'),
!                                                       'attrib_id'     => 
$column_id
                                                );
                                        }
                                }
                        }
+ 
+ //_debug_array($cols_return_extra);
  
                        $joinmethod .= " $this->join  fm_report_type ON 
($entity_table.report_type_id = fm_report_type.id))";

Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.uientity.inc.php      28 Oct 2003 15:14:37 -0000      1.5
--- class.uientity.inc.php      29 Oct 2003 17:28:42 -0000      1.6
***************
*** 555,562 ****
                                        $id = $values['id'];
                                        $function_msg = lang('edit entity');
-                                       if($values_attribute)
-                                       {
- //                                            
$this->bo->save_attributes($values_attribute,'entity');
-                                       }
                                }
                                else
--- 555,558 ----

Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** class.uiinvoice.inc.php     28 Oct 2003 15:14:40 -0000      1.39
--- class.uiinvoice.inc.php     29 Oct 2003 17:28:43 -0000      1.40
***************
*** 40,44 ****
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon');
                        $this->menu                                     = 
CreateObject($this->currentapp.'.menu');
-                       $this->bolocation                       = 
CreateObject($this->currentapp.'.bolocation');
  
                        $this->start                            = 
$this->bo->start;
--- 40,43 ----
***************
*** 272,277 ****
                        if ($paid)
                        {
                                $data['user_list']                              
                = 
$this->bo->get_invoice_user_list('select',$this->user_lid,array('all'),$default='all');
!                               
$location_data=$this->bolocation->initiate_ui_location(array('type_id'=> 1));
  
                                $data['cat_list']                               
                = $this->bo->select_category('select',$this->cat_id);
--- 271,277 ----
                        if ($paid)
                        {
+                               $bolocation                     = 
CreateObject($this->currentapp.'.bolocation');
                                $data['user_list']                              
                = 
$this->bo->get_invoice_user_list('select',$this->user_lid,array('all'),$default='all');
!                               
$location_data=$bolocation->initiate_ui_location(array('type_id'=> 1));
  
                                $data['cat_list']                               
                = $this->bo->select_category('select',$this->cat_id);
***************
*** 733,737 ****
                        $data['lang_vendor']                                    
= lang('Vendor');
  
!                       
$location_data=$this->bolocation->initiate_ui_location(array('type_id'=> 1));
  
                        $data['property_link']                                  
= 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&lookup=1&type_id=1&lookup_name=0');
--- 733,738 ----
                        $data['lang_vendor']                                    
= lang('Vendor');
  
!                       $bolocation                     = 
CreateObject($this->currentapp.'.bolocation');
!                       
$location_data=$bolocation->initiate_ui_location(array('type_id'=> 1));
  
                        $data['property_link']                                  
= 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&lookup=1&type_id=1&lookup_name=0');





reply via email to

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