[Fmsystem-commits] [12906] rental: fix billing of on_time items

[Sigurd Nes]

Revision: 12906
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12906
Author:   sigurdne
Date:     2015-03-26 13:54:43 +0000 (Thu, 26 Mar 2015)
Log Message:
-----------
rental: fix billing of on_time items

Modified Paths:
--------------
    trunk/rental/inc/class.socontract_price_item.inc.php

Modified: trunk/rental/inc/class.socontract_price_item.inc.php
===================================================================
--- trunk/rental/inc/class.socontract_price_item.inc.php        2015-03-26 
00:55:54 UTC (rev 12905)
+++ trunk/rental/inc/class.socontract_price_item.inc.php        2015-03-26 
13:54:43 UTC (rev 12906)
@@ -71,14 +71,20 @@
                        $filter_clauses[] = "date_start < {$timestamp_end}";
                        $filter_clauses[] = "date_start >= {$timestamp_start}";
                }
-               if(isset($filters['one_time'])){
+               if(isset($filters['one_time']) && $filters['include_billed'])
+               {
                        $filter_clauses[] = "is_one_time";
                }
+               if(isset($filters['one_time']) && !$filters['include_billed'])
+               {
+                       $filter_clauses[] = "is_one_time AND NOT is_billed";
+               }
                else if($filters['include_billed'])
                {
                        // Do not add filter on showing only price items that 
has not yet been billed
                }
-               else{
+               else
+               {
                        $filter_clauses[] = "NOT is_billed";
                }