[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.soworkorder.inc.php class.ui...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property/inc class.soworkorder.inc.php class.ui... |
Date: |
Fri, 05 May 2006 09:26:10 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/05/05 09:26:10
Modified files:
inc : class.soworkorder.inc.php
class.uibudget.inc.php
class.boworkorder.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.soworkorder.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uibudget.inc.php.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.boworkorder.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: property/inc/class.boworkorder.inc.php
diff -u property/inc/class.boworkorder.inc.php:1.12
property/inc/class.boworkorder.inc.php:1.13
--- property/inc/class.boworkorder.inc.php:1.12 Fri May 5 07:43:34 2006
+++ property/inc/class.boworkorder.inc.php Fri May 5 09:26:10 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boworkorder.inc.php,v 1.12 2006/05/05 07:43:34
sigurdne Exp $
+ * @version $Id: class.boworkorder.inc.php,v 1.13 2006/05/05 09:26:10
sigurdne Exp $
*/
/**
@@ -68,7 +68,7 @@
$this->start=0;
}
- if(array_key_exists('b_group',$_POST) ||
array_key_exists('b_group',$_GET) )
+ if(isset($b_group))
{
$this->b_group = $b_group;
}
@@ -76,7 +76,7 @@
{
$this->query = $query;
}
- if(array_key_exists('filter',$_POST))
+ if(array_key_exists('filter',$_POST) ||
array_key_exists('filter',$_GET) )
{
$this->filter = $filter;
}
Index: property/inc/class.soworkorder.inc.php
diff -u property/inc/class.soworkorder.inc.php:1.17
property/inc/class.soworkorder.inc.php:1.18
--- property/inc/class.soworkorder.inc.php:1.17 Fri May 5 07:43:34 2006
+++ property/inc/class.soworkorder.inc.php Fri May 5 09:26:10 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soworkorder.inc.php,v 1.17 2006/05/05 07:43:34
sigurdne Exp $
+ * @version $Id: class.soworkorder.inc.php,v 1.18 2006/05/05 09:26:10
sigurdne Exp $
*/
/**
@@ -136,6 +136,12 @@
$b_group =
(isset($data['b_group'])?$data['b_group']:'');
}
+ if ($b_group && !$status_id)
+ {
+ $status_id = 'Bestilt';
+ }
+
+
//_debug_array($data);
$sql =
$this->bocommon->fm_cache('sql_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id . '_' . !!$b_group);
Index: property/inc/class.uibudget.inc.php
diff -u property/inc/class.uibudget.inc.php:1.11
property/inc/class.uibudget.inc.php:1.12
--- property/inc/class.uibudget.inc.php:1.11 Fri May 5 07:43:33 2006
+++ property/inc/class.uibudget.inc.php Fri May 5 09:26:10 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage budget
- * @version $Id: class.uibudget.inc.php,v 1.11 2006/05/05 07:43:33
sigurdne Exp $
+ * @version $Id: class.uibudget.inc.php,v 1.12 2006/05/05 09:26:10
sigurdne Exp $
*/
/**
@@ -533,7 +533,7 @@
(
'grouping'
=> $entry['grouping'],
'district_id'
=> $entry['district_id'],
- 'budget_cost'
=> $entry['budget_cost'],
+ 'budget_cost'
=> number_format($entry['budget_cost'], 0, ',', ' '),
'hits'
=> $entry['hits'],
'link_details'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&filter=all&status_id=Bestilt&district_id='
. $entry['district_id'] . '&b_group=' . $entry['grouping']),
'lang_details_text'
=> lang('obligation details'),
@@ -543,6 +543,8 @@
}
}
+ $sum = number_format($sum, 0, ',', ' ');
+
$table_header[] = array
(
'lang_budget_cost' => lang('budget cost'),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.soworkorder.inc.php class.ui...,
Sigurd Nes <=