[Fmsystem-commits] [9115] property: order listing

[Sigurd Nes]

Revision: 9115
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9115
Author:   sigurdne
Date:     2012-04-10 16:43:51 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
property: order listing

Modified Paths:
--------------
    trunk/property/inc/class.boworkorder.inc.php
    trunk/property/inc/class.sobudget.inc.php
    trunk/property/inc/class.soworkorder.inc.php
    trunk/property/js/yahoo/budget.obligations.js

Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php        2012-04-10 14:30:22 UTC 
(rev 9114)
+++ trunk/property/inc/class.boworkorder.inc.php        2012-04-10 16:43:51 UTC 
(rev 9115)
@@ -417,7 +417,7 @@
                                );
                        $criteria[10] = array
                                (
-                                       'field' => 'fm_project.account_group',
+                                       'field' => 'fm_b_account.category',
                                        'type'  => 'int',
                                        'matchtype' => 'exact',
                                        'front' => '',

Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php   2012-04-10 14:30:22 UTC (rev 
9114)
+++ trunk/property/inc/class.sobudget.inc.php   2012-04-10 16:43:51 UTC (rev 
9115)
@@ -541,14 +541,14 @@
                        $ordermethod = '';
                        /* 0 => cancelled, 1 => obligation , 2 => paid */
                        //$filtermethod = "WHERE fm_workorder.paid = 1 and 
fm_workorder.vendor_id > 0";
-                       $filtermethod = "WHERE 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);
 //                     $filtermethod .= " AND fm_workorder.start_date >= 
$start_date AND fm_workorder.start_date <= $end_date";
                        $filtermethod .= " AND fm_workorder_status.closed IS 
NULL AND fm_workorder.start_date >= $start_date AND fm_workorder.start_date <= 
$end_date";
 
-                       $where = 'AND';
+                       $where = 'WHERE';
 
                        if ($cat_id > 0)
                        {

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2012-04-10 14:30:22 UTC 
(rev 9114)
+++ trunk/property/inc/class.soworkorder.inc.php        2012-04-10 16:43:51 UTC 
(rev 9115)
@@ -331,7 +331,7 @@
 
                                //----- b_group
 
-                               if($b_group)
+//                             if($b_group)
                                {
                                        $joinmethod .= " {$this->join} 
fm_b_account ON (fm_workorder.account_id =fm_b_account.id))";
                                        $paranthesis .='(';
@@ -479,14 +479,17 @@
 
                                if($status_id == 'open')
                                {
-                                       $_status_filter = array();
+                                       $filtermethod .= " $where 
fm_workorder_status.closed IS NULL"; 
+
+/*                                     $_status_filter = array();
                                        $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");
+                                       $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');
                                        }
                                        $filtermethod .= " $where 
fm_workorder.status IN ('" . implode("','", $_status_filter) . "')"; 
+*/
                                }
                                else
                                {

Modified: trunk/property/js/yahoo/budget.obligations.js
===================================================================
--- trunk/property/js/yahoo/budget.obligations.js       2012-04-10 14:30:22 UTC 
(rev 9114)
+++ trunk/property/js/yahoo/budget.obligations.js       2012-04-10 16:43:51 UTC 
(rev 9115)
@@ -59,15 +59,15 @@
                        if(details)
                        {
                                //look for  "grouping" column
-                               oMenuButton_3.set("label", ("<em>" + param + 
"</em>"));
-                               oMenuButton_3.set("value", param);
+               //              oMenuButton_3.set("label", ("<em>" + param + 
"</em>"));
+               //              oMenuButton_3.set("value", param);
                                path_values.grouping = param;
                        }
                        else
                        {
                                //reset GROUPING filter
-                               oMenuButton_3.set("label", ("<em>" + 
array_options[3][0][1] + "</em>"));
-                               path_values.grouping =  array_options[3][0][0];
+               //              oMenuButton_3.set("label", ("<em>" + 
array_options[3][0][1] + "</em>"));
+               //              path_values.grouping =  array_options[3][0][0];
                                path_values.b_account = param;
                        }