[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] bookkeeping/inc class.bobookkeeping.inc.php, 1.1, 1.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] bookkeeping/inc class.bobookkeeping.inc.php, 1.1, 1.2 class.uibilling.inc.php, 1.1, 1.2 class.uibookkeeping.inc.php, 1.1, 1.2 class.uideliveries.inc.php, 1.1, 1.2 |
|
Date: |
Wed, 03 Dec 2003 13:20:49 +0000 |
Update of /cvsroot/phpgroupware/bookkeeping/inc
In directory subversions:/tmp/cvs-serv16084/inc
Modified Files:
class.bobookkeeping.inc.php class.uibilling.inc.php
class.uibookkeeping.inc.php class.uideliveries.inc.php
Log Message:
update
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookkeeping/inc/class.uideliveries.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.uideliveries.inc.php 1 Dec 2003 16:31:33 -0000 1.1
--- class.uideliveries.inc.php 3 Dec 2003 13:20:47 -0000 1.2
***************
*** 1,9 ****
<?php
/*******************************************************************\
! * phpGroupWare - Projects *
* http://www.phpgroupware.org *
* This program is part of the GNU project, see http://www.gnu.org/
*
* *
! * Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
--- 1,9 ----
<?php
/*******************************************************************\
! * phpGroupWare - Bookkeeping *
* http://www.phpgroupware.org *
* This program is part of the GNU project, see http://www.gnu.org/
*
* *
! * Accounting application for the Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
***************
*** 52,55 ****
--- 52,56 ----
$this->boprojects =
CreateObject('projects.boprojects',True, $action);
$this->bodeliveries =
CreateObject('bookkeeping.bodeliveries');
+ $this->bobookkeeping =
CreateObject('bookkeeping.bobookkeeping');
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->sbox
= CreateObject('phpgwapi.sbox');
***************
*** 65,68 ****
--- 66,70 ----
$this->sort
= $this->boprojects->sort;
$this->cat_id =
$this->boprojects->cat_id;
+ $this->status =
$this->boprojects->status;
}
***************
*** 76,80 ****
'order' => $this->order,
'sort' => $this->sort,
! 'cat_id' => $this->cat_id
);
$this->boprojects->save_sessiondata($data, $action);
--- 78,83 ----
'order' => $this->order,
'sort' => $this->sort,
! 'cat_id' => $this->cat_id,
! 'status' => $this->status
);
$this->boprojects->save_sessiondata($data, $action);
***************
*** 127,133 ****
$GLOBALS['phpgw']->template->set_block('header','projects_header');
!
$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'));
--- 130,136 ----
$GLOBALS['phpgw']->template->set_block('header','projects_header');
!
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.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=bookkeeping.uideliveries.list_projects&action=mains'));
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
***************
*** 139,142 ****
--- 142,169 ----
}
+ function status_format($status = '', $showarchive = True)
+ {
+ if (!$status)
+ {
+ $status = $this->status = 'active';
+ }
+
+ switch ($status)
+ {
+ case 'active': $stat_sel[0]='
selected'; break;
+ case 'nonactive': $stat_sel[1]='
selected'; break;
+ case 'archive': $stat_sel[2]='
selected'; break;
+ }
+
+ $status_list = '<option value="active"' . $stat_sel[0]
. '>' . lang('Active') . '</option>' . "\n"
+ . '<option value="nonactive"' .
$stat_sel[1] . '>' . lang('Nonactive') . '</option>' . "\n";
+
+ if ($showarchive)
+ {
+ $status_list .= '<option value="archive"' .
$stat_sel[2] . '>' . lang('Archive') . '</option>' . "\n";
+ }
+ return $status_list;
+ }
+
function list_projects()
{
***************
*** 157,161 ****
$link_data = array
(
! 'menuaction' =>
'projects.uideliveries.list_projects',
'pro_parent' => $pro_parent,
'action' => $action,
--- 184,188 ----
$link_data = array
(
! 'menuaction' =>
'bookkeeping.uideliveries.list_projects',
'pro_parent' => $pro_parent,
'action' => $action,
***************
*** 173,177 ****
}
! $pro =
$this->boprojects->list_projects($this->start,True,$this->query,$this->filter,$this->sort,$this->order,'active',$this->cat_id,$action,$pro_parent);
// --------------------- nextmatch variable template-declarations
------------------------
--- 200,204 ----
}
! $pro = $this->boprojects->list_projects(array('type' =>
$action,'parent' => $pro_parent));
// --------------------- nextmatch variable template-declarations
------------------------
***************
*** 188,201 ****
if ($action == 'mains')
{
! $action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) . '" name="form">' . "\n"
! . '<select
name="cat_id" onChange="this.form.submit();"><option value="">' . lang('Select
category') . '</option>' . "\n"
! .
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var(lang_header,lang('Project list'));
}
else
{
! $action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) .'" name="form">' . "\n"
! . '<select
name="pro_parent" onChange="this.form.submit();"><option value="">' .
lang('Select main project') . '</option>' . "\n"
! .
$this->boprojects->select_project_list('mains', $status, $pro_parent) .
'</select>';
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Job list'));
}
--- 215,226 ----
if ($action == 'mains')
{
! $action_list = '<select name="cat_id"
onChange="this.form.submit();"><option value="">' . lang('Select category') .
'</option>' . "\n"
! .
$this->cats->formatted_list('select','all',$this->cat_id,True) . '</select>';
$GLOBALS['phpgw']->template->set_var(lang_header,lang('Project list'));
}
else
{
! $action_list = '<select name="pro_parent"
onChange="this.form.submit();"><option value="">' . lang('Select main project')
. '</option>' . "\n"
! .
$this->boprojects->select_project_list(array('status' => $status,'selected' =>
$pro_parent)) . '</select>';
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Job list'));
}
***************
*** 205,212 ****
$GLOBALS['phpgw']->template->set_var('action_list',$action_list);
!
$GLOBALS['phpgw']->template->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('filter_list',$this->nextmatchs->new_filter($this->filter));
-
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query'
=> $this->query)));
// ---------------- list header variable template-declarations
--------------------------
--- 230,237 ----
$GLOBALS['phpgw']->template->set_var('action_list',$action_list);
!
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('filter_list',$this->nextmatchs->new_filter($this->filter));
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query'
=> $this->query)));
+
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($this->status));
// ---------------- list header variable template-declarations
--------------------------
***************
*** 289,293 ****
if ($action == 'mains')
{
! $action_entry = '<td align="center"><a
href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects'
. '&pro_parent=' .
$pro[$i]['project_id'] . '&action=subs') . '">' . lang('Jobs')
. '</a></td>' . "\n";
--- 314,318 ----
if ($action == 'mains')
{
! $action_entry = '<td align="center"><a
href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uideliveries.list_projects'
. '&pro_parent=' .
$pro[$i]['project_id'] . '&action=subs') . '">' . lang('Jobs')
. '</a></td>' . "\n";
***************
*** 305,309 ****
$GLOBALS['phpgw']->template->set_var('lang_all_partlist',lang('All delivery
notes'));
!
$GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_deliveries&action=del'
. '&project_id='));
--- 330,334 ----
$GLOBALS['phpgw']->template->set_var('lang_all_partlist',lang('All delivery
notes'));
!
$GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uideliveries.list_deliveries&action=del'
. '&project_id='));
***************
*** 378,382 ****
$link_data = array
(
! 'menuaction' =>
'projects.uideliveries.delivery',
'pro_parent' => $pro_parent,
'action' => $action,
--- 403,407 ----
$link_data = array
(
! 'menuaction' =>
'bookkeeping.uideliveries.delivery',
'pro_parent' => $pro_parent,
'action' => $action,
***************
*** 419,423 ****
$GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Delivery ID
?'));
$GLOBALS['phpgw']->template->set_var('choose','<input type="checkbox"
name="values[choose]" value="True">');
!
$GLOBALS['phpgw']->template->set_var('print_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.fail'));
$GLOBALS['phpgw']->template->set_var('delivery_num',$values['delivery_num']);
$hours =
$this->bodeliveries->read_hours($project_id, $action);
--- 444,448 ----
$GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Delivery ID
?'));
$GLOBALS['phpgw']->template->set_var('choose','<input type="checkbox"
name="values[choose]" value="True">');
!
$GLOBALS['phpgw']->template->set_var('print_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uideliveries.fail'));
$GLOBALS['phpgw']->template->set_var('delivery_num',$values['delivery_num']);
$hours =
$this->bodeliveries->read_hours($project_id, $action);
***************
*** 427,431 ****
$GLOBALS['phpgw']->template->set_var('lang_choose','');
$GLOBALS['phpgw']->template->set_var('choose','');
!
$GLOBALS['phpgw']->template->set_var('print_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.show_delivery'
.
'&delivery_id=' . $delivery_id));
$del =
$this->bodeliveries->read_single_delivery($delivery_id);
--- 452,456 ----
$GLOBALS['phpgw']->template->set_var('lang_choose','');
$GLOBALS['phpgw']->template->set_var('choose','');
!
$GLOBALS['phpgw']->template->set_var('print_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uideliveries.show_delivery'
.
'&delivery_id=' . $delivery_id));
$del =
$this->bodeliveries->read_single_delivery($delivery_id);
***************
*** 631,635 ****
$link_data = array
(
! 'menuaction' =>
'projects.uideliveries.list_deliveries',
'action' => $action,
'project_id' => $project_id
--- 656,660 ----
$link_data = array
(
! 'menuaction' =>
'bookkeeping.uideliveries.list_deliveries',
'action' => $action,
'project_id' => $project_id
***************
*** 711,715 ****
$link_data['delivery_id'] =
$note['delivery_id'];
$link_data['project_id'] =
$note['project_id'];
! $link_data['menuaction'] =
'projects.uideliveries.delivery';
$GLOBALS['phpgw']->template->set_var('td_data',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_td_data',lang('Delivery'));
--- 736,740 ----
$link_data['delivery_id'] =
$note['delivery_id'];
$link_data['project_id'] =
$note['project_id'];
! $link_data['menuaction'] =
'bookkeeping.uideliveries.delivery';
$GLOBALS['phpgw']->template->set_var('td_data',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_td_data',lang('Delivery'));
Index: class.uibookkeeping.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookkeeping/inc/class.uibookkeeping.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.uibookkeeping.inc.php 1 Dec 2003 16:31:33 -0000 1.1
--- class.uibookkeeping.inc.php 3 Dec 2003 13:20:47 -0000 1.2
***************
*** 1,9 ****
<?php
/*******************************************************************\
! * phpGroupWare - Projects *
* http://www.phpgroupware.org *
* This program is part of the GNU project, see http://www.gnu.org/
*
* *
! * Project Manager *
* Written by Bettina Gille address@hidden *
* ----------------------------------------------- *
--- 1,9 ----
[...2143 lines suppressed...]
! $GLOBALS['phpgw']->template->set_var('bill',$bill);*/
! 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->pfp('out','prefs');
}
}
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookkeeping/inc/class.uibilling.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.uibilling.inc.php 1 Dec 2003 16:31:33 -0000 1.1
--- class.uibilling.inc.php 3 Dec 2003 13:20:47 -0000 1.2
***************
*** 51,56 ****
$this->boprojects =
CreateObject('projects.boprojects',True, $action);
! $this->bobilling =
CreateObject('projects.bobilling');
! $this->bodeliveries =
CreateObject('projects.bodeliveries');
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->sbox
= CreateObject('phpgwapi.sbox');
--- 51,56 ----
$this->boprojects =
CreateObject('projects.boprojects',True, $action);
! $this->bobilling =
CreateObject('bookkeeping.bobilling');
! $this->bodeliveries =
CreateObject('bookkeeping.bodeliveries');
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->sbox
= CreateObject('phpgwapi.sbox');
***************
*** 124,162 ****
{
if
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] !=
'idots')
- if
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] !=
'idots')
{
$GLOBALS['phpgw']->template->set_file(array('header' => 'header.tpl'));
$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'));
!
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
! }
!
! 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'));
!
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
--- 124,135 ----
{
if
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] !=
'idots')
{
$GLOBALS['phpgw']->template->set_file(array('header' => 'header.tpl'));
$GLOBALS['phpgw']->template->set_block('header','projects_header');
!
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.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=bookkeeping.uideliveries.list_projects&action=mains'));
!
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
***************
*** 199,203 ****
$link_data = array
(
! 'menuaction' =>
'projects.uibilling.list_projects',
'pro_parent' => $pro_parent,
'action' => $action
--- 172,176 ----
$link_data = array
(
! 'menuaction' =>
'bookkeeping.uibilling.list_projects',
'pro_parent' => $pro_parent,
'action' => $action
***************
*** 321,330 ****
$link_data['project_id'] =
$pro[$i]['project_id'];
! $link_data['menuaction'] =
'projects.uibilling.invoice';
$GLOBALS['phpgw']->template->set_var('part',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_part',lang('Invoice'));
! $link_data['menuaction'] =
'projects.uibilling.list_invoices';
$link_data['action'] = 'bill';
$GLOBALS['phpgw']->template->set_var('partlist',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 294,303 ----
$link_data['project_id'] =
$pro[$i]['project_id'];
! $link_data['menuaction'] =
'bookkeeping.uibilling.invoice';
$GLOBALS['phpgw']->template->set_var('part',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_part',lang('Invoice'));
! $link_data['menuaction'] =
'bookkeeping.uibilling.list_invoices';
$link_data['action'] = 'bill';
$GLOBALS['phpgw']->template->set_var('partlist',$GLOBALS['phpgw']->link('/index.php',$link_data));
***************
*** 333,337 ****
if ($action == 'mains')
{
! $action_entry = '<td align="center"><a
href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&pro_parent='
. $pro[$i]['project_id'] .
'&action=subs') . '">' . lang('Jobs')
. '</a></td>' . "\n";
--- 306,310 ----
if ($action == 'mains')
{
! $action_entry = '<td align="center"><a
href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uibilling.list_projects&pro_parent='
. $pro[$i]['project_id'] .
'&action=subs') . '">' . lang('Jobs')
. '</a></td>' . "\n";
***************
*** 349,353 ****
$GLOBALS['phpgw']->template->set_var('lang_all_partlist',lang('All invoices'));
!
$GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_invoices&action=bill'
. '&project_id='));
$GLOBALS['phpgw']->template->set_var('lang_all_part2list','');
--- 322,326 ----
$GLOBALS['phpgw']->template->set_var('lang_all_partlist',lang('All invoices'));
!
$GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uibilling.list_invoices&action=bill'
. '&project_id='));
$GLOBALS['phpgw']->template->set_var('lang_all_part2list','');
***************
*** 465,469 ****
$link_data['invoice_id'] =
$inv['invoice_id'];
$link_data['project_id'] =
$inv['project_id'];
! $link_data['menuaction'] =
'projects.uibilling.invoice';
$GLOBALS['phpgw']->template->set_var('td_data',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_td_data',lang('Invoice'));
--- 438,442 ----
$link_data['invoice_id'] =
$inv['invoice_id'];
$link_data['project_id'] =
$inv['project_id'];
! $link_data['menuaction'] =
'bookkeeping.uibilling.invoice';
$GLOBALS['phpgw']->template->set_var('td_data',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_td_data',lang('Invoice'));
***************
*** 543,547 ****
$link_data = array
(
! 'menuaction' => 'projects.uibilling.invoice',
'action' => $action,
'project_id' => $project_id,
--- 516,520 ----
$link_data = array
(
! 'menuaction' =>
'bookkeeping.uibilling.invoice',
'action' => $action,
'project_id' => $project_id,
***************
*** 580,584 ****
$GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Invoice ID
?'));
$GLOBALS['phpgw']->template->set_var('choose','<input type="checkbox"
name="values[choose]" value="True">');
!
$GLOBALS['phpgw']->template->set_var('print_invoice',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.fail'));
$GLOBALS['phpgw']->template->set_var('invoice_num',$values['invoice_num']);
$hours =
$this->bobilling->read_hours($project_id, $action);
--- 553,557 ----
$GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Invoice ID
?'));
$GLOBALS['phpgw']->template->set_var('choose','<input type="checkbox"
name="values[choose]" value="True">');
!
$GLOBALS['phpgw']->template->set_var('print_invoice',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uibilling.fail'));
$GLOBALS['phpgw']->template->set_var('invoice_num',$values['invoice_num']);
$hours =
$this->bobilling->read_hours($project_id, $action);
***************
*** 588,592 ****
$GLOBALS['phpgw']->template->set_var('lang_choose','');
$GLOBALS['phpgw']->template->set_var('choose','');
!
$GLOBALS['phpgw']->template->set_var('print_invoice',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.show_invoice'
.
'&invoice_id=' . $invoice_id));
$bill =
$this->bobilling->read_single_invoice($invoice_id);
--- 561,565 ----
$GLOBALS['phpgw']->template->set_var('lang_choose','');
$GLOBALS['phpgw']->template->set_var('choose','');
!
$GLOBALS['phpgw']->template->set_var('print_invoice',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uibilling.show_invoice'
.
'&invoice_id=' . $invoice_id));
$bill =
$this->bobilling->read_single_invoice($invoice_id);
Index: class.bobookkeeping.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookkeeping/inc/class.bobookkeeping.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.bobookkeeping.inc.php 1 Dec 2003 16:31:33 -0000 1.1
--- class.bobookkeeping.inc.php 3 Dec 2003 13:20:46 -0000 1.2
***************
*** 27,31 ****
// $Source$
! class boprojects
{
var $action;
--- 27,31 ----
// $Source$
! class bobookkeeping
{
var $action;
***************
*** 70,79 ****
);
! function boprojects($session=False, $action = '')
{
- $this->so =
CreateObject('projects.soprojects');
- $this->sohours =
CreateObject('projects.soprojecthours');
- $this->contacts = CreateObject('phpgwapi.contacts');
- $this->cats =
CreateObject('phpgwapi.categories');
$this->debug = False;
--- 70,75 ----
);
! function bobookkeeping($session=False, $action = '')
{
$this->debug = False;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] bookkeeping/inc class.bobookkeeping.inc.php, 1.1, 1.2 class.uibilling.inc.php, 1.1, 1.2 class.uibookkeeping.inc.php, 1.1, 1.2 class.uideliveries.inc.php, 1.1, 1.2,
Bettina Gille <address@hidden> <=