[Fmsystem-commits] [9114] property: listing active orders

[Sigurd Nes]

Revision: 9114
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9114
Author:   sigurdne
Date:     2012-04-10 14:30:22 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
property: listing active orders

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   2012-04-10 11:06:41 UTC (rev 
9113)
+++ trunk/property/inc/class.sobudget.inc.php   2012-04-10 14:30:22 UTC (rev 
9114)
@@ -540,7 +540,8 @@
                        //_debug_array($allrows);
                        $ordermethod = '';
                        /* 0 => cancelled, 1 => obligation , 2 => paid */
-                       $filtermethod = "WHERE fm_workorder.paid = 1 and 
fm_workorder.vendor_id > 0";
+                       //$filtermethod = "WHERE fm_workorder.paid = 1 and 
fm_workorder.vendor_id > 0";
+                       $filtermethod = "WHERE fm_workorder.vendor_id > 0";
 
                        $start_date = mktime(1, 1, 1, 1, 1, $year);
                        $end_date = mktime  (23, 59, 59, 12, 31, $year);

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2012-04-10 11:06:41 UTC 
(rev 9113)
+++ trunk/property/inc/class.soworkorder.inc.php        2012-04-10 14:30:22 UTC 
(rev 9114)
@@ -480,7 +480,8 @@
                                if($status_id == 'open')
                                {
                                        $_status_filter = array();
-                                       $this->db->query("SELECT * FROM 
fm_workorder_status WHERE delivered IS NULL AND closed IS NULL");
+                                       $this->db->query("SELECT * FROM 
fm_workorder_status WHERE closed IS NULL");
+       //                              $this->db->query("SELECT * FROM 
fm_workorder_status WHERE delivered IS NULL AND closed IS NULL");
                                        while($this->db->next_record())
                                        {
                                                $_status_filter[] = 
$this->db->f('id');