[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.64, 1.65 cla
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.64, 1.65 class.soprojects.inc.php, 1.52, 1.53 class.uiprojects.inc.php, 1.79, 1.80 hook_admin.inc.php, 1.14, 1.15 hook_sidebox_menu.inc.php, 1.3, 1.4 class.bobilling.inc.php, 1.10, NONE class.bodeliveries.inc.php, 1.19, NONE class.sobilling.inc.php, 1.18, NONE class.sodeliveries.inc.php, 1.22, NONE class.uibilling.inc.php, 1.33, NONE class.uideliveries.inc.php, 1.33, NONE |
|
Date: |
Mon, 01 Dec 2003 16:27:09 +0000 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv9077/inc
Modified Files:
class.boprojects.inc.php class.soprojects.inc.php
class.uiprojects.inc.php hook_admin.inc.php
hook_sidebox_menu.inc.php
Removed Files:
class.bobilling.inc.php class.bodeliveries.inc.php
class.sobilling.inc.php class.sodeliveries.inc.php
class.uibilling.inc.php class.uideliveries.inc.php
Log Message:
moved invoicing part to bookkeeping app
Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hook_sidebox_menu.inc.php 25 Nov 2003 15:34:36 -0000 1.3
--- hook_sidebox_menu.inc.php 1 Dec 2003 16:27:05 -0000 1.4
***************
*** 27,31 ****
$menu_title =
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
$file = array();
! if ($boprojects->isprojectadmin('pad'))
{
$file['Activities'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act');
--- 27,31 ----
$menu_title =
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
$file = array();
! if ($boprojects->isprojectadmin())
{
$file['Activities'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act');
***************
*** 33,41 ****
}
- if ($boprojects->isprojectadmin('pbo'))
- {
- $file['Billing'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains');
- $file['Deliveries'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains');
- }
$file['Projects'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains');
$file['Jobs'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs');
--- 33,36 ----
***************
*** 61,68 ****
{
$menu_title =
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Administration');
! $file = Array(
! 'Administration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pad'),
! 'Accountancy' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo'),
! 'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
. $appname)
);
display_sidebox($appname,$menu_title,$file);
--- 56,63 ----
{
$menu_title =
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Administration');
! $file = Array
! (
! 'project administrators' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins'),
! 'Global Categories'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
. $appname)
);
display_sidebox($appname,$menu_title,$file);
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** class.soprojects.inc.php 28 Nov 2003 23:53:50 -0000 1.52
--- class.soprojects.inc.php 1 Dec 2003 16:27:02 -0000 1.53
***************
*** 811,833 ****
}
! function return_admins($action, $type = 'all')
{
! if ($action == 'pad')
! {
! switch ($type)
! {
! case 'all': $filter = " type='aa'
or type='ag'"; break;
! case 'aa': $filter = " type='aa'";
break;
! case 'ag': $filter = " type='ag'";
break;
! }
! }
! else
{
! switch ($type)
! {
! case 'all': $filter = " type='ba'
or type='bg'"; break;
! case 'aa': $filter = " type='ba'";
break;
! case 'ag': $filter = " type='bg'";
break;
! }
}
--- 811,821 ----
}
! function return_admins($type = 'all')
{
! switch($type)
{
! case 'all': $filter = " type='aa' or
type='ag'"; break;
! case 'aa': $filter = " type='aa'"; break;
! case 'ag': $filter = " type='ag'"; break;
}
***************
*** 843,850 ****
}
! function isprojectadmin($action)
{
$admin_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
! $admins = $this->return_admins($action);
for ($i=0;$i<count($admins);$i++)
--- 831,838 ----
}
! function isprojectadmin()
{
$admin_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
! $admins = $this->return_admins('all');
for ($i=0;$i<count($admins);$i++)
***************
*** 873,920 ****
}
! function isbookkeeper($action)
! {
! $admin_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
! $admins = $this->return_admins($action);
!
! for ($i=0;$i<count($admins);$i++)
! {
! if ($admins[$i]['type']=='ba')
! {
! if ($admins[$i]['account_id'] ==
$this->account)
! return True;
! }
! elseif ($admins[$i]['type']=='bg')
! {
! if (is_array($admin_groups))
! {
! for
($j=0;$j<count($admin_groups);$j++)
! {
! if
($admin_groups[$j]['account_id'] == $admins[$i]['account_id'])
! return True;
! }
! }
! }
! else
! {
! return False;
! }
! }
! }
!
! function edit_admins($action, $users = '', $groups = '')
{
! if ($action == 'pad')
! {
! $ag = 'ag';
! $aa = 'aa';
! }
! else
! {
! $ag = 'bg';
! $aa = 'ba';
! }
! $this->db->query("DELETE from phpgw_p_projectmembers
WHERE type='" . $aa . "' OR type='" . $ag . "'",__LINE__,__FILE__);
if (is_array($users))
--- 861,870 ----
}
! function edit_admins($users = '', $groups = '')
{
! $ag = 'ag';
! $aa = 'aa';
! $this->db->query("DELETE from phpgw_p_projectmembers
WHERE type='aa' OR type='ag'",__LINE__,__FILE__);
if (is_array($users))
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_admin.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** hook_admin.inc.php 23 Oct 2003 12:15:43 -0000 1.14
--- hook_admin.inc.php 1 Dec 2003 16:27:04 -0000 1.15
***************
*** 15,22 ****
$file = Array
(
! 'Site Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname),
! 'Administration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pad'),
! 'Accountancy' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo'),
! 'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
. $appname)
);
//Do not modify below this line
--- 15,20 ----
$file = Array
(
! 'project administrators' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins'),
! 'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
. $appname)
);
//Do not modify below this line
--- class.bodeliveries.inc.php DELETED ---
--- class.bobilling.inc.php DELETED ---
--- class.sodeliveries.inc.php DELETED ---
--- class.sobilling.inc.php DELETED ---
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** class.uiprojects.inc.php 25 Nov 2003 15:34:35 -0000 1.79
--- class.uiprojects.inc.php 1 Dec 2003 16:27:04 -0000 1.80
***************
*** 165,173 ****
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! if ($this->boprojects->isprojectadmin('pad'))
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
-
$GLOBALS['phpgw']->template->set_var('break1',' | ');
-
$GLOBALS['phpgw']->template->set_var('space1',' ');
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
--- 165,171 ----
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! if ($this->boprojects->isprojectadmin())
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
***************
*** 176,190 ****
}
- if ($this->boprojects->isprojectadmin('pbo'))
- {
-
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
-
$GLOBALS['phpgw']->template->set_var('break2',' | ');
-
$GLOBALS['phpgw']->template->set_var('space2',' ');
-
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
-
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
-
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
-
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
- }
-
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
--- 174,177 ----
***************
*** 1463,1471 ****
function list_admins()
{
- $action = get_var('action',array('GET','POST'));
$link_data = array
(
! 'menuaction' =>
'projects.uiprojects.edit_admins',
! 'action' => $action
);
--- 1450,1456 ----
function list_admins()
{
$link_data = array
(
! 'menuaction' =>
'projects.uiprojects.edit_admins'
);
***************
*** 1480,1484 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action ==
'pad')?lang('administration'):lang('accountancy'));
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 1465,1469 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('administrator list');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 1498,1502 ****
}
! $admins = $this->boprojects->list_admins($action,
'both', $this->start, $this->query, $this->sort, $this->order);
//--------------------------------- nextmatch
--------------------------------------------
--- 1483,1487 ----
}
! $admins = $this->boprojects->list_admins('both',
$this->start, $this->query, $this->sort, $this->order);
//--------------------------------- nextmatch
--------------------------------------------
***************
*** 1550,1554 ****
function edit_admins()
{
- $action = get_var('action',array('GET','POST'));
$users = get_var('users',array('POST'));
$groups = get_var('groups',array('POST'));
--- 1535,1538 ----
***************
*** 1556,1566 ****
$link_data = array
(
! 'menuaction' =>
'projects.uiprojects.list_admins',
! 'action' => $action
);
if ($_POST['save'])
{
! $this->boprojects->edit_admins($action, $users,
$groups);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
--- 1540,1549 ----
$link_data = array
(
! 'menuaction' =>
'projects.uiprojects.list_admins'
);
if ($_POST['save'])
{
! $this->boprojects->edit_admins($users, $groups);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
***************
*** 1571,1575 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'pad')?lang('edit administrator
list'):lang('edit bookkeeper list'));
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 1554,1558 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('edit administrator list');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 1582,1587 ****
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('users_list',$this->boprojects->selected_admins($action,'aa'));
!
$GLOBALS['phpgw']->template->set_var('groups_list',$this->boprojects->selected_admins($action,'ag'));
$GLOBALS['phpgw']->template->set_var('lang_users_list',lang('Select users'));
$GLOBALS['phpgw']->template->set_var('lang_groups_list',lang('Select groups'));
--- 1565,1570 ----
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('users_list',$this->boprojects->selected_admins('aa'));
!
$GLOBALS['phpgw']->template->set_var('groups_list',$this->boprojects->selected_admins('ag'));
$GLOBALS['phpgw']->template->set_var('lang_users_list',lang('Select users'));
$GLOBALS['phpgw']->template->set_var('lang_groups_list',lang('Select groups'));
***************
*** 1747,1751 ****
$GLOBALS['phpgw']->template->set_var('notify_assign_selected',($prefs['notify_assign']
== 'yes'? ' checked':''));
! if ($this->boprojects->isprojectadmin('pbo') ||
$this->boprojects->isprojectadmin('pad'))
{
if ($obill)
--- 1730,1734 ----
$GLOBALS['phpgw']->template->set_var('notify_assign_selected',($prefs['notify_assign']
== 'yes'? ' checked':''));
! if ($this->boprojects->isprojectadmin('pad'))
{
if ($obill)
***************
*** 1754,1771 ****
}
-
$GLOBALS['phpgw']->template->set_var('lang_layout',lang('Invoice layout'));
-
$GLOBALS['phpgw']->template->set_var('lang_select_font',lang('Select font'));
-
$GLOBALS['phpgw']->template->set_var('lang_select_mysize',lang('Select font
size for own address'));
-
$GLOBALS['phpgw']->template->set_var('lang_select_allsize',lang('Select font
size for customer address'));
$GLOBALS['phpgw']->template->set_var('lang_bill',lang('Invoicing of work
time'));
-
$GLOBALS['phpgw']->template->set_var('lang_select_tax',lang('Select tax for
work time'));
-
$GLOBALS['phpgw']->template->set_var('lang_address',lang('Select own address'));
$GLOBALS['phpgw']->template->set_var('oldbill',$prefs['bill']);
-
$GLOBALS['phpgw']->template->set_var('addressbook_link',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.abook'));
-
-
$GLOBALS['phpgw']->template->set_var('tax',$prefs['tax']);
-
$bill = '<input type="radio" name="prefs[bill]"
value="wu"' . ($prefs['bill'] == 'wu'?' checked':'') . '>'
. lang('per workunit')
. '<br>';
--- 1737,1744 ----
***************
*** 1774,1848 ****
$GLOBALS['phpgw']->template->set_var('bill',$bill);
-
- switch($prefs['ifont'])
- {
- case'Arial,Helvetica,sans-serif':
$font_sel[0]=' selected'; break;
- case'Times New Roman,Times,serif':
$font_sel[1]=' selected'; break;
-
case'Verdana,Arial,Helvetica,sans-serif': $font_sel[2]=' selected'; break;
- case'Georgia,Times New
Roman,Times,serif': $font_sel[3]=' selected'; break;
- case'Courier New,Courier,mono':
$font_sel[4]=' selected'; break;
- case'Helvetica,Arial,sans-serif':
$font_sel[5]=' selected'; break;
-
case'Tahoma,Verdana,Arial,Helvetica,sans-serif': $font_sel[6]=' selected';
break;
- }
-
- $ifont = '<option
value="Arial,Helvetica,sans-serif"' . $font_sel[0] . '>' . lang('Arial') .
'</option>' . "\n"
- . '<option value="Times New
Roman,Times,serif"' . $font_sel[1] . '>' . lang('Times New Roman') .
'</option>' . "\n"
- . '<option
value="Verdana,Arial,Helvetica,sans-serif"' . $font_sel[2] . '>' .
lang('Verdana') . '</option>' . "\n"
- . '<option value="Georgia,Times New
Roman,Times,serif"' . $font_sel[3] . '>' . lang('Georgia') . '</option>' . "\n"
- . '<option value="Courier
New,Courier,mono"' . $font_sel[4] . '>' . lang('Courier New') . '</option>' .
"\n"
- . '<option
value="Helvetica,Arial,sans-serif"' . $font_sel[5] . '>' . lang('Helvetica') .
'</option>' . "\n"
- . '<option
value="Tahoma,Verdana,Arial,Helvetica,sans-serif"' . $font_sel[6] . '>' .
lang('Tahoma') . '</option>' . "\n";
-
-
$GLOBALS['phpgw']->template->set_var('ifont',$ifont);
-
- switch($prefs['mysize'])
- {
- case 1: $my_sel[0]=' selected'; break;
- case 2: $my_sel[1]=' selected'; break;
- case 3: $my_sel[2]=' selected'; break;
- case 4: $my_sel[3]=' selected'; break;
- case 5: $my_sel[4]=' selected'; break;
- }
-
- $mysize = '<option value="1"' . $my_sel[0] .
'>' . lang('Very Small') . '</option>' . "\n"
- . '<option value="2"' .
$my_sel[1] . '>' . lang('Small') . '</option>' . "\n"
- . '<option value="3"' .
$my_sel[2] . '>' . lang('Medium') . '</option>' . "\n"
- . '<option value="4"' .
$my_sel[3] . '>' . lang('Large') . '</option>' . "\n"
- . '<option value="5"' .
$my_sel[4] . '>' . lang('Very Large') . '</option>' . "\n";
-
-
$GLOBALS['phpgw']->template->set_var('mysize',$mysize);
-
- switch($prefs['allsize'])
- {
- case 1: $all_sel[0]=' selected'; break;
- case 2: $all_sel[1]=' selected'; break;
- case 3: $all_sel[2]=' selected'; break;
- case 4: $all_sel[3]=' selected'; break;
- case 5: $all_sel[4]=' selected'; break;
- }
-
- $allsize = '<option value="1"' . $all_sel[0] .
'>' . lang('Very Small') . '</option>' . "\n"
- . '<option value="2"' .
$all_sel[1] . '>' . lang('Small') . '</option>' . "\n"
- . '<option value="3"' .
$all_sel[2] . '>' . lang('Medium') . '</option>' . "\n"
- . '<option value="4"' .
$all_sel[3] . '>' . lang('Large') . '</option>' . "\n"
- . '<option value="5"' .
$all_sel[4] . '>' . lang('Very Large') . '</option>' . "\n";
-
-
$GLOBALS['phpgw']->template->set_var('allsize',$allsize);
-
- if (isset($prefs['abid']))
- {
- $abid = $prefs['abid'];
-
- $entry =
$this->boprojects->read_single_contact($abid);
-
- if ($entry[0]['org_name'] == '') {
$GLOBALS['phpgw']->template->set_var('name',$entry[0]['n_given'] . ' ' .
$entry[0]['n_family']); }
- else {
$GLOBALS['phpgw']->template->set_var('name',$entry[0]['org_name'] . ' [ ' .
$entry[0]['n_given'] . ' ' . $entry[0]['n_family'] . ' ]'); }
- }
- else
- {
-
$GLOBALS['phpgw']->template->set_var('name',$name);
- }
-
-
$GLOBALS['phpgw']->template->set_var('abid',$abid);
$GLOBALS['phpgw']->template->set_var('bookhandle','');
--- 1747,1750 ----
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** class.boprojects.inc.php 18 Nov 2003 16:11:44 -0000 1.64
--- class.boprojects.inc.php 1 Dec 2003 16:27:01 -0000 1.65
***************
*** 255,267 ****
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! $prefs['tax'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['tax'];
! $prefs['abid'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['abid'];
! $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'];
! $prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
! $prefs['notify_pro'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro'];
! $prefs['notify_assign'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_assign'];
}
return $prefs;
--- 255,262 ----
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! $prefs['bill'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
! $prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
! $prefs['notify_pro'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro'];
! $prefs['notify_assign'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_assign'];
}
return $prefs;
***************
*** 274,283 ****
if (is_array($prefs))
{
-
$GLOBALS['phpgw']->preferences->change('projects','tax',$prefs['tax']);
-
$GLOBALS['phpgw']->preferences->change('projects','abid',$prefs['abid']);
$GLOBALS['phpgw']->preferences->change('projects','bill',$prefs['bill']);
-
$GLOBALS['phpgw']->preferences->change('projects','ifont',$prefs['ifont']);
-
$GLOBALS['phpgw']->preferences->change('projects','mysize',$prefs['mysize']);
-
$GLOBALS['phpgw']->preferences->change('projects','allsize',$prefs['allsize']);
$GLOBALS['phpgw']->preferences->change('projects','notify_mstone',(isset($prefs['notify_mstone'])?'yes':''));
$GLOBALS['phpgw']->preferences->change('projects','notify_pro',(isset($prefs['notify_pro'])?'yes':''));
--- 269,273 ----
***************
*** 308,314 ****
}
! 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('if you are an
administrator, please set the preferences for this application');
--- 298,304 ----
}
! if ($this->isprojectadmin('pad'))
{
! if (! isset($prefs['bill']))
{
$error[] = lang('if you are an
administrator, please set the preferences for this application');
***************
*** 330,341 ****
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! if ($this->isprojectadmin('pad') ||
$this->isprojectadmin('pbo'))
{
- $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'];
}
$prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
--- 320,326 ----
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! if ($this->isprojectadmin('pad'))
{
$prefs['bill'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
}
$prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
***************
*** 380,393 ****
}
! function read_admins($action, $type)
{
! $admins = $this->so->return_admins($action, $type);
$this->total_records = $this->so->total_records;
return $admins;
}
! function list_admins($action, $type, $start, $query, $sort,
$order)
{
! $admins = $this->read_admins($action, 'all');
$allaccounts =
$GLOBALS['phpgw']->accounts->get_list($type, $start, $sort, $order, $query);
--- 365,378 ----
}
! function read_admins($type)
{
! $admins = $this->so->return_admins($type);
$this->total_records = $this->so->total_records;
return $admins;
}
! function list_admins($type, $start, $query, $sort, $order)
{
! $admins = $this->read_admins('all');
$allaccounts =
$GLOBALS['phpgw']->accounts->get_list($type, $start, $sort, $order, $query);
***************
*** 411,417 ****
}
! function selected_admins($action, $type)
{
! $is_admin = $this->read_admins($action, $type);
if ($type == 'aa')
--- 396,402 ----
}
! function selected_admins($type)
{
! $is_admin = $this->read_admins($type);
if ($type == 'aa')
***************
*** 445,459 ****
}
! function isprojectadmin($action)
{
! if ($action == 'pad')
! {
! $admin = $this->so->isprojectadmin($action);
! }
! else
! {
! $admin = $this->so->isbookkeeper($action);
! }
! return $admin;
}
--- 430,436 ----
}
! function isprojectadmin()
{
! return $this->so->isprojectadmin();
}
--- class.uideliveries.inc.php DELETED ---
--- class.uibilling.inc.php DELETED ---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.64, 1.65 class.soprojects.inc.php, 1.52, 1.53 class.uiprojects.inc.php, 1.79, 1.80 hook_admin.inc.php, 1.14, 1.15 hook_sidebox_menu.inc.php, 1.3, 1.4 class.bobilling.inc.php, 1.10, NONE class.bodeliveries.inc.php, 1.19, NONE class.sobilling.inc.php, 1.18, NONE class.sodeliveries.inc.php, 1.22, NONE class.uibilling.inc.php, 1.33, NONE class.uideliveries.inc.php, 1.33, NONE,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] bookkeeping/doc/examples/sql create_tables.mysql, 1.1, NONE create_tables.pgsql, 1.1, NONE drop_tables.mysql, 1.1, NONE lang_english.sql, 1.1, NONE
- Next by Date:
[Phpgroupware-cvs] bookkeeping/templates/default/admin add_admin.tpl, 1.1, NONE delete_admin.tpl, 1.1, NONE index.tpl, 1.2, NONE
- Previous by thread:
[Phpgroupware-cvs] bookkeeping/doc/examples/sql create_tables.mysql, 1.1, NONE create_tables.pgsql, 1.1, NONE drop_tables.mysql, 1.1, NONE lang_english.sql, 1.1, NONE
- Next by thread:
[Phpgroupware-cvs] bookkeeping/templates/default/admin add_admin.tpl, 1.1, NONE delete_admin.tpl, 1.1, NONE index.tpl, 1.2, NONE
- Index(es):