[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/class.uipricebook.inc.php, 1.4
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] property/inc/class.uipricebook.inc.php, 1.4 |
|
Date: |
Fri, 20 Aug 2004 17:15:21 +0200 |
Update of /property/inc
Modified Files:
Branch:
class.uipricebook.inc.php
date: 2004/08/20 15:15:21; author: sigurdne; state: Exp; lines: +71 -71
Log Message:
no message
=====================================================================
Index: property/inc/class.uipricebook.inc.php
diff -u property/inc/class.uipricebook.inc.php:1.3
property/inc/class.uipricebook.inc.php:1.4
--- property/inc/class.uipricebook.inc.php:1.3 Thu Jun 3 18:15:27 2004
+++ property/inc/class.uipricebook.inc.php Fri Aug 20 15:15:21 2004
@@ -32,8 +32,8 @@
(
'activity' => True,
'index' => True,
- 'agreement' => True,
- 'edit_agreement' => True,
+ 'agreement_group' => True,
+ 'edit_agreement_group' => True,
'edit_activity' => True,
'activity_vendor' => True,
'prizing' => True,
@@ -313,7 +313,7 @@
$this->save_sessiondata();
}
- function agreement()
+ function agreement_group()
{
if(!$this->acl_manage)
{
@@ -327,22 +327,22 @@
'nextmatchs',
'search_field'));
- $links = $this->menu->links('agreement');
+ $links = $this->menu->links('agreement_group');
- $agreement_list = $this->bo->read_agreement();
+ $agreement_list = $this->bo->read_agreement_group();
while (is_array($agreement_list) && list(,$agreement) =
each($agreement_list))
{
$content[] = array
(
- 'agreement_id'
=> $agreement['agreement_id'],
+ 'agreement_group_id'
=> $agreement['agreement_group_id'],
'num'
=> $agreement['num'],
'status'
=> lang($agreement['status']),
'descr'
=> $agreement['descr'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_agreement&agreement_id='
. $agreement['agreement_id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=agreement&agreement_id='
. $agreement['agreement_id'] .'&start=' . $this->start),
- 'lang_edit_statustext' =>
lang('edit the agreement'),
- 'lang_delete_statustext' =>
lang('Delete this agreement'),
+ 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_agreement_group&agreement_group_id='
. $agreement['agreement_group_id']),
+ 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=agreement_group&agreement_group_id='
. $agreement['agreement_group_id'] .'&start=' . $this->start),
+ 'lang_edit_statustext' =>
lang('edit the agreement_group'),
+ 'lang_delete_statustext' =>
lang('Delete this agreement_group'),
'text_edit'
=> lang('edit'),
'text_delete'
=> lang('delete')
);
@@ -356,7 +356,7 @@
'sort' => $this->sort,
'var' => 'num',
'order' => $this->order,
-
'extra' => array('menuaction' =>
$this->currentapp.'.uipricebook.agreement',
+
'extra' => array('menuaction' =>
$this->currentapp.'.uipricebook.agreement_group',
'cat_id'
=>$this->cat_id,
'allrows'
=>$this->allrows)
)),
@@ -368,7 +368,7 @@
$link_data = array
(
- 'menuaction' =>
$this->currentapp.'.uipricebook.agreement',
+ 'menuaction' =>
$this->currentapp.'.uipricebook.agreement_group',
'sort'
=>$this->sort,
'order'
=>$this->order,
'cat_id'
=>$this->cat_id,
@@ -380,7 +380,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add an
activity'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_agreement')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_agreement_group')
);
if(!$this->allrows)
@@ -406,7 +406,7 @@
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
- 'lang_status_statustext' =>
lang('Select the status the agreement belongs to. To do not use a category
select NO STATUS'),
+ 'lang_status_statustext' =>
lang('Select the status the agreement group belongs to. To do not use a
category select NO STATUS'),
'status_name'
=> 'cat_id',
'lang_no_status'
=> lang('No status'),
'status_list'
=> $this->bo->select_status_list('filter',$this->cat_id),
@@ -417,39 +417,39 @@
'lang_searchbutton_statustext' => lang('Submit
the search string'),
'query'
=> $this->query,
'lang_search'
=> lang('search'),
- 'table_header_agreement' =>
$table_header,
- 'values_agreement'
=> $content,
+ 'table_header_agreement_group' =>
$table_header,
+ 'values_agreement_group'
=> $content,
'table_add'
=> $table_add,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement')
+ 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement_group')
);
$appname
= lang('pricebook');
- $function_msg =
lang('list agreement');
+ $function_msg =
lang('list agreement group');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('agreement' => $data));
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('agreement_group' => $data));
$this->save_sessiondata();
}
- function edit_agreement()
+ function edit_agreement_group()
{
if(!$this->acl_manage)
{
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
}
- $agreement_id =
get_var('agreement_id',array('POST','GET'));
+ $agreement_group_id =
get_var('agreement_group_id',array('POST','GET'));
$values =
get_var('values',array('POST','GET'));
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook'));
if ($values['save'])
{
- $values['agreement_id'] = $agreement_id;
+ $values['agreement_group_id'] =
$agreement_group_id;
if(!$values['num'])
{
-
$receipt['error'][]=array('msg'=>lang('Please enter an agreement code !'));
+
$receipt['error'][]=array('msg'=>lang('Please enter an agreement group code
!'));
$error_id=true;
}
if(!$values['status'])
@@ -458,57 +458,57 @@
}
- if($values['num'] && !$agreement_id)
+ if($values['num'] && !$agreement_group_id)
{
-
if($this->bo->check_agreement_num($values['num']))
+
if($this->bo->check_agreement_group_num($values['num']))
{
-
$receipt['error'][]=array('msg'=>lang('This agreement code is already
registered!') . '[ '.$values['num'] .' ]');
+
$receipt['error'][]=array('msg'=>lang('This agreement group code is already
registered!') . '[ '.$values['num'] .' ]');
$error_id=true;
}
}
- if($agreement_id)
+ if($agreement_group_id)
{
$action='edit';
}
if(!$receipt['error'])
{
- $receipt =
$this->bo->save_agreement($values,$action);
- if(!$agreement_id)
+ $receipt =
$this->bo->save_agreement_group($values,$action);
+ if(!$agreement_group_id)
{
-
$agreement_id=$receipt['agreement_id'];
+
$agreement_group_id=$receipt['agreement_group_id'];
}
}
- if($agreement_id)
+ if($agreement_group_id)
{
- $values['agreement_id']=$agreement_id;
+
$values['agreement_group_id']=$agreement_group_id;
$action='edit';
}
else
{
- $agreement_id = $values['agreement_id'];
+ $agreement_group_id =
$values['agreement_group_id'];
}
}
else
{
- $values['agreement_id']= $agreement_id;
- if($agreement_id)
+ $values['agreement_group_id']=
$agreement_group_id;
+ if($agreement_group_id)
{
- $values =
$this->bo->read_single_agreement($agreement_id);
+ $values =
$this->bo->read_single_agreement_group($agreement_group_id);
}
}
//_debug_array($values);
- if ($agreement_id)
+ if ($agreement_group_id)
{
- $function_msg = lang('edit agreement');
+ $function_msg = lang('edit agreement group');
}
else
{
- $function_msg = lang('add agreement');
+ $function_msg = lang('add agreement_group');
}
if ($values['cat_id'] > 0)
@@ -523,8 +523,8 @@
$link_data = array
(
- 'menuaction' =>
$this->currentapp.'.uipricebook.edit_agreement',
- 'agreement_id' => $agreement_id
+ 'menuaction' =>
$this->currentapp.'.uipricebook.edit_agreement_group',
+ 'agreement_group_id' => $agreement_group_id
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -533,9 +533,9 @@
(
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement'),
- 'lang_agreement_id'
=> lang('Agreement ID'),
- 'lang_num'
=> lang('Agreement code'),
+ 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement_group'),
+ 'lang_agreement_group_id' =>
lang('Agreement group ID'),
+ 'lang_num'
=> lang('Agreement group code'),
'lang_status'
=> lang('Status'),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
'select_status_name' =>
'values[status]',
@@ -544,7 +544,7 @@
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'lang_descr'
=> lang('description'),
- 'value_agreement_id' =>
$values['agreement_id'],
+ 'value_agreement_group_id' =>
$values['agreement_group_id'],
'value_num'
=> $values['num'],
'value_descr'
=> $values['descr'],
'lang_num_statustext' =>
lang('A unique code for this activity'),
@@ -556,7 +556,7 @@
$appname
= lang('pricebook');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_agreement' => $data));
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_agreement_group' =>
$data));
}
@@ -785,7 +785,7 @@
function excel_2()
{
- $list = $this->bo->read_activities_pr_aggreement();
+ $list = $this->bo->read_activities_pr_agreement_group();
$name = array(
'activity_id',
@@ -828,7 +828,7 @@
$links = $this->menu->links('activity');
- $pricebook_list =
$this->bo->read_activities_pr_aggreement();
+ $pricebook_list =
$this->bo->read_activities_pr_agreement_group();
//_debug_array($pricebook_list);
while (is_array($pricebook_list) && list(,$pricebook) =
each($pricebook_list))
{
@@ -842,8 +842,8 @@
'ns3420'
=> $pricebook['ns3420'],
'unit'
=> $pricebook['unit'],
'descr'
=> $pricebook['descr'],
- 'link_vendor'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity_vendor&activity_id='
. $pricebook['activity_id'].'&agreement=' . $this->cat_id),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
. $pricebook['activity_id'].'&agreement=' . $this->cat_id),
+ 'link_vendor'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity_vendor&activity_id='
. $pricebook['activity_id'].'&agreement_group=' . $this->cat_id),
+ 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
. $pricebook['activity_id'].'&agreement_group=' . $this->cat_id),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=activity&activity_id='
. $pricebook['activity_id']),
'lang_vendor_statustext' =>
lang('view the vendor(s) for this activity'),
'lang_edit_statustext' =>
lang('edit this activity'),
@@ -881,7 +881,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add an
activity'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&agreement='
. $this->cat_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&agreement_group='
. $this->cat_id)
);
$link_data = array
@@ -930,10 +930,10 @@
'lang_select_all'
=> lang('Select All'),
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
- 'lang_no_cat'
=> lang('select agreement'),
- 'lang_cat_statustext' =>
lang('Select the agreement the pricebook belongs to. To do not use a category
select NO CATEGORY'),
+ 'lang_no_cat'
=> lang('select agreement_group'),
+ 'lang_cat_statustext' =>
lang('Select the agreement_group the pricebook belongs to. To do not use a
category select NO CATEGORY'),
'select_name'
=> 'cat_id',
- 'cat_list'
=> $this->bo->get_agreement_list('filter',$this->cat_id),
+ 'cat_list'
=> $this->bo->get_agreement_group_list('filter',$this->cat_id),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
@@ -947,7 +947,7 @@
);
$appname
= lang('pricebook');
- $function_msg =
lang('list activities per agreement');
+ $function_msg =
lang('list activities per agreement_group');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_activities' => $data));
@@ -1065,8 +1065,8 @@
'all_records'
=> $this->bo->total_records,
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
- 'lang_no_cat'
=> lang('select agreement'),
- 'lang_cat_statustext' =>
lang('Select the agreement the pricebook belongs to. To do not use a category
select NO CATEGORY'),
+ 'lang_no_cat'
=> lang('select agreement_group'),
+ 'lang_cat_statustext' =>
lang('Select the agreement_group the pricebook belongs to. To do not use a
category select NO CATEGORY'),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_statustext' => lang('Submit
the search string'),
@@ -1099,13 +1099,13 @@
}
$activity_id =
get_var('activity_id',array('POST','GET'));
- $agreement = get_var('agreement',array('GET'));
+ $agreement_group =
get_var('agreement_group',array('GET'));
$values =
get_var('values',array('POST','GET'));
$values['ns3420_id']=
get_var('ns3420_id',array('POST','GET'));
if(!$values['cat_id'])
{
- $values['cat_id'] = $agreement;
+ $values['cat_id'] = $agreement_group;
}
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook'));
@@ -1119,7 +1119,7 @@
}
if(!$values['cat_id'])
{
-
$receipt['error'][]=array('msg'=>lang('Please select an agreement !'));
+
$receipt['error'][]=array('msg'=>lang('Please select an agreement_group !'));
}
if(!$values['branch_id'])
@@ -1187,7 +1187,7 @@
(
'menuaction' =>
$this->currentapp.'.uipricebook.edit_activity',
'activity_id' => $activity_id,
- 'agreement' => $agreement
+ 'agreement_group' =>
$agreement_group
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -1199,7 +1199,7 @@
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity&cat_id='
. $values['cat_id']),
'lang_activity_id'
=> lang('Activity ID'),
'lang_num'
=> lang('Activity code'),
- 'lang_category'
=> lang('Agreement'),
+ 'lang_category'
=> lang('Agreement group'),
'lang_unit'
=> lang('Unit'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -1214,12 +1214,12 @@
'lang_num_statustext' =>
lang('A unique code for this activity'),
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the building'),
- 'lang_no_cat'
=> lang('Select agreement'),
- 'lang_cat_statustext' =>
lang('Select the agreement this activity belongs to.'),
+ 'lang_no_cat'
=> lang('Select agreement group'),
+ 'lang_cat_statustext' =>
lang('Select the agreement group this activity belongs to.'),
'select_name'
=> 'values[cat_id]',
'lang_descr_statustext' =>
lang('Enter the description for this activity'),
'lang_base_descr_statustext' => lang('Enter
a description for prerequisitions for this activity - if any'),
- 'cat_list'
=> $this->bo->get_agreement_list('select',$values['cat_id']),
+ 'cat_list'
=> $this->bo->get_agreement_group_list('select',$values['cat_id']),
'lang_dim_d'
=> lang('Dim D'),
'dim_d_list'
=> $this->bo->get_dim_d_list($values['dim_d']),
@@ -1262,7 +1262,7 @@
$activity_id = get_var('activity_id',array('GET'));
$vendor_id =
get_var('vendor_id',array('GET'));
$index_count = get_var('index_count',array('GET'));
- $agreement_id = get_var('agreement_id',array('GET'));
+ $agreement_group_id =
get_var('agreement_group_id',array('GET'));
$confirm =
get_var('confirm',array('POST'));
if($method=='activity_vendor')
@@ -1316,20 +1316,20 @@
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
}
- elseif($method=='agreement')
+ elseif($method=='agreement_group')
{
$link_data = array
(
- 'menuaction' =>
$this->currentapp.'.uipricebook.agreement',
+ 'menuaction' =>
$this->currentapp.'.uipricebook.agreement_group',
'start' => $this->start
);
- $function_msg =lang('Delete agreement and all
the activities associated with it!');
- $delete_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
. $method . '&agreement_id=' . $agreement_id . '&start=' . $this->start);
+ $function_msg =lang('Delete agreement group
and all the activities associated with it!');
+ $delete_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
. $method . '&agreement_group_id=' . $agreement_group_id . '&start=' .
$this->start);
if (get_var('confirm',array('POST')))
{
-
$this->bo->delete_agreement($agreement_id);
+
$this->bo->delete_agreement_group($agreement_group_id);
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/class.uipricebook.inc.php, 1.4,
nomail <=