[Fmsystem-commits] [12313] applying new format

[Alejandro]

Revision: 12313
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12313
Author:   nudrick
Date:     2014-11-13 23:22:48 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
applying new format

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

Modified: branches/dev-syncromind/property/inc/class.botts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.botts.inc.php    2014-11-13 
23:22:41 UTC (rev 12312)
+++ branches/dev-syncromind/property/inc/class.botts.inc.php    2014-11-13 
23:22:48 UTC (rev 12313)
@@ -491,7 +491,7 @@
                        return $related;
                }
                
-               function read($data = array())
+               function readold2($data = array())
                {
                        $locations = $this->so->read($data);
 
@@ -501,7 +501,7 @@
                        return $locations;
                }
 
-               function readold($start_date='',$end_date='', 
$external='',$dry_run = '', $download = '')
+               function read($data = array()/*$start_date='',$end_date='', 
$external='',$dry_run = '', $download = ''*/)
                {
                        static $category_name = array();
                        static $account = array();
@@ -511,13 +511,14 @@
                        $start_date     = 
$this->bocommon->date_to_timestamp($start_date);
                        $end_date       = 
$this->bocommon->date_to_timestamp($end_date);
 
-                       $tickets = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
+                       /*$tickets = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
                                'status_id' => $this->status_id,'cat_id' => 
$this->cat_id,'district_id' => $this->district_id,
                                'part_of_town_id' => $this->part_of_town_id, 
'start_date'=>$start_date,'end_date'=>$end_date,
                                'allrows'=>$this->allrows,'user_id' => 
$this->user_id,'reported_by' => $this->reported_by, 'external'=>$external, 
'dry_run' => $dry_run,
                                'location_code' => $this->location_code, 
'p_num' => $this->p_num, 'vendor_id' => $this->vendor_id,
                                'ecodimb' => $this->ecodimb, 'b_account' => 
$this->b_account, 'building_part' => $this->building_part,
-                               'branch_id' => $this->branch_id ,'order_dim1' 
=> $this->order_dim1));
+                               'branch_id' => $this->branch_id ,'order_dim1' 
=> $this->order_dim1));*/
+                       $tickets = $this->so->read($data);
 
                        $this->total_records            = 
$this->so->total_records;
                        $this->sum_budget                       = 
$this->so->sum_budget;