[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15929] more on integration
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15929] more on integration |
Date: |
Tue, 1 Nov 2016 11:34:01 +0000 (UTC) |
Revision: 15929
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15929
Author: sigurdne
Date: 2016-11-01 11:34:01 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
more on integration
Modified Paths:
--------------
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
trunk/property/templates/base/tts.xsl
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2016-11-01 09:45:53 UTC (rev
15928)
+++ trunk/property/inc/class.uitts.inc.php 2016-11-01 11:34:01 UTC (rev
15929)
@@ -1594,9 +1594,6 @@
'tts_mandatory_title' =>
$this->bo->config->config_data['tts_mandatory_title'],
'value_finnish_date' =>
(isset($values['finnish_date']) ? $values['finnish_date'] : ''),
'lang_finnish_date_statustext' => lang('Select
the estimated date for closing the task'),
- 'lang_cancel_statustext' => lang('Back to the
ticket list'),
- 'lang_send_statustext' => lang('Save the entry
and return to list'),
- 'lang_save_statustext' => lang('Save the
ticket'),
'lang_no_cat' => lang('no category'),
'lang_town_statustext' => lang('Select the part
of town the building belongs to. To do not use a part of town - select NO PART
OF TOWN'),
'lang_part_of_town' => lang('Part of town'),
Modified: trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
2016-11-01 09:45:53 UTC (rev 15928)
+++ trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
2016-11-01 11:34:01 UTC (rev 15929)
@@ -84,15 +84,6 @@
// )
);
- $Header = array(
- 'AcceptFlag' => 1,
- 'OrderType]' => 'WB',
- 'Status' => 'N',
- 'OrderDate' => date('Y-m-d'),
- 'Currency' => 'NOK',
- 'Seller' => array($Seller),
- 'Buyer' => array($param['buyer']),
- );
$DetailInfo = array();
// $DetailInfo[] = array(
@@ -148,6 +139,17 @@
)
);
+ $Header = array(
+ 'AcceptFlag' => 1,
+ 'OrderType]' => 'WB',
+ 'Status' => 'N',
+ 'OrderDate' => date('Y-m-d'),
+ 'Currency' => 'NOK',
+ 'Seller' => array($Seller),
+ 'Buyer' => array($param['buyer']),
+ $DetailInfo
+ );
+
$Detail = array();
$i = 1;
foreach ($param['lines'] as $line)
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2016-11-01 09:45:53 UTC (rev
15928)
+++ trunk/property/templates/base/tts.xsl 2016-11-01 11:34:01 UTC (rev
15929)
@@ -210,17 +210,17 @@
<input type="hidden" id="cancel" name="values[cancel]"
value=""/>
<input class="pure-button pure-button-primary"
type="button" name="save" value="{lang_send}"
onClick="confirm_session('save');">
<xsl:attribute name="title">
- <xsl:value-of
select="lang_send_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'Save the entry and return to list')"/>
</xsl:attribute>
</input>
<input class="pure-button pure-button-primary"
type="button" name="apply" value="{lang_save}"
onClick="confirm_session('apply');">
<xsl:attribute name="title">
- <xsl:value-of
select="lang_send_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'Save the ticket')"/>
</xsl:attribute>
</input>
<input class="pure-button pure-button-primary"
type="button" name="cancel" value="{lang_cancel}"
onClick="confirm_session('cancel');">
<xsl:attribute name="title">
- <xsl:value-of
select="lang_send_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'Back to the ticket list')"/>
</xsl:attribute>
</input>
</div>
@@ -233,7 +233,7 @@
<style type="text/css">
#floating-box {
position: relative;
- z-index: 1000;
+ z-index: 10;
}
#submitbox {
display: none;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15929] more on integration,
sigurdne <=