[Fmsystem-commits] [14616] Syncromind: Merge 14597:14615 from trunk

[Sigurd Nes]

Revision: 14616
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14616
Author:   sigurdne
Date:     2015-12-21 11:46:40 +0000 (Mon, 21 Dec 2015)
Log Message:
-----------
Syncromind: Merge 14597:14615 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/rental/inc/class.soadjustment.inc.php

Modified: branches/dev-syncromind/rental/inc/class.soadjustment.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.soadjustment.inc.php       
2015-12-18 10:39:43 UTC (rev 14615)
+++ branches/dev-syncromind/rental/inc/class.soadjustment.inc.php       
2015-12-21 11:46:40 UTC (rev 14616)
@@ -337,6 +337,7 @@
                                                
$price_item->set_price($this->unmarshal($this->db->f('price'), 'float'));
                                                
$price_item->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
 true), 'int'));
                                                
$price_item->set_responsibility_title($this->unmarshal($this->db->f('resp_title',
 true), 'string'));
+                                               
$price_item->set_price_type_id($this->unmarshal($this->db->f('type'), true), 
'int');
 
                                                $price_items[] = $price_item;
                                        }