[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.71, 1.72
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.71, 1.72 class.boinvoice.inc.php, 1.24, 1.25 class.botemplate.inc.php, 1.2, 1.3 class.soinvoice.inc.php, 1.35, 1.36 class.solocation.inc.php, 1.31, 1.32 class.solookup.inc.php, 1.25, 1.26 class.soproject.inc.php, 1.33, 1.34 class.sotemplate.inc.php, 1.6, 1.7 class.sowo_hour.inc.php, 1.12, 1.13 class.soworkorder.inc.php, 1.21, 1.22 class.uiinvoice.inc.php, 1.32, 1.33 |
|
Date: |
Thu, 04 Sep 2003 13:27:29 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv17393/inc
Modified Files:
class.bocommon.inc.php class.boinvoice.inc.php
class.botemplate.inc.php class.soinvoice.inc.php
class.solocation.inc.php class.solookup.inc.php
class.soproject.inc.php class.sotemplate.inc.php
class.sowo_hour.inc.php class.soworkorder.inc.php
class.uiinvoice.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** class.bocommon.inc.php 2 Sep 2003 17:44:38 -0000 1.71
--- class.bocommon.inc.php 4 Sep 2003 17:27:27 -0000 1.72
***************
*** 757,761 ****
}
! $cols_return[] = 'loc1_name';
$cols_extra[] = 'loc1_name';
$uicols['input_type'][] = 'text';
--- 757,761 ----
}
! /* $cols_return[] = 'loc1_name';
$cols_extra[] = 'loc1_name';
$uicols['input_type'][] = 'text';
***************
*** 763,767 ****
$uicols['descr'][] =
lang('Property Name');
$uicols['statustext'][] = lang('Property Name');
!
if($lookup)
{
--- 763,767 ----
$uicols['descr'][] =
lang('Property Name');
$uicols['statustext'][] = lang('Property Name');
! */
if($lookup)
{
***************
*** 1039,1042 ****
--- 1039,1047 ----
$value_set = implode(",", $value_entry);
return $value_set;
+ }
+
+ function fm_cache($name='',$value='')
+ {
+ return $this->socommon->fm_cache($name,$value);
}
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.boinvoice.inc.php 2 Sep 2003 17:44:38 -0000 1.24
--- class.boinvoice.inc.php 4 Sep 2003 17:27:27 -0000 1.25
***************
*** 116,119 ****
--- 116,120 ----
$this->total_records = $this->so->total_records;
+ $this->end_time = $this->so->end_time;
return $invoice;
***************
*** 528,531 ****
--- 529,537 ----
function get_invoice_user_list($format='',$selected='')
{
+ if (!$selected)
+ {
+ $selected='none';
+ }
+
switch($format)
{
Index: class.botemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botemplate.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.botemplate.inc.php 23 May 2003 08:40:19 -0000 1.2
--- class.botemplate.inc.php 4 Sep 2003 17:27:27 -0000 1.3
***************
*** 58,62 ****
$this->query = $query;
}
! if(!empty($filter))
{
$this->filter = $filter;
--- 58,62 ----
$this->query = $query;
}
! if(isset($filter))
{
$this->filter = $filter;
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.soinvoice.inc.php 2 Sep 2003 17:44:38 -0000 1.35
--- class.soinvoice.inc.php 4 Sep 2003 17:27:27 -0000 1.36
***************
*** 48,57 ****
$start=0;
}
- $filter =
(isset($data['filter'])?$data['filter']:'none');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
! $user_lid =
(isset($data['user_lid'])?$data['user_lid']:0);
$paid =
(isset($data['paid'])?$data['paid']:'');
$start_date =
(isset($data['start_date'])?$data['start_date']:'');
--- 48,56 ----
$start=0;
}
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
! $user_lid =
(isset($data['user_lid'])?$data['user_lid']:'none');
$paid =
(isset($data['paid'])?$data['paid']:'');
$start_date =
(isset($data['start_date'])?$data['start_date']:'');
***************
*** 65,69 ****
//_debug_array($data);
-
if ($order)
{
--- 64,67 ----
***************
*** 77,85 ****
$where= 'WHERE';
! if ($user_lid)
{
$filtermethod = " WHERE ( oppsynsmannid=
'$user_lid' or saksbehandlerid= '$user_lid' or budsjettansvarligid=
'$user_lid')";
$where= 'AND';
}
if ($cat_id > 0)
--- 75,88 ----
$where= 'WHERE';
! if ($user_lid=='none' || !$user_lid):
! {
! return;
! }
! elseif ($user_lid!='all'):
{
$filtermethod = " WHERE ( oppsynsmannid=
'$user_lid' or saksbehandlerid= '$user_lid' or budsjettansvarligid=
'$user_lid')";
$where= 'AND';
}
+ endif;
if ($cat_id > 0)
***************
*** 95,99 ****
}
-
if ($vendor_id)
{
--- 98,101 ----
***************
*** 194,198 ****
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
. "
forfallsdato,periode,artid,kidnr,kreditnota "
! . " from $table $this->join
phpgw_addressbook ON phpgw_addressbook.id = $table.spvend_code WHERE bilagsnr =
'$voucher_id' "
. " group by
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
--- 196,200 ----
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
. "
forfallsdato,periode,artid,kidnr,kreditnota "
! . " from $table $this->join
phpgw_addressbook ON phpgw_addressbook.id = $table.spvend_code WHERE bilagsnr =
$voucher_id "
. " group by
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
***************
*** 288,291 ****
--- 290,296 ----
}
}
+ // $end_time = explode(' ',microtime());
+ // $this->end_time = $end_time;
+
//_debug_array($invoice);
//_debug_array($invoice_temp);
***************
*** 819,822 ****
--- 824,833 ----
$sql = "SELECT * FROM fm_acl2 $this->join
phpgw_accounts on phpgw_accounts.account_id=fm_acl2.acl_account where
acl_location ='.invoice' and account_type='u' ";
$this->db->query($sql,__LINE__,__FILE__);
+
+ $employees[] = Array(
+ 'account_lid' => 'all',
+ 'account_lastname' => lang('All')
+ );
+
while ($this->db->next_record())
{
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.solocation.inc.php 29 Aug 2003 16:17:55 -0000 1.31
--- class.solocation.inc.php 4 Sep 2003 17:27:27 -0000 1.32
***************
*** 151,162 ****
}
! //_debug_array($fm_location_cols);
!
! $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');
for ($i=2;$i<($type_id+1);$i++)
--- 151,164 ----
}
! $street_level =
$this->soadmin_location->read_config_single('street_id');
! if ($street_level > $type_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');
! }
for ($i=2;$i<($type_id+1);$i++)
***************
*** 362,365 ****
--- 364,368 ----
$sql .= "$filtermethod $querymethod";
+ //echo $sql;
$this->db2->query($sql,__LINE__,__FILE__);
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.solookup.inc.php 7 Aug 2003 16:08:59 -0000 1.25
--- class.solookup.inc.php 4 Sep 2003 17:27:27 -0000 1.26
***************
*** 58,62 ****
if ($cat_id > 0)
{
! $filtermethod .= " $where cat_id='$cat_id' ";
$where= 'AND';
}
--- 58,62 ----
if ($cat_id > 0)
{
! $filtermethod .= " $where cat_id LIKE
'%,$cat_id,%' ";
$where= 'AND';
}
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.soproject.inc.php 30 Aug 2003 23:30:00 -0000 1.33
--- class.soproject.inc.php 4 Sep 2003 17:27:27 -0000 1.34
***************
*** 117,158 ****
}
! $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.= ",$entity_table.start_date";
! $cols_return[] = 'start_date';
! $uicols['input_type'][] = 'text';
! $uicols['name'][] = 'start_date';
! $uicols['descr'][] = lang('start
date');
! $uicols['statustext'][] = lang('Project start
date');
!
! $cols.= ",$entity_table.name as name";
! $cols_return[] = 'name';
! $uicols['input_type'][] = 'text';
! $uicols['name'][] = 'name';
! $uicols['descr'][] = lang('name');
! $uicols['statustext'][] = lang('Project name');
!
! $cols.= ",$entity_table.coordinator";
! $cols_return[] = 'coordinator';
! $uicols['input_type'][] = 'text';
! $uicols['name'][] = 'coordinator';
! $uicols['descr'][] =
lang('Coordinator');
! $uicols['statustext'][] = lang('Project
coordinator');
! $cols.= ",$entity_table.user_id";
! $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)
--- 117,182 ----
}
+ $sql = $this->bocommon->fm_cache('sql_project');
! if(!$sql)
! {
! $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.= ",$entity_table.start_date";
! $cols_return[] =
'start_date';
! $uicols['input_type'][] = 'text';
! $uicols['name'][] =
'start_date';
! $uicols['descr'][] =
lang('start date');
! $uicols['statustext'][] = lang('Project
start date');
!
! $cols.= ",$entity_table.name as name";
! $cols_return[] =
'name';
! $uicols['input_type'][] = 'text';
! $uicols['name'][] =
'name';
! $uicols['descr'][] =
lang('name');
! $uicols['statustext'][] = lang('Project
name');
!
! $cols.= ",$entity_table.coordinator";
! $cols_return[] =
'coordinator';
! $uicols['input_type'][] = 'text';
! $uicols['name'][] =
'coordinator';
! $uicols['descr'][] =
lang('Coordinator');
! $uicols['statustext'][] = lang('Project
coordinator');
!
! $cols.= ",$entity_table.user_id";
!
! $sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
!
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query));
!
! $this->bocommon->fm_cache('sql_project',$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->bocommon->fm_cache('uicols_project',$this->uicols);
!
$this->bocommon->fm_cache('cols_return_project',$cols_return);
!
$this->bocommon->fm_cache('type_id_project',$type_id);
!
$this->bocommon->fm_cache('cols_extra_project',$this->cols_extra);
! }
! else
! {
! $this->uicols =
$this->bocommon->fm_cache('uicols_project');
! $cols_return =
$this->bocommon->fm_cache('cols_return_project');
! $type_id =
$this->bocommon->fm_cache('type_id_project');
! $this->cols_extra =
$this->bocommon->fm_cache('cols_extra_project');
! }
if ($order)
***************
*** 213,221 ****
$sql .= " $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__);
$this->total_records = $this->db2->num_rows();
--- 237,240 ----
***************
*** 548,552 ****
. "1,'"
. $location_code. "',"
! . time() . ",$this->account '$address'
$vals)",__LINE__,__FILE__);
}
}
--- 567,571 ----
. "1,'"
. $location_code. "',"
! . time() . ",$this->account, '$address'
$vals)",__LINE__,__FILE__);
}
}
Index: class.sotemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotemplate.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.sotemplate.inc.php 17 Jul 2003 18:15:50 -0000 1.6
--- class.sotemplate.inc.php 4 Sep 2003 17:27:27 -0000 1.7
***************
*** 50,54 ****
else
{
! $ordermethod = ' order by id desc';
}
--- 50,54 ----
else
{
! $ordermethod = ' order by fm_template.id desc';
}
***************
*** 77,81 ****
$sql = "SELECT
fm_template.id,fm_template.descr,fm_template.name,fm_template.owner,fm_template.entry_date,"
! . " fm_chapter.descr as chapter FROM fm_template
$this->left_join fm_chapter on fm_template.chapter_id=fm_chapter.id"
. " $filtermethod $querymethod";
--- 77,81 ----
$sql = "SELECT
fm_template.id,fm_template.descr,fm_template.name,fm_template.owner,fm_template.entry_date,"
! . " fm_chapter.descr as chapter FROM fm_template
$this->left_join fm_chapter on fm_template.chapter_id=fm_chapter.id"
. " $filtermethod $querymethod";
Index: class.sowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sowo_hour.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.sowo_hour.inc.php 17 Jul 2003 18:15:50 -0000 1.12
--- class.sowo_hour.inc.php 4 Sep 2003 17:27:27 -0000 1.13
***************
*** 141,144 ****
--- 141,146 ----
//_debug_array($workorder);
+ $this->db->transaction_begin();
+
$this->db->query("insert into fm_template
(owner,name,descr,chapter_id,entry_date) "
. " values ('" .
***************
*** 153,157 ****
$hour = $this->read(array('workorder_id' =>
$workorder_id));
-
$record = $this->next_record($hour[0]['workorder_id']);
--- 155,158 ----
***************
*** 188,191 ****
--- 189,193 ----
}
+ $this->db->transaction_commit();
$receipt['message'][] = array('msg'=>lang('template %1
is added',$values['name']));
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.soworkorder.inc.php 26 Aug 2003 19:16:30 -0000 1.21
--- class.soworkorder.inc.php 4 Sep 2003 17:27:27 -0000 1.22
***************
*** 132,191 ****
}
! $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');
!
! $cols .= ",fm_project.user_id as project_owner";
! $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,216 ----
}
+ $sql = $this->bocommon->fm_cache('sql_workorder');
! if(!$sql)
! {
! $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');
!
! $cols .= ",fm_project.user_id as project_owner";
!
!
! $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));
!
!
! $this->bocommon->fm_cache('sql_workorder',$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->bocommon->fm_cache('uicols_workorder',$this->uicols);
!
$this->bocommon->fm_cache('cols_return_workorder',$cols_return);
!
$this->bocommon->fm_cache('type_id_workorder',$type_id);
!
$this->bocommon->fm_cache('cols_extra_workorder',$this->cols_extra);
! }
! else
! {
! $this->uicols =
$this->bocommon->fm_cache('uicols_workorder');
! $cols_return =
$this->bocommon->fm_cache('cols_return_workorder');
! $type_id =
$this->bocommon->fm_cache('type_id_workorder');
! $this->cols_extra =
$this->bocommon->fm_cache('cols_extra_workorder');
! }
if ($order)
***************
*** 216,220 ****
if ($cat_id > 0)
{
! $filtermethod .= " $where
fm_workorder.category='$cat_id' ";
$where= 'AND';
}
--- 241,245 ----
if ($cat_id > 0)
{
! $filtermethod .= " $where
fm_project.category='$cat_id' ";
$where= 'AND';
}
***************
*** 242,250 ****
$sql .= " $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__);
$this->total_records = $this->db2->num_rows();
--- 267,270 ----
***************
*** 252,259 ****
$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]);
--- 272,280 ----
+ $count_cols_return=count($cols_return);
$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]);
***************
*** 263,267 ****
$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];
--- 284,289 ----
$location_code= $this->db->f('location_code');
$location = split('-',$location_code);
! $count_location =count($location);
! for ($m=0;$m<$count_location;$m++)
{
$workorder_list[$j]['loc' . ($m+1)] =
$location[$m];
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** class.uiinvoice.inc.php 27 Jul 2003 15:53:24 -0000 1.32
--- class.uiinvoice.inc.php 4 Sep 2003 17:27:27 -0000 1.33
***************
*** 79,82 ****
--- 79,85 ----
function index()
{
+ // $start_time = explode(' ',microtime());
+ // $start_time = $start_time[1]+$start_time[0];
+
if(!$this->acl_read)
{
***************
*** 246,250 ****
$data['select_name']
= 'cat_id';
$data['select_action']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
! $data['lang_no_user']
= lang('All users');
$data['lang_user_statustext'] =
lang('Select the user the selection belongs to. To do not use a user select NO
USER');
$data['select_user_name']
= 'user_lid';
--- 249,253 ----
$data['select_name']
= 'cat_id';
$data['select_action']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
! $data['lang_no_user']
= lang('None');
$data['lang_user_statustext'] =
lang('Select the user the selection belongs to. To do not use a user select NO
USER');
$data['select_user_name']
= 'user_lid';
***************
*** 327,331 ****
}
$this->save_sessiondata();
! //_debug_array($data);
}
--- 330,339 ----
}
$this->save_sessiondata();
!
! $end_time = $this->bo->end_time;
!
! // $end_time = $end_time[1]+$end_time[0];
! // $process = ($end_time-$start_time);
! // echo "tidsforbruk: $process";
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.71, 1.72 class.boinvoice.inc.php, 1.24, 1.25 class.botemplate.inc.php, 1.2, 1.3 class.soinvoice.inc.php, 1.35, 1.36 class.solocation.inc.php, 1.31, 1.32 class.solookup.inc.php, 1.25, 1.26 class.soproject.inc.php, 1.33, 1.34 class.sotemplate.inc.php, 1.6, 1.7 class.sowo_hour.inc.php, 1.12, 1.13 class.soworkorder.inc.php, 1.21, 1.22 class.uiinvoice.inc.php, 1.32, 1.33,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php, 1.130, 1.131
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default lookup.xsl, 1.21, 1.22 user_lid_filter.xsl, 1.1, 1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php, 1.130, 1.131
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default lookup.xsl, 1.21, 1.22 user_lid_filter.xsl, 1.1, 1.2
- Index(es):