[Phpgroupware-cvs] property/inc class.uibudget.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/09 10:42:47

Modified files:
        inc            : class.uibudget.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uibudget.inc.php.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: property/inc/class.uibudget.inc.php
diff -u property/inc/class.uibudget.inc.php:1.16 
property/inc/class.uibudget.inc.php:1.17
--- property/inc/class.uibudget.inc.php:1.16    Mon May  8 08:16:59 2006
+++ property/inc/class.uibudget.inc.php Tue May  9 10:42:47 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.16 2006/05/08 08:16:59 
sigurdne Exp $
+       * @version $Id: class.uibudget.inc.php,v 1.17 2006/05/09 10:42:47 
sigurdne Exp $
        */
 
        /**
@@ -525,6 +525,8 @@
                        $list = $this->bo->read_obligations();
                        if (isset($list) AND is_array($list))
                        {
+                               $start_date = 
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,1,1,date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               $end_date = 
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,12,31,date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                          
                                $sum = 0;
                                foreach($list as $entry)
                                {
@@ -535,12 +537,12 @@
                                                'grouping'                      
=> $entry['grouping'],
                                                'district_id'                   
=> $entry['district_id'],
                                                'obligation'                    
=> number_format($entry['obligation'], 0, ',', ' '),
+                                               'link_obligation'               
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&filter=all&status_id=Bestilt&district_id='
 . $entry['district_id'] . '&b_group=' . $entry['grouping']),
                                                'actual_cost'                   
=> number_format($entry['actual_cost'], 0, ',', ' '),
+                                               'link_actual_cost'              
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.consume&district_id='
 . $entry['district_id'] . '&b_account_class=' . $entry['grouping'] . 
'&start_date=' . $start_date . '&end_date=' . $end_date . 
'&submit_search=true'),
                                                'diff'                          
=> number_format($entry['budget_cost'] - $entry['actual_cost'] - 
$entry['obligation'], 0, ',', ' '),
                                                'hits'                          
=> number_format($entry['hits'], 0, ',', ' '),
-                                               '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'),
-                                               'text_details'                  
=> lang('details'),
+
                                        );
                                        $sum_obligation = $sum_obligation + 
$entry['obligation'];
                                        $sum_hits = $sum_hits + $entry['hits'];
@@ -548,7 +550,7 @@
                                        $sum_actual_cost = $sum_actual_cost + 
$entry['actual_cost'];
                                }
                        }
-
+//_debug_array($content);
                        $sum_diff = number_format($sum_budget_cost - 
$sum_actual_cost - $sum_obligation, 0, ',', ' ');
                        $sum_obligation = number_format($sum_obligation, 0, 
',', ' ');
                        $sum_hits = number_format($sum_hits, 0, ',', ' ');
@@ -563,11 +565,8 @@
                                'lang_obligations'      => lang('obligations'),
                                'lang_grouping'         => lang('grouping'),
                                'lang_hits'             => lang('hits'),
-                               'lang_details'          => lang('details'),
-
                                'lang_district_id'      => lang('district_id'),
 
-
                                'sort_grouping' => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
                                                                                
        'sort'  => $this->sort,
@@ -582,8 +581,6 @@
                                                                                
)),
                        );
 
-
-
                        if($acl_add)
                        {
                                $table_add = array
@@ -656,8 +653,6 @@
                                'year_list'                             => 
$this->bo->get_year_filter_list($this->year,$basis=true),
                                'lang_no_year'                          => 
lang('no year'),
                                'lang_year_statustext'                  => 
lang('Select the year the selection belongs to'),
-
-
                        );
 
                        $this->save_sessiondata();
@@ -670,7 +665,6 @@
 
                function edit()
                {
-
                        $acl2_location  = '.budget';
                        $acl_add        = $this->acl2->check($acl2_location,2);
                        $acl_edit       = $this->acl2->check($acl2_location,4);