[Fmsystem-commits] [11016] property: budget handling

[Sigurd Nes]

Revision: 11016
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11016
Author:   sigurdne
Date:     2013-03-28 17:02:12 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
property: budget handling

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

Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php   2013-03-24 18:17:03 UTC (rev 
11015)
+++ trunk/property/inc/class.sobudget.inc.php   2013-03-28 17:02:12 UTC (rev 
11016)
@@ -576,7 +576,7 @@
 
                        if($cat_ids)
                        {
-                               $filtermethod .= " $where fm_project.category 
IN (". implode(',', $cat_ids) . ')';
+                               $filtermethod .= " $where fm_workorder.category 
IN (". implode(',', $cat_ids) . ')';
                                $where = 'AND';
                        }
 

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2013-03-24 18:17:03 UTC 
(rev 11015)
+++ trunk/property/inc/class.soworkorder.inc.php        2013-03-28 17:02:12 UTC 
(rev 11016)
@@ -511,7 +511,7 @@
                                {
                                        $cat_filter[] = $_category['id'];
                                }
-                               $filtermethod .= " {$where} fm_project.category 
IN (" .  implode(',', $cat_filter) .')';
+                               $filtermethod .= " {$where} 
fm_workorder.category IN (" .  implode(',', $cat_filter) .')';
 
                                $where= 'AND';
                        }