[Fmsystem-commits] [6894] Merge 6887:6893 from trunk

[Sigurd Nes]

Revision: 6894
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6894
Author:   sigurdne
Date:     2011-02-01 08:47:02 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
Merge 6887:6893 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/booking/inc/schedule.php
    branches/Version-1_0-branch/property/inc/class.soinvoice.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
   + 
/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

Modified: branches/Version-1_0-branch/booking/inc/schedule.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/schedule.php        2011-02-01 
08:46:05 UTC (rev 6893)
+++ branches/Version-1_0-branch/booking/inc/schedule.php        2011-02-01 
08:47:02 UTC (rev 6894)
@@ -55,6 +55,7 @@
                                $row['_from'] = $t;
                                $row['_to'] = $tmp_t;
                                $empty = true;
+                $testdata = array();
                                foreach($bookings as $booking)
                                {
                                        if($booking['from_'] > $t)
@@ -63,8 +64,15 @@
                                        }
                                        if(in_array($res['id'], 
$booking['resources']))
                                        {
-                                               $empty = false;
-                                               $row[$booking['wday']] = 
$booking;
+                        if(($testdata['wday'] == $booking['wday']) and 
($testdata['from_'] == $booking['from_']) and ($testdata['to_'] == 
$booking['to_']) and ($testdata['allocation_id'] == $booking['id'])){
+                            //
+                       } else {
+                                                   $empty = false;
+                                                   $row[$booking['wday']] = 
$booking;
+                        }
+                        if($booking['type'] == 'booking'){
+                                               $testdata = $booking;
+                        } 
                                        }
                                }
                                if(!$empty) {
@@ -82,4 +90,4 @@
 
        }
        return $data;
-}
\ No newline at end of file
+}

Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php    
2011-02-01 08:46:05 UTC (rev 6893)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php    
2011-02-01 08:47:02 UTC (rev 6894)
@@ -761,7 +761,7 @@
 
                        $value_set = array
                        (
-                               'project_id'    => $values['project_group'],
+                               'project_id'    => $values['project_group'] ? 
$values['project_group'] : '',
                                'pmwrkord_code' => $values['order_id'],
                                'process_log'   => 
$this->db->db_addslashes($values['process_log']),
                                'process_code'  => $values['process_code'],