[Fmsystem-commits] [12960]

[Nelson Guerra]

Revision: 12960
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12960
Author:   nelson224
Date:     2015-04-07 23:05:45 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.bobudget.inc.php

Modified: branches/dev-syncromind/property/inc/class.bobudget.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-04-07 
23:04:58 UTC (rev 12959)
+++ branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-04-07 
23:05:45 UTC (rev 12960)
@@ -224,16 +224,38 @@
                }
 
 
-               function read_obligations()
+               function read_obligations($data= array())
                {
                        //cramirez: add strtoupper function for $this->sort. in 
YUI use asc/desc (lowercase letters)
-                       $obligations = 
$this->so->read_obligations(array('start' => $this->start, 'query' => 
$this->query,
+                       /*$obligations = 
$this->so->read_obligations(array('start' => $this->start, 'query' => 
$this->query,
                                'sort' => strtoupper($this->sort), 'order' => 
$this->order, 'filter' => $this->filter,
                                'cat_id' => $this->cat_id, 
'allrows'=>$this->allrows, 'district_id' => $this->district_id,
                                'year' => $this->year,'month' => $this->month, 
'grouping' => $this->grouping, 'revision' => $this->revision,
                                'details' => $this->details,'dimb_id' => 
$this->dimb_id, 'org_unit_id' => $this->org_unit_id,
-                               'direction'     => $this->direction));
+                               'direction'     => $this->direction));*/
 
+                       $obligations = $this->so->read_obligations(array
+                               (
+                                       'start'         => $data['start'],
+                                       'query'         => $data['query'],
+                                       'sort'          => $data['sort'],
+                                       'order'         => $data['order'],
+                                       'results'       => $data['results'],
+                                       'filter'        => $this->filter,
+                                       'cat_id'        => $this->cat_id, 
+                                       'allrows'       => 
isset($data['allrows'])?$data['allrows']:'',
+                                       'district_id' => $this->district_id,
+                                       'year'          => $this->year,
+                                       'month'         => $this->month, 
+                                       'grouping'      => $this->grouping, 
+                                       'revision'      => $this->revision,
+                                       'details'       => $this->details,
+                                       'dimb_id'       => $this->dimb_id, 
+                                       'org_unit_id' => $this->org_unit_id,
+                                       'direction'     => $this->direction
+                               )
+                       );
+                       
                        $this->total_records                    = 
$this->so->total_records;
                        $this->sum_budget_cost                  = 
$this->so->sum_budget_cost;
                        $this->sum_obligation_cost              = 
$this->so->sum_obligation_cost;