[Fmsystem-commits] [13144] restore billed items to previous state on delete invoice

[Sigurd Nes]

Revision: 13144
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13144
Author:   sigurdne
Date:     2015-05-05 18:32:56 +0000 (Tue, 05 May 2015)
Log Message:
-----------
restore billed items to previous state on delete invoice

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

Modified: trunk/rental/inc/class.uibilling.inc.php
===================================================================
--- trunk/rental/inc/class.uibilling.inc.php    2015-05-05 11:48:58 UTC (rev 
13143)
+++ trunk/rental/inc/class.uibilling.inc.php    2015-05-05 18:32:56 UTC (rev 
13144)
@@ -464,7 +464,7 @@
                //set is_billed on invoice price items to false
                $billing_job_invoices = 
rental_soinvoice::get_instance()->get(null, null, null, null, null, null, 
array('billing_id' => phpgw::get_var('id')));
                foreach($billing_job_invoices as $invoice){
-                       $price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array('contract_id' => $invoice->get_contract_id(), 'one_time' => true));
+                       $price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array('contract_id' => $invoice->get_contract_id(), 'one_time' => true, 
'include_billed' => true));
                        foreach($price_items as $price_item){
                                if($price_item->get_date_start() >= 
$invoice->get_timestamp_start() && $price_item->get_date_start() <= 
$invoice->get_timestamp_end()){
                                        $price_item->set_is_billed(false);