[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc hook_settings.inc.php, 1.12, 1.13 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc hook_settings.inc.php, 1.12, 1.13 class.bolocation.inc.php, 1.28, 1.29 class.sowo_hour.inc.php, 1.15, 1.16 class.uiworkorder.inc.php, 1.41, 1.42 class.uiproject.inc.php, 1.45, 1.46 class.soworkorder.inc.php, 1.27, 1.28 class.uiinvoice.inc.php, 1.35, 1.36 class.boinvoice.inc.php, 1.26, 1.27 class.soinvoice.inc.php, 1.37, 1.38 class.solocation.inc.php, 1.33, 1.34 |
|
Date: |
Fri, 19 Sep 2003 13:50:48 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv13957/inc
Modified Files:
hook_settings.inc.php class.bolocation.inc.php
class.sowo_hour.inc.php class.uiworkorder.inc.php
class.uiproject.inc.php class.soworkorder.inc.php
class.uiinvoice.inc.php class.boinvoice.inc.php
class.soinvoice.inc.php class.solocation.inc.php
Log Message:
no message
Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** hook_settings.inc.php 18 Sep 2003 14:00:49 -0000 1.12
--- hook_settings.inc.php 19 Sep 2003 17:50:46 -0000 1.13
***************
*** 74,84 ****
$status_list= $soworkorder->select_status_list();
! while (list($key,$entry) = each($status_list))
{
! $_status[$entry['id']] = $entry['name'];
}
unset($soworkorder);
create_select_box('Default project
status','project_status',$_status,'The default status for your projects and
workorders');
create_input_box('Yout Cellphone','cellphone');
--- 74,97 ----
$status_list= $soworkorder->select_status_list();
! $category_list= $soworkorder->select_category_workorder_list();
!
! if ($status_list)
! {
! while (list($key,$entry) = each($status_list))
! {
! $_status[$entry['id']] = $entry['name'];
! }
! }
! if ($category_list)
{
! while (list($key,$entry) = each($category_list))
! {
! $_categories[$entry['id']] = $entry['name'];
! }
}
unset($soworkorder);
create_select_box('Default project
status','project_status',$_status,'The default status for your projects and
workorders');
+ create_select_box('Default project
categories','project_category',$_categories,'The default category for your
projects and workorders');
create_input_box('Yout Cellphone','cellphone');
***************
*** 94,111 ****
$GLOBALS['phpgw']->preferences->add("email","address",$email_property);
$GLOBALS['phpgw']->preferences->save_repository();
-
-
- /* $categories = CreateObject('phpgwapi.categories');
-
- $category_list = $categories->return_array($type,$start,$limit =
True,$query = '',$sort = '',$order = '',$globals = False, $parent_id = '');
- if ($category_list)
- {
- echo 'category_list: '.$category_list .'<BR>';
-
- while (list($key,$entry) = each($category_list))
- {
- $_categories[$entry['cat_id']] =
$entry['cat_description'];
- }
- }
- create_select_box('Default
categories','categoriesdefault',$_categories);
- */
\ No newline at end of file
--- 107,108 ----
Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.bolocation.inc.php 18 Sep 2003 14:00:49 -0000 1.28
--- class.bolocation.inc.php 19 Sep 2003 17:50:46 -0000 1.29
***************
*** 272,276 ****
$location['location'][$i]['extra'][0]['input_name'] = 'loc' .
($i+1).'_name';
$input_name[]
=
$location['location'][$i]['extra'][0]['input_name'];
!
$location['location'][$i]['extra'][0]['input_type']
= 'hidden';
$location['location'][$i]['extra'][0]['size'] = 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
--- 272,276 ----
$location['location'][$i]['extra'][0]['input_name'] = 'loc' .
($i+1).'_name';
$input_name[]
=
$location['location'][$i]['extra'][0]['input_name'];
!
$location['location'][$i]['extra'][0]['input_type']
= 'text';
$location['location'][$i]['extra'][0]['size'] = 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
Index: class.sowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sowo_hour.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.sowo_hour.inc.php 18 Sep 2003 14:00:49 -0000 1.15
--- class.sowo_hour.inc.php 19 Sep 2003 17:50:46 -0000 1.16
***************
*** 223,227 ****
}
! $this->update_calculation($workorder_id);
$receipt['message'][] = array('msg'=>lang('%1 entries
is added!',count($hour)));
--- 223,227 ----
}
! $this->update_calculation($hour[0]['workorder_id']);
$receipt['message'][] = array('msg'=>lang('%1 entries
is added!',count($hour)));
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** class.uiworkorder.inc.php 18 Sep 2003 14:00:49 -0000 1.41
--- class.uiworkorder.inc.php 19 Sep 2003 17:50:46 -0000 1.42
***************
*** 464,468 ****
if(!$receipt['error'])
{
! $values = $this->bo->read_single($id);
if($project_id && !$values['project_id'])
{
--- 464,471 ----
if(!$receipt['error'])
{
! if($id)
! {
! $values =
$this->bo->read_single($id);
! }
if($project_id && !$values['project_id'])
{
***************
*** 493,497 ****
}
! $record_history = $this->bo->read_record_history($id);
$table_header_history[] = array
--- 496,503 ----
}
! if($id)
! {
! $record_history =
$this->bo->read_record_history($id);
! }
$table_header_history[] = array
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** class.uiproject.inc.php 18 Sep 2003 14:00:49 -0000 1.45
--- class.uiproject.inc.php 19 Sep 2003 17:50:46 -0000 1.46
***************
*** 605,611 ****
--- 605,617 ----
$project_status=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_status'];
+
$project_category=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_category'];
if(!$values['status'])
{
$values['status']=$project_status;
+ }
+
+ if(!$values['cat_id'])
+ {
+ $values['cat_id']=$project_category;
}
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.soworkorder.inc.php 18 Sep 2003 14:00:49 -0000 1.27
--- class.soworkorder.inc.php 19 Sep 2003 17:50:46 -0000 1.28
***************
*** 339,343 ****
{
$sql = "SELECT fm_workorder.*, fm_chapter.descr as
chapter ,fm_project.user_id from fm_workorder $this->join fm_project on
fm_workorder.project_id=fm_project.id $this->left_join fm_chapter on "
! . " fm_workorder.chapter_id = fm_chapter.id
where fm_workorder.id='$workorder_id'";
$this->db->query($sql,__LINE__,__FILE__);
--- 339,343 ----
{
$sql = "SELECT fm_workorder.*, fm_chapter.descr as
chapter ,fm_project.user_id from fm_workorder $this->join fm_project on
fm_workorder.project_id=fm_project.id $this->left_join fm_chapter on "
! . " fm_workorder.chapter_id = fm_chapter.id
where fm_workorder.id=$workorder_id";
$this->db->query($sql,__LINE__,__FILE__);
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.uiinvoice.inc.php 18 Sep 2003 14:00:49 -0000 1.35
--- class.uiinvoice.inc.php 19 Sep 2003 17:50:46 -0000 1.36
***************
*** 488,491 ****
--- 488,493 ----
$data = array
(
+ 'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.gif',
+ 'check_source'
=> './'.$this->currentapp.'/inc/check.js',
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'sum'
=> number_format($sum, 2, ',', ' '),
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.boinvoice.inc.php 10 Sep 2003 14:36:23 -0000 1.26
--- class.boinvoice.inc.php 19 Sep 2003 17:50:46 -0000 1.27
***************
*** 336,343 ****
}
- //_debug_array($receipt);
-
return $receipt;
-
}
--- 336,340 ----
***************
*** 345,351 ****
function update_invoice_sub($values)
{
-
- //_debug_array($values);
-
return $this->so->update_invoice_sub($values);
}
--- 342,345 ----
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** class.soinvoice.inc.php 10 Sep 2003 14:36:23 -0000 1.37
--- class.soinvoice.inc.php 19 Sep 2003 17:50:46 -0000 1.38
***************
*** 480,484 ****
}
! $filtermethod .= " $where (utbetalingsigndato
>'$start_date') AND (utbetalingsigndato < '$end_date')";
$sql = "SELECT district_id,periode,sum(godkjentbelop)
as consume $select_account_class "
--- 480,484 ----
}
! $filtermethod .= " $where (fakturadato >'$start_date')
AND (fakturadato < '$end_date')";
$sql = "SELECT district_id,periode,sum(godkjentbelop)
as consume $select_account_class "
***************
*** 626,630 ****
if (! $local_error)
{
-
$id =
$values['id'][$n];
$tax_code =
$values['tax_code'][$n];
--- 626,629 ----
***************
*** 632,641 ****
if($values['close_order'][$n])
{
!
$GLOBALS['phpgw']->db->query("update fm_workorder set status='closed' where
id='$workorder_id'");
}
if(!$values['close_order'][$n] &&
$values['close_order_orig'][$n])
{
!
$GLOBALS['phpgw']->db->query("update fm_workorder set status='re_opened' where
id='$workorder_id'");
}
--- 631,640 ----
if($values['close_order'][$n])
{
!
$update_status[$workorder_id]='X';
}
if(!$values['close_order'][$n] &&
$values['close_order_orig'][$n])
{
!
$update_status[$workorder_id]='R';
}
***************
*** 645,648 ****
--- 644,661 ----
}
+ }
+
+ if (isset($update_status) AND is_array($update_status))
+ {
+
$status_code=array('X'=>'closed','R'=>'re_opened');
+
+ $historylog_workorder =
CreateObject($this->currentapp.'.historylog','workorder');
+
+ while (list($id,$entry) = each($update_status))
+ {
+
$historylog_workorder->add($entry,$id,$status_code[$entry]);
+ $GLOBALS['phpgw']->db->query("update
fm_workorder set status=" . "'$status_code[$entry]'" . "where id=$id");
+ $receipt['message'][] =
array('msg'=>lang('Workorder %1 is %2',$id, $status_code[$entry]));
+ }
}
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.solocation.inc.php 8 Sep 2003 17:36:37 -0000 1.33
--- class.solocation.inc.php 19 Sep 2003 17:50:46 -0000 1.34
***************
*** 115,120 ****
$sql = $this->socommon->fm_cache('sql_'. $type_id . '_'
. $lookup_tenant);
- // $sql = $GLOBALS['phpgw']->session->appsession('sql_'.
$type_id . '_' . $lookup_tenant ,$this->currentapp);
-
if(!$sql)
--- 115,118 ----
***************
*** 160,170 ****
$uicols['descr'][]
= lang('Property Name');
$uicols['statustext'][] =
lang('Property Name');
}
! for ($i=2;$i<($type_id+1);$i++)
{
$cols.= ',fm_location' . $i . '.loc' .
$i . '_name';
$cols_return[]
= 'loc' . $i . '_name';
! $uicols['input_type'][] =
'hidden';
$uicols['name'][]
= 'loc' . $i . '_name';
$uicols['descr'][]
= '';
--- 158,178 ----
$uicols['descr'][]
= lang('Property Name');
$uicols['statustext'][] =
lang('Property Name');
+
+ if($type_id>1)
+ {
+ $cols.= ',fm_location' .
$type_id . '.loc' . $type_id . '_name';
+ $cols_return[]
= 'loc' . $type_id . '_name';
+ $uicols['input_type'][]
= 'text';
+ $uicols['name'][]
= 'loc' . $type_id . '_name';
+ $uicols['descr'][]
= lang('Name');
+ $uicols['statustext'][]
= lang('Name');
+ }
}
! /* for ($i=2;$i<($type_id+1);$i++)
{
$cols.= ',fm_location' . $i . '.loc' .
$i . '_name';
$cols_return[]
= 'loc' . $i . '_name';
! $uicols['input_type'][] =
'text';
$uicols['name'][]
= 'loc' . $i . '_name';
$uicols['descr'][]
= '';
***************
*** 172,175 ****
--- 180,184 ----
}
+ */
for ($j=($type_id-1); $j>0; $j--)
***************
*** 227,231 ****
$sub_query_tenant=1;
$this->socommon->fm_cache('sub_query_tenant_'. $type_id . '_' .
$lookup_tenant,$sub_query_tenant);
- //
$GLOBALS['phpgw']->session->appsession('sub_query_tenant_'. $type_id . '_' .
$lookup_tenant,$this->currentapp,$sub_query_tenant);
}
--- 236,239 ----
***************
*** 253,257 ****
$sub_query_street=1;
$this->socommon->fm_cache('sub_query_street_'. $type_id . '_' .
$lookup_tenant,$sub_query_street);
- //
$GLOBALS['phpgw']->session->appsession('sub_query_street_'. $type_id
,$this->currentapp,$sub_query_street);
$cols.=
',fm_streetaddress.descr as street_name';
--- 261,264 ----
***************
*** 293,302 ****
$this->socommon->fm_cache('sql_'. $type_id .
'_' . $lookup_tenant ,$sql);
- // $GLOBALS['phpgw']->session->appsession('sql_'.
$type_id ,$this->currentapp,$sql);
$this->socommon->fm_cache('uicols_'. $type_id
. '_' . $lookup_tenant,$uicols);
$this->socommon->fm_cache('cols_return_'.
$type_id . '_' . $lookup_tenant,$cols_return);
- //
$GLOBALS['phpgw']->session->appsession('uicols_'. $type_id
,$this->currentapp,$uicols);
- //
$GLOBALS['phpgw']->session->appsession('cols_return_'. $type_id
,$this->currentapp,$cols_return);
}
else
--- 300,306 ----
***************
*** 305,315 ****
$cols_return =
$this->socommon->fm_cache('cols_return_'. $type_id . '_' . $lookup_tenant);
- // $uicols =
$GLOBALS['phpgw']->session->appsession('uicols_'. $type_id ,$this->currentapp);
- // $cols_return =
$GLOBALS['phpgw']->session->appsession('cols_return_'. $type_id
,$this->currentapp);
-
$sub_query_tenant =
$this->socommon->fm_cache('sub_query_tenant_'. $type_id . '_' .
$lookup_tenant);
$sub_query_street =
$this->socommon->fm_cache('sub_query_street_'. $type_id . '_' .
$lookup_tenant);
- // $sub_query_tenant =
$GLOBALS['phpgw']->session->appsession('sub_query_tenant_'. $type_id
,$this->currentapp);
- // $sub_query_street =
$GLOBALS['phpgw']->session->appsession('sub_query_street_'. $type_id
,$this->currentapp);
}
--- 309,314 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc hook_settings.inc.php, 1.12, 1.13 class.bolocation.inc.php, 1.28, 1.29 class.sowo_hour.inc.php, 1.15, 1.16 class.uiworkorder.inc.php, 1.41, 1.42 class.uiproject.inc.php, 1.45, 1.46 class.soworkorder.inc.php, 1.27, 1.28 class.uiinvoice.inc.php, 1.35, 1.36 class.boinvoice.inc.php, 1.26, 1.27 class.soinvoice.inc.php, 1.37, 1.38 class.solocation.inc.php, 1.33, 1.34,
Sigurd Nes <address@hidden> <=