[Fmsystem-commits] [13553] rental more on price item types

[Sigurd Nes]

Revision: 13553
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13553
Author:   sigurdne
Date:     2015-07-02 12:24:31 +0000 (Thu, 02 Jul 2015)
Log Message:
-----------
rental more on price item types

Modified Paths:
--------------
    trunk/rental/inc/class.socontract_price_item.inc.php

Modified: trunk/rental/inc/class.socontract_price_item.inc.php
===================================================================
--- trunk/rental/inc/class.socontract_price_item.inc.php        2015-07-02 
11:41:57 UTC (rev 13552)
+++ trunk/rental/inc/class.socontract_price_item.inc.php        2015-07-02 
12:24:31 UTC (rev 13553)
@@ -31,13 +31,13 @@
                $columns = array();
                
                $dir = $ascending ? 'ASC' : 'DESC';
-               $order = $sort_field ? "ORDER BY $sort_field $dir": 'ORDER BY 
agresso_id ASC, title ASC';
+               $order = $sort_field ? "ORDER BY 
rental_contract_price_item.{$sort_field} $dir": 'ORDER BY agresso_id ASC, title 
ASC';
                
                $filter_clauses = array();
                
                if(isset($filters[$this->get_id_field_name()])){
                        $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
-                       $filter_clauses[] = "{$this->get_id_field_name()} = 
{$id}";
+                       $filter_clauses[] = 
"rental_contract_price_item.{$this->get_id_field_name()} = {$id}";
                }
                if(isset($filters['contract_id'])){
                        $id = $this->marshal($filters['contract_id'],'int');