[Fmsystem-commits] [15572] Stable: Merge 15570:15571 from trunk

[sigurdne]

Revision: 15572
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15572
Author:   sigurdne
Date:     2016-09-02 14:18:51 +0000 (Fri, 02 Sep 2016)
Log Message:
-----------
Stable: Merge 15570:15571 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571

Modified: branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php 
2016-09-02 14:17:46 UTC (rev 15571)
+++ branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php 
2016-09-02 14:18:51 UTC (rev 15572)
@@ -874,16 +874,17 @@
                                // Create a new invoice price item
                                $invoice_price_item = new 
rental_invoice_price_item(
                                        2, // the number of decimals to use for 
the total price of the price item
-        -1, // no price item identifier
-        0, // the invoice identifier
-        $contract_price_item->get_title(), // the contract price item title
-        $contract_price_item->get_agresso_id(), // the contract price item 
agresso identifier
-        $contract_price_item->is_area(), // flag for specifying if the 
contract is of area/piece
-        $contract_price_item->get_price(), // the price of the contract price 
item
-        $contract_price_item->get_area(), // the rented area on this contract 
(derived from contract)
-        $contract_price_item->get_count(), // the number of items on this 
price item
-        $invoice_price_item_start, // the start date from which this price 
item should be calculated
-        $invoice_price_item_end   // the end date to which this price item 
should be calculated
+                                       -1, // no price item identifier
+                                       0, // the invoice identifier
+                                       $contract_price_item->get_title(), // 
the contract price item title
+                                       $contract_price_item->get_agresso_id(), 
// the contract price item agresso identifier
+                                       $contract_price_item->is_area(), // 
flag for specifying if the contract is of area/piece
+                                       $contract_price_item->get_price(), // 
the price of the contract price item
+                                       $contract_price_item->get_area(), // 
the rented area on this contract (derived from contract)
+                                       $contract_price_item->get_count(), // 
the number of items on this price item
+                                       $invoice_price_item_start, // the start 
date from which this price item should be calculated
+                                       $invoice_price_item_end,   // the end 
date to which this price item should be calculated
+                                       
$contract_price_item->get_price_type_id()
                                );