[Fmsystem-commits] [7086] Merge 7084:7085 from trunk

[Sigurd Nes]

Revision: 7086
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7086
Author:   sigurdne
Date:     2011-03-08 13:28:18 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
Merge 7084:7085 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php
    branches/Version-1_0-branch/rental/inc/class.uicontract.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,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083
   + 
/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,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085

Modified: 
branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php  
2011-03-08 13:14:36 UTC (rev 7085)
+++ branches/Version-1_0-branch/rental/inc/class.socontract_price_item.inc.php  
2011-03-08 13:28:18 UTC (rev 7086)
@@ -74,6 +74,10 @@
                if(isset($filters['one_time'])){
                        $filter_clauses[] = "is_one_time";
                }
+               else if($filters['include_billed'])
+               {
+                       // Do not add filter on showing only price items that 
has not yet been billed
+               }
                else{
                        $filter_clauses[] = "NOT is_billed";
                }
@@ -102,6 +106,7 @@
                $tables = "rental_contract_price_item";
                $joins = "";
 
+               //var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}");
                return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
        }
        

Modified: branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php     
2011-03-08 13:14:36 UTC (rev 7085)
+++ branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php     
2011-03-08 13:28:18 UTC (rev 7086)
@@ -182,7 +182,7 @@
                                                if(isset($price_items_only))
                                                {
                                                        //export contract price 
items
-                                                       $result_objects_pi = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array('contract_id' => $result->get_id(),'export'=>'true'));
+                                                       $result_objects_pi = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array('contract_id' => 
$result->get_id(),'export'=>'true','include_billed'=>'true'));
                                                        foreach 
($result_objects_pi as $result_pi) {
                                                                
if(isset($result_pi))
                                                                {