[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.3,1
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.3,1.42.2.4 class.soprojects.inc.php,1.34.2.5,1.34.2.6 class.uiprojects.inc.php,1.47.2.5,1.47.2.6 |
Date: |
Sun, 18 Aug 2002 17:47:24 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv22215/inc
Modified Files:
Tag: Version-0_9_14-branch
class.boprojects.inc.php class.soprojects.inc.php
class.uiprojects.inc.php
Log Message:
fix for prefs settings mismatch
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -C2 -r1.42.2.3 -r1.42.2.4
*** class.boprojects.inc.php 5 Jul 2002 20:39:35 -0000 1.42.2.3
--- class.boprojects.inc.php 18 Aug 2002 21:47:21 -0000 1.42.2.4
***************
*** 240,249 ****
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;
--- 240,252 ----
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;
***************
*** 259,270 ****
$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;
--- 262,277 ----
$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.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.5
retrieving revision 1.34.2.6
diff -C2 -r1.34.2.5 -r1.34.2.6
*** class.soprojects.inc.php 4 Jun 2002 13:34:20 -0000 1.34.2.5
--- class.soprojects.inc.php 18 Aug 2002 21:47:21 -0000 1.34.2.6
***************
*** 57,65 ****
case 'wu': $l = lang('per workunit');
break;
case 'h': $l = lang('per hour'); break;
! default : $l = lang('per hour/workunit');
! }
return $l;
}
-
function read_projects($start, $limit = True, $query = '',
$filter = '', $sort = '', $order = '', $status = '', $cat_id = '', $type =
'mains', $pro_parent = '')
--- 57,64 ----
case 'wu': $l = lang('per workunit');
break;
case 'h': $l = lang('per hour'); break;
! default: $l = lang('per hour/workunit');
! }
return $l;
}
function read_projects($start, $limit = True, $query = '',
$filter = '', $sort = '', $order = '', $status = '', $cat_id = '', $type =
'mains', $pro_parent = '')
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.5
retrieving revision 1.47.2.6
diff -C2 -r1.47.2.5 -r1.47.2.6
*** class.uiprojects.inc.php 4 Jun 2002 13:34:20 -0000 1.47.2.5
--- class.uiprojects.inc.php 18 Aug 2002 21:47:21 -0000 1.47.2.6
***************
*** 1562,1566 ****
$this->set_app_langs();
! $this->t->set_var('lang_action',lang('Project
preferences'));
if ($obill == True)
--- 1562,1566 ----
$this->set_app_langs();
!
$this->t->set_var('lang_action',lang('Preferences for accountancy'));
if ($obill == True)
***************
*** 1573,1579 ****
$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();
--- 1573,1579 ----
$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();
***************
*** 1588,1594 ****
$bill = '<input type="radio" name="prefs[bill]"
value="wu"' . ($prefs['bill'] == 'wu'?' checked':'') . '>'
! . 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);
--- 1588,1594 ----
$bill = '<input type="radio" name="prefs[bill]"
value="wu"' . ($prefs['bill'] == 'wu'?' checked':'') . '>'
! . lang('per workunit')
. '<br>';
$bill .= '<input type="radio"
name="prefs[bill]" value="h"' . ($prefs['bill'] == 'h'?' checked':'') . '>'
! . lang('exactly
accounting') . ' [hh:mm]';
$this->t->set_var('bill',$bill);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.3,1.42.2.4 class.soprojects.inc.php,1.34.2.5,1.34.2.6 class.uiprojects.inc.php,1.47.2.5,1.47.2.6,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/templates/default preferences.tpl,1.19,1.19.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.2,1.17.2.3 phpgw_en.lang,1.25,1.25.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/templates/default preferences.tpl,1.19,1.19.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.2,1.17.2.3 phpgw_en.lang,1.25,1.25.2.1
- Index(es):