[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14809] Merge 14793:14808 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14809] Merge 14793:14808 from trunk |
|
Date: |
Fri, 04 Mar 2016 12:11:10 +0000 |
Revision: 14809
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14809
Author: sigurdne
Date: 2016-03-04 12:11:09 +0000 (Fri, 04 Mar 2016)
Log Message:
-----------
Merge 14793:14808 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
branches/Version-2_0-branch/controller/templates/base/css/base.css
branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_inline.xsl
branches/Version-2_0-branch/property/inc/class.soproject.inc.php
branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/templates/base/project.xsl
branches/Version-2_0-branch/property/templates/base/tts.xsl
branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
branches/Version-2_0-branch/rental/inc/class.sobilling.inc.php
branches/Version-2_0-branch/rental/inc/class.sodocument.inc.php
branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
branches/Version-2_0-branch/rental/js/rental/party.edit.js
branches/Version-2_0-branch/rental/setup/phpgw_no.lang
branches/Version-2_0-branch/rental/setup/tables_update.inc.php
branches/Version-2_0-branch/rental/templates/base/party.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/bookingfrontend/
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,14785-14792
+ /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,14794-14808
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
2016-03-04 12:11:09 UTC (rev 14809)
@@ -127,12 +127,10 @@
</ul>
</div>
- <div class="pure-u-1" id="activity_tree">
+ <!--div class="pure-u-1" id="activity_tree">
<div class="heading">
- <!--xsl:value-of
select="php:function('lang', 'Resource')" /-->
Velg type lokale/anlegg/utstyr.
</div>
- <!-- Some style for the expand/contract
section-->
<style>
#expandcontractdiv {border:1px
dotted #dedede; margin:0 0 .5em 0; padding:0.4em;}
#treeDiv1 { background: #fff;
padding:1em; margin-top:1em; }
@@ -141,7 +139,6 @@
<script type="text/javascript">
filter_tree = <xsl:value-of
select="filter_tree"/>;
</script>
- <!-- markup for expand/contract links
-->
<div id="treecontrol">
<a id="collapse1"
title="Collapse the entire tree below" href="#">
<xsl:value-of
select="php:function('lang', 'collapse all')"/>
@@ -152,7 +149,7 @@
</a>
</div>
<div id="treeDiv1"></div>
- </div>
+ </div-->
<div class="pure-u-1">
<div class="heading">
Modified: branches/Version-2_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-2_0-branch/controller/templates/base/css/base.css
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/controller/templates/base/css/base.css
2016-03-04 12:11:09 UTC (rev 14809)
@@ -950,6 +950,10 @@
width:71%;
}
+#check-list-heading .box-1 h2 {
+ border: none;
+}
+
#check-list-heading .box-2 {
float:right;
width:25%;
@@ -1040,6 +1044,7 @@
#check_list_details .col_1, #check_list_details .col_2 {
float: left;
vertical-align: top;
+ border: none;
}
#check_list_details .col_1 {
@@ -1272,6 +1277,7 @@
border-radius: 4px 4px 4px 4px;
float: right;
padding: 6px 10px;
+ list-style-type: none;
}
ul#icon_color_map li {
@@ -1641,6 +1647,14 @@
padding: 0 20px 20px;
}
+#tab_content h2 {
+ border: none;
+}
+
+#tab_content #control_details {
+ border: none;
+}
+
/* ======================== CHECK LIST MENU ========================== */
#check_list_menu {
clear: both;
@@ -1909,6 +1923,22 @@
padding: 0;
}
+ul.add-cases {
+ list-style-type: none;
+}
+
+ul.add-cases li.expanded {
+ list-style-type: none;
+}
+
+ul.expand_list {
+ list-style-type: none;
+}
+
+ul.expand_list li.expanded {
+ list-style-type: none;
+}
+
.add-cases .expand_list h4 span{
padding-left: 0;
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -216,7 +216,7 @@
{
foreach ($messages['error'] as $key => $entry)
{
-
phpgwapi_cache::message_set($entry['msg'], 'message');
+
phpgwapi_cache::message_set($entry['msg'], 'error');
}
unset($entry);
}
@@ -314,6 +314,8 @@
$to = lang('to');
$shows_from = lang('shows from');
$of_total = lang('of total');
+ $sort_asc = lang(': activate to sort column
ascending');
+ $sort_desc = lang(': activate to sort column
descending');
if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
{
@@ -337,17 +339,17 @@
}
$data['jquery_phpgw_i18n'] = array(
'datatable' => array(
- 'emptyTable' => json_encode("No data
available in table"),
- 'info' => json_encode("Showing _START_
to _END_ of _TOTAL_ entries"),
- 'infoEmpty' => json_encode("Showing 0
to 0 of 0 entries"),
- 'infoFiltered' =>
json_encode("(filtered from _MAX_ total entries)"),
+ 'emptyTable' => json_encode(lang("No
data available in table")),
+ 'info' => json_encode(lang("Showing
_START_ to _END_ of _TOTAL_ entries")),
+ 'infoEmpty' =>
json_encode(lang("Showing 0 to 0 of 0 entries")),
+ 'infoFiltered' =>
json_encode(lang("(filtered from _MAX_ total entries)")),
'infoPostFix' => json_encode(""),
'thousands' => json_encode(","),
- 'lengthMenu' => json_encode("Show
_MENU_ entries"),
- 'loadingRecords' =>
json_encode("Loading..."),
- 'processing' =>
json_encode("Processing..."),
+ 'lengthMenu' => json_encode(lang("Show
_MENU_ entries")),
+ 'loadingRecords' =>
json_encode(lang("Loading...")),
+ 'processing' =>
json_encode(lang("Processing...")),
'search' => json_encode(lang('search')),
- 'zeroRecords' => json_encode("No
matching records found"),
+ 'zeroRecords' => json_encode(lang("No
matching records found")),
'paginate' => json_encode(array(
'first' => $first,
'last' => $last,
@@ -355,11 +357,12 @@
'previous' => $previous
)),
'aria' => json_encode(array(
- 'sortAscending' => ": activate
to sort column ascending",
- 'sortDescending' => ": activate
to sort column descending"
+ 'sortAscending' => $sort_asc,
+ 'sortDescending' => $sort_desc
)),
),
- 'lengthmenu' => array('_' =>
json_encode($lengthmenu))
+ 'lengthmenu' => array('_' =>
json_encode($lengthmenu)),
+ 'lengthmenu_allrows' => array('_' =>
json_encode(array(-1, lang('all'))))
);
// _debug_array($data['jquery_phpgw_i18n']);die();
}
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-03-04
10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/common.js 2016-03-04
12:11:09 UTC (rev 14809)
@@ -247,6 +247,7 @@
var initial_search = options['initial_search'] || false;
var editor_action = options['editor_action'] || false;
var editor_cols = [];
+ var allrows = options['allrows'] || false;
for (i = 0; i < columns.length; i++)
{
@@ -270,6 +271,34 @@
lengthMenu = [10, 25, 50, 100];
}
+ if (allrows == true)
+ {
+ lengthmenu_allrows = [];
+
+ try
+ {
+ lengthmenu_allrows =
JqueryPortico.i18n.lengthmenu_allrows();
+
+ if (lengthMenu.length == 2)
+ {
+ lengthMenu[0].push(lengthmenu_allrows[0]);
+ lengthMenu[1].push(lengthmenu_allrows[1]);
+ }
+ }
+ catch (err)
+ {
+ }
+ }
+
+ var language = null;
+ try
+ {
+ language = JqueryPortico.i18n.datatable();
+ }
+ catch (err)
+ {
+ }
+
data = data || {};
if (ajax_url)
@@ -351,7 +380,7 @@
}*/
},
lengthMenu: lengthMenu,
- // language: JqueryPortico.i18n.datatable(),
+ language: language,
columns: columns,
// stateSave: true,
// stateDuration: -1, //sessionstorage
Modified: branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2016-03-04
10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2016-03-04
12:11:09 UTC (rev 14809)
@@ -1,3 +1,5 @@
+: activate to sort column ascending common no : sorter kolonne
stigende
+: activate to sort column descending common no : sorter kolonne
synkende
features common no Egenskaper
select none common no Velg ingen
bookmarks common no Snarveier
@@ -42,6 +44,7 @@
february common no Februar
files common no Filer
filter common no Filter
+filtered from _MAX_ total entries common no filtrert fra totalt
_MAX_ poster
first name common no Fornavn
first name of the user, eg. %1 common no Fornavnet til brukeren, %1
first common no Første
@@ -66,6 +69,7 @@
last name of the user, eg. %1 common no Etternavn til bruker, %1
last page common no siste side
last common no Siste
+Loading... common no Laster...
login common no Login
logout common no Logg ut
low common no Lav
@@ -79,7 +83,9 @@
next page common no neste side
next common no Neste
no common no Nei
+No matching records found common no Ingen poster funnet som passer
med søket
none common no Ikke angitt
+No data available in table common no Ingen data i tabell
normal common no Normal
november common no November
october common no Oktober
@@ -97,6 +103,7 @@
print common no Utskrift
priority common no Prioritet
private common no Privat
+Processing... common no Prosesserer...
rename common no Endre navn
rental common no Leie
saturday common no Lørdag
@@ -109,6 +116,9 @@
showing %1 - %2 of %3 common no showing %1 - %2 of %3
showing items common no Viser
shows from common no Viser fra
+Showing _START_ to _END_ of _TOTAL_ entries common no Viser _START_
til _END_ av _TOTAL_ poster
+Showing 0 to 0 of 0 entries common no Viser 0 til 0 av 0 poster
+Show _MENU_ entries common no Vis _MENU_ poster
site configuration common no Konfigurasjon av moduler
sorry, there was a problem processing your request. common no
Beklager, der var problemer ved din forespørsel.
submit common no Submit
@@ -162,4 +172,5 @@
down common no ned
no access common no Ingen Tilgang
toolbar common no Verktøy
-collection common no Samling..
\ No newline at end of file
+collection common no Samling..
+item common no Valg
\ No newline at end of file
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_inline.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_inline.xsl
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_inline.xsl
2016-03-04 12:11:09 UTC (rev 14809)
@@ -342,6 +342,9 @@
var options<xsl:number value="($num - 1)"/> = {};
<xsl:for-each select="$config">
+ <xsl:if test="allrows">
+ options<xsl:number value="($num - 1)"/>.allrows
= true;
+ </xsl:if>
<xsl:if test="singleSelect">
options<xsl:number value="($num -
1)"/>.singleSelect = true;
</xsl:if>
Modified: branches/Version-2_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -1200,8 +1200,15 @@
.
"descr,budget,reserve,location_code,address,key_deliver,key_fetch,other_branch,key_responsible,user_id,ecodimb,account_group,contact_id,inherit_location,periodization_id
$cols) "
. "VALUES ($values $vals )", __LINE__,
__FILE__);
- if ($project['budget'])
+ /**
+ * insert an entry for the budget anyhow
+ */
+ if ($project['project_type_id'] == 3)//buffer
{
+ $this->_update_buffer_budget($id,
$project['budget_year'], $project['budget'], null, null);
+ }
+ else
+ {
$this->update_budget($id,
$project['budget_year'], $project['budget_periodization'], $project['budget'],
$project['budget_periodization_all'], 'update',
$project['budget_periodization_activate']);
}
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-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/inc/class.uicondition_survey.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -473,7 +473,10 @@
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uicondition_survey.get_request',
'id' => $id, 'phpgw_return_as'
=> 'json'))),
- 'ColumnDefs' => $related_def
+ 'ColumnDefs' => $related_def,
+ 'config' => array(
+ array('allrows' => true),
+ )
);
$summation_def = array
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-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -1635,10 +1635,11 @@
$values['sum'] = number_format($values['sum'], 0,
$this->decimal_separator, '.');
$value_remainder = number_format($value_remainder, 0,
$this->decimal_separator, '.');
+ $s_amount_in = 0;
+ $s_amount_out = 0;
+
if (isset($values['project_type_id']) &&
$values['project_type_id'] == 3)
{
- $s_amount_in = 0;
- $s_amount_out = 0;
$content_budget =
$this->bo->get_buffer_budget($id);
foreach ($content_budget as & $b_entry)
{
@@ -1653,11 +1654,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' => 'JqueryPortico.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' => 'JqueryPortico.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)
@@ -1694,6 +1695,8 @@
);
}
+ $check_for_budget = (int)abs($s_budget) +
(int)abs($s_amount_in);
+
$datatable_def[] = array
(
'container' => 'datatable-container_0',
@@ -2040,6 +2043,7 @@
'lang_power_meter_statustext' => lang('Enter
the power meter'),
'value_power_meter' =>
isset($values['power_meter']) ? $values['power_meter'] : '',
'value_budget' => isset($values['budget']) &&
$this->receipt['error'] ? $values['budget'] : '',
+ 'check_for_budget' => $check_for_budget,
'lang_reserve' => lang('reserve'),
'value_reserve' => isset($values['reserve']) ?
$values['reserve'] : '',
'lang_reserve_statustext' => lang('Enter the
reserve'),
Modified: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -1242,7 +1242,7 @@
(
'formatted_gab_id' => $formatted_gab_id,
'org_name' =>
isset($this->config->config_data['org_name']) ?
"{$this->config->config_data['org_name']}::" : '',
- 'location_data' => $location_data,
+ 'location_data_local' => $location_data,
'lang_workorder' => lang('Workorder ID'),
'workorder_id' => $workorder_id,
'lang_reminder' => $lang_reminder,
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2016-03-04
10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2016-03-04
12:11:09 UTC (rev 14809)
@@ -2051,4 +2051,6 @@
enable bulk common no Aktiver bulk
enable controller common no Aktiver Kontroll
entity group common no RegisterGruppe
-modified on common no Oppdatert
\ No newline at end of file
+modified on common no Oppdatert
+property type property no Type
+hjemmel common no Hjemmel
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl
2016-03-04 12:11:09 UTC (rev 14809)
@@ -373,11 +373,23 @@
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Enter the budget')"/>
</xsl:attribute>
- <xsl:if
test="not(value_project_id > 0) and mode='edit'">
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
- </xsl:if>
+ <xsl:choose>
+
<xsl:when test="not(value_project_id > 0) and mode='edit'">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
<xsl:when test="value_project_id > 0 and not(check_for_budget > 0) and
mode='edit'">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:attribute name="data-validation-optional">
+
<xsl:text>true</xsl:text>
+
</xsl:attribute>
+
</xsl:otherwise>
+ </xsl:choose>
</input>
<xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
<select
name="values[budget_year]">
Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2016-03-04
10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2016-03-04
12:11:09 UTC (rev 14809)
@@ -699,19 +699,7 @@
<xsl:apply-templates select="order_dim1_list/options"/>
</select>
</div>
- <div
class="pure-control-group">
-
<label>
-
<xsl:value-of select="php:function('lang', 'cost estimate')"/>
-
</label>
-
<input type="text" name="values[budget]" value="{value_budget}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'Enter the
budget')"/>
-
</xsl:attribute>
-
</input>
-
<xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
- </div>
-
<div
class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'cost estimate')"/>
Modified: branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/property/templates/base/wo_hour.xsl
2016-03-04 12:11:09 UTC (rev 14809)
@@ -450,9 +450,6 @@
<hr noshade="noshade" width="100%" align="center"
size="1"/>
</div>
<xsl:apply-templates select="email_data"/>
- <div class="pure-control-group">
- <hr noshade="noshade" width="100%" align="center"
size="1"/>
- </div>
<xsl:choose>
<xsl:when test="files!=''">
<div class="pure-control-group">
@@ -484,9 +481,6 @@
</label>
</xsl:when>
<xsl:otherwise>
- <label>
- <xsl:value-of
select="lang_history"/>
- </label>
<div>
<xsl:for-each
select="//datatable_def">
<xsl:if test="container
= 'datatable-container_1'">
@@ -573,7 +567,7 @@
</xsl:template>
<!-- New template-->
-<xsl:template match="email_data">
+<!--xsl:template match="email_data">
<div class="pure-control-group">
<label>
@@ -838,8 +832,304 @@
</div>
</xsl:when>
</xsl:choose>
+</xsl:template-->
+
+<!-- New template-->
+<xsl:template match="email_data">
+ <font size="-1">
+ <table align="left">
+ <tr>
+ <td width="100%">
+ <table width="100%" cellpadding="2"
cellspacing="2" align="left">
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_date"/>
+ </td>
+ <td align="left"
colspan="2">
+ <xsl:value-of
select="date"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_workorder"/>
+ </td>
+ <td align="left"
colspan="2">
+ <xsl:value-of
select="workorder_id"/>
+ <xsl:choose>
+
<xsl:when test="lang_reminder !=''">
+
<xsl:text> - </xsl:text>
+
<b>
+
<xsl:value-of select="lang_reminder"/>
+
</b>
+
</xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_to"/>
+ </td>
+ <td align="left"
colspan="2">
+ <xsl:value-of
select="to_name"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text"
align="left" valign="top">
+ <xsl:value-of
select="lang_from"/>
+ </td>
+ <td align="left"
colspan="2">
+ <xsl:value-of
select="from_name"/>
+ <br/>
+ <xsl:choose>
+
<xsl:when test="ressursnr !=''">
+
<xsl:text>RessursNr: </xsl:text>
+
<xsl:value-of select="ressursnr"/>
+
<br/>
+
</xsl:when>
+ </xsl:choose>
+ <xsl:value-of
select="org_name"/>
+ <xsl:value-of
select="lang_district"/>
+ <xsl:text>
</xsl:text>
+ <xsl:value-of
select="district"/>
+ <br/>
+ <xsl:text> [
</xsl:text>
+ <xsl:value-of
select="from_phone"/>
+ <xsl:text> ]
</xsl:text>
+ <xsl:value-of
select="from_email"/>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when
test="contact_data/value_contact_name">
+
<xsl:call-template name="contact_form"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:call-template
name="location_view_local"/>
+ <xsl:choose>
+ <xsl:when
test="formatted_gab_id !=''">
+ <tr>
+ <td
class="th_text" align="left">
+
Gnr/Bnr/Feste/Seksjon
+ </td>
+ <td
align="left" colspan="2">
+
<xsl:value-of select="formatted_gab_id"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="contact_phone !=''">
+ <tr>
+ <td
class="th_text" align="left">
+
<xsl:value-of select="lang_contact_phone"/>
+ </td>
+ <td
align="left" colspan="2">
+
<xsl:value-of select="contact_phone"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_title"/>
+ </td>
+ <td align="left"
colspan="2">
+ <xsl:value-of
select="title"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text"
align="left" valign="top">
+ <xsl:value-of
select="lang_descr"/>
+ </td>
+ <td align="left"
colspan="2">
+ <table
border="1" width="100%" bordercolor="#000000" cellspacing="0" cellpadding="0">
+ <tr>
+
<td width="100%">
+
<xsl:value-of select="descr"/>
+
</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_budget_account"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="budget_account"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="lang_cost_tax"/>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when
test="sum_calculation!=''">
+ <tr>
+ <td
class="th_text" align="left">
+
<xsl:value-of select="lang_sum_calculation"/>
+ </td>
+ <td
align="left">
+
<xsl:value-of select="sum_calculation"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_start_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="start_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="lang_materials"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text"
align="left">
+ <xsl:value-of
select="lang_end_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="end_date"/>
+ </td>
+ <td align="left">
+ <xsl:value-of
select="lang_work"/>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when
test="branch_list/selected">
+ <tr>
+ <td
class="th_text" align="left" valign="top">
+
<xsl:value-of select="lang_branch"/>
+ </td>
+ <td
align="left">
+
<xsl:for-each select="branch_list[selected='selected']">
+
<xsl:value-of select="name"/>
+
<xsl:if test="position() != last()">, </xsl:if>
+
</xsl:for-each>
+
<xsl:choose>
+
<xsl:when test="other_branch!=''">
+
<xsl:text>, </xsl:text>
+
<xsl:value-of select="other_branch"/>
+
</xsl:when>
+
</xsl:choose>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="key_responsible_list/selected">
+ <tr>
+ <td
class="th_text" align="left">
+
<xsl:value-of select="lang_key_responsible"/>
+ </td>
+ <td
align="left">
+
<xsl:for-each select="key_responsible_list">
+
<xsl:choose>
+
<xsl:when test="selected">
+
<xsl:value-of select="name"/>
+
</xsl:when>
+
</xsl:choose>
+
</xsl:for-each>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:if
test="key_fetch_list/selected">
+ <tr>
+ <td
class="th_text" align="left">
+
<xsl:value-of select="lang_key_fetch"/>
+ </td>
+ <xsl:for-each
select="key_fetch_list">
+
<xsl:choose>
+
<xsl:when test="selected">
+
<td align="left">
+
<xsl:value-of select="name"/>
+
</td>
+
</xsl:when>
+
</xsl:choose>
+ </xsl:for-each>
+ </tr>
+ </xsl:if>
+ <xsl:if
test="key_deliver_list/selected">
+ <tr>
+ <td
class="th_text" align="left">
+
<xsl:value-of select="lang_key_deliver"/>
+ </td>
+ <xsl:for-each
select="key_deliver_list">
+
<xsl:choose>
+
<xsl:when test="selected">
+
<td align="left">
+
<xsl:value-of select="name"/>
+
</td>
+
</xsl:when>
+
</xsl:choose>
+ </xsl:for-each>
+ </tr>
+ </xsl:if>
+ </table>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when test="values_view_order!=''">
+ <tr>
+ <td colspand="3">
+ <xsl:choose>
+ <xsl:when
test="use_yui_table='1'">
+
<xsl:for-each select="//datatable_def">
+
<xsl:if test="container = 'datatable-container_0'">
+
<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="data" select ='data' />
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <table
width="100%" cellpadding="2" cellspacing="2" align="left" border="1">
+
<xsl:apply-templates select="table_header_view_order"/>
+
<xsl:apply-templates select="values_view_order"/>
+ </table>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="sms_data!=''">
+ <xsl:apply-templates select="sms_data"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="order_footer_header!=''">
+ <tr>
+ <td>
+ <br/>
+ <h4>
+ <xsl:value-of
select="order_footer_header"/>
+ </h4>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="order_footer!=''">
+ <tr>
+ <td>
+ <xsl:value-of
select="order_footer"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ </table>
+ </font>
</xsl:template>
+
<!-- New template-->
<xsl:template match="table_header_view_order">
<xsl:variable name="sort_activity_num">
@@ -853,25 +1143,25 @@
</xsl:variable>
<thead>
<tr class="th">
- <td class="th_text" width="5%" align="right">
+ <td class="th_text" width="5%" align="center">
<xsl:value-of select="php:function('lang',
'post')"/>
</td>
- <td class="th_text" width="15%" align="left">
+ <td class="th_text" width="15%" align="center">
<xsl:value-of select="php:function('lang',
'Code')"/>
</td>
- <td class="th_text" width="40%" align="left">
+ <td class="th_text" width="40%" align="center">
<xsl:value-of select="php:function('lang',
'descr')"/>
</td>
- <td class="th_text" width="4%" align="left">
+ <td class="th_text" width="4%" align="center">
<xsl:value-of select="php:function('lang',
'Unit')"/>
</td>
- <td class="th_text" width="2%" align="right">
+ <td class="th_text" width="2%" align="center">
<xsl:value-of select="php:function('lang',
'Quantity')"/>
</td>
- <td class="th_text" width="5%" align="right">
+ <td nowrap="true" class="th_text" width="5%"
align="center">
<xsl:value-of select="php:function('lang',
'Bill per unit')"/>
</td>
- <td class="th_text" width="15%" align="right">
+ <td class="th_text" width="15%" align="center">
<xsl:value-of select="php:function('lang',
'cost')"/>
</td>
</tr>
@@ -2436,9 +2726,46 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+<!-- New template-->
+<xsl:template match="sms_data">
+ <tr>
+ <td>
+ <br/>
+ <xsl:value-of select="heading"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text">
+ <xsl:value-of select="message"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xsl:value-of select="status_code_text"/>
+ <xsl:text>: </xsl:text>
+ <xsl:for-each select="status_code">
+ <xsl:value-of select="name"/>
+ <xsl:if test="position() != last()">, </xsl:if>
+ </xsl:for-each>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text">
+ <xsl:value-of select="lang_example"/>
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="example"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <img src="{encoded_text}"/>
+ </td>
+ </tr>
+</xsl:template>
+
<!-- New template-->
-<xsl:template match="sms_data">
+<!--xsl:template match="sms_data">
<div class="pure-control-group">
<label>
<xsl:text> </xsl:text>
@@ -2468,7 +2795,7 @@
</div>
</div>
</div>
-</xsl:template>
+</xsl:template-->
<!-- New template-->
<xsl:template match="options">
@@ -2531,3 +2858,48 @@
</form>
</xsl:template>
+
+<!-- $Id$ -->
+<xsl:template name="location_view_local">
+ <xsl:apply-templates select="location_data_local"/>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="location_data_local">
+ <xsl:for-each select="location">
+ <tr>
+ <xsl:choose>
+ <xsl:when test="value !=''">
+ <td>
+ <xsl:value-of select="name"/>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when
test="input_type !='hidden'">
+ <xsl:choose>
+
<xsl:when test="query_link !=''">
+
<xsl:variable name="query_link" select="query_link"/>
+
<a href="{$query_link}" class="th_text">
+
<xsl:value-of select="value"/>
+
</a>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:value-of select="value"/>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:for-each select="extra">
+ <xsl:choose>
+ <xsl:when
test="input_type !='hidden'">
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="value"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </tr>
+ </xsl:for-each>
+</xsl:template>
Modified: branches/Version-2_0-branch/rental/inc/class.sobilling.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.sobilling.inc.php
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/rental/inc/class.sobilling.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -92,7 +92,7 @@
array
(
'string' =>
"/rental/billings/{$id}",
- RELATIVE_NONE
+ 'relatives' => array(
RELATIVE_NONE)
)
);
@@ -380,7 +380,7 @@
$vfs->override_acl = 1;
$path = "/rental";
- $dir = array('string' => $path,
RELATIVE_NONE);
+ $dir = array('string' => $path,
'relatives' => array(RELATIVE_NONE));
if (!$vfs->file_exists($dir))
{
if (!$vfs->mkdir($dir))
@@ -390,7 +390,7 @@
}
$path .= "/billings";
- $dir = array('string' => $path,
RELATIVE_NONE);
+ $dir = array('string' =>
$path,'relatives' => array( RELATIVE_NONE));
if (!$vfs->file_exists($dir))
{
if (!$vfs->mkdir($dir))
@@ -399,18 +399,15 @@
}
}
-
$id = $billing_job->get_id();
$export_data =
$exportable->get_contents();
$file_path = $path . "/{$id}";
if ($export_data != "")
{
- $result = $vfs->write
- (
- array
- (
+ $result = $vfs->write(
+ array(
'string' =>
$file_path,
- RELATIVE_NONE,
+ 'relatives' =>
array(RELATIVE_NONE),
'content' =>
$export_data
)
);
Modified: branches/Version-2_0-branch/rental/inc/class.sodocument.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.sodocument.inc.php
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/rental/inc/class.sodocument.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -236,7 +236,7 @@
$vfs->override_acl = 1;
$path = "/{$root_directory}";
- $dir = array('string' => $path, RELATIVE_NONE);
+ $dir = array('string' => $path, 'relatives' => array(
RELATIVE_NONE));
if (!$vfs->file_exists($dir))
{
if (!$vfs->mkdir($dir))
@@ -246,7 +246,7 @@
}
$path .= "/{$type_directory}";
- $dir = array('string' => $path, RELATIVE_NONE);
+ $dir = array('string' => $path, 'relatives' => array(
RELATIVE_NONE));
if (!$vfs->file_exists($dir))
{
if (!$vfs->mkdir($dir))
@@ -256,7 +256,7 @@
}
$path .= "/{$id}";
- $dir = array('string' => $path, RELATIVE_NONE);
+ $dir = array('string' => $path, 'relatives' => array(
RELATIVE_NONE));
if (!$vfs->file_exists($dir))
{
if (!$vfs->mkdir($dir))
@@ -281,14 +281,14 @@
$vfs = CreateObject('phpgwapi.vfs');
$vfs->override_acl = 1;
$path .= "/{$name}";
- $file = array('string' => $path, RELATIVE_NONE);
+ $file = array('string' => $path, 'relatives' => array(
RELATIVE_NONE));
return $vfs->write
(
array
(
'string' => $path,
- RELATIVE_NONE,
+ 'relatives' => array(
RELATIVE_NONE),
'content' =>
file_get_contents($temporary_name)
)
);
@@ -308,7 +308,7 @@
array
(
'string' => $path,
- RELATIVE_NONE
+ 'relatives' => array(
RELATIVE_NONE)
)
);
}
@@ -327,7 +327,7 @@
array
(
'string' => $path,
- RELATIVE_NONE
+ 'relatives' => array(
RELATIVE_NONE)
)
);
}
Modified: branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -32,7 +32,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('invoice_menu');
}
- private function _object_to_array( $contract , $include_billing
= false)
+ private function _object_to_array( $contract, $include_billing
= false )
{
$values['old_contract_id'] =
$contract->get_old_contract_id();
$values['start_date'] =
($contract->get_contract_date()->has_start_date()) ? date($this->dateFormat,
$contract->get_contract_date()->get_start_date()) : '';
@@ -44,7 +44,7 @@
if ($contract->get_bill_only_one_time())
{
$values['bill_only_one_time'] =
lang('only_one_time_yes');
- $values['old_contract_id'] .= '<input
name="bill_only_one_time[]" value="' . $contract->get_id() . '" type="hidden"/>'
+ $values['old_contract_id'] .= '<input
name="bill_only_one_time[]" value="' . $contract->get_id() . '" type="hidden"/>'
. '<input name="contract[]" value="' .
$contract->get_id() . '" type="hidden"/>';
}
else
@@ -52,7 +52,7 @@
$values['bill_only_one_time'] =
lang('only_one_time_no');
}
- if($include_billing)
+ if ($include_billing)
{
$values['old_contract_id'] .= '<input
name="contract[]" value="' . $contract->get_id() . '" type="hidden"/>';
}
@@ -84,6 +84,15 @@
// Step 3 - the billing job
if (phpgw::get_var('step') == '2' &&
phpgw::get_var('next') != null) // User clicked next on step 2
{
+ if ($GLOBALS['phpgw']->session->is_repost())
+ {
+
phpgwapi_cache::message_set(lang('Hmm... looks like a repost!'), 'error');
+ self::redirect(array(
+ 'menuaction' =>
'rental.uibilling.index'
+ )
+ );
+ }
+
$use_existing = phpgw::get_var('use_existing');
$existing_billing =
phpgw::get_var('existing_billing');
if ($use_existing < 1)
@@ -425,7 +434,7 @@
$tabletools_irregular_contracts[] = array
(
'my_name' => 'override_all',
- 'className'=> 'select',
+ 'className' => 'select',
'text' => lang('Override'),
'type' => 'custom',
'custom_code' => "checkOverride();"
@@ -433,7 +442,7 @@
$tabletools_irregular_contracts[] = array
(
'my_name' => 'bill2_all',
- 'className'=> 'select',
+ 'className' => 'select',
'text' => lang('Bill2'),
'type' => 'custom',
'custom_code' => "checkBill2()"
@@ -1290,7 +1299,7 @@
array
(
'string' =>
$path,
- RELATIVE_NONE
+ 'relatives' =>
array( RELATIVE_NONE)
)
);
Modified: branches/Version-2_0-branch/rental/js/rental/party.edit.js
===================================================================
--- branches/Version-2_0-branch/rental/js/rental/party.edit.js 2016-03-04
10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/rental/js/rental/party.edit.js 2016-03-04
12:11:09 UTC (rev 14809)
@@ -99,6 +99,25 @@
}
});
});
+ $.formUtils.addValidator({
+ name: 'naming',
+ validatorFunction: function (value, $el, config, languaje,
$form)
+ {
+ var v = false;
+ var firstname = $('#firstname').val();
+ var lastname = $('#lastname').val();
+ var company_name = $('#company_name').val();
+ var department = $('#department').val();
+ if ((firstname != "" && lastname != "") ||
(company_name != "" && department != ""))
+ {
+ v = true;
+ }
+ return v;
+ },
+ errorMessage: lang['Name or company is required'],
+ errorMessageKey: ''
+ });
+
});
function filterDataContract(param, value)
Modified: branches/Version-2_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/rental/setup/phpgw_no.lang 2016-03-04
10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/rental/setup/phpgw_no.lang 2016-03-04
12:11:09 UTC (rev 14809)
@@ -37,6 +37,7 @@
address1 rental no Adresse 1
address2 rental no Adresse 2
all rental no Alle
+alle rental no Alle
all_locations rental no Enheter fra eiendomsregisteret
and rental no og
annually rental no Årlig
@@ -59,6 +60,7 @@
available_price_items rental no Tilgjengelige priselementer
available? rental no Kan leies ut?
available rental no Tilgjengelig
+available ? rental no Tilgjengelig
available_for_pick rental no tilgjengelig
back rental no Tilbake
bank_guarantee rental no Bankgaranti
@@ -188,6 +190,8 @@
description rental no Beskrivelse
details rental no Detaljer
document_type rental no Dokumenttype
+document_name rental no Dokumentnavn
+document_title rental no Dokumenttittel
documents rental no Dokumenter
Download Agresso import file rental no Last ned Agresso-importfil
(CS15)
Download as %1 rental no Last tabellen i %1-format
@@ -401,6 +405,7 @@
only_one_time_yes rental no Avviker fra vanlig faktureringssyklus,
kun engangsbeløp
only_one_time_no rental no Følger vanlig fakturasyklus
open_and_exported_exist rental no En fakturakjøring som ikke er
avsluttet med eksportert til Agresso-format eksisterer for dette
ansvarsområdet. Denne må enten slettes eller avsluttes før denne
fakturakjøringen kan eksportes.
+organization rental no Organisasjon
organisation_number rental no Organisasjonsnummer
organisation_or_ssn_number rental no Org./fødselsnr
orphan_units rental no Ubrukte arealer
@@ -410,6 +415,7 @@
org_unit_exist rental no Eksisterer
other_guarantee rental no Annen garanti
others rental no Annet
+other operations rental no Andre operasjoner
out_of_operation rental no Ikke i drift
overridden_address rental no Overstyrt adresse
override rental no Fakturer fra
@@ -487,6 +493,7 @@
save_setup rental no Lagre oppsett på forsiden
search_for rental no Søk etter
search_options rental no Søkevalg
+search option rental no Søkevalg
search rental no Søk
search_where rental no i
second_half rental no 2. halvår
@@ -605,3 +612,8 @@
free_of_charge rental no Vederlagsfritt
select rental no Velg
district rental no Område
+list %1 rental no Alle %1
+new rental no Ny
+download excel export bk rental no Last ned Excel-eksport BK
+serial_number rental no Serienummer
+Name or company is required rental no Navn på person ELLER navn på
foretak er obligatorisk
\ No newline at end of file
Modified: branches/Version-2_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/tables_update.inc.php
2016-03-04 10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/rental/setup/tables_update.inc.php
2016-03-04 12:11:09 UTC (rev 14809)
@@ -153,7 +153,7 @@
$vfs->override_acl = 1;
$path = "/rental";
- $dir = array('string' => $path, RELATIVE_NONE);
+ $dir = array('string' => $path, 'relatives' => array(
RELATIVE_NONE));
if (!$vfs->file_exists($dir))
{
if (!$vfs->mkdir($dir))
@@ -163,7 +163,7 @@
}
$path .= "/billings";
- $dir = array('string' => $path, RELATIVE_NONE);
+ $dir = array('string' => $path, 'relatives' => array(
RELATIVE_NONE));
if (!$vfs->file_exists($dir))
{
if (!$vfs->mkdir($dir))
@@ -188,7 +188,7 @@
array
(
'string' => $file_path,
- RELATIVE_NONE,
+ 'relatives' => array(
RELATIVE_NONE),
'content' => $export_data
)
);
Modified: branches/Version-2_0-branch/rental/templates/base/party.xsl
===================================================================
--- branches/Version-2_0-branch/rental/templates/base/party.xsl 2016-03-04
10:14:46 UTC (rev 14808)
+++ branches/Version-2_0-branch/rental/templates/base/party.xsl 2016-03-04
12:11:09 UTC (rev 14809)
@@ -31,6 +31,9 @@
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
</xsl:variable>
+ <script type="text/javascript">
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name
or company is required')"/>;
+ </script>
<form id="form" name="form" method="post"
action="{$form_action}" class="pure-form pure-form-aligned">
<div id="tab-content">
@@ -41,16 +44,20 @@
<label>
<xsl:value-of
select="php:function('lang', 'identifier')"/>
</label>
- <input type="text"
name="identifier" value="{value_identifier}"></input>
+ <input type="text"
name="identifier" value="{value_identifier}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<input type="hidden"
name="id" value="{party_id}"/>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'firstname')"/>
</label>
- <input type="text"
name="firstname" value="{value_firstname}">
+ <input type="text"
id="firstname" name="firstname" value="{value_firstname}">
<xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
+
<xsl:text>naming</xsl:text>
</xsl:attribute>
</input>
</div>
@@ -58,7 +65,12 @@
<label>
<xsl:value-of
select="php:function('lang', 'lastname')"/>
</label>
- <input type="text"
name="lastname" value="{value_lastname}"></input>
+ <input type="text"
id="lastname" name="lastname" value="{value_lastname}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>naming</xsl:text>
+ </xsl:attribute>
+
+ </input>
</div>
<div class="pure-control-group">
<label>
@@ -70,13 +82,23 @@
<label>
<xsl:value-of
select="php:function('lang', 'company')"/>
</label>
- <input type="text"
id="company_name" name="company_name" value="{value_company}"></input>
+ <input type="text"
id="company_name" name="company_name" value="{value_company}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>naming</xsl:text>
+ </xsl:attribute>
+
+ </input>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'department')"/>
</label>
- <input type="text"
id="department" name="department" value="{value_department}"></input>
+ <input type="text"
id="department" name="department" value="{value_department}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>naming</xsl:text>
+ </xsl:attribute>
+
+ </input>
</div>
<div class="pure-control-group">
<label>
@@ -130,7 +152,11 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
name="email" id="email" value="{value_email}"></input>
+ <input type="text"
name="email" id="email" value="{value_email}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<xsl:choose>
<xsl:when
test="valid_email = 1">
<xsl:text> </xsl:text>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14809] Merge 14793:14808 from trunk,
Sigurd Nes <=