[Fmsystem-commits] [16970] property: list obligations from budget report

[sigurdne]

Revision: 16970
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16970
Author:   sigurdne
Date:     2017-08-12 12:54:38 -0400 (Sat, 12 Aug 2017)
Log Message:
-----------
property: list obligations from budget report

Modified Paths:
--------------
    trunk/property/inc/class.sobudget.inc.php
    trunk/property/inc/class.uibudget.inc.php
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php   2017-08-11 09:08:54 UTC (rev 
16969)
+++ trunk/property/inc/class.sobudget.inc.php   2017-08-12 16:54:38 UTC (rev 
16970)
@@ -695,7 +695,7 @@
                        $sum_obligation_cost = 0;
                        $obligations = array();
                        $sum_hits = 0;
-
+                       $obligation_orders = array();//for testing
                        $sum_hits = count($_temp_paid_info);
                        $_periods = array();
                        foreach ($_temp_paid_info as $order_id => &$order_info)
@@ -716,6 +716,12 @@
                                                $_taxfactor = 1 + 
($_taxcode[(int)$order_info['mva']] / 100);
                                                $_actual_cost = 
round($budget['actual_cost'] / $_taxfactor);
 
+                                               //for testing
+                                               if($budget['sum_oblications'])
+                                               {
+                                                       $obligation_orders[] = 
$order_id;
+                                               }
+
                                                $sum_actual_cost += 
$_actual_cost;
                                                if 
((int)$budget['actual_period'] == (int)$filter_period)
                                                {
@@ -740,7 +746,7 @@
                                        }
                                }
                        }
-
+//_debug_array(array_unique($obligation_orders));
 //_debug_array($_periods);
 //                     _debug_array($obligations);
                        //----------- ad hoc order

Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php   2017-08-11 09:08:54 UTC (rev 
16969)
+++ trunk/property/inc/class.uibudget.inc.php   2017-08-12 16:54:38 UTC (rev 
16970)
@@ -952,10 +952,10 @@
                                                'obligation_ex' => 
$entry['obligation'],
                                                'obligation' => 
number_format($entry['obligation'], 0, ',', ' '),
                                                'link_obligation' => 
urldecode($GLOBALS['phpgw']->link('/index.php', array(
-                                                               'menuaction' => 
'property.uiworkorder.index', 'filter' => 'all', 'paid' => 1,
+                                                               'menuaction' => 
'property.uiworkorder.index', 'filter' => 'all',// 'paid' => 1,
                                                                'district_id' 
=> $entry['district_id'], 'b_group' => $entry['grouping'],
                                                                'b_account' => 
$entry['b_account'],
-                                                               'start_date' => 
$start_date, 'end_date' => $end_date, 'ecodimb' => $entry['ecodimb'],
+                                                               
'filter_start_date' => $start_date, 'filter_end_date' => $end_date, 'ecodimb' 
=> $entry['ecodimb'],
                                                                'status_id' => 
'all', 'obligation' => true))),
                                                'actual_cost_ex' => 
$entry['actual_cost'],
                                                'actual_cost_period' => 
number_format($entry['actual_cost_period'], 0, ',', ' '),

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2017-08-11 09:08:54 UTC 
(rev 16969)
+++ trunk/property/inc/class.uiworkorder.inc.php        2017-08-12 16:54:38 UTC 
(rev 16970)
@@ -426,10 +426,17 @@
                                                'b_group' => $this->b_group,
                                                'paid' => $this->paid,
                                                'obligation' => 
$this->obligation,
+                                               'ecodimb'       => 
$this->ecodimb,
                                                'phpgw_return_as' => 'json'
                                        )),
                                        'download' => self::link(array(
                                                'menuaction' => 
'property.uiworkorder.download',
+                                               'start_date' => $start_date,
+                                               'end_date' => $end_date,
+                                               'b_group' => $this->b_group,
+                                               'paid' => $this->paid,
+                                               'obligation' => 
$this->obligation,
+                                               'ecodimb'       => 
$this->ecodimb,
                                                'export' => true,
                                                'allrows' => true
                                        )),