[Fmsystem-commits] [13873] fix on ont-time amount on contract billings

[Erik Holm-Larsen]

Revision: 13873
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13873
Author:   erikhl
Date:     2015-09-10 09:04:40 +0000 (Thu, 10 Sep 2015)
Log Message:
-----------
fix on ont-time amount on contract billings

Modified Paths:
--------------
    trunk/rental/inc/class.sobilling.inc.php
    trunk/rental/inc/model/class.invoice.inc.php

Modified: trunk/rental/inc/class.sobilling.inc.php
===================================================================
--- trunk/rental/inc/class.sobilling.inc.php    2015-09-10 00:08:51 UTC (rev 
13872)
+++ trunk/rental/inc/class.sobilling.inc.php    2015-09-10 09:04:40 UTC (rev 
13873)
@@ -305,7 +305,7 @@
 
                        foreach($contracts_to_bill as $contract_id) // Runs 
through all the contracts that should be billed in this run
                        {
-                               $invoice = 
rental_invoice::create_invoice($decimals, $billing->get_id(), $contract_id, 
in_array($contract_id, $contracts_overriding_billing_start) ? true : false, 
$bill_from_timestamp, $billing_end_timestamp, in_array($contract_id, 
$contracts_bill_only_one_time) ? true : false ); // Creates an invoice of the 
contract
+                               $invoice = 
rental_invoice::create_invoice($decimals, $billing->get_id(), $contract_id, 
in_array($contract_id, $contracts_overriding_billing_start) ? true : false, 
$bill_from_timestamp, $billing_end_timestamp, in_array($contract_id, 
$contracts_bill_only_one_time) ? true : false, false, $billing_term ); // 
Creates an invoice of the contract
                                if($invoice != null)
                                {
                                        $total_sum += $invoice->get_total_sum();

Modified: trunk/rental/inc/model/class.invoice.inc.php
===================================================================
--- trunk/rental/inc/model/class.invoice.inc.php        2015-09-10 00:08:51 UTC 
(rev 13872)
+++ trunk/rental/inc/model/class.invoice.inc.php        2015-09-10 09:04:40 UTC 
(rev 13873)
@@ -261,7 +261,7 @@
                 * @param bool $bill_only_one_time      flag to indicate if the 
the invoice should only bil one time price elements
                 * @return rental_invoice       the newly created invoice
                 */
-               public static function create_invoice(int $decimals, int 
$billing_id, int $contract_id, bool $override,int $timestamp_invoice_start, int 
$timestamp_invoice_end, $bill_only_one_time, $dry_run = false)
+               public static function create_invoice(int $decimals, int 
$billing_id, int $contract_id, bool $override,int $timestamp_invoice_start, int 
$timestamp_invoice_end, $bill_only_one_time, $dry_run = false, $billing_term = 
0)
                {
                        $contract = 
rental_socontract::get_instance()->get_single($contract_id);
                        
@@ -317,7 +317,15 @@
                        // Retrieve the contract price items: only one-time or 
all
                        if($bill_only_one_time)
                        {
-                               $contract_price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array('contract_id' => $contract->get_id(), 'one_time' => true));
+                                $filters2 = array('contract_id' => 
$contract->get_id(), 
+                                                'contract_ids_one_time' => 
true, 
+                                                'billing_term_id' => 
$billing_term, 
+                                                'year' => date('Y', $year), 
+                                                'month' => date('m', $month));
+                               //$contract_price_items = 
$socontract_price_item->get($start_index, $num_of_objects, $sort_field, 
$sort_ascending, $search_for, $search_type, $filters2);
+                               
+                               $contract_price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, $filters2);
+                                //$contract_price_items = 
rental_socontract_price_item::get_instance()->get(null, null, null, null, null, 
null, array('contract_id' => $contract->get_id(), 'one_time' => true));
                        }
                        else
                        {