[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.46,1.47 class.uiprojects.inc.php,1.55,1.56 hook_add_def_pref.inc.php,1.2,1.3

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv31173/inc

Modified Files:
        class.boprojects.inc.php class.uiprojects.inc.php 
        hook_add_def_pref.inc.php 
Log Message:
fixed some mismatch in prefs settings

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** class.boprojects.inc.php    5 Jul 2002 20:38:55 -0000       1.46
--- class.boprojects.inc.php    18 Aug 2002 22:36:06 -0000      1.47
***************
*** 231,241 ****
                        if (! isset($prefs['country']) || (! 
isset($prefs['currency'])))
                        {
!                               $error[] = lang('Please set your global 
preferences !');
                        }
  
!                       if (! isset($prefs['abid']) || (! isset($prefs['tax'])) 
|| (! isset($prefs['bill'])) || (! isset($prefs['ifont'])) || (! 
isset($prefs['mysize'])) || (! isset($prefs['allsize'])))
                        {
!                               $error[] = lang('Please set your preferences 
for this application !');
!                       }
                        return $error;
                }
--- 231,244 ----
                        if (! isset($prefs['country']) || (! 
isset($prefs['currency'])))
                        {
!                               $error[] = lang('Please set your global 
preferences');
                        }
  
!                       if ($this->isprojectadmin('pad') || 
$this->isprojectadmin('pbo'))
                        {
!                               if (! isset($prefs['abid']) || (! 
isset($prefs['tax'])) || (! isset($prefs['bill'])) || (! 
isset($prefs['ifont'])) || (! isset($prefs['mysize'])) || (! 
isset($prefs['allsize'])))
!                               {
!                                       $error[] = lang('Please set your 
preferences for this application');
!                               }
!                       ]
                        return $error;
                }
***************
*** 250,261 ****
                        $prefs['country']       = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
  
!                       if 
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
                        {
!                               $prefs['abid']          = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['abid'];
!                               $prefs['tax']           = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['tax'];
!                               $prefs['bill']          = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
!                               $prefs['ifont']         = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['ifont'];
!                               $prefs['mysize']        = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize'];
!                               $prefs['allsize']       = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize'];
                        }
                        return $prefs;
--- 253,267 ----
                        $prefs['country']       = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
  
!                       if ($this->isprojectadmin('pad') || 
$this->isprojectadmin('pbo'))
                        {
!                               if 
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
!                               {
!                                       $prefs['abid']          = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['abid'];
!                                       $prefs['tax']           = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['tax'];
!                                       $prefs['bill']          = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
!                                       $prefs['ifont']         = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['ifont'];
!                                       $prefs['mysize']        = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize'];
!                                       $prefs['allsize']       = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize'];
!                               }
                        }
                        return $prefs;

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** class.uiprojects.inc.php    4 Jun 2002 13:33:19 -0000       1.55
--- class.uiprojects.inc.php    18 Aug 2002 22:36:06 -0000      1.56
***************
*** 1548,1552 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        if ($this->boprojects->isprojectadmin('pbo') || 
$this->boprojects->isprojectadmin('pad'))
--- 1548,1551 ----
***************
*** 1558,1562 ****
                                $this->set_app_langs();
  
!                               $this->t->set_var('lang_action',lang('Project 
preferences'));
  
                                if ($obill == True)
--- 1557,1561 ----
                                $this->set_app_langs();
  
!                               
$this->t->set_var('lang_action',lang('Preferences for accountancy'));
  
                                if ($obill == True)
***************
*** 1569,1575 ****
                                
$this->t->set_var('lang_select_mysize',lang('Select font size for own 
address'));
                                
$this->t->set_var('lang_select_allsize',lang('Select font size for customer 
address'));
!                               
$this->t->set_var('lang_bill',lang('Invoicing'));
!                               
$this->t->set_var('lang_select_tax',lang('Select tax for workhours'));
!                               $this->t->set_var('lang_address',lang('Select 
your address'));
  
                                $prefs = $this->boprojects->read_prefs();
--- 1568,1574 ----
                                
$this->t->set_var('lang_select_mysize',lang('Select font size for own 
address'));
                                
$this->t->set_var('lang_select_allsize',lang('Select font size for customer 
address'));
!                               $this->t->set_var('lang_bill',lang('Invoicing 
of work time'));
!                               
$this->t->set_var('lang_select_tax',lang('Select tax for work time'));
!                               $this->t->set_var('lang_address',lang('Select 
own address'));
  
                                $prefs = $this->boprojects->read_prefs();
***************
*** 1586,1590 ****
                                                        . lang('per workunit') 
. "\n";
                                $bill .= '<input type="radio" 
name="prefs[bill]" value="h"' . ($prefs['bill'] == 'h'?' checked':'') . '>'
!                                                       . lang('per hour');
  
                                $this->t->set_var('bill',$bill);
--- 1585,1589 ----
                                                        . lang('per workunit') 
. "\n";
                                $bill .= '<input type="radio" 
name="prefs[bill]" value="h"' . ($prefs['bill'] == 'h'?' checked':'') . '>'
!                                                       . lang('exactly 
accounting') . '&nbsp;[hh:mm]';
  
                                $this->t->set_var('bill',$bill);

Index: hook_add_def_pref.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_add_def_pref.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hook_add_def_pref.inc.php   5 Jan 2002 23:56:37 -0000       1.2
--- hook_add_def_pref.inc.php   18 Aug 2002 22:36:06 -0000      1.3
***************
*** 13,17 ****
        global $pref;
        $pref->change('projects','tax','16');
-       $pref->change('projects','bill','h');
        
$pref->change('projects','ifont','Tahoma,Verdana,Arial,Helvetica,sans-serif');
        $pref->change('projects','mysize','1');
--- 13,16 ----