[Fmsystem-commits] [6954] Merge 6952:6953 from trunk

[Sigurd Nes]

Revision: 6954
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6954
Author:   sigurdne
Date:     2011-02-08 11:26:36 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
Merge 6952:6953 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953

Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2011-02-08 11:25:15 UTC (rev 6953)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2011-02-08 11:26:36 UTC (rev 6954)
@@ -369,7 +369,8 @@
                        {
                                if($order == 'workorder_id')
                                {
-                                       $ordermethod = " ORDER BY 
fm_workorder.project_id {$sort},fm_workorder.id {$sort}";     
+       //                              $ordermethod = " ORDER BY 
fm_workorder.project_id {$sort},fm_workorder.id {$sort}";     
+                                       $ordermethod = " ORDER BY 
fm_workorder.id {$sort}";     
                                }
                                else
                                {
@@ -378,7 +379,8 @@
                        }
                        else
                        {
-                               $ordermethod = ' ORDER BY 
fm_workorder.project_id DESC,fm_workorder.id DESC';
+       //                      $ordermethod = ' ORDER BY 
fm_workorder.project_id DESC,fm_workorder.id DESC';
+                               $ordermethod = ' ORDER BY fm_workorder.id DESC';
                        }
 
                        $where= 'WHERE';