[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: inv/inc class.boinvoice.inc.php,NONE,1.1 class.u
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: inv/inc class.boinvoice.inc.php,NONE,1.1 class.uiinvoice.inc.php,NONE,1.1 class.boinventory.inc.php,1.9,1.10 class.uiinventory.inc.php,1.10,1.11 hook_preferences.inc.php,1.14,1.15 |
|
Date: |
Sun, 14 Apr 2002 18:27:33 -0400 |
Update of /cvsroot/phpgroupware/inv/inc
In directory subversions:/tmp/cvs-serv14082/inc
Modified Files:
class.boinventory.inc.php class.uiinventory.inc.php
hook_preferences.inc.php
Added Files:
class.boinvoice.inc.php class.uiinvoice.inc.php
Log Message:
update
***** Error reading new file: [Errno 2] No such file or directory:
'class.boinvoice.inc.php'
***** Error reading new file: [Errno 2] No such file or directory:
'class.uiinvoice.inc.php'
Index: class.boinventory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/inc/class.boinventory.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.boinventory.inc.php 5 Apr 2002 23:35:03 -0000 1.9
--- class.boinventory.inc.php 14 Apr 2002 22:27:31 -0000 1.10
***************
*** 195,235 ****
}
- function cached_accounts($account_id)
- {
- $this->accounts =
CreateObject('phpgwapi.accounts',$account_id);
-
- $this->accounts->read_repository();
-
-
$cached_data[$this->accounts->data['account_id']]['account_id'] =
$this->accounts->data['account_id'];
-
$cached_data[$this->accounts->data['account_id']]['account_lid'] =
$this->accounts->data['account_lid'];
-
$cached_data[$this->accounts->data['account_id']]['firstname'] =
$this->accounts->data['firstname'];
-
$cached_data[$this->accounts->data['account_id']]['lastname'] =
$this->accounts->data['lastname'];
-
- return $cached_data;
- }
-
- function read_abook($start, $query, $qfilter, $sort, $order)
- {
- $account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
-
- $cols = array('n_given' => 'n_given',
- 'n_family' => 'n_family',
- 'org_name' => 'org_name');
-
- $entries = $this->contacts->read($start, True, $cols,
$query, $qfilter, $sort, $order, $account_id);
- $this->total_records = $this->contacts->total_records;
- return $entries;
- }
-
- function read_single_contact($abid)
- {
- $cols = array('n_given' => 'n_given',
- 'n_family' => 'n_family',
- 'org_name' => 'org_name');
-
- $entry =
$this->contacts->read_single_entry($abid,$cols);
- return $entry;
- }
-
function get_status_id($sname)
{
--- 195,198 ----
Index: class.uiinventory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/inc/class.uiinventory.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uiinventory.inc.php 6 Apr 2002 00:28:32 -0000 1.10
--- class.uiinventory.inc.php 14 Apr 2002 22:27:31 -0000 1.11
***************
*** 53,57 ****
'list_products' => True,
'edit_product' => True,
- 'preferences' => True,
'view_product' => True,
'delete_product' => True,
--- 53,56 ----
***************
*** 65,68 ****
--- 64,68 ----
{
$this->boinv
= CreateObject('inv.boinventory',True);
+ $this->bo
= CreateObject('inv.boinvoice');
$this->nextmatchs
= CreateObject('phpgwapi.nextmatchs');
$this->sbox
= CreateObject('phpgwapi.sbox');
***************
*** 165,169 ****
$this->t->set_var('link_status',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.list_status'));
$this->t->set_var('link_orders',$GLOBALS['phpgw']->link('/inv/listorders.php'));
!
$this->t->set_var('link_dists',$GLOBALS['phpgw']->link('/inv/listdist.php'));
$this->t->set_var('link_archive',$GLOBALS['phpgw']->link('/inv/archiv.php','subarchive=True'));
$this->t->set_var('link_rooms',$GLOBALS['phpgw']->link('/inv/rooms.php','subroom=True'));
--- 165,169 ----
$this->t->set_var('link_status',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.list_status'));
$this->t->set_var('link_orders',$GLOBALS['phpgw']->link('/inv/listorders.php'));
!
$this->t->set_var('link_dists',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinvoice.list_dist&action=inv_dist'));
$this->t->set_var('link_archive',$GLOBALS['phpgw']->link('/inv/archiv.php','subarchive=True'));
$this->t->set_var('link_rooms',$GLOBALS['phpgw']->link('/inv/rooms.php','subroom=True'));
***************
*** 317,321 ****
else
{
! $dist =
$this->boinv->read_single_contact($abid);
$selection =
$dist[0]['org_name'];
}
--- 317,321 ----
else
{
! $dist =
$this->bo->read_single_contact($abid);
$selection =
$dist[0]['org_name'];
}
***************
*** 847,913 ****
$this->t->set_var('lang_yes',lang('Yes'));
$this->t->pfp('out','status_delete');
- }
-
- function preferences()
- {
- $submit = $GLOBALS['HTTP_POST_VARS']['submit'];
- $prefs = $GLOBALS['HTTP_POST_VARS']['prefs'];
- $abid = $GLOBALS['HTTP_POST_VARS']['abid'];
-
- if ($submit)
- {
- $prefs['abid'] = $abid;
- $this->boinv->save_prefs($prefs);
-
- Header('Location: ' .
$GLOBALS['phpgw']->link('/preferences/index.php'));
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
-
- $GLOBALS['phpgw']->common->phpgw_header();
- echo parse_navbar();
-
- $this->t->set_file(array('prefs' => 'preferences.tpl'));
-
-
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.preferences'));
-
$this->t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/inv/addressbook.php','query='));
- $this->t->set_var('lang_action',lang('Inventory
preferences'));
- $this->t->set_var('lang_address',lang('Select your
address'));
- $this->t->set_var('lang_select',lang('Select per button
!'));
- $this->t->set_var('lang_print_format',lang('Select
print format'));
- $this->t->set_var('lang_def_cat',lang('Default
category'));
- $this->t->set_var('lang_select_def_cat',lang('Select
default category'));
-
- $prefs = $this->boinv->read_prefs();
-
- if (isset($prefs['abid']))
- {
- $abid = $prefs['abid'];
- $entry =
$this->boinv->read_single_contact($abid);
-
- if ($entry[0]['org_name'] == '') {
$this->t->set_var('name',$entry[0]['n_given'] . ' ' . $entry[0]['n_family']); }
- else {
$this->t->set_var('name',$entry[0]['org_name'] . ' [ ' . $entry[0]['n_given'] .
' ' . $entry[0]['n_family'] . ' ]'); }
- }
- else
- {
- $this->t->set_var('name',$name);
- }
-
- $this->t->set_var('abid',$abid);
-
- if ($prefs['print_format']=='html'):
- $format_sel[0]=' selected';
- elseif ($prefs['print_format']=='pdf'):
- $format_sel[1]=' selected';
- endif;
-
- $print_format = '<option value="html"' . $format_sel[0]
.'>' . lang('HTML') . '</option>' . "\n"
- . '<option value="pdf"' .
$format_sel[1] . '>' . lang('PDF') . '</option>' . "\n";
-
- $this->t->set_var('print_format',$print_format);
-
-
$this->t->set_var('category_list',$this->boinv->cats->formated_list(array('format'
=> 'select','type' => 'all','selected' => $prefs['cat_id'])));
-
- $this->t->set_var('lang_save',lang('Save'));
- $this->t->pfp('out','prefs');
}
}
--- 847,850 ----
Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/inc/hook_preferences.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** hook_preferences.inc.php 17 Jan 2002 01:49:04 -0000 1.14
--- hook_preferences.inc.php 14 Apr 2002 22:27:31 -0000 1.15
***************
*** 25,29 ****
$file = Array
(
! 'Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.preferences'),
'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
'Edit Categories' =>
$GLOBALS['phpgw']->link('/index.php',$link_data)
--- 25,29 ----
$file = Array
(
! 'Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinvoice.preferences'),
'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
'Edit Categories' =>
$GLOBALS['phpgw']->link('/index.php',$link_data)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: inv/inc class.boinvoice.inc.php,NONE,1.1 class.uiinvoice.inc.php,NONE,1.1 class.boinventory.inc.php,1.9,1.10 class.uiinventory.inc.php,1.10,1.11 hook_preferences.inc.php,1.14,1.15,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: inv addressbook.php,1.21,NONE listdist.php,1.23,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: inv/templates/default listdist.tpl,1.6,1.7
- Previous by thread:
[Phpgroupware-cvs] CVS: inv addressbook.php,1.21,NONE listdist.php,1.23,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: inv/templates/default listdist.tpl,1.6,1.7
- Index(es):