[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.23,1.24
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.23,1.24 class.uiwo_hour.inc.php,1.26,1.27 class.uiproject.inc.php,1.27,1.28 class.soXport.inc.php,1.24,1.25 class.soworkorder.inc.php,1.15,1.16 class.sowo_hour.inc.php,1.9,1.10 class.sotts2.inc.php,1.3,1.4 class.sotts.inc.php,1.17,1.18 class.sotenant.inc.php,1.2,1.3 class.sotemplate.inc.php,1.3,1.4class.sostandard_entity.inc.php,1.10,1.11 class.sostandard_3.inc.php,1.4,1.5class.sostandard_2.inc.php,1.17,1.18 class.sorequest.inc.php,1.10,1.11 class.soreport.inc.php,1.2,1.3 class.soproperty.inc.php,1.18,1.19class.soproject.inc.php,1.18,1.19 class.sopricebook.inc.php,1.9,1.10 class.soowner.inc.php,1.4,1.5 class.someter.inc.php,1.1,1.2 class.solookup.inc.php,1.21,1.22 class.solocation.inc.php,1.11,1.12 class.soinvoice.inc.php,1.22,1.23 class.socommon.inc.php,1.28,1.29 class.boworkorder.inc.php,1.10,1.11 |
|
Date: |
Sat, 21 Jun 2003 15:27:38 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv8086/inc
Modified Files:
class.uiworkorder.inc.php class.uiwo_hour.inc.php
class.uiproject.inc.php class.soXport.inc.php
class.soworkorder.inc.php class.sowo_hour.inc.php
class.sotts2.inc.php class.sotts.inc.php
class.sotenant.inc.php class.sotemplate.inc.php
class.sostandard_entity.inc.php class.sostandard_3.inc.php
class.sostandard_2.inc.php class.sorequest.inc.php
class.soreport.inc.php class.soproperty.inc.php
class.soproject.inc.php class.sopricebook.inc.php
class.soowner.inc.php class.someter.inc.php
class.solookup.inc.php class.solocation.inc.php
class.soinvoice.inc.php class.socommon.inc.php
class.boworkorder.inc.php
Log Message:
no message
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uiworkorder.inc.php 19 Jun 2003 20:03:09 -0000 1.23
--- class.uiworkorder.inc.php 21 Jun 2003 19:27:35 -0000 1.24
***************
*** 36,47 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.boworkorder',True);
$this->boproject =
CreateObject($this->currentapp.'.boproject');
$this->so =
CreateObject($this->currentapp.'.soworkorder');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->config =
CreateObject('phpgwapi.config');
$this->start =
$this->bo->start;
--- 36,50 ----
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bo =
CreateObject($this->currentapp.'.boworkorder',True);
$this->boproject =
CreateObject($this->currentapp.'.boproject');
$this->so =
CreateObject($this->currentapp.'.soworkorder');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->config =
CreateObject('phpgwapi.config');
+ $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
+ $this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl_read =
$this->acl2->check('.project',1);
+ $this->acl_add =
$this->acl2->check('.project',2);
+ $this->acl_edit =
$this->acl2->check('.project',4);
+ $this->acl_delete =
$this->acl2->check('.project',8);
$this->start =
$this->bo->start;
***************
*** 73,77 ****
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('workorder',
'menu',
'nextmatchs',
--- 76,80 ----
{
!
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder','values','table_header',
'menu',
'nextmatchs',
***************
*** 85,193 ****
//_debug_array($workorder_list);
! while (is_array($workorder_list) && list(,$workorder) =
each($workorder_list))
{
! $location = split("-",
$workorder['location_code']);
! $content[] = array
! (
! 'title'
=> $workorder['title'],
! 'workorder_id'
=> $workorder['workorder_id'],
! 'project_id'
=> $workorder['project_id'],
! 'descr'
=> $workorder['descr'],
! 'property_id'
=> $location[0],
! 'building_id'
=> $location[1],
! 'entrance_id'
=> $location[2],
! 'floor'
=> $workorder['floor'],
! 'apartment_id'
=> $location[3],
! 'address'
=> $workorder['address'],
! 'entry_date'
=> $workorder['entry_date'],
! 'status'
=> $workorder['status'],
! 'owner'
=> $workorder['owner'],
! 'link_calculate'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder['workorder_id']),
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $workorder['workorder_id']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $workorder['workorder_id']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $workorder['workorder_id']),
! 'lang_calculate_statustext' =>
lang('calculate this workorder'),
! 'lang_view_statustext' =>
lang('view the workorder'),
! 'lang_edit_statustext' =>
lang('edit the workorder'),
! 'lang_delete_statustext' =>
lang('delete this workorder'),
! 'text_calculate'
=> lang('calculate'),
! 'text_view'
=> lang('view'),
! 'text_edit'
=> lang('edit'),
! 'text_delete'
=> lang('delete')
! );
! }
! $table_header[] = array
! (
! 'sort_project' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'project_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'query'
=>$this->query)
!
)),
! 'sort_workorder' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'query'
=>$this->query)
!
)),
! 'lang_project' => lang('project'),
! 'lang_workorder' => lang('workorder'),
! 'lang_title' => lang('Title'),
! 'sort_property' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'property_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'query'
=>$this->query)
!
)),
! 'lang_property' => lang('Property'),
! 'lang_building' => lang('Building'),
! 'lang_entrance' => lang('Entrance'),
! 'lang_floor' => lang('Floor'),
! 'lang_apartment' => lang('Apartment'),
! 'sort_address' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
'var' => 'address',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'query'
=>$this->query)
!
)),
! 'lang_address' => lang('Address'),
! 'lang_entry_date' => lang('Entry date'),
! 'lang_user' => lang('User'),
! 'lang_status' => lang('Status'),
! 'lang_calculate' => lang('Calculate'),
! 'lang_view' => lang('view'),
! 'lang_edit' => lang('edit'),
! 'lang_delete' => lang('delete')
! );
! $table_add[] = array
! (
! 'lang_add' =>
lang('add'),
! 'lang_add_statustext' => lang('add a
workorder'),
! 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.add')
! );
$link_data = array
--- 88,277 ----
//_debug_array($workorder_list);
!
! $uicols = $this->bo->uicols;
! //_debug_array($uicols);
!
! $j=0;
! while (is_array($workorder_list) &&
list(,$workorder_entry) = each($workorder_list))
{
! for ($k=0;$k<count($uicols['name']);$k++)
! {
! if($uicols['input_type'][$k]!='hidden')
! {
!
if($workorder_entry['query_location'][$uicols['name'][$k]])
! {
!
$content[$j]['row'][$k]['statustext'] = lang('search');
!
$content[$j]['row'][$k]['text'] =
$workorder_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&query='
. $workorder_entry['query_location'][$uicols['name'][$k]] . '&lookup=' .
$lookup);
! }
! else
! {
!
$content[$j]['row'][$k]['value'] =
$workorder_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['name'] = $uicols['name'][$k];
! }
+ }
! if($lookup &&
$k==(count($uicols['name'])-2))
!
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&workorder_id='
. $workorder_entry['workorder_id']);
!
! }
!
! if(!$lookup)
! {
! if($this->acl_read)
! {
!
$content[$j]['row'][$k]['statustext'] = lang('view the
workorder');
! $content[$j]['row'][$k]['text']
= lang('view');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $workorder_entry['workorder_id']);
! $k++;
! }
!
! if($this->acl_edit)
! {
!
$content[$j]['row'][$k]['statustext'] = lang('edit the
workorder');
! $content[$j]['row'][$k]['text']
= lang('edit');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $workorder_entry['workorder_id']);
! $k++;
!
!
$content[$j]['row'][$k]['statustext'] = lang('calculate the
workorder');
! $content[$j]['row'][$k]['text']
= lang('calculate');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_entry['workorder_id']);
! $k++;
! }
!
! if($this->acl_delete)
! {
!
$content[$j]['row'][$k]['statustext'] = lang('delete the
workorder');
! $content[$j]['row'][$k]['text']
= lang('delete');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $workorder_entry['workorder_id']);
! $k++;
! }
! }
!
! $j++;
! }
!
! for ($i=0;$i<count($uicols['descr']);$i++)
! {
! if($uicols['input_type'][$i]!='hidden')
! {
! $table_header[$i]['header'] =
$uicols['descr'][$i];
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! if($uicols['name'][$i]=='loc1')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'fm_location1.loc1',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! if($uicols['name'][$i]=='project_id')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'project_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
if($uicols['name'][$i]=='workorder_id')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'workorder_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! /* if($uicols['name'][$i]=='street_name')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
'var' => 'address',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! */
! }
! }
! if(!$lookup)
! {
! if($this->acl_read)
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header']
= lang('view');
! $i++;
! }
! if($this->acl_edit)
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header']
= lang('edit');
! $i++;
!
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header']
= lang('calculate');
! $i++;
! }
! if($this->acl_delete)
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header']
= lang('delete');
! $i++;
! }
! }
! else
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header'] =
lang('select');
! }
!
! //_debug_array($content);
! if($this->acl_add)
! {
! $table_add[] = array
! (
! 'lang_add'
=> lang('add'),
! 'lang_add_statustext' => lang('add a
workorder'),
! 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit')
! );
! }
$link_data = array
***************
*** 235,240 ****
'query'
=> $this->query,
'lang_search'
=> lang('search'),
! 'table_header_workorder' =>
$table_header,
! 'values_workorder'
=> $content,
'table_add'
=> $table_add
);
--- 319,324 ----
'query'
=> $this->query,
'lang_search'
=> lang('search'),
! 'table_header'
=> $table_header,
! 'values'
=> $content,
'table_add'
=> $table_add
);
***************
*** 250,253 ****
--- 334,341 ----
function edit()
{
+ if(!$this->acl_add && !$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$id =
get_var('id',array('POST','GET'));
$project_id =
get_var('project_id',array('POST','GET'));
***************
*** 394,415 ****
!
$location_data=$this->bocommon->initiate_ui_location(array(
! 'location_type' => 'view',
! 'equipment' =>
$project['equipment_id'],
! 'tenant' =>
$project['tenant_id'],
! 'address' =>
$project['street_name'],
! 'equipment_id' =>
$project['equipment_id'],
! 'property_id' =>
$project['property_id'],
! 'property_name' =>
$project['property_name'],
! 'building_id' =>
$project['building_id'],
! 'entrance_id' =>
$project['entrance_id'],
! 'floor' =>
$project['floor'],
! 'street_name' =>
$project['street_name'],
! 'street_number' =>
$project['street_number'],
! 'tenant_id' =>
$project['tenant_id'],
! 'tenant_name' =>
$project['tenant_name'],
! 'contact_phone' =>
$project['contact_phone'],
! 'apartment_id' =>
$project['apartment_id']));
!
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
--- 482,493 ----
!
$location_data=$this->bolocation->initiate_ui_location(array(
! 'values' =>
$project['location_data'],
! 'type_id' => -1,
// calculated from location_types
! 'no_link' =>
False, // disable lookup links for location type less than type_id
! 'tenant' =>
$project['location_data']['tenant_id'],
! 'equipment' =>
$project['location_data']['equipment_id'],
! 'lookup_type' => 'view'
! ));
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
***************
*** 593,596 ****
--- 671,678 ----
function add()
{
+ if(!$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$link_data = array
***************
*** 627,630 ****
--- 709,716 ----
function delete()
{
+ if(!$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$id = get_var('id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
***************
*** 663,666 ****
--- 749,757 ----
function view()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
+
$id = get_var('id',array('POST','GET'));
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uiwo_hour.inc.php 12 Jun 2003 20:51:13 -0000 1.26
--- class.uiwo_hour.inc.php 21 Jun 2003 19:27:35 -0000 1.27
***************
*** 38,44 ****
$this->create_html =
CreateObject('phpgwapi.xslttemplates');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bowo_hour',True);
$this->boworkorder =
CreateObject($this->currentapp.'.boworkorder');
--- 38,43 ----
$this->create_html =
CreateObject('phpgwapi.xslttemplates');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->bo =
CreateObject($this->currentapp.'.bowo_hour',True);
$this->boworkorder =
CreateObject($this->currentapp.'.boworkorder');
***************
*** 46,58 ****
$this->botemplate =
CreateObject($this->currentapp.'.botemplate');
$this->bopricebook =
CreateObject($this->currentapp.'.bopricebook');
- $this->soproperty =
CreateObject($this->currentapp.'.soproperty');
$this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
$this->pdf =
CreateObject($this->currentapp.'.pdf');
$this->so =
CreateObject($this->currentapp.'.sowo_hour',True);
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
! $this->socommon =
CreateObject($this->currentapp.'.socommon',True);
$this->config =
CreateObject('phpgwapi.config');
$this->start =
$this->bo->start;
$this->query =
$this->bo->query;
--- 45,61 ----
$this->botemplate =
CreateObject($this->currentapp.'.botemplate');
$this->bopricebook =
CreateObject($this->currentapp.'.bopricebook');
$this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
$this->pdf =
CreateObject($this->currentapp.'.pdf');
$this->so =
CreateObject($this->currentapp.'.sowo_hour',True);
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->config =
CreateObject('phpgwapi.config');
+ $this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl_read =
$this->acl2->check('.project',1);
+ $this->acl_add =
$this->acl2->check('.project',2);
+ $this->acl_edit =
$this->acl2->check('.project',4);
+ $this->acl_delete =
$this->acl2->check('.project',8);
+
$this->start =
$this->bo->start;
$this->query =
$this->bo->query;
***************
*** 269,277 ****
function index()
{
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'menu'));
-
$delete = get_var('delete',array('POST','GET'));
$hour_id = get_var('hour_id',array('POST','GET'));
--- 272,283 ----
function index()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'menu'));
$delete = get_var('delete',array('POST','GET'));
$hour_id = get_var('hour_id',array('POST','GET'));
***************
*** 353,356 ****
--- 359,366 ----
function view()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
***************
*** 385,388 ****
--- 395,407 ----
$project =
$this->boproject->read_single($common_data['workorder']['project_id']);
+
$location_data=$this->bolocation->initiate_ui_location(array(
+ 'values' =>
$project['location_data'],
+ 'type_id' => -1,
// calculated from location_types
+ 'no_link' =>
False, // disable lookup links for location type less than type_id
+ 'tenant' =>
$project['location_data']['tenant_id'],
+ 'equipment' =>
$project['location_data']['equipment_id'],
+ 'lookup_type' => 'view'
+ ));
+
if(!$show_cost)
***************
*** 424,436 ****
$date
= $GLOBALS['phpgw']->common->show_date(time(),$dateformat);
-
$tenant_data=$this->socommon->read_single_tenant($project['tenant_id']);
- $tenant_name= $tenant_data['last_name'] . ', ' .
$tenant_data['first_name'];
-
$from_name =
$GLOBALS['phpgw_info']['user']['fullname'];
$from_email =
$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
-
$email_data = array
(
'lang_workorder'
=> lang('Workorder ID'),
'workorder_id'
=> $workorder_id,
--- 443,452 ----
$date
= $GLOBALS['phpgw']->common->show_date(time(),$dateformat);
$from_name =
$GLOBALS['phpgw_info']['user']['fullname'];
$from_email =
$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
$email_data = array
(
+ 'location_data'
=> $location_data,
'lang_workorder'
=> lang('Workorder ID'),
'workorder_id'
=> $workorder_id,
***************
*** 450,482 ****
'from_phone'
=>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['cellphone'],
'lang_district'
=> lang('District'),
! 'district'
=> $this->soproperty->get_district($project['property_id']),
'lang_to'
=> lang('To'),
'to_name'
=> $workorder['vendor_name'],
- 'lang_property'
=> lang('Property'),
- 'property_id'
=> $project['property_id'],
-
- 'lang_building'
=> lang('Building'),
- 'building_id'
=> $project['building_id'],
-
- 'lang_building'
=> lang('Building'),
- 'building_id'
=> $project['building_id'],
-
- 'lang_entrance'
=> lang('Entrance'),
- 'entrance_id'
=> $project['entrance_id'],
-
- 'lang_floor'
=> lang('Floor'),
- 'floor'
=> $project['floor'],
-
- 'lang_apartment'
=> lang('Apartment'),
- 'apartment_id'
=> $project['apartment_id'],
-
- 'lang_address'
=> lang('Address'),
- 'address'
=> $project['street_name'] . ' ' . $project['street_number'],
-
- 'lang_tenant'
=> lang('Tenant'),
- 'tenant_name'
=> $tenant_name,
-
'lang_contact_phone' =>
lang('Contact Phone'),
'contact_phone'
=> $project['contact_phone'],
--- 466,474 ----
'from_phone'
=>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['cellphone'],
'lang_district'
=> lang('District'),
! 'district'
=> $project['location_data']['district_id'],
'lang_to'
=> lang('To'),
'to_name'
=> $workorder['vendor_name'],
'lang_contact_phone' =>
lang('Contact Phone'),
'contact_phone'
=> $project['contact_phone'],
***************
*** 616,619 ****
--- 608,615 ----
function tender()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
$show_cost = get_var('show_cost',array('POST','GET'));
***************
*** 730,733 ****
--- 726,734 ----
function prizebook()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
+
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'menu',
***************
*** 923,926 ****
--- 924,932 ----
function template()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
+
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'menu',
***************
*** 1146,1149 ****
--- 1152,1159 ----
function edit()
{
+ if(!$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$from =
get_var('from',array('POST','GET'));
$template_id =
get_var('template_id',array('POST','GET'));
***************
*** 1314,1317 ****
--- 1324,1331 ----
function delete()
{
+ if(!$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
+ }
$id = get_var('id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uiproject.inc.php 20 Jun 2003 10:31:50 -0000 1.27
--- class.uiproject.inc.php 21 Jun 2003 19:27:35 -0000 1.28
***************
*** 317,321 ****
function edit()
{
-
if(!$this->acl_add && !$this->acl_edit)
{
--- 317,320 ----
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.soXport.inc.php 13 Jun 2003 11:05:30 -0000 1.24
--- class.soXport.inc.php 21 Jun 2003 19:27:35 -0000 1.25
***************
*** 4,67 ****
{
var $db = '';
- var $std_table='fm_ecobilag';
-
var $account_id = 0;
var $total_records = 0;
- /* The left side are the array elements used throughout phpgw,
right side are the db field names. */
- var $stock_contact_fields = array(
- 'id' => 'id',
- 'bilagsnr' => 'bilagsnr',
- 'kidnr' => 'kidnr',
- 'typeid' => 'typeid',
- 'kildeid' => 'kildeid',
- 'pmwrkord_code' => 'pmwrkord_code',
- 'belop' => 'belop',
- 'fakturadato' => 'fakturadato',
- 'periode' => 'periode',
- 'forfallsdato' => 'forfallsdato',
- 'fakturanr' => 'fakturanr',
- 'spbudact_code' => 'spbudact_code',
- 'regtid' => 'regtid',
- 'artid' => 'artid',
- 'godkjentbelop' => 'godkjentbelop',
- 'spvend_code' => 'spvend_code',
- 'dima' => 'dima',
- 'dimb' => 'dimb',
- 'mvakode' => 'mvakode',
- 'dimd' => 'dimd',
- 'oppsynsmannid' => 'oppsynsmannid',
- 'saksbehandlerid' => 'saksbehandlerid',
- 'budsjettansvarligid'=> 'budsjettansvarligid',
- 'oppsynsigndato' => 'oppsynsigndato',
- 'saksigndato' => 'saksigndato',
- 'budsjettsigndato' => 'budsjettsigndato',
- 'merknad' => 'merknad',
- 'splitt' => 'splitt',
- 'utbetalingid' => 'utbetalingid',
- 'utbetalingsigndato'=> 'utbetalingsigndato',
- 'kreditnota' => 'kreditnota'
- );
-
function soXport($useacl=True)
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->datetimeformat =
$this->bocommon->datetimeformat;
!
! $this->db = $GLOBALS['phpgw']->db;
!
! $this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
!
!
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 4,20 ----
{
var $db = '';
var $account_id = 0;
var $total_records = 0;
function soXport($useacl=True)
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $this->db =
$GLOBALS['phpgw']->db;
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
+ $this->join =
$this->socommon->join;
+ $this->datetimeformat =
$this->bocommon->datetimeformat;
+ $this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
}
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.soworkorder.inc.php 21 May 2003 20:09:51 -0000 1.15
--- class.soworkorder.inc.php 21 Jun 2003 19:27:35 -0000 1.16
***************
*** 18,32 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
$this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 18,26 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
***************
*** 123,126 ****
--- 117,176 ----
}
+
+ $entity_table = 'fm_project';
+
+ $cols .= $entity_table . '.location_code';
+ $cols_return[] = 'location_code';
+
+ $cols .= ",$entity_table.id as project_id";
+ $cols_return[] = 'project_id';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'project_id';
+ $uicols['descr'][] =
lang('Project');
+ $uicols['statustext'][] = lang('Project ID');
+
+ $cols .= ",fm_workorder.id as workorder_id";
+ $cols_return[] =
'workorder_id';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] =
'workorder_id';
+ $uicols['descr'][] =
lang('Workorder');
+ $uicols['statustext'][] = lang('Workorder ID');
+
+ $cols .= ",fm_workorder.title as title";
+ $cols_return[] = 'title';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'title';
+ $uicols['descr'][] = lang('Title');
+ $uicols['statustext'][] = lang('Workorder
title');
+
+ $cols .= ",fm_workorder.status as status";
+ $cols_return[] = 'status';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'status';
+ $uicols['descr'][] =
lang('Status');
+ $uicols['statustext'][] = lang('Workorder
status');
+
+ $cols .= ",fm_workorder.entry_date as entry_date";
+ $cols_return[] = 'entry_date';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'entry_date';
+ $uicols['descr'][] = lang('Entry
date');
+ $uicols['statustext'][] = lang('Workorder entry
date');
+
+ $cols .= ",fm_workorder.user_id as user_id";
+ $cols_return[] = 'user_id';
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'user';
+ $uicols['descr'][] = lang('User');
+ $uicols['statustext'][] = lang('Workorder
User');
+
+
+
+ $joinmethod .= " $this->join fm_workorder ON
($entity_table.id = fm_workorder.project_id))";
+ $paranthesis .='(';
+
+ $sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
+
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query));
+
if ($order)
{
***************
*** 132,136 ****
}
! $filtermethod = ' ( fm_workorder.owner=' .
$this->account;
if (is_array($this->grants))
{
--- 182,186 ----
}
! $filtermethod = ' ( fm_workorder.user_id=' .
$this->account;
if (is_array($this->grants))
{
***************
*** 141,145 ****
}
reset($public_user_list);
! $filtermethod .= " OR
(fm_workorder.access='public' OR fm_workorder.owner IN(" .
implode(',',$public_user_list) . ")))";
}
else
--- 191,195 ----
}
reset($public_user_list);
! $filtermethod .= " OR
(fm_workorder.access='public' OR fm_workorder.user_id IN(" .
implode(',',$public_user_list) . ")))";
}
else
***************
*** 160,164 ****
if ($filter)
{
! $filtermethod .= " AND
fm_workorder.owner='$filter' ";
}
--- 210,214 ----
if ($filter)
{
! $filtermethod .= " AND
fm_workorder.user_id='$filter' ";
}
***************
*** 168,177 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_workorder.title LIKE
'%$query%' or fm_workorder.descr LIKE '%$query%' or fm_project.address LIKE
'%$query%' or fm_project.location_code LIKE '%$query%'";
}
! $sql = "SELECT fm_project.id as
project_id,fm_workorder.id,fm_workorder.entry_date,fm_workorder.status,fm_project.location_code,"
! . "
fm_project.floor,fm_project.address,fm_workorder.title,fm_workorder.owner "
! . " FROM fm_workorder $this->join fm_project ON
fm_project.id = fm_workorder.project_id WHERE $filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 218,230 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND (fm_workorder.title LIKE
'%$query%' or fm_workorder.descr LIKE '%$query%' or fm_project.address LIKE
'%$query%' or fm_project.location_code LIKE '%$query%')";
}
! $sql .= " WHERE $filtermethod $querymethod";
! //echo $sql;
! $this->uicols = $this->bocommon->uicols;
! $cols_return = $this->bocommon->cols_return;
! $type_id =
$this->bocommon->type_id;
! $this->cols_extra = $this->bocommon->cols_extra;
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 179,201 ****
$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
while ($this->db->next_record())
{
! $ngrants =
(int)$this->grants[$this->db->f('fm_workorder.owner')];
! $workorder_list[] = array
! (
! 'workorder_id' => $this->db->f('id'),
! 'project_id' =>
$this->db->f('project_id'),
! 'title' =>
stripslashes($this->db->f('title')),
! 'entry_date' =>
$this->db->f('entry_date'),
! 'status' =>
$this->db->f('status'),
! 'owner' =>
$this->db->f('owner'),
! 'equipment_id' =>
$this->db->f('equipment_id'),
! 'location_code' =>
$this->db->f('location_code'),
! 'floor' =>
$this->db->f('floor'),
! 'address' =>
$this->db->f('address'),
! 'category' =>
$this->db->f('category'),
! 'grants' => $ngrants
! );
}
return $workorder_list;
}
--- 232,255 ----
$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
+
+ $j=0;
while ($this->db->next_record())
{
! for ($i=0;$i<count($cols_return);$i++)
! {
! $workorder_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
! }
!
! $location_code= $this->db->f('location_code');
! $location = split('-',$location_code);
! for ($m=0;$m<count($location);$m++)
! {
! $workorder_list[$j]['loc' . ($m+1)] =
$location[$m];
!
$workorder_list[$j]['query_location']['loc' . ($m+1)]=implode("-",
array_slice($location, 0, ($m+1)));
! }
!
! $j++;
}
+
return $workorder_list;
}
Index: class.sowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sowo_hour.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sowo_hour.inc.php 15 May 2003 09:08:02 -0000 1.9
--- class.sowo_hour.inc.php 21 Jun 2003 19:27:35 -0000 1.10
***************
*** 19,31 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->soworkorder =
CreateObject($this->currentapp.'.soworkorder');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 19,25 ----
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->soworkorder =
CreateObject($this->currentapp.'.soworkorder');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
Index: class.sotts2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sotts2.inc.php 16 Mar 2003 11:41:17 -0000 1.3
--- class.sotts2.inc.php 21 Jun 2003 19:27:35 -0000 1.4
***************
*** 17,20 ****
--- 17,23 ----
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
$this->config =
CreateObject('phpgwapi.config');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
+
+ $this->join = $this->socommon->join;
}
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.sotts.inc.php 19 Jun 2003 20:03:10 -0000 1.17
--- class.sotts.inc.php 21 Jun 2003 19:27:35 -0000 1.18
***************
*** 21,33 ****
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
$this->config =
CreateObject('phpgwapi.config');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 21,27 ----
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
$this->config =
CreateObject('phpgwapi.config');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
Index: class.sotenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotenant.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sotenant.inc.php 29 May 2003 07:42:24 -0000 1.2
--- class.sotenant.inc.php 21 Jun 2003 19:27:35 -0000 1.3
***************
*** 14,29 ****
function sotenant()
{
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
$this->grants =
$GLOBALS['phpgw']->acl->get_grants('property');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 14,25 ----
function sotenant()
{
+ $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
$this->grants =
$GLOBALS['phpgw']->acl->get_grants('property');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
!
! $this->join = $this->socommon->join;
}
Index: class.sotemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotemplate.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sotemplate.inc.php 15 May 2003 09:08:02 -0000 1.3
--- class.sotemplate.inc.php 21 Jun 2003 19:27:35 -0000 1.4
***************
*** 14,30 ****
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
! $this->db = $GLOBALS['phpgw']->db;
! $this->db2 = $this->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 14,24 ----
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
! $this->db = $GLOBALS['phpgw']->db;
! $this->db2 = $this->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sostandard_entity.inc.php 29 May 2003 07:42:24 -0000 1.10
--- class.sostandard_entity.inc.php 21 Jun 2003 19:27:35 -0000 1.11
***************
*** 14,31 ****
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
! $this->db = $GLOBALS['phpgw']->db;
! $this->db2 = $this->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
--- 14,24 ----
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
! $this->db = $GLOBALS['phpgw']->db;
! $this->db2 = $this->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
Index: class.sostandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_3.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sostandard_3.inc.php 21 May 2003 12:46:39 -0000 1.4
--- class.sostandard_3.inc.php 21 Jun 2003 19:27:35 -0000 1.5
***************
*** 14,32 ****
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
! $this->db = $GLOBALS['phpgw']->db;
! $this->db2 = $this->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
!
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 14,24 ----
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
! $this->db = $GLOBALS['phpgw']->db;
! $this->db2 = $this->db;
! $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
+ $this->join = $this->socommon->join;
}
Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.sostandard_2.inc.php 21 May 2003 12:46:39 -0000 1.17
--- class.sostandard_2.inc.php 21 Jun 2003 19:27:35 -0000 1.18
***************
*** 18,31 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
!
}
--- 18,24 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sorequest.inc.php 19 Jun 2003 20:03:10 -0000 1.10
--- class.sorequest.inc.php 21 Jun 2003 19:27:35 -0000 1.11
***************
*** 20,32 ****
$this->soproject =
CreateObject($this->currentapp.'.soproject');
$this->historylog =
CreateObject($this->currentapp.'.historylog','request');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 20,26 ----
$this->soproject =
CreateObject($this->currentapp.'.soproject');
$this->historylog =
CreateObject($this->currentapp.'.historylog','request');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
Index: class.soreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soreport.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soreport.inc.php 13 Jun 2003 11:05:30 -0000 1.2
--- class.soreport.inc.php 21 Jun 2003 19:27:35 -0000 1.3
***************
*** 18,31 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 18,25 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.soproperty.inc.php 13 Jun 2003 11:05:30 -0000 1.18
--- class.soproperty.inc.php 21 Jun 2003 19:27:35 -0000 1.19
***************
*** 18,30 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
--- 18,24 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.soproject.inc.php 20 Jun 2003 10:52:24 -0000 1.18
--- class.soproject.inc.php 21 Jun 2003 19:27:35 -0000 1.19
***************
*** 18,33 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
$this->historylog =
CreateObject($this->currentapp.'.historylog','project');
$this->historylog_r =
CreateObject($this->currentapp.'.historylog','request');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 18,27 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->historylog =
CreateObject($this->currentapp.'.historylog','project');
$this->historylog_r =
CreateObject($this->currentapp.'.historylog','request');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
***************
*** 199,205 ****
$query = ereg_replace('"','',$query);
! $sub_query = $this->socommon->sub_query;
!
! $querymethod = " AND (fm_project.name LIKE
'%$query%' or fm_project.descr LIKE '%$query%' or fm_project.location_code LIKE
'%$query%' $sub_query)";
}
--- 193,197 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND (fm_project.name LIKE
'%$query%' or fm_project.descr LIKE '%$query%' or fm_project.location_code LIKE
'%$query%')";
}
Index: class.sopricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sopricebook.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sopricebook.inc.php 19 May 2003 11:04:36 -0000 1.9
--- class.sopricebook.inc.php 21 Jun 2003 19:27:35 -0000 1.10
***************
*** 18,30 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 18,24 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
Index: class.soowner.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soowner.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.soowner.inc.php 23 May 2003 10:11:48 -0000 1.4
--- class.soowner.inc.php 21 Jun 2003 19:27:35 -0000 1.5
***************
*** 14,28 ****
function soowner()
{
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 14,24 ----
function soowner()
{
+ $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
!
! $this->join = $this->socommon->join;
}
Index: class.someter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.someter.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.someter.inc.php 8 Apr 2003 12:38:09 -0000 1.1
--- class.someter.inc.php 21 Jun 2003 19:27:35 -0000 1.2
***************
*** 18,30 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
--- 18,24 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
***************
*** 111,115 ****
while ($this->db->next_record())
{
! $ngrants =
(int)$this->grants[$this->db->f('meter_owner')];
$meter[] = array
(
--- 105,109 ----
while ($this->db->next_record())
{
! $ngrants =
(int)$this->grants[$this->db->f('user_id')];
$meter[] = array
(
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.solookup.inc.php 19 Jun 2003 20:03:10 -0000 1.21
--- class.solookup.inc.php 21 Jun 2003 19:27:35 -0000 1.22
***************
*** 18,30 ****
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
--- 18,24 ----
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.solocation.inc.php 20 Jun 2003 10:31:50 -0000 1.11
--- class.solocation.inc.php 21 Jun 2003 19:27:35 -0000 1.12
***************
*** 19,31 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 19,25 ----
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
}
***************
*** 493,496 ****
--- 487,493 ----
}
}
+
+ $cols.= ',district_id';
+ $cols_return[] = 'district_id';
$this->uicols = $uicols;
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.soinvoice.inc.php 13 Jun 2003 11:05:30 -0000 1.22
--- class.soinvoice.inc.php 21 Jun 2003 19:27:35 -0000 1.23
***************
*** 28,40 ****
$this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
! if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
! {
! $this->join = " JOIN ";
! }
! else
! {
! $this->join = " LEFT JOIN ";
! }
}
--- 28,35 ----
$this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
+ $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
! $this->left_join = $this->socommon->left_join;
}
***************
*** 347,353 ****
}
! $sql = "SELECT
$table.*,fm_workorder.status,fm_workorder.charge_tenant ,org_name FROM $table
$this->join "
! . "fm_workorder on fm_workorder.id =
$table.pmwrkord_code $this->join "
! . "phpgw_addressbook on $table.spvend_code =
phpgw_addressbook.id $filtermethod ";
$this->db2->query($sql,__LINE__,__FILE__);
--- 342,348 ----
}
! $sql = "SELECT
$table.*,fm_workorder.status,fm_workorder.charge_tenant ,org_name FROM ((
$table $this->left_join "
! . "fm_workorder on fm_workorder.id =
$table.pmwrkord_code ) $this->join "
! . "phpgw_addressbook on $table.spvend_code =
phpgw_addressbook.id ) $filtermethod ";
$this->db2->query($sql,__LINE__,__FILE__);
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.socommon.inc.php 19 Jun 2003 20:03:10 -0000 1.28
--- class.socommon.inc.php 21 Jun 2003 19:27:35 -0000 1.29
***************
*** 18,22 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
- $this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
--- 18,21 ----
***************
*** 27,201 ****
else
{
$this->join = " LEFT JOIN ";
}
- }
-
-
- function generate_sql_old($data)
- {
-
- $entity_table =
(isset($data['entity_table'])?$data['entity_table']:'');
- $cols =
(isset($data['cols'])?$data['cols']:'');
- $cols_return =
(isset($data['cols_return'])?$data['cols_return']:'');
- $uicols =
(isset($data['uicols'])?$data['uicols']:'');
- $joinmethod =
(isset($data['joinmethod'])?$data['joinmethod']:'');
- $paranthesis =
(isset($data['paranthesis'])?$data['paranthesis']:'');
- $query =
(isset($data['query'])?$data['query']:'');
-
- $location_types =
$this->soadmin_location->select_location_type();
- $config = $this->soadmin_location->read_config('');
-
- for ($i=0;$i<count($config);$i++)
- {
-
if($config[$i]['location_type']>$max_location_join)
- {
- $max_location_join =
$config[$i]['location_type'];
- }
- }
-
- $this->max_location_join = $max_location_join;
- $this->type_id = count($location_types);
-
- for ($i=0; $i<count($location_types); $i++)
- {
-
- $uicols['input_type'][] = 'text';
- $uicols['name'][] = 'loc'
. $location_types[$i]['id'];
- $uicols['descr'][] =
$location_types[$i]['name'];
- $uicols['statustext'][] =
$location_types[$i]['descr'];
- }
-
- for ($i=0; $i<$max_location_join; $i++)
- {
- $cols .= ",$entity_table" . ".loc" .
$location_types[$i]['id'];
- $cols_return[] = 'loc' .
$location_types[$i]['id'];
- }
-
- $cols.= ',fm_location1.loc1_name as loc1_name';
- $cols_return[] = 'loc1_name';
- $uicols['input_type'][] = 'text';
- $uicols['name'][] = 'loc1_name';
- $uicols['descr'][] =
lang('Property Name');
- $uicols['statustext'][] = lang('Property Name');
-
-
- $first_join = False;
-
- /* for ($j=$max_location_join; $j>0; $j--)
- {
- $joinmethod .= " $this->join fm_location". ($j);
-
- $paranthesis .='(';
-
-
- $on = 'ON';
- for ($i=($j); $i>0; $i--)
- {
- if(!$first_join)
- {
- $joinmethod .= " $on
($entity_table" . ".loc" . ($i). " = fm_location" . ($j) . ".loc" . ($i) . ")";
- }
- else
- {
- $joinmethod .= " $on
(fm_location" . ($j+1) .".loc" . ($i). " = fm_location" . ($j) . ".loc" . ($i)
. ")";
- }
- $on = 'AND';
- if($i==1)
- {
- $joinmethod .= ")";
- }
- }
-
- $first_join = True;
- }
- */
- $type_id = count($location_types);
-
- for ($j=$type_id; $j>0; $j--)
- {
- $joinmethod .= " INNER JOIN fm_location". ($j);
-
- $paranthesis .='(';
-
-
- $on = 'ON';
- for ($i=($j); $i>0; $i--)
- {
- $joinmethod .= " $on ($entity_table" .
".loc" . ($i). " = fm_location" . ($j) . ".loc" . ($i) . ")";
-
- $on = 'AND';
- if($i==1)
- {
- $joinmethod .= ")";
- }
- }
-
- }
-
-
-
-
- for ($i=0;$i<count($config);$i++)
- {
- if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['f_key'] ==1))
- {
- $joinmethod .= " INNER JOIN " .
$config[$i]['reference_table'] . " ON ( fm_location" .
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" .
$config[$i]['reference_table'] . ".".$config[$i]['column_name']."))";
-
- $paranthesis .='(';
- }
-
- if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['query_value'] ==1))
- {
-
-
if($config[$i]['column_name']=='street_id')
- {
- $this->sub_query= "or
street_name LIKE '%$query%'";
-
- $cols.=
',fm_streetaddress.street_name';
- $cols_return[]
= 'street_name';
- $uicols['input_type'][]
= 'text';
- $uicols['name'][]
= 'street_name';
- $uicols['descr'][]
= lang('street name');
- $uicols['statustext'][]
= lang('street name');
-
- $cols.= ',street_number';
- $cols_return[]
= 'street_number';
- $uicols['input_type'][]
= 'text';
- $uicols['name'][]
= 'street_number';
- $uicols['descr'][]
= lang('street number');
- $uicols['statustext'][]
= lang('street number');
-
- $cols.= ',fm_location' .
$config[$i]['location_type'] . '.' . $config[$i]['column_name'];
- $cols_return[]
= $config[$i]['column_name'];
- $uicols['input_type'][]
= 'hidden';
- $uicols['name'][]
= $config[$i]['column_name'];
- $uicols['descr'][]
= lang($config[$i]['input_text']);
- $uicols['statustext'][]
= lang($config[$i]['input_text']);
-
- }
- else
- {
- $cols.= ',' .
$config[$i]['column_name'];
- $cols_return[]
= $config[$i]['column_name'];
- $uicols['input_type'][]
= 'text';
- $uicols['name'][]
= $config[$i]['column_name'];
- $uicols['descr'][]
= $config[$i]['input_text'];
- $uicols['statustext'][]
= $config[$i]['input_text'];
- }
- }
- }
-
- $this->uicols = $uicols;
- $this->cols_return = $cols_return;
-
- $from .= " FROM $paranthesis $entity_table ";
-
- $sql = "SELECT $cols $from $joinmethod";
- return $sql;
}
-
--- 26,37 ----
else
{
+ // $this->join = " INNER JOIN ";
$this->join = " LEFT JOIN ";
}
+ $this->left_join = " LEFT JOIN ";
}
Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.boworkorder.inc.php 23 May 2003 08:40:19 -0000 1.10
--- class.boworkorder.inc.php 21 Jun 2003 19:27:35 -0000 1.11
***************
*** 33,36 ****
--- 33,37 ----
$this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
$this->contacts =
CreateObject('phpgwapi.contacts');
+ $this->solocation =
CreateObject($this->currentapp.'.solocation');
if ($session)
***************
*** 293,300 ****
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
for ($i=0; $i<count($workorder); $i++)
{
! $workorder[$i]['owner'] =
$GLOBALS['phpgw']->accounts->id2name($workorder[$i]['owner']);
$workorder[$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($workorder[$i]['entry_date'],$dateformat);
}
--- 294,310 ----
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $this->uicols = $this->so->uicols;
+ $cols_extra = $this->so->cols_extra;
+
for ($i=0; $i<count($workorder); $i++)
{
! $workorder[$i]['user'] =
$GLOBALS['phpgw']->accounts->id2name($workorder[$i]['user_id']);
$workorder[$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($workorder[$i]['entry_date'],$dateformat);
+
$location_data=$this->solocation->read_single($workorder[$i]['location_code']);
+
+ for ($j=0;$j<count($cols_extra);$j++)
+ {
+ $workorder[$i][$cols_extra[$j]] =
$location_data[$cols_extra[$j]];
+ }
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.23,1.24 class.uiwo_hour.inc.php,1.26,1.27 class.uiproject.inc.php,1.27,1.28 class.soXport.inc.php,1.24,1.25 class.soworkorder.inc.php,1.15,1.16 class.sowo_hour.inc.php,1.9,1.10 class.sotts2.inc.php,1.3,1.4 class.sotts.inc.php,1.17,1.18 class.sotenant.inc.php,1.2,1.3 class.sotemplate.inc.php,1.3,1.4class.sostandard_entity.inc.php,1.10,1.11 class.sostandard_3.inc.php,1.4,1.5class.sostandard_2.inc.php,1.17,1.18 class.sorequest.inc.php,1.10,1.11 class.soreport.inc.php,1.2,1.3 class.soproperty.inc.php,1.18,1.19class.soproject.inc.php,1.18,1.19 class.sopricebook.inc.php,1.9,1.10 class.soowner.inc.php,1.4,1.5 class.someter.inc.php,1.1,1.2 class.solookup.inc.php,1.21,1.22 class.solocation.inc.php,1.11,1.12 class.soinvoice.inc.php,1.22,1.23 class.socommon.inc.php,1.28,1.29 class.boworkorder.inc.php,1.10,1.11,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default workorder.xsl,1.13,1.14 wo_hour.xsl,1.13,1.14
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.uiproject.inc.php,1.28,1.29 class.uilookup.inc.php,1.23,1.24class.uiinvestment.inc.php,1.20,1.21 class.solocation.inc.php,1.12,1.13 class.botts.inc.php,1.12,1.13 class.boproject.inc.php,1.8,1.9 class.bolocation.inc.php,1.13,1.14 class.boinvestment.inc.php,1.9,1.10
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default workorder.xsl,1.13,1.14 wo_hour.xsl,1.13,1.14
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.uiproject.inc.php,1.28,1.29 class.uilookup.inc.php,1.23,1.24class.uiinvestment.inc.php,1.20,1.21 class.solocation.inc.php,1.12,1.13 class.botts.inc.php,1.12,1.13 class.boproject.inc.php,1.8,1.9 class.bolocation.inc.php,1.13,1.14 class.boinvestment.inc.php,1.9,1.10
- Index(es):