[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11847] property: alter rollback voucher
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11847] property: alter rollback voucher |
|
Date: |
Wed, 19 Mar 2014 21:26:36 +0000 |
Revision: 11847
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11847
Author: sigurdne
Date: 2014-03-19 21:26:35 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
property: alter rollback voucher
Modified Paths:
--------------
trunk/property/inc/class.boXport.inc.php
trunk/property/inc/class.uiXport.inc.php
trunk/property/templates/base/invoice.xsl
Modified: trunk/property/inc/class.boXport.inc.php
===================================================================
--- trunk/property/inc/class.boXport.inc.php 2014-03-19 14:31:22 UTC (rev
11846)
+++ trunk/property/inc/class.boXport.inc.php 2014-03-19 21:26:35 UTC (rev
11847)
@@ -294,11 +294,11 @@
return $buffer;
}
- function rollback($conv_type, $role_back_date, $rollback_file,
$rollback_voucher)
+ function rollback($conv_type, $role_back_date, $rollback_file,
$rollback_voucher, $voucher_id_intern)
{
include (PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}/{$conv_type}");
$invoice = new export_conv;
- $buffer = $invoice->RullTilbake($role_back_date,
$rollback_file, $rollback_voucher);
+ $buffer = $invoice->RullTilbake($role_back_date,
$rollback_file, $rollback_voucher, $voucher_id_intern);
return $buffer;
}
Modified: trunk/property/inc/class.uiXport.inc.php
===================================================================
--- trunk/property/inc/class.uiXport.inc.php 2014-03-19 14:31:22 UTC (rev
11846)
+++ trunk/property/inc/class.uiXport.inc.php 2014-03-19 21:26:35 UTC (rev
11847)
@@ -578,14 +578,14 @@
$receipt['error'][] = array('msg' =>
lang('No conversion type could be located.') . ' - ' . lang('Please choose a
conversion type from the list'));
}
- if(!$values['file'] && !$values['voucher_id'])
+ if(!$values['file'] && !$values['voucher_id']
&& !$values['voucher_id_intern'])
{
$receipt['error'][] = array('msg' =>
lang('Please choose a file or a voucher'));
}
if(!$receipt['error'])
{
- $receipt =
$this->bo->rollback($values['conv_type'], $values['file'], $date,
$values['voucher_id']);
+ $receipt =
$this->bo->rollback($values['conv_type'], $values['file'], $date,
$values['voucher_id'],$values['voucher_id_intern']);
}
}
else
Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl 2014-03-19 14:31:22 UTC (rev
11846)
+++ trunk/property/templates/base/invoice.xsl 2014-03-19 21:26:35 UTC (rev
11847)
@@ -1274,7 +1274,7 @@
<xsl:variable
name="select_conv">
<xsl:value-of
select="select_conv"/>
</xsl:variable>
- <select
name="{$select_conv}" class="forms"
onMouseover="window.status='{$lang_conv_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="{$select_conv}" title='{$lang_conv_statustext}'>
<option
value="">
<xsl:value-of select="lang_select_conv"/>
</option>
@@ -1309,20 +1309,33 @@
<input type="text"
id="voucher_id" name="values[voucher_id]" value="">
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'voucher')"/>
+
<xsl:text> extern</xsl:text>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
+ <xsl:value-of
select="php:function('lang', 'voucher')"/>
+ <xsl:text>
intern</xsl:text>
+ </td>
+ <td valign="top">
+ <input type="text"
id="voucher_id_intern" name="values[voucher_id_intern]" value="">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'voucher')"/>
+
<xsl:text> intern</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
<xsl:value-of
select="lang_date"/>
</td>
<td>
<input type="text"
id="date" name="date" size="10" value="{value_date}" readonly="readonly"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <xsl:attribute
name="title">
<xsl:value-of select="lang_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11847] property: alter rollback voucher,
Sigurd Nes <=