|
| From: | Sigurd Nes <address@hidden> |
| Subject: | [Phpgroupware-cvs] property/inc class.uiproject.inc.php, 1.48, 1.49 class.bocommon.inc.php, 1.78, 1.79 class.soreport.inc.php, 1.8, 1.9 class.uireport.inc.php, 1.16, 1.17 class.sostandard_entity.inc.php, 1.15, 1.16 class.boreport.inc.php, 1.8, 1.9 class.uiinvoice.inc.php, 1.36, 1.37 class.uiworkorder.inc.php, 1.42, 1.43 class.soworkorder.inc.php, 1.28, 1.29 class.soproject.inc.php, 1.39, 1.40 class.boproject.inc.php, 1.16, 1.17 class.boworkorder.inc.php, 1.16, 1.17 class.soequipment.inc.php, 1.25, 1.26 class.uirequest.inc.php, 1.28, 1.29 |
| Date: | Fri, 26 Sep 2003 18:04:37 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv23481/inc
Modified Files:
class.uiproject.inc.php class.bocommon.inc.php
class.soreport.inc.php class.uireport.inc.php
class.sostandard_entity.inc.php class.boreport.inc.php
class.uiinvoice.inc.php class.uiworkorder.inc.php
class.soworkorder.inc.php class.soproject.inc.php
class.boproject.inc.php class.boworkorder.inc.php
class.soequipment.inc.php class.uirequest.inc.php
Log Message:
no message
Index: class.boreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boreport.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.boreport.inc.php 3 Sep 2003 18:04:35 -0000 1.8
--- class.boreport.inc.php 26 Sep 2003 18:04:34 -0000 1.9
***************
*** 68,71 ****
--- 68,72 ----
$cat_id = get_var('cat_id',array('POST','GET'));
$district_id =
get_var('district_id',array('POST','GET'));
+ $status_id =
get_var('status_id',array('POST','GET'));
if ($start)
***************
*** 102,105 ****
--- 103,110 ----
$this->district_id = $district_id;
}
+ if(isset($status_id))
+ {
+ $this->status_id = $status_id;
+ }
}
***************
*** 123,126 ****
--- 128,132 ----
$this->cat_id = $data['cat_id'];
$this->district_id = $data['district_id'];
+ $this->status_id = $data['status_id'];
}
***************
*** 210,217 ****
}
! function read()
{
$report = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'district_id' =>
$this->district_id));
$this->total_records = $this->so->total_records;
--- 216,227 ----
}
! function read($start_date='',$end_date='')
{
+ $start_date =
$this->bocommon->date_to_timestamp($start_date);
+ $end_date =
$this->bocommon->date_to_timestamp($end_date);
+
$report = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'district_id' =>
$this->district_id,'status_id' => $this->status_id,
!
'start_date'=>$start_date,'end_date'=>$end_date));
$this->total_records = $this->so->total_records;
***************
*** 246,252 ****
--- 256,268 ----
}
+
+ $this->vfs->override_acl = 1;
+
$report['files'] = $this->vfs->ls (array(
'string' => $this->fakebase. SEP .
'report' . SEP . $report['location_data']['loc1'] . SEP . $report_id,
'relatives' => array(RELATIVE_NONE)));
+
+ $this->vfs->override_acl = 0;
+
if(!$report['files'][0]['file_id'])
{
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** class.soproject.inc.php 18 Sep 2003 14:00:49 -0000 1.39
--- class.soproject.inc.php 26 Sep 2003 18:04:34 -0000 1.40
***************
*** 114,118 ****
$order =
(isset($data['order'])?$data['order']:'');
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
! $status_id =
(isset($data['status_id'])?$data['status_id']:0);
}
--- 114,120 ----
$order =
(isset($data['order'])?$data['order']:'');
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
! $status_id =
(isset($data['status_id'])?$data['status_id']:'');
! $start_date =
(isset($data['start_date'])?$data['start_date']:'');
! $end_date =
(isset($data['end_date'])?$data['end_date']:'');
}
***************
*** 231,234 ****
--- 233,243 ----
}
endif;
+
+ if ($start_date)
+ {
+ $filtermethod .= " $where fm_project.start_date
>= $start_date AND fm_project.start_date <= $end_date ";
+ $where= 'AND';
+ }
+
if($query)
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** class.uiproject.inc.php 24 Sep 2003 18:13:35 -0000 1.48
--- class.uiproject.inc.php 26 Sep 2003 18:04:34 -0000 1.49
***************
*** 25,29 ****
'view' => True,
'edit' => True,
! 'delete' => True
);
--- 25,30 ----
'view' => True,
'edit' => True,
! 'delete' => True,
! 'date_search'=>True
);
***************
*** 87,93 ****
$lookup = get_var('lookup',array('POST','GET'));
$links = $this->bocommon->menu();
! $project_list = $this->bo->read();
$uicols = $this->bo->uicols;
$count_uicols_name=count($uicols['name']);
--- 88,97 ----
$lookup = get_var('lookup',array('POST','GET'));
+ $start_date =
urldecode(get_var('start_date',array('POST','GET')));
+ $end_date =
urldecode(get_var('end_date',array('POST','GET')));
+
$links = $this->bocommon->menu();
! $project_list = $this->bo->read($start_date,$end_date);
$uicols = $this->bo->uicols;
$count_uicols_name=count($uicols['name']);
***************
*** 187,191 ****
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
));
}
--- 191,197 ----
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 203,207 ****
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
));
}
--- 209,215 ----
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 219,223 ****
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
));
}
--- 227,233 ----
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 277,285 ****
'status_id'
=>$this->status_id,
'lookup'
=>$lookup,
! 'query'
=>$this->query
);
$data = array
(
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
--- 287,307 ----
'status_id'
=>$this->status_id,
'lookup'
=>$lookup,
! 'query'
=>$this->query,
! 'start_date'=>$start_date,
! 'end_date'=>$end_date
);
+ $link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
+
$data = array
(
+ 'start_date'
=>$start_date,
+ 'end_date'
=>$end_date,
+ 'lang_none'
=>lang('None'),
+ 'lang_date_search' =>
lang('Date search'),
+ 'lang_date_search_help' => lang('Narrow
the search by dates'),
+ 'link_date_search' =>
$link_date_search,
+ 'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
+
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
***************
*** 331,334 ****
--- 353,409 ----
}
+ function date_search()
+ {
+
$GLOBALS['phpgw']->xslttpl->add_file(array('date_search'));
+ $GLOBALS['phpgw_info']['flags']['headonly']=true;
+ $values['start_date'] =
get_var('start_date',array('POST'));
+ $values['end_date'] =
get_var('end_date',array('POST'));
+
+ $function_msg = lang('Date search');
+ $appname = lang('project');
+
+
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] = 'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+
+ $dateformat= (implode($sep,$dlarr));
+
+ if(!$values['end_date'])
+ {
+ $values['end_date'] =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ }
+
+
+ $data = array
+ (
+ 'calendar_gif'
=> './'.$this->currentapp.'/templates/default/images/calendar.gif',
+ 'calendar_source'
=> './'.$this->currentapp.'/inc/calendar.js',
+ 'dateformat'
=> $dateformat,
+ 'lang_popup_calendar' =>
lang('Popup Calendar'),
+
+ 'link_calendar_start_date' =>
'setDateField(document.form.start_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
+ 'lang_start_date_statustext' => lang('Select
the estimated end date for the Project'),
+ 'lang_start_date'
=> lang('Start date'),
+ 'value_start_date'
=> $values['start_date'],
+
+ 'link_calendar_end_date' =>
'setDateField(document.form.end_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
+ 'lang_end_date_statustext' =>
lang('Select the estimated end date for the Project'),
+ 'lang_end_date'
=> lang('End date'),
+ 'value_end_date'
=> $values['end_date'],
+
+ 'dateformat'
=> $dateformat,
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'lang_submit_statustext' =>
lang('Select this dates'),
+ 'lang_submit' =>
lang('Submit')
+ );
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('date_search' => $data));
+ }
+
function edit()
{
***************
*** 475,479 ****
{
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
!
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
$headers = "Return-Path: <".
$coordinator_email .">\r\n";
$headers .= "From: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
--- 550,554 ----
{
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
!
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['email'];
$headers = "Return-Path: <".
$coordinator_email .">\r\n";
$headers .= "From: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
Index: class.boproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.boproject.inc.php 15 Sep 2003 18:28:43 -0000 1.16
--- class.boproject.inc.php 26 Sep 2003 18:04:34 -0000 1.17
***************
*** 285,292 ****
! function read()
{
$project = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id));
$this->total_records = $this->so->total_records;
--- 285,296 ----
! function read($start_date='',$end_date='')
{
+ $start_date =
$this->bocommon->date_to_timestamp($start_date);
+ $end_date =
$this->bocommon->date_to_timestamp($end_date);
+
$project = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,
!
'start_date'=>$start_date,'end_date'=>$end_date));
$this->total_records = $this->so->total_records;
Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.uireport.inc.php 24 Sep 2003 15:40:50 -0000 1.16
--- class.uireport.inc.php 26 Sep 2003 18:04:34 -0000 1.17
***************
*** 57,60 ****
--- 57,61 ----
$this->part_of_town_id =
$this->bo->part_of_town_id;
$this->district_id =
$this->bo->district_id;
+ $this->status_id =
$this->bo->status_id;
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'report');
***************
*** 72,76 ****
'cat_id' =>
$this->cat_id,
'part_of_town_id' =>
$this->part_of_town_id,
! 'district_id' => $this->district_id
);
$this->bo->save_sessiondata($data);
--- 73,78 ----
'cat_id' =>
$this->cat_id,
'part_of_town_id' =>
$this->part_of_town_id,
! 'district_id' => $this->district_id,
! 'status_id' =>
$this->status_id
);
$this->bo->save_sessiondata($data);
***************
*** 91,95 ****
$links = $this->bocommon->menu();
! $report_list = $this->bo->read();
//_debug_array($report_list);
--- 93,99 ----
$links = $this->bocommon->menu();
! $start_date =
urldecode(get_var('start_date',array('POST','GET')));
! $end_date =
urldecode(get_var('end_date',array('POST','GET')));
! $report_list = $this->bo->read($start_date,$end_date);
//_debug_array($report_list);
***************
*** 182,186 ****
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
));
}
--- 186,193 ----
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id,
!
'status_id'
=>$this->status_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 198,202 ****
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
));
}
--- 205,212 ----
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id,
!
'status_id'
=>$this->status_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 214,218 ****
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
));
}
--- 224,231 ----
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id,
!
'status_id'
=>$this->status_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 270,279 ****
'cat_id'
=>$this->cat_id,
'district_id'
=>$this->district_id,
'filter'
=>$this->filter,
! 'query'
=>$this->query
);
$data = array
(
'links'
=> $links,
'allow_allrows'
=> false,
--- 283,305 ----
'cat_id'
=>$this->cat_id,
'district_id'
=>$this->district_id,
+ 'status_id'
=>$this->status_id,
'filter'
=>$this->filter,
! 'query'
=>$this->query,
! 'start_date'=>$start_date,
! 'end_date'=>$end_date
);
+ $link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
+
$data = array
(
+ 'start_date'
=>$start_date,
+ 'end_date'
=>$end_date,
+ 'lang_none'
=>lang('None'),
+ 'lang_date_search' =>
lang('Date search'),
+ 'lang_date_search_help' => lang('Narrow
the search by dates'),
+ 'link_date_search' =>
$link_date_search,
+ 'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
+
'links'
=> $links,
'allow_allrows'
=> false,
***************
*** 299,302 ****
--- 325,332 ----
'user_list'
=> $this->bocommon->get_user_list('filter',$this->filter),
+ 'lang_status_statustext' =>
lang('Select the status the report belongs to. To do not use a status select NO
STATUS'),
+ 'status_name'
=> 'status_id',
+ 'lang_no_status'
=> lang('No status'),
+ 'status_list'
=> $this->bo->select_status_list('filter',$this->status_id),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.boworkorder.inc.php 15 Sep 2003 18:28:43 -0000 1.16
--- class.boworkorder.inc.php 26 Sep 2003 18:04:34 -0000 1.17
***************
*** 296,303 ****
! function read()
{
$workorder = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,'search_vendor' => $this->search_vendor));
$this->total_records = $this->so->total_records;
--- 296,307 ----
! function read($start_date='',$end_date='')
{
+ $start_date =
$this->bocommon->date_to_timestamp($start_date);
+ $end_date =
$this->bocommon->date_to_timestamp($end_date);
+
$workorder = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,'search_vendor' => $this->search_vendor,
!
'start_date'=>$start_date,'end_date'=>$end_date));
$this->total_records = $this->so->total_records;
***************
*** 415,423 ****
function save($workorder,$action='')
{
! $start_date =
$this->bocommon->date_array($workorder['start_date']);
! $end_date =
$this->bocommon->date_array($workorder['end_date']);
!
! $workorder['start_date'] = mktime
(2,0,0,$start_date['month'],$start_date['day'],$start_date['year']);
! $workorder['end_date'] = mktime
(2,0,0,$end_date['month'],$end_date['day'],$end_date['year']);
if ($action=='edit')
--- 419,424 ----
function save($workorder,$action='')
{
! $workorder['start_date'] =
$this->bocommon->date_to_timestamp($workorder['start_date']);
! $workorder['end_date'] =
$this->bocommon->date_to_timestamp($workorder['end_date']);
if ($action=='edit')
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** class.uiworkorder.inc.php 19 Sep 2003 17:50:46 -0000 1.42
--- class.uiworkorder.inc.php 26 Sep 2003 18:04:34 -0000 1.43
***************
*** 87,94 ****
'nextmatchs'));
! $sub = get_var('sub',array('POST','GET'));
! $links = $this->bocommon->menu($sub);
! $workorder_list = $this->bo->read();
$uicols = $this->bo->uicols;
--- 87,95 ----
'nextmatchs'));
! $links = $this->bocommon->menu();
! $start_date =
urldecode(get_var('start_date',array('POST','GET')));
! $end_date =
urldecode(get_var('end_date',array('POST','GET')));
! $workorder_list =
$this->bo->read($start_date,$end_date);
$uicols = $this->bo->uicols;
***************
*** 196,200 ****
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id)
));
}
--- 197,203 ----
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 213,217 ****
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id)
));
}
if($uicols['name'][$i]=='workorder_id')
--- 216,222 ----
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
if($uicols['name'][$i]=='workorder_id')
***************
*** 229,233 ****
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id)
));
}
--- 234,240 ----
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 246,250 ****
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id)
));
}
--- 253,259 ----
'district_id' =>
$this->district_id,
'search_vendor'
=>$this->search_vendor,
!
'cat_id'
=>$this->cat_id,
!
'start_date'=>$start_date,
!
'end_date'=>$end_date)
));
}
***************
*** 310,319 ****
'filter'
=>$this->filter,
'query'
=>$this->query,
! 'search_vendor'
=>$this->search_vendor
);
$data = array
(
! 'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
'lang_history_statustext' =>
lang('search for history at this location'),
--- 319,339 ----
'filter'
=>$this->filter,
'query'
=>$this->query,
! 'search_vendor'
=>$this->search_vendor,
! 'start_date'=>$start_date,
! 'end_date'=>$end_date
);
+ $link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
+
$data = array
(
! 'start_date'
=>$start_date,
! 'end_date'
=>$end_date,
! 'lang_none'
=>lang('None'),
! 'lang_date_search' =>
lang('Date search'),
! 'lang_date_search_help' => lang('Narrow
the search by dates'),
! 'link_date_search' =>
$link_date_search,
! 'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
!
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
'lang_history_statustext' =>
lang('search for history at this location'),
***************
*** 401,404 ****
--- 421,428 ----
$receipt['error'][]=array('msg'=>lang('Please select a status !'));
}
+ if(!$values['b_account_id'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select a budget account !'));
+ }
if($id)
***************
*** 428,432 ****
{
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
!
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
$headers = "Return-Path: <".
$coordinator_email .">\r\n";
$headers .= "From: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
--- 452,456 ----
{
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
!
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['email'];
$headers = "Return-Path: <".
$coordinator_email .">\r\n";
$headers .= "From: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
***************
*** 493,496 ****
--- 517,532 ----
{
$values['charge_tenant']=$project['charge_tenant'];
+ }
+ if( $project['start_date'] &&
!$values['start_date'])
+ {
+
$values['start_date']=$project['start_date'];
+ }
+ if( $project['end_date'] &&
!$values['end_date'])
+ {
+
$values['end_date']=$project['end_date'];
+ }
+ if( $project['name'] && !$values['title'])
+ {
+ $values['title']=$project['name'];
}
}
Index: class.soreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soreport.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.soreport.inc.php 24 Sep 2003 15:40:50 -0000 1.8
--- class.soreport.inc.php 26 Sep 2003 18:04:34 -0000 1.9
***************
*** 78,81 ****
--- 78,84 ----
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
$district_id =
(isset($data['district_id'])?$data['district_id']:0);
+ $start_date =
(isset($data['start_date'])?$data['start_date']:'');
+ $end_date =
(isset($data['end_date'])?$data['end_date']:'');
+ $status_id =
(isset($data['status_id'])?$data['status_id']:'');
}
***************
*** 169,172 ****
--- 172,187 ----
}
+ if ($status_id)
+ {
+ $filtermethod .= " $where
fm_report.status='$status_id' ";
+ $where= 'AND';
+ }
+
+ if ($start_date)
+ {
+ $filtermethod .= " $where fm_report.entry_date
>= $start_date AND fm_report.entry_date <= $end_date ";
+ $where= 'AND';
+ }
+
if($query)
{
***************
*** 272,283 ****
$this->db->next_record();
$prefix = $this->db->f('prefix');
- //echo 'prefix ' .$prefix .'<br>' ;
! // $prefix = $prefix . $year . '-';
! $pos = strlen($prefix);
! $this->db->query("select max(report_id) from fm_report
where report_id like ('$prefix%')");
! $this->db->next_record();
! $max =
$this->bocommon->add_leading_zero(substr($this->db->f(0),$pos));
return $prefix . $max;
--- 287,300 ----
$this->db->next_record();
$prefix = $this->db->f('prefix');
! if($prefix)
! {
! $pos = strlen($prefix);
! $this->db->query("select max(report_id) as
report_id from fm_report where report_id like ('$prefix%')");
! $this->db->next_record();
! $num = substr($this->db->f('report_id'),$pos);
! }
! $max = $this->bocommon->add_leading_zero($num);
return $prefix . $max;
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** class.bocommon.inc.php 24 Sep 2003 15:40:50 -0000 1.78
--- class.bocommon.inc.php 26 Sep 2003 18:04:34 -0000 1.79
***************
*** 158,161 ****
--- 158,172 ----
}
+ function date_to_timestamp($date)
+ {
+ if($date)
+ {
+ $date_array = $this->date_array($date);
+ $date = mktime
(2,0,0,$date_array['month'],$date_array['day'],$date_array['year']);
+ }
+ return $date;
+ }
+
+
function
get_user_list($format='',$selected='',$extra='',$default='')
{
***************
*** 1231,1234 ****
--- 1242,1249 ----
}
+ function next_id($table)
+ {
+ return $this->socommon->next_id($table);
+ }
}
?>
Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** class.sostandard_entity.inc.php 24 Sep 2003 15:40:50 -0000 1.15
--- class.sostandard_entity.inc.php 26 Sep 2003 18:04:34 -0000 1.16
***************
*** 16,22 ****
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join = $this->socommon->join;
--- 16,22 ----
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->join = $this->bocommon->join;
***************
*** 162,171 ****
$table = $this->select_table($type);
! $standard['id'] =
$this->socommon->next_id($table);
$standard['name'] =
$this->db->db_addslashes($standard['name']);
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $this->db->query("INSERT INTO $table (id, name,
descr, prefix) "
! . "VALUES ('" . $standard['id'] . "','"
. $standard['name'] . "','" . $standard['descr'] . "','" . $standard['prefix'].
"')",__LINE__,__FILE__);
$receipt['id']=$standard['id'];
--- 162,180 ----
$table = $this->select_table($type);
! $standard['id'] =
$this->bocommon->next_id($table);
$standard['name'] =
$this->db->db_addslashes($standard['name']);
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $values= array(
! $standard['id'],
! $standard['name'],
! $standard['descr'],
! $standard['prefix']
! );
!
! $values = $this->bocommon->validate_db_insert($values);
!
!
! $this->db->query("INSERT INTO $table (id, name,
descr, prefix) VALUES ($values)",__LINE__,__FILE__);
$receipt['id']=$standard['id'];
***************
*** 196,202 ****
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $this->db->query("UPDATE $table set descr='" .
$standard['descr'] . "', name='". $standard['name'] . "', prefix='".
$standard['prefix']
! . "' WHERE id='" . $standard['id'].
"'",__LINE__,__FILE__);
$receipt['message'][] = array('msg'=>
lang('Standard has been edited'));
--- 205,217 ----
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $value_set=array(
! 'descr' =>
$standard['descr'],
! 'name' => $standard['name'],
! 'prefix' => $standard['prefix']
! );
+ $value_set =
$this->bocommon->validate_db_update($value_set);
+
+ $this->db->query("UPDATE $table set $value_set
WHERE id=" . $standard['id'],__LINE__,__FILE__);
$receipt['message'][] = array('msg'=>
lang('Standard has been edited'));
***************
*** 221,227 ****
$table =
$this->select_table($type);
$attrib_table =
$this->select_table_attrib($type);
! $this->db->query("DELETE FROM $attrib_table
WHERE type_id='" . $id . "'",__LINE__,__FILE__);
}
! $this->db->query("DELETE FROM $table WHERE id='" . $id
. "'",__LINE__,__FILE__);
}
--- 236,242 ----
$table =
$this->select_table($type);
$attrib_table =
$this->select_table_attrib($type);
! $this->db->query("DELETE_ FROM $attrib_table
WHERE type_id='" . $id . "'",__LINE__,__FILE__);
}
! $this->db->query("DELETE_ FROM $table WHERE id='" . $id
. "'",__LINE__,__FILE__);
}
***************
*** 357,361 ****
$table = $this->select_table_attrib($type);
! $attrib['id'] =
$this->socommon->next_id($table);
$attrib['name'] =
$this->db->db_addslashes($attrib['name']);
$attrib['descr'] =
$this->db->db_addslashes($attrib['descr']);
--- 372,376 ----
$table = $this->select_table_attrib($type);
! $attrib['id'] =
$this->bocommon->next_id($table);
$attrib['name'] =
$this->db->db_addslashes($attrib['name']);
$attrib['descr'] =
$this->db->db_addslashes($attrib['descr']);
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** class.soequipment.inc.php 9 Sep 2003 15:24:47 -0000 1.25
--- class.soequipment.inc.php 26 Sep 2003 18:04:34 -0000 1.26
***************
*** 279,295 ****
function generate_id($equipment_type)
{
- $year =
$GLOBALS['phpgw']->common->show_date(time(),'Y');
$this->db->query("select prefix from fm_equipment_type
where id='$equipment_type' ");
$this->db->next_record();
$prefix = $this->db->f('prefix');
- //echo 'prefix ' .$prefix .'<br>' ;
! // $prefix = $prefix . $year . '-';
! $pos = strlen($prefix);
! $this->db->query("select max(equipment_id) from
fm_equipment where equipment_id like ('$prefix%')");
! $this->db->next_record();
! $max =
$this->bocommon->add_leading_zero(substr($this->db->f(0),$pos));
return $prefix . $max;
--- 279,296 ----
function generate_id($equipment_type)
{
$this->db->query("select prefix from fm_equipment_type
where id='$equipment_type' ");
$this->db->next_record();
$prefix = $this->db->f('prefix');
! if($prefix)
! {
! $pos = strlen($prefix);
! $this->db->query("select max(equipment_id) as
equipment_id from fm_equipment where equipment_id like ('$prefix%')");
! $this->db->next_record();
! $num =
substr($this->db->f('equipment_id'),$pos);
! }
! $max = $this->bocommon->add_leading_zero($num);
return $prefix . $max;
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** class.uirequest.inc.php 8 Sep 2003 17:36:37 -0000 1.28
--- class.uirequest.inc.php 26 Sep 2003 18:04:34 -0000 1.29
***************
*** 533,537 ****
{
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
!
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
$headers = "Return-Path: <".
$coordinator_email .">\r\n";
$headers .= "From: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
--- 533,537 ----
{
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
!
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['email'];
$headers = "Return-Path: <".
$coordinator_email .">\r\n";
$headers .= "From: " .
$coordinator_name . "<" . $coordinator_email .">\r\n";
***************
*** 638,641 ****
--- 638,645 ----
$dateformat= (implode($sep,$dlarr));
+ if(!$values['coordinator'])
+ {
+ $values['coordinator']=$this->account;
+ }
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
***************
*** 645,649 ****
if ($supervisor_id && ($notify=='yes'))
{
- // $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($supervisor_id);
$prefs =
$this->bocommon->create_preferences($this->currentapp,$supervisor_id);
$supervisor_email = $prefs['email'];
--- 649,652 ----
***************
*** 805,809 ****
'select_user_name'
=> 'values[coordinator]',
'lang_no_user'
=> lang('Select coordinator'),
! 'user_list'
=> $this->bocommon->get_user_list('select',$values['coordinator']),
'status_list'
=> $this->boproject->select_status_list('select',$values['status']),
--- 808,812 ----
'select_user_name'
=> 'values[coordinator]',
'lang_no_user'
=> lang('Select coordinator'),
! 'user_list'
=>
$this->bocommon->get_user_list_right2('select',4,$values['coordinator'],$this->acl2_location),
'status_list'
=> $this->boproject->select_status_list('select',$values['status']),
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** class.uiinvoice.inc.php 19 Sep 2003 17:50:46 -0000 1.36
--- class.uiinvoice.inc.php 26 Sep 2003 18:04:34 -0000 1.37
***************
*** 130,134 ****
$content[$i]['amount']
= number_format($extra['amount'], 2, ',', ' ');
$content[$i]['lang_payment_date']
= lang('Payment Date');
! $content[$i]['link_sub']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.list_sub&user_lid='.$this->user_lid);
$content[$i]['lang_sub']
= lang('Voucher ID');
$content[$i]['lang_sub_help']
= lang('Klick this link to enter the list of sub-invoices');
--- 130,134 ----
$content[$i]['amount']
= number_format($extra['amount'], 2, ',', ' ');
$content[$i]['lang_payment_date']
= lang('Payment Date');
! $content[$i]['link_sub']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.list_sub&user_lid='.$this->user_lid
. '&query=' . $this->query);
$content[$i]['lang_sub']
= lang('Voucher ID');
$content[$i]['lang_sub_help']
= lang('Klick this link to enter the list of sub-invoices');
***************
*** 399,406 ****
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.list_sub',
!
'cat_id'
=>$this->cat_id,
!
'sub'
=>$this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id)
)),
'lang_workorder' =>
lang('Workorder'),
--- 399,407 ----
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.list_sub',
!
'cat_id'
=> $this->cat_id,
!
'sub'
=> $this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id,
!
'query'
=> $this->query)
)),
'lang_workorder' =>
lang('Workorder'),
***************
*** 414,418 ****
'sub'
=>$this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id)
)),
'lang_budget_account' => lang('Budget
account'),
--- 415,420 ----
'sub'
=>$this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id,
!
'query'
=> $this->query)
)),
'lang_budget_account' => lang('Budget
account'),
***************
*** 427,431 ****
'sub'
=>$this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id)
)),
--- 429,434 ----
'sub'
=>$this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id,
!
'query'
=> $this->query)
)),
***************
*** 444,448 ****
'sub'
=>$this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id)
)),
'lang_dima'
=> lang('Dim A'),
--- 447,452 ----
'sub'
=>$this->sub,
'paid'
=> $paid,
!
'voucher_id'
=> $voucher_id,
!
'query'
=> $this->query)
)),
'lang_dima'
=> lang('Dim A'),
***************
*** 471,475 ****
'paid' => $paid,
'voucher_id' => $voucher_id,
! 'user_lid' =>
$this->user_lid
);
--- 475,480 ----
'paid' => $paid,
'voucher_id' => $voucher_id,
! 'user_lid' =>
$this->user_lid,
! 'query' => $this->query
);
***************
*** 496,500 ****
'lang_save'
=> lang('save'),
'lang_done'
=> lang('Done'),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index&user_lid='.$this->user_lid),
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the voucher'),
--- 501,505 ----
'lang_save'
=> lang('save'),
'lang_done'
=> lang('Done'),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index&user_lid='.$this->user_lid
. '&query='.$this->query),
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the voucher'),
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** class.soworkorder.inc.php 19 Sep 2003 17:50:46 -0000 1.28
--- class.soworkorder.inc.php 26 Sep 2003 18:04:34 -0000 1.29
***************
*** 131,134 ****
--- 131,136 ----
$status_id =
(isset($data['status_id'])?$data['status_id']:0);
$search_vendor =
(isset($data['search_vendor'])?$data['search_vendor']:'');
+ $start_date =
(isset($data['start_date'])?$data['start_date']:'');
+ $end_date =
(isset($data['end_date'])?$data['end_date']:'');
}
***************
*** 282,285 ****
--- 284,293 ----
}
endif;
+
+ if ($start_date)
+ {
+ $filtermethod .= " $where
fm_workorder.start_date >= $start_date AND fm_workorder.start_date <= $end_date
";
+ $where= 'AND';
+ }
if($query)
| [Prev in Thread] | Current Thread | [Next in Thread] |