phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.70, 1.71


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.70, 1.71 class.boinvoice.inc.php, 1.23, 1.24 class.botts.inc.php, 1.17, 1.18 class.soinvoice.inc.php, 1.34, 1.35 class.uilocation.inc.php, 1.27, 1.28 hook_settings.inc.php, 1.8, 1.9
Date: Tue, 02 Sep 2003 13:44:41 -0400

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

Modified Files:
        class.bocommon.inc.php class.boinvoice.inc.php 
        class.botts.inc.php class.soinvoice.inc.php 
        class.uilocation.inc.php hook_settings.inc.php 
Log Message:
no message

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** class.bocommon.inc.php      12 Aug 2003 17:02:40 -0000      1.70
--- class.bocommon.inc.php      2 Sep 2003 17:44:38 -0000       1.71
***************
*** 464,468 ****
                                $previous_sub = 
$GLOBALS['phpgw']->session->appsession('previous_sub',$currentapp,$sub);
  
- 
                                $i=0;
                                $menu['module'][$i]['link']             = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&type_id=1');
--- 464,467 ----
***************
*** 530,533 ****
--- 529,539 ----
                                                
$menu['sub_menu'][$i]['statustext'] = $location[$j]['descr'];
                                        }
+ 
+                                       $config_tenant = 
$this->soadmin_location->read_config_single('tenant_id');
+ 
+                                       $i++;
+                                       $menu['sub_menu'][$i]['link']           
        =       
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&lookup_tenant=1&type_id='
 . $config_tenant);
+                                       $menu['sub_menu'][$i]['name']           
        =       lang('Tenant');
+                                       $menu['sub_menu'][$i]['statustext']     
        =       lang('Tenant');
  
                                        $i++;

Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.boinvoice.inc.php     27 Jul 2003 15:53:24 -0000      1.23
--- class.boinvoice.inc.php     2 Sep 2003 17:44:38 -0000       1.24
***************
*** 19,24 ****
        {
                var $db = '';
-               var $grants = '';
- 
  
                function boinvoice($session=False)
--- 19,22 ----
***************
*** 160,208 ****
                                        $voucher_id=$values['voucher_id'][$n];
  
!                                       $check_count = 
$this->so->check_count($voucher_id);
! //_debug_array($check_count);
! 
  
!                                       if (!($check_count['dima_count'] == 
$values['invoice_count'][$n]))
                                        {
-                                               $receipt['error'][] = 
array('msg'=>lang('Dima is missing from sub invoice in:'). " 
".$values['voucher_id'][$n]);
-                                               $local_error= true;
-                                       }
  
  
  
-                                       if 
(!($check_count['spbudact_code_count'] == $values['invoice_count'][$n]))
-                                       {
-                                               $receipt['error'][] = 
array('msg'=>lang('Budget code is missing from sub invoice in :'). " 
".$values['voucher_id'][$n]);
-                                               $local_error= true;
-                                       }
  
  
  
-                                       $blank_date = '';
-                                       $sign_field='';
-                                       $sign_id='';
-                                       $sign_date_field='';
-                                       $sign_date='';
-                                       $kommma='';
-                                       $wait_for_kreditnota='';
-                                       $user_lid       
=strtoupper($GLOBALS['phpgw_info']['user']['account_lid']);
  
!                                       if (($values['sign'][$n]=='sign_none') 
&& ($values['sign_orig'][$n]=='janitor')):
!                                               $blank_date = 'oppsynsigndato= 
NULL';
!                                               $sign_field='';
!                                               $sign_id='';
!                                               $sign_date_field='';
!                                               $sign_date='';
!                                               $kommma='';
!                                       elseif 
(($values['sign'][$n]=='sign_none') && 
($values['sign_orig'][$n]=='supervisor')):
!                                               $blank_date = 'saksigndato= 
NULL';
!                                               $sign_field='';
!                                               $sign_id='';
!                                               $sign_date_field='';
!                                               $sign_date='';
!                                               $kommma='';
!                                       elseif 
(($values['sign'][$n]=='sign_none') && 
($values['sign_orig'][$n]=='budget_responsible')):
!                                               $blank_date = 
'budsjettsigndato= NULL';
                                                $sign_field='';
                                                $sign_id='';
--- 158,190 ----
                                        $voucher_id=$values['voucher_id'][$n];
  
!                                       
$check_value=array('voucher_id'=>$voucher_id,
!                                                       'sign_orig'             
=> $values['sign_orig'][$n],
!                                                       'sign'                  
=> $values['sign'][$n],
!                                                       'transfer'              
=> $values['transfer'][$n],
!                                                       'kreditnota'    => 
$values['kreditnota'][$n],
!                                                       'num_days'              
=> $values['num_days'][$n]);
  
!                                       
if($this->so->check_for_updates($check_value))
                                        {
  
+                                               $check_count = 
$this->so->check_count($voucher_id);
  
+                                               if 
(!($check_count['dima_count'] == $values['invoice_count'][$n]))
+                                               {
+                                                       $receipt['error'][] = 
array('msg'=>lang('Dima is missing from sub invoice in:'). " 
".$values['voucher_id'][$n]);
+                                                       $local_error= true;
+                                               }
  
  
  
+                                               if 
(!($check_count['spbudact_code_count'] == $values['invoice_count'][$n]))
+                                               {
+                                                       $receipt['error'][] = 
array('msg'=>lang('Budget code is missing from sub invoice in :'). " 
".$values['voucher_id'][$n]);
+                                                       $local_error= true;
+                                               }
  
  
! 
!                                               $blank_date = '';
                                                $sign_field='';
                                                $sign_id='';
***************
*** 210,333 ****
                                                $sign_date='';
                                                $kommma='';
!                                       elseif 
($values['sign'][$n]=='sign_janitor' && !$values['sign_orig'][$n]):
!                                               $blank_date = '';
!                                               $sign_field = 'oppsynsmannid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'oppsynsigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_janitor' && $values['sign_orig'][$n]=='supervisor'):
!                                               $blank_date = 'saksigndato= 
NULL';
!                                               $sign_field = 'oppsynsmannid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'oppsynsigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_janitor' && 
$values['sign_orig'][$n]=='budget_responsible'):
!                                               $blank_date = 
'budsjettsigndato= NULL';
!                                               $sign_field = 'oppsynsmannid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'oppsynsigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_supervisor' && !$values['sign_orig'][$n]):
!                                               $blank_date = '';
!                                               $sign_field = 
'saksbehandlerid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'saksigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_supervisor' && $values['sign_orig'][$n]=='janitor'):
!                                               $blank_date = 'oppsynsigndato= 
NULL';
!                                               $sign_field = 
'saksbehandlerid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'saksigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_supervisor' && 
$values['sign_orig'][$n]=='budget_responsible'):
!                                               $blank_date = 
'budsjettsigndato= NULL';
!                                               $sign_field = 
'saksbehandlerid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'saksigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_budget_responsible' && 
$values['sign_orig'][$n]=='janitor'):
!                                               $blank_date = 'oppsynsigndato= 
NULL';
!                                               $sign_field = 
'budsjettansvarligid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'budsjettsigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_budget_responsible' && 
$values['sign_orig'][$n]=='supervisor'):
!                                               $blank_date = 'saksigndato= 
NULL';
!                                               $sign_field = 
'budsjettansvarligid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'budsjettsigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       elseif 
($values['sign'][$n]=='sign_budget_responsible' && !$values['sign_orig'][$n]):
!                                               $blank_date = '';
!                                               $sign_field = 
'budsjettansvarligid=';
!                                               $sign_id = "'$user_lid'";
!                                               $sign_date_field = 
'budsjettsigndato=';
!                                               $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
!                                               $kommma=",";
!                                       endif;
  
  
!                                       if($blank_date )
!                                       {
!                                               $kommma_blank=",";
                                        }
-                                       else
-                                       {
-                                               $kommma_blank='';
-                                       }
- 
-                                       $transfer_sign_field='utbetalingid=';
-                                       
$transfer_date_field='utbetalingsigndato=';
- 
-                                       if 
(!($values['num_days_orig'][$n]==$values['num_days'][$n]))
-                                       {
-                                               $payment_date = 
date($this->bocommon->dateformat,$values['timestamp_voucher_date'][$n]+(24*3600*$values['num_days'][$n]));
-                                               
$GLOBALS['phpgw']->db->query("update fm_ecobilag set forfallsdato= 
'$payment_date' where bilagsnr='$voucher_id'");
-                                       }
- 
-                                       if ($values['transfer'][$n])
-                                       {
- 
-                                               $transfer_id="'$user_lid',";
-                                               $transfer_date="'" . 
date($this->bocommon->datetimeformat) . "'";
-                                       }
-                                       else
-                                       {
-                                               $transfer_id="Null".",";
-                                               $transfer_date="Null";
-                                       }
- 
-                                       if ($values['kreditnota'][$n])
-                                       {
-                                               $wait_for_kreditnota=1;
-                                               $transfer_date="Null";
-                                       }
-                                       else
-                                       {
-                                               $wait_for_kreditnota='NULL';
-                                       }
- 
-                                       if (! $local_error)
-                                       {
- 
-                                               $sql= "update fm_ecobilag set 
$blank_date $kommma_blank $sign_field $sign_id $kommma $sign_date_field 
$sign_date $kommma $transfer_sign_field $transfer_id $transfer_date_field 
$transfer_date ,kreditnota=$wait_for_kreditnota  where bilagsnr='$voucher_id'";
-                                               
$GLOBALS['phpgw']->db->query($sql);
- //                                    echo $sql.'<br>';
- 
-                                               $receipt['message'][] = 
array('msg'=> lang('voucher is updated: ') . $voucher_id);
-                                       }
- 
- 
                                }
- 
- 
                        }
  
--- 192,336 ----
                                                $sign_date='';
                                                $kommma='';
!                                               $wait_for_kreditnota='';
!                                               $user_lid       
=strtoupper($GLOBALS['phpgw_info']['user']['account_lid']);
  
+                                               if 
(($values['sign'][$n]=='sign_none') && ($values['sign_orig'][$n]=='janitor')):
+                                                       $blank_date = 
'oppsynsigndato= NULL';
+                                                       $sign_field='';
+                                                       $sign_id='';
+                                                       $sign_date_field='';
+                                                       $sign_date='';
+                                                       $kommma='';
+                                               elseif 
(($values['sign'][$n]=='sign_none') && 
($values['sign_orig'][$n]=='supervisor')):
+                                                       $blank_date = 
'saksigndato= NULL';
+                                                       $sign_field='';
+                                                       $sign_id='';
+                                                       $sign_date_field='';
+                                                       $sign_date='';
+                                                       $kommma='';
+                                               elseif 
(($values['sign'][$n]=='sign_none') && 
($values['sign_orig'][$n]=='budget_responsible')):
+                                                       $blank_date = 
'budsjettsigndato= NULL';
+                                                       $sign_field='';
+                                                       $sign_id='';
+                                                       $sign_date_field='';
+                                                       $sign_date='';
+                                                       $kommma='';
+                                               elseif 
($values['sign'][$n]=='sign_janitor' && !$values['sign_orig'][$n]):
+                                                       $blank_date = '';
+                                                       $sign_field = 
'oppsynsmannid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'oppsynsigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_janitor' && $values['sign_orig'][$n]=='supervisor'):
+                                                       $blank_date = 
'saksigndato= NULL';
+                                                       $sign_field = 
'oppsynsmannid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'oppsynsigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_janitor' && 
$values['sign_orig'][$n]=='budget_responsible'):
+                                                       $blank_date = 
'budsjettsigndato= NULL';
+                                                       $sign_field = 
'oppsynsmannid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'oppsynsigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_supervisor' && !$values['sign_orig'][$n]):
+                                                       $blank_date = '';
+                                                       $sign_field = 
'saksbehandlerid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'saksigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_supervisor' && $values['sign_orig'][$n]=='janitor'):
+                                                       $blank_date = 
'oppsynsigndato= NULL';
+                                                       $sign_field = 
'saksbehandlerid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'saksigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_supervisor' && 
$values['sign_orig'][$n]=='budget_responsible'):
+                                                       $blank_date = 
'budsjettsigndato= NULL';
+                                                       $sign_field = 
'saksbehandlerid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'saksigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_budget_responsible' && 
$values['sign_orig'][$n]=='janitor'):
+                                                       $blank_date = 
'oppsynsigndato= NULL';
+                                                       $sign_field = 
'budsjettansvarligid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'budsjettsigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_budget_responsible' && 
$values['sign_orig'][$n]=='supervisor'):
+                                                       $blank_date = 
'saksigndato= NULL';
+                                                       $sign_field = 
'budsjettansvarligid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'budsjettsigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               elseif 
($values['sign'][$n]=='sign_budget_responsible' && !$values['sign_orig'][$n]):
+                                                       $blank_date = '';
+                                                       $sign_field = 
'budsjettansvarligid=';
+                                                       $sign_id = 
"'$user_lid'";
+                                                       $sign_date_field = 
'budsjettsigndato=';
+                                                       $sign_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                                       $kommma=",";
+                                               endif;
+ 
+ 
+                                               if($blank_date )
+                                               {
+                                                       $kommma_blank=",";
+                                               }
+                                               else
+                                               {
+                                                       $kommma_blank='';
+                                               }
+ 
+                                               
$transfer_sign_field='utbetalingid=';
+                                               
$transfer_date_field='utbetalingsigndato=';
+ 
+                                               if 
(!($values['num_days_orig'][$n]==$values['num_days'][$n]))
+                                               {
+                                                       $payment_date = 
date($this->bocommon->dateformat,$values['timestamp_voucher_date'][$n]+(24*3600*$values['num_days'][$n]));
+                                                       
$GLOBALS['phpgw']->db->query("update fm_ecobilag set forfallsdato= 
'$payment_date' where bilagsnr='$voucher_id'");
+                                               }
+ 
+                                               if ($values['transfer'][$n])
+                                               {
+ 
+                                                       
$transfer_id="'$user_lid',";
+                                                       $transfer_date="'" . 
date($this->bocommon->datetimeformat) . "'";
+                                               }
+                                               else
+                                               {
+                                                       $transfer_id="Null".",";
+                                                       $transfer_date="Null";
+                                               }
+ 
+                                               if ($values['kreditnota'][$n])
+                                               {
+                                                       $wait_for_kreditnota=1;
+                                                       $transfer_date="Null";
+                                               }
+                                               else
+                                               {
+                                                       
$wait_for_kreditnota='NULL';
+                                               }
+ 
+                                               if (! $local_error)
+                                               {
+                                                       $sql= "update 
fm_ecobilag set $blank_date $kommma_blank $sign_field $sign_id $kommma 
$sign_date_field $sign_date $kommma $transfer_sign_field $transfer_id 
$transfer_date_field $transfer_date ,kreditnota=$wait_for_kreditnota  where 
bilagsnr='$voucher_id'";
+                                                       
$GLOBALS['phpgw']->db->transaction_begin();
+                                                       
$GLOBALS['phpgw']->db->query($sql);
+                                                       
$GLOBALS['phpgw']->db->transaction_commit();
  
!                                                       $receipt['message'][] = 
array('msg'=> lang('voucher is updated: ') . $voucher_id);
!                                               }
                                        }
                                }
                        }
  

Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.botts.inc.php 29 Aug 2003 16:17:55 -0000      1.17
--- class.botts.inc.php 2 Sep 2003 17:44:38 -0000       1.18
***************
*** 686,690 ****
                        if (!$rc)
                        {
!                               $receipt['error'][$errorcount++] = 
array('msg'=> lang('But Your message could not be sent by mail!'));
                                $receipt['error'][$errorcount++] = 
array('msg'=> lang('The mail server returned'));
                                $receipt['error'][$errorcount++] = 
array('msg'=> 'From :' . $current_user_name . '<' . $current_user_address .'>');
--- 686,690 ----
                        if (!$rc)
                        {
!                               $receipt['error'][$errorcount++] = 
array('msg'=> lang('Your message could not be sent by mail!'));
                                $receipt['error'][$errorcount++] = 
array('msg'=> lang('The mail server returned'));
                                $receipt['error'][$errorcount++] = 
array('msg'=> 'From :' . $current_user_name . '<' . $current_user_address .'>');

Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.soinvoice.inc.php     1 Sep 2003 19:26:54 -0000       1.34
--- class.soinvoice.inc.php     2 Sep 2003 17:44:38 -0000       1.35
***************
*** 503,506 ****
--- 503,543 ----
                }
  
+               function check_for_updates($values)
+               {
+                       $update=False;
+ 
+                       if($values['sign_orig']!=$values['sign'])
+                       {
+                               $update=True;
+                               return $update;
+                       }
+ 
+                       $sql = "SELECT * FROM fm_ecobilag WHERE bilagsnr=" . 
$values['voucher_id'];
+                       $this->db->limit_query($sql,0,__LINE__,__FILE__,1);
+ 
+                       $this->db->next_record();
+ 
+                       if( ($this->db->f('utbetalingsigndato') && 
!$values['transfer']) || (!$this->db->f('utbetalingsigndato') && 
$values['transfer']))
+                       {
+                               $update=True;
+                               return $update;
+                       }
+ 
+                       if( ($this->db->f('kreditnota') && 
!$values['kreditnota']) || (!$this->db->f('kreditnota') && 
$values['kreditnota']) )
+                       {
+                               $update=True;
+                               return $update;
+                       }
+ 
+                       $timestamp_voucher_date= 
mktime(0,0,0,date(m,strtotime($this->db->f('fakturadato'))),date(d,strtotime($this->db->f('fakturadato'))),date(y,strtotime($this->db->f('fakturadato'))));
+                       $timestamp_payment_date= 
mktime(0,0,0,date(m,strtotime($this->db->f('forfallsdato'))),date(d,strtotime($this->db->f('forfallsdato'))),date(y,strtotime($this->db->f('forfallsdato'))));
+ 
+                       if( 
((intval(($timestamp_payment_date-$timestamp_voucher_date)/(24*3600)))!=$values['num_days'])
 )
+                       {
+                               $update=True;
+                               return $update;
+                       }
+               }
+ 
                function update_invoice_sub($values)
                {

Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uilocation.inc.php    29 Aug 2003 16:17:55 -0000      1.27
--- class.uilocation.inc.php    2 Sep 2003 17:44:38 -0000       1.28
***************
*** 126,130 ****
                                                                
$content[$j]['row'][$i]['statustext']                   = lang('search');
                                                                
$content[$j]['row'][$i]['text']                                 = 
$location[$uicols['name'][$i]];
!                                                               
$content[$j]['row'][$i]['link']                         = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&query='
 . $location['query_location'][$uicols['name'][$i]] . '&lookup=' . $lookup . 
'&type_id=' . $type_id);
                                                        }
                                                        else
--- 126,130 ----
                                                                
$content[$j]['row'][$i]['statustext']                   = lang('search');
                                                                
$content[$j]['row'][$i]['text']                                 = 
$location[$uicols['name'][$i]];
!                                                               
$content[$j]['row'][$i]['link']                         = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&query='
 . $location['query_location'][$uicols['name'][$i]] . '&lookup=' . $lookup . 
'&type_id=' . $type_id . '&lookup_tenant=' . $lookup_tenant . '&lookup_name=' . 
$lookup_name);
                                                        }
                                                        else
***************
*** 339,349 ****
                        {
                                $lookup_list    = 
$GLOBALS['phpgw']->session->appsession('lookup_name',$this->currentapp);
- //_debug_array($lookup_list);
- 
                                $function_msg                                   
= $lookup_list[$lookup_name];
                        }
                        else
                        {
!                               $function_msg                                   
= $uicols['descr'][($type_id-1)];
                        }
  
--- 339,354 ----
                        {
                                $lookup_list    = 
$GLOBALS['phpgw']->session->appsession('lookup_name',$this->currentapp);
                                $function_msg                                   
= $lookup_list[$lookup_name];
                        }
                        else
                        {
!                               if($lookup_tenant)
!                               {
!                                       $function_msg                           
        = lang('Tenant');
!                               }
!                               else
!                               {
!                                       $function_msg                           
        = $uicols['descr'][($type_id-1)];
!                               }
                        }
  

Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** hook_settings.inc.php       28 Jun 2003 17:57:57 -0000      1.8
--- hook_settings.inc.php       2 Sep 2003 17:44:38 -0000       1.9
***************
*** 74,88 ****
        create_select_box('Workorder Approval 
From','workorder_approval_from',$_accounts,'If you need approval from your 
supervisor for projects/workorders');
  
! /*    
$email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
! 
!       $GLOBALS['phpgw']->preferences->add("property","email",$email);
        $GLOBALS['phpgw']->preferences->save_repository();
-       echo 'email: '.$email .'<BR>';
  
!       if(!$email)
        {
!               create_input_box('Yout Email','email');
        }
! */
  
  /*    $categories = CreateObject('phpgwapi.categories');
--- 74,88 ----
        create_select_box('Workorder Approval 
From','workorder_approval_from',$_accounts,'If you need approval from your 
supervisor for projects/workorders');
  
!       
$email_property=$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
!       $GLOBALS['phpgw']->preferences->add("email","address",$email_property);
        $GLOBALS['phpgw']->preferences->save_repository();
  
! //    echo 'email: '.$email .'<BR>';
! 
!       if(!$email_org)
        {
!               create_input_box('Your Email','email','Insert your email 
address');
        }
! 
  
  /*    $categories = CreateObject('phpgwapi.categories');





reply via email to

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