[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14793] Merge 14784:14792 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14793] Merge 14784:14792 from trunk |
|
Date: |
Tue, 01 Mar 2016 19:20:00 +0000 |
Revision: 14793
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14793
Author: sigurdne
Date: 2016-03-01 19:20:00 +0000 (Tue, 01 Mar 2016)
Log Message:
-----------
Merge 14784:14792 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/controller/templates/base/component.xsl
branches/Version-2_0-branch/frontend/inc/class.uifrontend.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/phpgwapi/templates/portico/js/base.js
branches/Version-2_0-branch/property/inc/class.sorequest.inc.php
branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-2_0-branch/property/inc/class.uientity.inc.php
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-2_0-branch/property/js/portico/budget.basis.js
branches/Version-2_0-branch/property/js/portico/condition_survey.js
branches/Version-2_0-branch/property/js/portico/investment.index.js
branches/Version-2_0-branch/property/js/portico/invoice2.index.js
branches/Version-2_0-branch/property/js/portico/project.edit.js
branches/Version-2_0-branch/property/js/portico/request.index.js
branches/Version-2_0-branch/property/js/portico/tts.index.js
branches/Version-2_0-branch/property/templates/base/condition_survey.xsl
branches/Version-2_0-branch/property/templates/base/condition_survey_summation.xsl
branches/Version-2_0-branch/rental/templates/base/billing.xsl
branches/Version-2_0-branch/rental/templates/base/contract.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/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
+ /branches/dev-syncromind:13653
/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
Modified: branches/Version-2_0-branch/controller/templates/base/component.xsl
===================================================================
--- branches/Version-2_0-branch/controller/templates/base/component.xsl
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/controller/templates/base/component.xsl
2016-03-01 19:20:00 UTC (rev 14793)
@@ -21,14 +21,23 @@
<xsl:value-of select="datatable_name"/>
</h2>
<div id="receipt"></div>
- <xsl:call-template name="icon_color_map" />
- <xsl:apply-templates select="form" />
- <xsl:apply-templates select="paging"/>
- <div id="list_flash">
- <xsl:call-template name="msgbox"/>
+
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2">
+ <xsl:apply-templates select="form" />
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2">
+ <xsl:call-template name="icon_color_map" />
+ </div>
</div>
- <xsl:apply-templates select="datatable"/>
- <xsl:apply-templates select="form/list_actions"/>
+
+
+ <xsl:apply-templates select="paging"/>
+ <div id="list_flash">
+ <xsl:call-template name="msgbox"/>
+ </div>
+ <xsl:apply-templates select="datatable"/>
+ <xsl:apply-templates select="form/list_actions"/>
</xsl:template>
@@ -51,154 +60,203 @@
<xsl:template match="toolbar">
- <div id="toolbar">
- <table>
- <tr>
+ <style id='toggle-box-css' type='text/css' scoped='scoped'>
+ .toggle-box {
+ display: none;
+ }
+
+ .toggle-box + label {
+ cursor: pointer;
+ display: block;
+ font-weight: bold;
+ line-height: 21px;
+ margin-bottom: 5px;
+ }
+
+ .toggle-box + label + #toolbar {
+ display: none;
+ margin-bottom: 10px;
+ }
+
+ .toggle-box:checked + label + #toolbar {
+ display: block;
+ }
+
+ .toggle-box + label:before {
+ background-color: #4F5150;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+ color: #FFFFFF;
+ content: "+";
+ display: block;
+ float: left;
+ font-weight: bold;
+ height: 20px;
+ line-height: 20px;
+ margin-right: 5px;
+ text-align: center;
+ width: 20px;
+ }
+
+ .toggle-box:checked + label:before {
+ content: "\2212";
+ }
+ </style>
+ <div id="active_filters"></div>
+
+ <input class="toggle-box" id="header1" type="checkbox" />
+ <label for="header1">
+ <xsl:value-of select="php:function('lang', 'filter')"/>
+ </label>
+
+ <div id="toolbar" xmlns:php="http://php.net/xsl";>
+ <table id="toolbar_table" class="pure-table">
+ <thead>
+ <tr>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'name')"/>
+ </th>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'item')"/>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
<xsl:for-each select="item">
- <xsl:variable name="filter_key"
select="concat('filter_', name)"/>
- <xsl:variable name="filter_key_name"
select="concat(concat('filter_', name), '_name')"/>
- <xsl:variable name="filter_key_id"
select="concat(concat('filter_', name), '_id')"/>
+ <tr>
+ <td>
+
+ <label>
+ <xsl:attribute
name="for">
+
<xsl:value-of select="phpgw:conditional(not(name), '', name)"/>
+ </xsl:attribute>
+ <xsl:value-of
select="phpgw:conditional(not(text), '', text)"/>
+ </label>
+ </td>
+ <td>
+ <xsl:variable
name="filter_key" select="concat('filter_', name)"/>
+ <xsl:variable
name="filter_key_name" select="concat(concat('filter_', name), '_name')"/>
+ <xsl:variable
name="filter_key_id" select="concat(concat('filter_', name), '_id')"/>
- <xsl:choose>
- <xsl:when test="type =
'date-picker'">
- <td>
- <div
class="date-picker">
- <input
id="filter_{name}" name="filter_{name}" type="text">
+ <xsl:choose>
+ <xsl:when
test="type = 'date-picker'">
+ <div
class="date-picker">
+
<input id="filter_{name}" name="filter_{name}" type="text">
+
<xsl:attribute name="value">
+
<xsl:value-of select="../../../filters/*[local-name() =
$filter_key]"/>
+
</xsl:attribute>
+
</input>
+ </div>
+ </xsl:when>
+ <xsl:when
test="type = 'filter'">
+
<xsl:variable name="name">
+
<xsl:value-of select="name"/>
+
</xsl:variable>
+
+ <select
id="{$name}" name="{$name}" width="250" style="width: 250px">
+
<xsl:attribute name="onchange">
+
<xsl:value-of select="phpgw:conditional(not(onchange), '', onchange)"/>
+
</xsl:attribute>
+
<xsl:for-each select="list">
+
<xsl:variable name="id">
+
<xsl:value-of select="id"/>
+
</xsl:variable>
+
<option value="{$id}">
+
<xsl:if test="selected = '1'">
+
<xsl:attribute name="selected">
+
<xsl:text>selected</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:for-each>
+
</select>
+ </xsl:when>
+ <xsl:otherwise>
+ <input
id="innertoolbar">
+
<xsl:attribute name="type">
+
<xsl:value-of select="phpgw:conditional(not(type), '', type)"/>
+
</xsl:attribute>
+
<xsl:attribute name="name">
+
<xsl:value-of select="phpgw:conditional(not(name), '', name)"/>
+
</xsl:attribute>
+
<xsl:attribute name="onclick">
+
<xsl:value-of select="phpgw:conditional(not(onclick), '', onclick)"/>
+
</xsl:attribute>
<xsl:attribute name="value">
-
<xsl:value-of select="../../../filters/*[local-name() = $filter_key]"/>
+
<xsl:value-of select="phpgw:conditional(not(value), '', value)"/>
</xsl:attribute>
+
<xsl:attribute name="href">
+
<xsl:value-of select="phpgw:conditional(not(href), '', href)"/>
+
</xsl:attribute>
+
<xsl:attribute name="class">
+
<xsl:value-of select="phpgw:conditional(not(class), '', class)"/>
+
</xsl:attribute>
</input>
- </div>
- </td>
- </xsl:when>
- <xsl:when test="type =
'filter'">
- <td>
- <xsl:variable
name="name">
-
<xsl:value-of select="name"/>
- </xsl:variable>
-
- <select
id="{$name}" name="{$name}">
-
<xsl:attribute name="onchange">
-
<xsl:value-of select="phpgw:conditional(not(onchange), '', onchange)"/>
-
</xsl:attribute>
-
<xsl:for-each select="list">
-
<xsl:variable name="id">
-
<xsl:value-of select="id"/>
-
</xsl:variable>
-
<option value="{$id}">
-
<xsl:if test="selected = '1'">
-
<xsl:attribute name="selected">
-
<xsl:text>selected</xsl:text>
-
</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="name"/>
-
</option>
-
</xsl:for-each>
- </select>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td valign="top">
- <input
id="innertoolbar">
-
<xsl:attribute name="type">
-
<xsl:value-of select="phpgw:conditional(not(type), '', type)"/>
-
</xsl:attribute>
-
<xsl:attribute name="name">
-
<xsl:value-of select="phpgw:conditional(not(name), '', name)"/>
-
</xsl:attribute>
-
<xsl:attribute name="onclick">
-
<xsl:value-of select="phpgw:conditional(not(onclick), '', onclick)"/>
-
</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="phpgw:conditional(not(value), '', value)"/>
-
</xsl:attribute>
-
<xsl:attribute name="href">
-
<xsl:value-of select="phpgw:conditional(not(href), '', href)"/>
-
</xsl:attribute>
-
<xsl:attribute name="class">
-
<xsl:value-of select="phpgw:conditional(not(class), '', class)"/>
-
</xsl:attribute>
- </input>
- </td>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ </tr>
</xsl:for-each>
- </tr>
- <xsl:if test="item/text and normalize-space(item/text)">
- <thead>
- <tr>
- <xsl:for-each select="item">
- <td>
- <xsl:if
test="name">
- <label>
-
<xsl:attribute name="for">
-
<xsl:value-of select="phpgw:conditional(not(name), '', name)"/>
-
</xsl:attribute>
-
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
- </label>
- </xsl:if>
- </td>
- </xsl:for-each>
- </tr>
- </thead>
- </xsl:if>
+ </tbody>
</table>
</div>
</xsl:template>
<xsl:template match="datatable">
-<style>
-#components {
- font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
- width: 100%;
- border-collapse: collapse;
-}
+ <style>
+ #components {
+ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+ width: 100%;
+ border-collapse: collapse;
+ }
-#components td, #components th {
- font-size: 1em;
- border: 1px solid #98bf21;
- padding: 3px 7px 2px 7px;
-}
+ #components td, #components th {
+ font-size: 1em;
+ border: 1px solid #98bf21;
+ padding: 3px 7px 2px 7px;
+ }
-#components th {
- font-size: 1.1em;
- text-align: left;
- padding-top: 5px;
- padding-bottom: 4px;
- background-color: green;
- color: #ffffff;
-}
+ #components th {
+ font-size: 1.1em;
+ text-align: left;
+ padding-top: 5px;
+ padding-bottom: 4px;
+ background-color: green;
+ color: #ffffff;
+ }
-#components tr.alt td {
- color: #000000;
- background-color: #EAF2D3;
-}
-#summary {
- font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
- width: 100%;
- border-collapse: collapse;
-}
+ #components tr.alt td {
+ color: #000000;
+ background-color: #EAF2D3;
+ }
+ #summary {
+ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+ width: 100%;
+ border-collapse: collapse;
+ }
-#summary td, #summary th {
- font-size: 1em;
- border: 1px solid #98bf21;
- padding: 3px 7px 2px 7px;
-}
+ #summary td, #summary th {
+ font-size: 1em;
+ border: 1px solid #98bf21;
+ padding: 3px 7px 2px 7px;
+ }
-#summary th {
- font-size: 1.1em;
- text-align: left;
- padding-top: 5px;
- padding-bottom: 4px;
- background-color: green;
- color: #ffffff;
-}
+ #summary th {
+ font-size: 1.1em;
+ text-align: left;
+ padding-top: 5px;
+ padding-bottom: 4px;
+ background-color: green;
+ color: #ffffff;
+ }
-#summary tr.alt td {
- color: #000000;
- background-color: #EAF2D3;
-}
-</style>
+ #summary tr.alt td {
+ color: #000000;
+ background-color: #EAF2D3;
+ }
+ </style>
<xsl:call-template name="datasource-definition" />
</xsl:template>
Modified: branches/Version-2_0-branch/frontend/inc/class.uifrontend.inc.php
===================================================================
--- branches/Version-2_0-branch/frontend/inc/class.uifrontend.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/frontend/inc/class.uifrontend.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -33,11 +33,6 @@
class frontend_uifrontend extends frontend_uicommon
{
- public $public_functions = array
- (
- 'index' => true
- );
-
public function __construct()
{
parent::__construct();
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-03-01
18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-03-01
19:20:00 UTC (rev 14793)
@@ -212,15 +212,15 @@
JqueryPortico.FormatterAmount0 = function (key, oData)
{
- var amount = $.number(oData[key], 0, ',', ' ');
- return amount;
+ var amount = $.number(oData[key], 0, ',', '.');
+ return "<div align=\"right\">" + amount + "</div>";
};
JqueryPortico.FormatterAmount2 = function (key, oData)
{
- var amount = $.number(oData[key], 2, ',', ' ');
- return amount;
+ var amount = $.number(oData[key], 2, ',', '.');
+ return "<div align=\"right\">" + amount + "</div>";
};
JqueryPortico.FormatterRight = function (key, oData)
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-03-01 19:20:00 UTC (rev 14793)
@@ -935,23 +935,24 @@
var column_to_keep =
aoData.columns[column];
delete aoData.columns;
aoData.columns = {};
- aoData.columns[column] =
column_to_keep;
+
if(JqueryPortico.columns[column]['orderable'] == true)
+ {
+ aoData.columns[column]
= column_to_keep;
+ }
}
-
active_filters_html = [];
var select = null;
for (var i in filter_selects)
{
- select = $("#" +
filter_selects[i]);
- var select_name =
select.prop("name");
- var select_value =
select.val();
- aoData[select_name] =
select_value;
+ select = $("#" +
filter_selects[i]);
+ var select_name =
select.prop("name");
+ var select_value = select.val();
+ aoData[select_name] =
select_value;
- if(select_value &&
select_value !=0 )
- {
+ if(select_value && select_value
!=0 )
+ {
active_filters_html.push(i);
- }
-
+ }
}
if(active_filters_html.length > 0)
Modified: branches/Version-2_0-branch/phpgwapi/templates/portico/js/base.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/js/base.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/js/base.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -17,7 +17,7 @@
, spacing_closed: 22
, togglerLength_closed: 140
, togglerAlign_closed: "top"
- , togglerContent_closed:
"C<BR>o<BR>n<BR>t<BR>e<BR>n<BR>t<BR>s"
+ , togglerContent_closed: "M<BR>E<BR>N<BR>Y"
, togglerTip_closed: "Open & Pin Contents"
, sliderTip: "Slide Open Contents"
, slideTrigger_open: "mouseover"
Modified: branches/Version-2_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sorequest.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/inc/class.sorequest.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -197,8 +197,11 @@
$condition_survey_id = $data['condition_survey_id'] ?
(int)$data['condition_survey_id'] : 0;
$sort = isset($data['sort']) && $data['sort'] ?
$data['sort'] : 'DESC';
$order = isset($data['order']) ? $data['order'] : '';
+ $query = isset($data['query']) ? $data['query'] : '';
+ $allrows = isset($data['allrows']) ? $data['allrows'] :
false;
+ $results = isset($data['results']) && $data['results']
? (int)$data['results'] : 0;
+ $cat_id = isset($data['cat_id']) && $data['cat_id'] ?
(int)$data['cat_id'] : 0;
-
if ($order)
{
switch ($order)
@@ -223,7 +226,12 @@
$filtermethod = " WHERE fm_request.condition_survey_id
= '{$condition_survey_id}'";
+ if($query)
+ {
+ $filtermethod .= " AND fm_request.title
{$this->_like} '%$query%'";
+ }
+
if ($cat_id > 0)
{
$filtermethod .= " AND
fm_request.category='{$cat_id}'";
@@ -232,7 +240,6 @@
$sql = "SELECT DISTINCT fm_request.id as
request_id,fm_request_status.descr as status,fm_request.building_part,"
. "
fm_request.start_date,fm_request.closed_date,fm_request.in_progress_date,fm_request.category
as cat_id,"
. " fm_request.delivered_date,fm_request.title
as title,max(fm_request_condition.degree) as condition_degree,"
- // . "
sum(fm_request_planning.amount) as planned_budget,"
. " (fm_request.amount_investment *
fm_request.multiplier) as amount_investment,"
. " (fm_request.amount_operation *
fm_request.multiplier) as amount_operation,"
. " (fm_request.amount_potential_grants *
fm_request.multiplier) as amount_potential_grants,"
@@ -240,14 +247,12 @@
. " fm_request.recommended_year,"
. " fm_request.start_date"
. " FROM (( fm_request LEFT JOIN
fm_request_status ON fm_request.status = fm_request_status.id)"
- // . " LEFT JOIN
fm_request_planning ON fm_request.id = fm_request_planning.request_id)"
- // . " LEFT JOIN
fm_request_consume ON fm_request.id = fm_request_consume.request_id)"
. " LEFT JOIN fm_request_condition ON
fm_request.id = fm_request_condition.request_id)"
. " {$filtermethod}"
. " GROUP BY fm_request.category,
fm_request.multiplier,fm_request.recommended_year, fm_request_status.descr,"
. "
building_part,fm_request.start_date,fm_request.entry_date,fm_request.closed_date,"
. "
fm_request.in_progress_date,fm_request.delivered_date,title,amount_investment,amount_operation,amount_potential_grants,score,fm_request.id,fm_request_status.descr";
-//_debug_array($sql);
+
$sql2 = "SELECT count(*) as cnt, sum(amount_investment)
as sum_investment, sum(amount_operation) as sum_operation,
sum(amount_potential_grants) as sum_potential_grants FROM ({$sql}) as t";
$this->_db->query($sql2, __LINE__, __FILE__);
@@ -257,18 +262,9 @@
$this->sum_operation = $this->_db->f('sum_operation');
$this->sum_potential_grants =
$this->_db->f('sum_potential_grants');
-
-
- /*
- $sql3 = "SELECT sum(fm_request_consume.amount) as
sum_consume FROM {$sql_arr[1]}";
- $this->_db->query($sql3,__LINE__,__FILE__);
- $this->_db->next_record();
- $this->sum_consume = $this->_db->f('sum_consume');
- */
-
if (!$allrows)
{
- $this->_db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->_db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__, $results);
}
else
{
Modified:
branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -741,19 +741,23 @@
}
$borequest = CreateObject('property.borequest');
- $start = phpgw::get_var('start', 'int', 'REQUEST', 0);
- $sortKey = phpgw::get_var('sort', 'string', 'REQUEST',
'request_id');
- $sortDir = phpgw::get_var('dir', 'string', 'REQUEST',
'ASC');
- $criteria = array
- (
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+ $columns = phpgw::get_var('columns');
+
+ $params = array(
'condition_survey_id' => $id,
- 'start' => $start,
- 'order' => $sortKey,
- 'sort' => $sortDir
+ 'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
+ 'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
+ 'query' => $search['value'],
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' => $order[0]['dir'],
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1,
);
- $values = $borequest->read_survey_data($criteria);
+ $values = $borequest->read_survey_data($params);
$total_records = $borequest->total_records;
$base_url = self::link(array('menuaction' =>
'property.uirequest.edit'));
Modified: branches/Version-2_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uientity.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/inc/class.uientity.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -2196,6 +2196,7 @@
array('key' => 'url', 'label'
=> lang('id'), 'sortable' => false, 'resizeable' => true),
array('key' => 'type', 'label'
=> lang('type'), 'sortable' => true, 'resizeable' => true),
array('key' => 'title', 'label'
=> lang('title'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'value', 'label'
=> lang('value'), 'sortable' => false, 'resizeable' => true),
array('key' => 'status',
'label' => lang('status'), 'sortable' => false, 'resizeable' => true),
array('key' => 'user', 'label'
=> lang('user'), 'sortable' => true, 'resizeable' => true),
array('key' => 'entry_date',
'label' => lang('entry date'), 'sortable' => false,
Modified: branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -349,7 +349,7 @@
{
return $this->query();
}
-
+ phpgwapi_jquery::load_widget('numberformat');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
@@ -452,6 +452,26 @@
# Aca debe ser el Onclick
$params['formatter'] =
'JqueryPortico.searchLink';
}
+ if ($uicols['name'][$k] == 'actual_cost')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] == 'combined_cost')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] == 'budget')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] == 'diff')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] == 'obligation')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
array_push($data['datatable']['field'],
$params);
}
@@ -1607,13 +1627,13 @@
if (isset($values['reserve']) && $values['reserve'] !=
0)
{
$reserve_remainder = $values['reserve'] -
$values['deviation'];
- $remainder_percent =
number_format(($reserve_remainder / $values['reserve']) * 100, 2,
$this->decimal_separator, '');
+ $remainder_percent =
number_format(($reserve_remainder / $values['reserve']) * 100, 2,
$this->decimal_separator, '.');
$values['sum'] = $values['sum'] +
$values['reserve'];
}
$value_remainder = $values['sum'] - $sum_actual_cost -
$sum_oblications;
- $values['sum'] = number_format($values['sum'], 0,
$this->decimal_separator, ' ');
- $value_remainder = number_format($value_remainder, 0,
$this->decimal_separator, ' ');
+ $values['sum'] = number_format($values['sum'], 0,
$this->decimal_separator, '.');
+ $value_remainder = number_format($value_remainder, 0,
$this->decimal_separator, '.');
if (isset($values['project_type_id']) &&
$values['project_type_id'] == 3)
{
@@ -1633,11 +1653,11 @@
array('key' => 'year', 'label' =>
lang('year'), 'sortable' => false, 'value_footer' => lang('Sum')),
array('key' => 'entry_date', 'label' =>
lang('entry date'), 'sortable' => true),
array('key' => 'amount_in', 'label' =>
lang('amount in'), 'sortable' => false,
- 'className' => 'right',
'formatter' => 'FormatterAmount0', 'value_footer' =>
number_format($s_amount_in, 0, $this->decimal_separator, ' ')),
+ 'className' => 'right',
'formatter' => 'FormatterAmount0', 'value_footer' =>
number_format($s_amount_in, 0, $this->decimal_separator, '.')),
array('key' => 'from_project', 'label'
=> lang('from project'), 'sortable' => true,
'className' => 'right',
'formatter' => 'project_link'),
array('key' => 'amount_out', 'label' =>
lang('amount out'), 'sortable' => false,
- 'className' => 'right',
'formatter' => 'FormatterAmount0', 'value_footer' =>
number_format($s_amount_out, 0, $this->decimal_separator, ' ')),
+ 'className' => 'right',
'formatter' => 'FormatterAmount0', 'value_footer' =>
number_format($s_amount_out, 0, $this->decimal_separator, '.')),
array('key' => 'to_project', 'label' =>
lang('to project'), 'sortable' => true,
'formatter' => 'project_link'),
array('key' => 'remark', 'label' =>
lang('remark'), 'sortable' => true)
@@ -1650,15 +1670,15 @@
array('key' => 'year', 'label' =>
lang('year'), 'sortable' => false, 'value_footer' => lang('Sum')),
array('key' => 'month', 'label' =>
lang('month'), 'sortable' => false),
array('key' => 'budget', 'label' =>
lang('budget'), 'sortable' => false, 'className' => 'right',
- 'formatter' =>
'JqueryPortico.FormatterAmount0', 'value_footer' => number_format($s_budget, 0,
$this->decimal_separator, ' ')),
+ 'formatter' =>
'JqueryPortico.FormatterAmount0', 'value_footer' => number_format($s_budget, 0,
$this->decimal_separator, '.')),
array('key' => 'sum_oblications',
'label' => lang('sum orders'), 'sortable' => false,
- 'className' => 'right',
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' =>
number_format($s_orders, 0, $this->decimal_separator, ' ')),
+ 'className' => 'right',
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' =>
number_format($s_orders, 0, $this->decimal_separator, '.')),
array('key' => 'actual_cost', 'label'
=> lang('actual cost'), 'sortable' => false,
- 'className' => 'right',
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' =>
number_format($s_actual_cost, 0, $this->decimal_separator, ' ')),
+ 'className' => 'right',
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' =>
number_format($s_actual_cost, 0, $this->decimal_separator, '.')),
array('key' => 'diff', 'label' =>
lang('difference'), 'sortable' => false, 'className' => 'right',
- 'formatter' =>
'JqueryPortico.FormatterAmount0', 'value_footer' => number_format($s_diff, 0,
$this->decimal_separator, ' ')),
+ 'formatter' =>
'JqueryPortico.FormatterAmount0', 'value_footer' => number_format($s_diff, 0,
$this->decimal_separator, '.')),
array('key' => 'deviation_period',
'label' => lang('deviation'), 'sortable' => false,
- 'className' => 'right',
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' =>
number_format($s_deviation, 0, $this->decimal_separator, ' ')),
+ 'className' => 'right',
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' =>
number_format($s_deviation, 0, $this->decimal_separator, '.')),
array('key' => 'deviation_acc', 'label'
=> lang('deviation') . '::' . lang('accumulated'),
'sortable' => false,
'className' => 'right', 'formatter' => 'JqueryPortico.FormatterAmount0'),
array('key' =>
'deviation_percent_period', 'label' => lang('deviation') . '::' .
lang('percent'),
Modified: branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/inc/class.uirequest.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -165,10 +165,10 @@
$result_data['total_records'] =
$this->bo->total_records;
$result_data['draw'] = $draw;
- $result_data['amount_investment'] =
number_format($this->bo->sum_investment, 0, ',', ' ');
- $result_data['amount_operation'] =
number_format($this->bo->sum_operation, 0, ',', ' ');
- $result_data['amount_potential_grants'] =
number_format($this->bo->sum_potential_grants, 0, ',', ' ');
- $result_data['consume'] =
number_format($this->bo->sum_consume, 0, ',', ' ');
+ $result_data['amount_investment'] =
number_format($this->bo->sum_investment, 0, ',', '.');
+ $result_data['amount_operation'] =
number_format($this->bo->sum_operation, 0, ',', '.');
+ $result_data['amount_potential_grants'] =
number_format($this->bo->sum_potential_grants, 0, ',', '.');
+ $result_data['consume'] =
number_format($this->bo->sum_consume, 0, ',', '.');
return $this->jquery_results($result_data);
}
@@ -615,6 +615,7 @@
$lookup = true;
}
+ phpgwapi_jquery::load_widget('numberformat');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
@@ -758,6 +759,18 @@
{
$params['formatter'] =
'JqueryPortico.searchLink';
}
+ if ($uicols['name'][$k] == 'amount_investment')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] == 'amount_operation')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] ==
'amount_potential_grants')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
array_push($data['datatable']['field'],
$params);
}
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -567,7 +567,18 @@
{
$params['formatter'] =
'JqueryPortico.searchLinkTts';
}
-
+ if ($uicols['name'][$k] == 'estimate')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] == 'actual_cost')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
+ if ($uicols['name'][$k] == 'difference')
+ {
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ }
if ($uicols['name'][$k] == 'address' ||
$uicols['name'][$k] == 'id' || $uicols['name'][$k] == 'priority')
{
$params['sortable'] = true;
@@ -807,6 +818,7 @@
return $this->query();
}
+ phpgwapi_jquery::load_widget('numberformat');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
self::add_javascript('property', 'portico',
'tts.index.js');
Modified: branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2016-03-01 19:20:00 UTC (rev 14793)
@@ -383,7 +383,7 @@
$default_district =
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_district'])
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_district'] :
'');
- if ($default_district && !
isset($_REQUEST['district_id']))
+ if ($default_district &&
!isset($_REQUEST['district_id']))
{
$this->bo->district_id = $default_district;
$this->district_id = $default_district;
@@ -399,6 +399,7 @@
return $this->query();
}
+ phpgwapi_jquery::load_widget('numberformat');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
self::add_javascript('property', 'portico',
'workorder.index.js');
@@ -505,10 +506,16 @@
case 'loc1':
$params['formatter'] =
'JqueryPortico.searchLink';
break;
+ case 'actual_cost':
+ case 'obligation':
+ case 'combined_cost':
+ case 'diff':
+ case 'budget':
+ $params['formatter'] =
'JqueryPortico.FormatterAmount0';
+ break;
default:
break;
}
-
array_push($data['datatable']['field'],
$params);
}
@@ -1481,8 +1488,8 @@
$sum_estimated_cost = $values['calculation'];
}
- $sum_estimated_cost =
number_format($sum_estimated_cost, 2, $this->decimal_separator, ' ');
- $values['calculation'] =
number_format($values['calculation'], 2, $this->decimal_separator, ' ');
+ $sum_estimated_cost =
number_format($sum_estimated_cost, 2, $this->decimal_separator, '.');
+ $values['calculation'] =
number_format($values['calculation'], 2, $this->decimal_separator, '.');
$link_data = array
(
@@ -1808,13 +1815,13 @@
'label' => lang('amount'),
'sortable' => false,
'className' => 'right',
- 'value_footer' =>
number_format($amount, 2, $this->decimal_separator, ' ')),
+ 'value_footer' =>
number_format($amount, 2, $this->decimal_separator, '.')),
array(
'key' => 'approved_amount',
'label' => lang('approved amount'),
'sortable' => false,
'className' => 'right',
- 'value_footer' =>
number_format($approved_amount, 2, $this->decimal_separator, ' ')),
+ 'value_footer' =>
number_format($approved_amount, 2, $this->decimal_separator, '.')),
array(
'key' => 'period',
'label' => lang('period'),
@@ -2031,42 +2038,42 @@
'sortable' => false,
'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0',
- 'value_footer' =>
number_format($budget, 0, $this->decimal_separator, ' ')),
+ 'value_footer' =>
number_format($budget, 0, $this->decimal_separator, '.')),
array(
'key' => 'sum_orders',
'label' => lang('order'),
'sortable' => false,
'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0',
- 'value_footer' =>
number_format($sum_orders, 0, $this->decimal_separator, ' ')),
+ 'value_footer' =>
number_format($sum_orders, 0, $this->decimal_separator, '.')),
array(
'key' => 'sum_oblications',
'label' => lang('sum orders'),
'sortable' => false,
'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0',
- 'value_footer' =>
number_format($sum_oblications, 0, $this->decimal_separator, ' ')),
+ 'value_footer' =>
number_format($sum_oblications, 0, $this->decimal_separator, '.')),
array(
'key' => 'actual_cost',
'label' => lang('actual cost'),
'sortable' => false,
'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0',
- 'value_footer' =>
number_format($actual_cost, 0, $this->decimal_separator, ' ')),
+ 'value_footer' =>
number_format($actual_cost, 0, $this->decimal_separator, '.')),
array(
'key' => 'diff',
'label' => lang('difference'),
'sortable' => false,
'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0',
- 'value_footer' => number_format($diff,
0, $this->decimal_separator, ' ')),
+ 'value_footer' => number_format($diff,
0, $this->decimal_separator, '.')),
array(
'key' => 'deviation_period',
'label' => lang('deviation'),
'sortable' => false,
'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount0',
- 'value_footer' =>
number_format($deviation, 0, $this->decimal_separator, ' ')),
+ 'value_footer' =>
number_format($deviation, 0, $this->decimal_separator, '.')),
array(
'key' => 'deviation_acc',
'label' => lang('deviation') . '::' .
lang('accumulated'),
Modified: branches/Version-2_0-branch/property/js/portico/budget.basis.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/budget.basis.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/js/portico/budget.basis.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -21,7 +21,7 @@
return intVal(a) + intVal(b);
}) : 0;
- var amount = $.number(pageTotal, 0, ',', ' ');
+ var amount = $.number(pageTotal, 0, ',', '.');
$(api.column(i).footer()).html("<div align=\"right\">"
+ amount + "</div>");
}
Modified: branches/Version-2_0-branch/property/js/portico/condition_survey.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/condition_survey.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/js/portico/condition_survey.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -14,7 +14,7 @@
{
return intVal(a) + intVal(b);
}) : 0;
- var amount = $.number(pageTotal, 0, ',', ' ');
+ var amount = $.number(pageTotal, 0, ',', '.');
$(api.column(i).footer()).html("<div align=\"right\">" + amount +
"</div>");
};
Modified: branches/Version-2_0-branch/property/js/portico/investment.index.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/investment.index.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/js/portico/investment.index.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -26,7 +26,7 @@
return intVal(a) + intVal(b)
}) : 0;
- var amount = $.number(pagetotal, 0, ',', ' ');
+ var amount = $.number(pagetotal, 0, ',', '.');
$(api.column(i).footer()).html("<div align=\"right\">"
+ amount + "</div>");
}
@@ -40,7 +40,7 @@
return intVal(a) + intVal(b)
}) : 0;
- var amount = $.number(pagetotal, 0, ',', ' ');
+ var amount = $.number(pagetotal, 0, ',', '.');
$(api.column(i).footer()).html("<div align=\"right\">"
+ amount + "</div>");
}
@@ -54,7 +54,7 @@
return intVal(a) + intVal(b)
}) : 0;
- var amount = $.number(pagetotal, 0, ',', ' ');
+ var amount = $.number(pagetotal, 0, ',', '.');
$(api.column(i).footer()).html("<div align=\"right\">"
+ amount + "</div>");
}
Modified: branches/Version-2_0-branch/property/js/portico/invoice2.index.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/invoice2.index.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/js/portico/invoice2.index.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -31,8 +31,8 @@
amount += intVal(data[i]['amount']);
approved_amount += intVal(data[i]['approved_amount_hidden']);
}
- amount = $.number(amount, 2, ',', '');
- approved_amount = $.number(approved_amount, 2, ',', '');
+ amount = $.number(amount, 2, ',', '.');
+ approved_amount = $.number(approved_amount, 2, ',', '.');
$(api.column(0).footer()).html("Sum:");
$(api.column(2).footer()).html("<div align=\"right\">" + amount +
"</div>");
$(api.column(3).footer()).html("<div align=\"right\">" +
approved_amount + "</div>");
Modified: branches/Version-2_0-branch/property/js/portico/project.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/project.edit.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/js/portico/project.edit.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -292,7 +292,7 @@
return intVal(a) + intVal(b);
}) : 0;
- pageTotal = $.number(pageTotal, 0, ',', ' ');
+ pageTotal = $.number(pageTotal, 0, ',', '.');
$(api.column(col).footer()).html(pageTotal);
});
}
@@ -320,7 +320,7 @@
return intVal(a) + intVal(b);
}) : 0;
- pageTotal = $.number(pageTotal, 2, ',', ' ');
+ pageTotal = $.number(pageTotal, 2, ',', '.');
$(api.column(col).footer()).html(pageTotal);
});
}
Modified: branches/Version-2_0-branch/property/js/portico/request.index.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/request.index.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/js/portico/request.index.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -11,25 +11,25 @@
case 'amount_investment':
if (typeof (nCells[i]) !== 'undefined')
{
- nCells[i].innerHTML =
data.amount_investment;
+ nCells[i].innerHTML = "<div
align=\"right\">" + data.amount_investment + "</div>";
}
break;
case 'amount_operation':
if (typeof (nCells[i]) !== 'undefined')
{
- nCells[i].innerHTML =
data.amount_operation;
+ nCells[i].innerHTML = "<div
align=\"right\">" + data.amount_operation + "</div>";
}
break;
case 'amount_potential_grants':
if (typeof (nCells[i]) !== 'undefined')
{
- nCells[i].innerHTML =
data.amount_potential_grants;
+ nCells[i].innerHTML = "<div
align=\"right\">" + data.amount_potential_grants + "</div>";
}
break;
case 'consume':
- if (typeof (nCells[i]) !== 'undefined')
+ if (typeof (nCells[i]) !== 'undefined' &&
data.consume != null)
{
- nCells[i].innerHTML = data.consume;
+ nCells[i].innerHTML = "<div
align=\"right\">" + data.consume + "</div>";
}
break;
}
Modified: branches/Version-2_0-branch/property/js/portico/tts.index.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/tts.index.js
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/js/portico/tts.index.js
2016-03-01 19:20:00 UTC (rev 14793)
@@ -20,7 +20,7 @@
{
if (typeof (nRow.getElementsByTagName('th')[j])
!= 'undefined')
{
-
nRow.getElementsByTagName('th')[j].innerHTML = tmp_sum_budget;
+
nRow.getElementsByTagName('th')[j].innerHTML = "<div align=\"right\">" +
$.number(tmp_sum_budget, 0, ',', '.') + "</div>";
}
break;
}
@@ -39,7 +39,7 @@
{
if (typeof (nRow.getElementsByTagName('th')[j])
!= 'undefined')
{
-
nRow.getElementsByTagName('th')[j].innerHTML = tmp_sum_actual_cost;
+
nRow.getElementsByTagName('th')[j].innerHTML = "<div align=\"right\">" +
$.number(tmp_sum_actual_cost, 0, ',', '.') + "</div>";
}
show_actual_cost = true;
@@ -55,7 +55,7 @@
nRow.getElementsByTagName('th')[0].innerHTML = "Sum:";
if (typeof (nRow.getElementsByTagName('th')[j]) != 'undefined')
{
- nRow.getElementsByTagName('th')[j].innerHTML =
tmp_sum_difference;
+ nRow.getElementsByTagName('th')[j].innerHTML = "<div
align=\"right\">" + $.number(tmp_sum_difference, 0, ',', '.') + "</div>";
}
}
}
Modified:
branches/Version-2_0-branch/property/templates/base/condition_survey.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/condition_survey.xsl
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/property/templates/base/condition_survey.xsl
2016-03-01 19:20:00 UTC (rev 14793)
@@ -19,15 +19,15 @@
<form name="form" class="pure-form pure-form-aligned" id="form"
action="{$action_url}" method="post" ENCTYPE="multipart/form-data">
- <dl>
- <xsl:choose>
- <xsl:when test="msgbox_data !=
''">
- <dt>
-
<xsl:call-template name="msgbox"/>
- </dt>
- </xsl:when>
- </xsl:choose>
- </dl>
+ <dl>
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <dt>
+ <xsl:call-template
name="msgbox"/>
+ </dt>
+ </xsl:when>
+ </xsl:choose>
+ </dl>
<div id="tab-content">
@@ -36,8 +36,8 @@
<div id="generic">
<fieldset>
- <xsl:choose>
- <xsl:when test="survey/id!=''">
+ <xsl:choose>
+ <xsl:when
test="survey/id!=''">
<div
class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'id')" />
@@ -46,11 +46,11 @@
<input
type="hidden" name="id" value="{survey/id}"/>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
- <xsl:choose>
- <xsl:when
test="location_data2!=''">
+ <xsl:choose>
+ <xsl:when
test="location_data2!=''">
<xsl:choose>
<xsl:when test="editable = 1">
<xsl:call-template name="location_form2"/>
@@ -59,15 +59,15 @@
<xsl:call-template name="location_view2"/>
</xsl:otherwise>
</xsl:choose>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
<div class="pure-control-group">
<label for="name">
<xsl:value-of
select="php:function('lang', 'name')" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
<input
id="title" name='values[title]' type="text" value="{survey/title}">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
@@ -75,20 +75,20 @@
<xsl:attribute name="data-validation-error-msg">
<xsl:value-of select="php:function('lang', 'Please enter a title !')"/>
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="survey/title" />
- </xsl:otherwise>
- </xsl:choose>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="survey/title" />
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<div class="pure-control-group"
>
<label for="name">
<xsl:value-of
select="php:function('lang', 'description')" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
<textarea id="descr" rows="6" style="width:40%; resize:none;"
name="values[descr]">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
@@ -96,21 +96,21 @@
<xsl:attribute name="data-validation-error-msg">
<xsl:value-of select="php:function('lang', 'Please enter a description
!')"/>
</xsl:attribute>
+
<xsl:value-of select="survey/descr" disable-output-escaping="yes"/>
+
</textarea>
+ </xsl:when>
+ <xsl:otherwise>
<xsl:value-of select="survey/descr" disable-output-escaping="yes"/>
- </textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="survey/descr" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<div class="pure-control-group">
<label for="category">
<xsl:value-of
select="php:function('lang', 'category')" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
<select
id="cat_id" name="values[cat_id]">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
@@ -118,25 +118,25 @@
<xsl:attribute name="data-validation-error-msg">
<xsl:value-of select="php:function('lang', 'Please enter a category
!')"/>
</xsl:attribute>
-
<xsl:apply-templates select="categories/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each
select="categories/options">
- <xsl:if
test="selected = 'selected' or selected = 1">
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
-
</xsl:if>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
+
<xsl:apply-templates select="categories/options"/>
+
</select>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:for-each select="categories/options">
+
<xsl:if test="selected = 'selected' or selected = 1">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</xsl:if>
+
</xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<div class="pure-control-group">
<label for="multiplier">
<xsl:value-of
select="php:function('lang', 'multiplier')" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
<input
id="multiplier" name='values[multiplier]' type="text"
value="{survey/multiplier}">
<xsl:attribute name="data-validation">
<xsl:text>number</xsl:text>
@@ -148,34 +148,34 @@
<xsl:value-of select="php:function('lang', 'Please enter a multiplier
!')"/>
</xsl:attribute>
</input>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="survey/multiplier"/>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="survey/multiplier"/>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<div class="pure-control-group">
<label for="date">
<xsl:value-of
select="php:function('lang', 'date')" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
- <input
id="report_date" name='values[report_date]' type="text"
value="{survey/report_date}"
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+ <input
id="report_date" name='values[report_date]' type="text"
value="{survey/report_date}"
data-validation="date" data-validation-format="dd/mm/yyyy"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="survey/report_date"/>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="survey/report_date"/>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<div class="pure-control-group">
<label for="status">
<xsl:value-of
select="php:function('lang', 'status')" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
<select
id="status_id" name="values[status_id]">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
@@ -183,78 +183,78 @@
<xsl:attribute name="data-validation-error-msg">
<xsl:value-of select="php:function('lang', 'Please enter a status !')"/>
</xsl:attribute>
-
<xsl:apply-templates select="status_list/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each
select="status_list/options">
- <xsl:if
test="selected = 'selected' or selected = 1">
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
-
</xsl:if>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
+
<xsl:apply-templates select="status_list/options"/>
+
</select>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:for-each select="status_list/options">
+
<xsl:if test="selected = 'selected' or selected = 1">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</xsl:if>
+
</xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<div class="pure-control-group">
<label
for="coordinator">
<xsl:value-of
select="lang_coordinator" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
<!--div
class="autocomplete"-->
- <input
type="hidden" id="coordinator_id" name="values[coordinator_id]"
value="{survey/coordinator_id}"/>
- <input
type="text" id="coordinator_name" name="values[coordinator_name]"
value="{survey/coordinator_name}">
+ <input
type="hidden" id="coordinator_id" name="values[coordinator_id]"
value="{survey/coordinator_id}"/>
+ <input
type="text" id="coordinator_name" name="values[coordinator_name]"
value="{survey/coordinator_name}">
</input>
- <div
id="coordinator_container"/>
+ <div
id="coordinator_container"/>
<!--/div-->
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="survey/coordinator_name" />
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="survey/coordinator_name" />
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<div class="pure-control-group">
<label for="vendor">
<xsl:value-of
select="php:function('lang', 'vendor')" />
</label>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
<!--div
class="autocomplete"-->
- <input
type="hidden" id="vendor_id" name="values[vendor_id]"
value="{survey/vendor_id}"/>
- <input
type="text" id="vendor_name" name="values[vendor_name]"
value="{survey/vendor_name}">
+ <input
type="hidden" id="vendor_id" name="values[vendor_id]"
value="{survey/vendor_id}"/>
+ <input
type="text" id="vendor_name" name="values[vendor_name]"
value="{survey/vendor_name}">
</input>
- <div
id="vendor_container"/>
+ <div
id="vendor_container"/>
<!--/div-->
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="survey/vendor_name" />
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="survey/vendor_name" />
+ </xsl:otherwise>
+ </xsl:choose>
</div>
</fieldset>
- </div>
+ </div>
- <div id="documents">
- <script type="text/javascript">
+ <div id="documents">
+ <script type="text/javascript">
- var survey_id = '<xsl:value-of
select='survey/id'/>';
- var fileuploader_action = {
+ var survey_id = '<xsl:value-of
select='survey/id'/>';
+ var fileuploader_action = {
menuaction:'property.fileuploader.add',
upload_target:'property.bocondition_survey.addfiles',
id: survey_id
- };
+ };
- this.show_related_requests = function()
- {
+ this.show_related_requests =
function()
+ {
var oArgs =
{menuaction:'property.uirequest.index', nonavbar:1,
condition_survey_id:survey_id};
var requestUrl =
phpGWLink('index.php', oArgs);
TINY.box.show({iframe:requestUrl,
boxid:'frameless',width:screen.width*.9,height:screen.height*.5,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true, close: true});
- }
- </script>
+ }
+ </script>
<div class="pure-control-group">
@@ -273,16 +273,15 @@
</xsl:call-template>
</xsl:if>
</xsl:for-each>
- <xsl:choose>
- <xsl:when test="editable = 1">
- <xsl:call-template
name="file_upload"/>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+
<xsl:call-template name="file_upload"/>
+ </xsl:when>
+ </xsl:choose>
</div>
- </div>
- <div id="request">
- <dl class="proplist-col">
- <dt>
+ </div>
+ <div id="request">
+ <div class="pure-control-group">
<label>
<a
href="javascript:show_related_requests();">
<xsl:attribute
name="title">
@@ -291,12 +290,12 @@
<xsl:value-of
select="php:function('lang', 'details')"/>
</a>
</label>
- </dt>
- <dt>
+ </div>
+ <div class="pure-control-group">
<label>
- <xsl:variable
name="lang_new_request">
-
<xsl:value-of select="php:function('lang', 'new record')" />
- </xsl:variable>
+ <xsl:variable
name="lang_new_request">
+ <xsl:value-of
select="php:function('lang', 'new record')" />
+ </xsl:variable>
<a
href="javascript:document.load_new_request_form.submit();">
<xsl:attribute
name="title">
<xsl:value-of select="$lang_new_request"/>
@@ -304,57 +303,48 @@
<xsl:value-of
select="$lang_new_request"/>
</a>
</label>
- </dt>
+ </div>
+ <div class="pure-control-group">
- <dt>
- <label>
- <xsl:value-of
select="php:function('lang', 'request')"/>
- </label>
- </dt>
- <dd>
- <!--div
style="clear:both;" id="datatable-container_1"></div-->
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_1'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
- </xsl:if>
- </xsl:for-each>
+ <label>
+ <xsl:value-of
select="php:function('lang', 'request')"/>
+ </label>
+ </div>
+ <xsl:for-each select="datatable_def">
+ <xsl:if test="container =
'datatable-container_1'">
+ <xsl:call-template
name="table_setup">
+ <xsl:with-param
name="container" select ='container'/>
+ <xsl:with-param
name="requestUrl" select ='requestUrl' />
+ <xsl:with-param
name="ColumnDefs" select ='ColumnDefs' />
+ <xsl:with-param
name="tabletools" select ='tabletools' />
+ <xsl:with-param
name="config" select ='config' />
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ <div id="summation">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'summation')"/>
+ </label>
+ </div>
+ <!--div style="clear:both;"
id="datatable-container_2"></div-->
+ <xsl:for-each select="datatable_def">
+ <xsl:if test="container =
'datatable-container_2'">
+ <xsl:call-template
name="table_setup">
+ <xsl:with-param
name="container" select ='container'/>
+ <xsl:with-param
name="requestUrl" select ='requestUrl' />
+ <xsl:with-param
name="ColumnDefs" select ='ColumnDefs' />
+ <xsl:with-param
name="tabletools" select ='tabletools' />
+ <xsl:with-param
name="config" select ='config' />
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:for-each>
- </dd>
- </dl>
- </div>
- <div id="summation">
- <dl class="proplist-col">
- <dt>
- <label>
- <xsl:value-of
select="php:function('lang', 'summation')"/>
- </label>
- </dt>
- <dd>
- <!--div
style="clear:both;" id="datatable-container_2"></div-->
- <xsl:for-each
select="datatable_def">
- <xsl:if
test="container = 'datatable-container_2'">
-
<xsl:call-template name="table_setup">
-
<xsl:with-param name="container" select ='container'/>
-
<xsl:with-param name="requestUrl" select ='requestUrl' />
-
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-
<xsl:with-param name="tabletools" select ='tabletools' />
-
<xsl:with-param name="config" select ='config' />
-
</xsl:call-template>
- </xsl:if>
- </xsl:for-each>
-
- </dd>
- </dl>
- </div>
- <div id="import">
- <xsl:choose>
- <xsl:when test="editable = 1">
+ </div>
+ <div id="import">
+ <xsl:choose>
+ <xsl:when test="editable = 1">
<div
class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'upload file')"/>
@@ -365,23 +355,23 @@
</xsl:attribute>
</input>
</div>
- </xsl:when>
- </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ </div>
</div>
- </div>
<div class="proplist-col">
<xsl:variable name="lang_cancel">
<xsl:value-of
select="php:function('lang', 'cancel')" />
</xsl:variable>
- <xsl:choose>
- <xsl:when
test="editable = 1">
+ <xsl:choose>
+ <xsl:when test="editable = 1">
<xsl:variable name="lang_save">
<xsl:value-of
select="php:function('lang', 'save')" />
</xsl:variable>
<input type="submit"
class="pure-button pure-button-primary" name="save_project"
value="{$lang_save}" title = "{$lang_save}" />
<input class="pure-button
pure-button-primary" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
- </xsl:when>
- <xsl:otherwise>
+ </xsl:when>
+ <xsl:otherwise>
<xsl:variable name="lang_edit">
<xsl:value-of
select="php:function('lang', 'edit')" />
</xsl:variable>
@@ -391,49 +381,49 @@
<input type="button"
class="pure-button pure-button-primary" name="edit_survey" value="{$lang_edit}"
title = "{$lang_edit}" onClick="document.load_edit_form.submit();"/>
<input type="button"
class="pure-button pure-button-primary" name="new_survey"
value="{$lang_new_survey}" title = "{$lang_new_survey}"
onClick="document.new_form.submit();"/>
<input class="pure-button
pure-button-primary" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </form>
- </div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </form>
+ </div>
- <xsl:variable name="cancel_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.index')" />
- </xsl:variable>
+ <xsl:variable name="cancel_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.index')" />
+ </xsl:variable>
- <form name="cancel_form" id="cancel_form"
action="{$cancel_url}" method="post">
- </form>
- <xsl:variable name="new_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.add')" />
- </xsl:variable>
- <form name="new_form" id="new_form" action="{$new_url}"
method="post">
- </form>
+ <form name="cancel_form" id="cancel_form" action="{$cancel_url}"
method="post">
+ </form>
+ <xsl:variable name="new_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.add')" />
+ </xsl:variable>
+ <form name="new_form" id="new_form" action="{$new_url}" method="post">
+ </form>
- <xsl:variable name="edit_params">
- <xsl:text>menuaction:property.uicondition_survey.edit,
id:</xsl:text>
- <xsl:value-of select="survey/id" />
- </xsl:variable>
- <xsl:variable name="edit_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $edit_params )" />
- </xsl:variable>
+ <xsl:variable name="edit_params">
+ <xsl:text>menuaction:property.uicondition_survey.edit,
id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
+ <xsl:variable name="edit_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $edit_params )" />
+ </xsl:variable>
- <form name="load_edit_form" id="load_edit_form"
action="{$edit_url}" method="post">
- </form>
+ <form name="load_edit_form" id="load_edit_form" action="{$edit_url}"
method="post">
+ </form>
- <xsl:variable name="new_request_params">
- <xsl:text>menuaction:property.uirequest.edit,
location_code:</xsl:text>
- <xsl:value-of select="survey/location_code" />
- <xsl:text>,origin:.project.condition_survey,
origin_id:</xsl:text>
- <xsl:value-of select="survey/id" />
- </xsl:variable>
+ <xsl:variable name="new_request_params">
+ <xsl:text>menuaction:property.uirequest.edit,
location_code:</xsl:text>
+ <xsl:value-of select="survey/location_code" />
+ <xsl:text>,origin:.project.condition_survey,
origin_id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
- <xsl:variable name="new_request_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $new_request_params )" />
- </xsl:variable>
+ <xsl:variable name="new_request_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $new_request_params )" />
+ </xsl:variable>
- <form name="load_new_request_form" id="load_new_request_form"
action="{$new_request_url}" method="post">
- </form>
+ <form name="load_new_request_form" id="load_new_request_form"
action="{$new_request_url}" method="post">
+ </form>
</xsl:template>
@@ -448,21 +438,21 @@
</xsl:template>
<xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
- <dt>
+ <dt>
<label>
<xsl:value-of select="php:function('lang', 'upload
file')"/>
</label>
- </dt>
- <dd>
- <input type="file" name="file" size="40">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
- </xsl:attribute>
- </input>
- </dd>
- <xsl:choose>
- <xsl:when test="multiple_uploader!=''">
- <dt>
+ </dt>
+ <dd>
+ <input type="file" name="file" size="40">
+ <xsl:attribute name="title">
+ <xsl:value-of select="php:function('lang',
'Select file to upload')"/>
+ </xsl:attribute>
+ </input>
+ </dd>
+ <xsl:choose>
+ <xsl:when test="multiple_uploader!=''">
+ <dt>
<label>
<a href="javascript:fileuploader()">
<xsl:attribute name="title">
@@ -471,8 +461,8 @@
<xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
</a>
</label>
- </dt>
- </xsl:when>
- </xsl:choose>
+ </dt>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
Modified:
branches/Version-2_0-branch/property/templates/base/condition_survey_summation.xsl
===================================================================
---
branches/Version-2_0-branch/property/templates/base/condition_survey_summation.xsl
2016-03-01 18:59:36 UTC (rev 14792)
+++
branches/Version-2_0-branch/property/templates/base/condition_survey_summation.xsl
2016-03-01 19:20:00 UTC (rev 14793)
@@ -207,7 +207,7 @@
return intVal(a) + intVal(b);
}) : 0;
- pageTotal = $.number( pageTotal, 0, ',', ' ' );
+ pageTotal = $.number( pageTotal, 0, ',', '.' );
$(api.column(col).footer()).html(pageTotal);
});
}
Modified: branches/Version-2_0-branch/rental/templates/base/billing.xsl
===================================================================
--- branches/Version-2_0-branch/rental/templates/base/billing.xsl
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/rental/templates/base/billing.xsl
2016-03-01 19:20:00 UTC (rev 14793)
@@ -28,7 +28,7 @@
<fieldset>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'fields_of_responsibility')"/>
+ <xsl:value-of
select="php:function('lang', 'field_of_responsibility')"/>
</label>
<xsl:text> </xsl:text>
<xsl:value-of
select="fields_of_responsibility_label"/>
@@ -151,11 +151,14 @@
</div>
<h3>Fakturakjøringsvalg</h3>
<div
class="pure-control-group">
+ <xsl:variable
name="previous">
+
<xsl:value-of select="php:function('lang', 'previous')"/>
+ </xsl:variable>
<xsl:variable
name="next">
<xsl:value-of select="php:function('lang', 'bill2')"/>
</xsl:variable>
<div
class="proplist-col">
- <input
type="submit" class="pure-button pure-button-primary" name="previous"
value="previous"/>
+ <input
type="submit" class="pure-button pure-button-primary" name="previous"
value="{$previous}"/>
<input
type="submit" class="pure-button pure-button-primary" name="next"
value="{$next}"/>
</div>
</div>
Modified: branches/Version-2_0-branch/rental/templates/base/contract.xsl
===================================================================
--- branches/Version-2_0-branch/rental/templates/base/contract.xsl
2016-03-01 18:59:36 UTC (rev 14792)
+++ branches/Version-2_0-branch/rental/templates/base/contract.xsl
2016-03-01 19:20:00 UTC (rev 14793)
@@ -697,7 +697,7 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'date_emd')"/>
+ <xsl:value-of
select="php:function('lang', 'date_end')"/>
</label>
<xsl:value-of
select="value_date_end"/>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14793] Merge 14784:14792 from trunk,
Sigurd Nes <=