[Fmsystem-commits] [13976] rental: more on manual price adjustment

[Sigurd Nes]

Revision: 13976
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13976
Author:   sigurdne
Date:     2015-09-20 19:21:53 +0000 (Sun, 20 Sep 2015)
Log Message:
-----------
rental: more on manual price adjustment

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

Modified: branches/dev-syncromind/rental/inc/class.soadjustment.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.soadjustment.inc.php       
2015-09-20 18:39:27 UTC (rev 13975)
+++ branches/dev-syncromind/rental/inc/class.soadjustment.inc.php       
2015-09-20 19:21:53 UTC (rev 13976)
@@ -41,14 +41,16 @@
                                $id                                      = 
$this->marshal($filters[$this->get_id_field_name()], 'int');
                                $filter_clauses[]        = 
"{$this->get_id_field_name()} = {$id}";
                        }
-
-                       if(isset($filters['manual_adjustment']))
-                       {
-                               $clauses[] = "is_manual";
-                       }
                        else
                        {
-                               $clauses[] = "NOT is_manual";
+                               if(isset($filters['manual_adjustment']))
+                               {
+                                       $clauses[] = "is_manual";
+                               }
+                               else
+                               {
+                                       $clauses[] = "NOT is_manual";
+                               }
                        }
 
                        if(count($filter_clauses))

Modified: branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php       
2015-09-20 18:39:27 UTC (rev 13975)
+++ branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php       
2015-09-20 19:21:53 UTC (rev 13976)
@@ -568,6 +568,11 @@
                                        (
                                                'name'          => 'id',
                                                'source'        => 'id'
+                                       ),
+                                       array
+                                       (
+                                               'name'          => 
'responsibility_id',
+                                               'source'        => 
'responsibility_id'
                                        )
                                )
                        );

Modified: branches/dev-syncromind/rental/inc/model/class.adjustment.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/model/class.adjustment.inc.php   
2015-09-20 18:39:27 UTC (rev 13975)
+++ branches/dev-syncromind/rental/inc/model/class.adjustment.inc.php   
2015-09-20 19:21:53 UTC (rev 13976)
@@ -163,15 +163,15 @@
                        'id' => $this->get_id(),
                        'price_item_id' => $this->get_price_item_id(),
                        'responsibility_title' => 
lang(rental_socontract::get_instance()->get_responsibility_title($this->get_responsibility_id())),
+                       'responsibility_id' => $this->get_responsibility_id(),
                        'new_price' => $this->get_new_price(),
                        'percent' => $this->get_percent(),
                        'interval' => $this->get_interval(),
                        'adjustment_type' => 
lang(($this->get_adjustment_type())?$this->get_adjustment_type():'none'),
                        'adjustment_date' => date($date_format, 
$this->get_adjustment_date()),
-                        'extra_adjustment' => 
lang(($this->is_extra_adjustment())?'yes':'no'),
+             'extra_adjustment' => 
lang(($this->is_extra_adjustment())?'yes':'no'),
                        'is_executed' => 
lang(($this->is_executed())?'yes':'no'),
                        'year' => $this->get_year()
                );
        }
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file