[Fmsystem-commits] [12082] Added display of extra adjustment-flag on adjustment table

[Erik Holm-Larsen]

Revision: 12082
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12082
Author:   erikhl
Date:     2014-09-08 07:31:44 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
Added display of extra adjustment-flag on adjustment table

Modified Paths:
--------------
    trunk/rental/inc/model/class.adjustment.inc.php
    trunk/rental/templates/base/adjustment_list_partial.php

Modified: trunk/rental/inc/model/class.adjustment.inc.php
===================================================================
--- trunk/rental/inc/model/class.adjustment.inc.php     2014-09-08 07:22:52 UTC 
(rev 12081)
+++ trunk/rental/inc/model/class.adjustment.inc.php     2014-09-08 07:31:44 UTC 
(rev 12082)
@@ -168,6 +168,7 @@
                        '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'),
                        'is_executed' => 
lang(($this->is_executed())?'yes':'no'),
                        'year' => $this->get_year()
                );

Modified: trunk/rental/templates/base/adjustment_list_partial.php
===================================================================
--- trunk/rental/templates/base/adjustment_list_partial.php     2014-09-08 
07:22:52 UTC (rev 12081)
+++ trunk/rental/templates/base/adjustment_list_partial.php     2014-09-08 
07:31:44 UTC (rev 12082)
@@ -75,6 +75,11 @@
                        label: "<?php echo lang('responsibility') ?>",
                        sortable: true
                },
+                {
+                       key: "extra_adjustment",
+                       label: "<?php echo lang('extra_adjustment')?>",
+                       sortable: true
+               },
                {
                        key: "is_executed",
                        label: "<?php echo lang('is_executed')?>",
@@ -129,4 +134,4 @@
 </script>
 
 <div id="<?php echo $list_id ?>_paginator" class="paginator"></div>
-<div id="<?php echo $list_id ?>_container" class="datatable_container"></div>
+<div id="<?php echo $list_id ?>_container" class="datatable_container"></div>