[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11973] fix on billing tems
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [11973] fix on billing tems |
Date: |
Thu, 15 May 2014 05:03:32 +0000 |
Revision: 11973
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11973
Author: erikhl
Date: 2014-05-15 05:03:30 +0000 (Thu, 15 May 2014)
Log Message:
-----------
fix on billing tems
Modified Paths:
--------------
trunk/rental/inc/class.sobilling.inc.php
trunk/rental/setup/phpgw_no.lang
trunk/rental/templates/base/composite_list_partial.php
Modified: trunk/rental/inc/class.sobilling.inc.php
===================================================================
--- trunk/rental/inc/class.sobilling.inc.php 2014-05-14 12:47:29 UTC (rev
11972)
+++ trunk/rental/inc/class.sobilling.inc.php 2014-05-15 05:03:30 UTC (rev
11973)
@@ -210,7 +210,7 @@
{
if($this->billing_terms == null)
{
- $sql = "SELECT id, title FROM
rental_billing_term ORDER BY months DESC";
+ $sql = "SELECT id, title FROM
rental_billing_term WHERE NOT months=0 ORDER BY months DESC";
//FIXME Sigurd 21.june 2010: this query trigger
fetch_single mode for next_record()
$this->db->query($sql, __LINE__, __FILE__,
false, true);
$results = array();
Modified: trunk/rental/setup/phpgw_no.lang
===================================================================
--- trunk/rental/setup/phpgw_no.lang 2014-05-14 12:47:29 UTC (rev 11972)
+++ trunk/rental/setup/phpgw_no.lang 2014-05-15 05:03:30 UTC (rev 11973)
@@ -46,7 +46,7 @@
area suffix rental no Areal suffix
area_max rental no Max areal
audience rental no Målgrupper
-availability rental no Tilgjengelighet
+availability rental no Status
availability_date rental no Dato
available_areas rental no Tilgjenglig areal
available_at rental no Ledig på dato
Modified: trunk/rental/templates/base/composite_list_partial.php
===================================================================
--- trunk/rental/templates/base/composite_list_partial.php 2014-05-14
12:47:29 UTC (rev 11972)
+++ trunk/rental/templates/base/composite_list_partial.php 2014-05-15
05:03:30 UTC (rev 11973)
@@ -181,19 +181,25 @@
<fieldset>
<!-- Filters -->
<h3><?php echo lang('filters') ?></h3>
-
- <!-- Møbleringsstatus -->
- <label for="furnished_status"><?php echo lang('furnish_type')
?></label>
- <select name="furnished_status" id="<?php echo $list_id
?>_ctrl_toggle_furnished_status_rental_composites">
- <?php
- $furnish_types_arr =
rental_composite::get_furnish_types();
-
- echo "<option value='4'>Alle</option>";
- foreach($furnish_types_arr as $id => $title){
- echo "<option value='$id'>" . $title .
"</option>";
- }
- ?>
- </select>
+ <?php
+
if(isset($config->config_data['contract_furnished_status']) &&
$config->config_data['contract_furnished_status'])
+ {
+
+ ?>
+ <!-- Møbleringsstatus -->
+ <label for="furnished_status"><?php echo
lang('furnish_type') ?></label>
+ <select name="furnished_status" id="<?php echo $list_id
?>_ctrl_toggle_furnished_status_rental_composites">
+ <?php
+ $furnish_types_arr =
rental_composite::get_furnish_types();
+
+ echo "<option value='4'>Alle</option>";
+ foreach($furnish_types_arr as $id =>
$title){
+ echo "<option value='$id'>" .
$title . "</option>";
+ }
+ ?>
+ </select>
+ <?php }
+ ?>
<label for="ctrl_toggle_active_rental_composites"><?php echo
lang('availability') ?></label>
<select name="is_active" id="<?php echo $list_id
?>_ctrl_toggle_active_rental_composites">
<option value="both" <?php echo ($status == 'both') ?
'selected' : ''?>><?php echo lang('all') ?></option>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11973] fix on billing tems,
Erik Holm-Larsen <=