[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8476] property: enable forwarding un-processed vouch
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8476] property: enable forwarding un-processed vouchers |
|
Date: |
Tue, 03 Jan 2012 11:42:42 +0000 |
Revision: 8476
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8476
Author: sigurdne
Date: 2012-01-03 11:42:41 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
property: enable forwarding un-processed vouchers
Modified Paths:
--------------
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/js/yahoo/invoice.index.js
trunk/property/js/yahoo/invoice.list_sub.js
trunk/property/js/yahoo/property.js
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/invoice.xsl
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2012-01-03 08:17:13 UTC (rev
8475)
+++ trunk/property/inc/class.boinvoice.inc.php 2012-01-03 11:42:41 UTC (rev
8476)
@@ -657,4 +657,9 @@
$this->bocommon->download($values,$names,$descr);
}
}
+
+ public function forward($data)
+ {
+ return $this->so->forward($data);
+ }
}
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2012-01-03 08:17:13 UTC (rev
8475)
+++ trunk/property/inc/class.soinvoice.inc.php 2012-01-03 11:42:41 UTC (rev
8476)
@@ -1499,4 +1499,57 @@
return $values;
}
+
+ /*
+ * Forward vouchers to other responsible
+ */
+ public function forward($data)
+ {
+ if(isset($data['forward']) &&
is_array($data['forward']) && isset($data['voucher_id']) && $data['voucher_id'])
+ {
+ $value_set = array();
+
+ foreach ($data['forward'] as $role => $user_lid)
+ {
+ $value_set[$role] = $user_lid;
+ }
+
+ if( $data['approve'] != $data['sign_orig'] )
+ {
+ switch ( $data['sign_orig'] )
+ {
+ case 'is_janitor':
+
$value_set['oppsynsigndato'] = null;
+ break;
+ case 'is_supervisor':
+
$value_set['saksigndato'] = null;
+ break;
+ case 'is_budget_responsible':
+
$value_set['budsjettsigndato'] = null;
+ break;
+ }
+
+ switch ( $data['approve'] )
+ {
+ case 'is_janitor':
+
$value_set['oppsynsigndato'] = date( $this->db->datetime_format() );
+
$value_set['oppsynsmannid'] = $data['my_initials'];
+ break;
+ case 'is_supervisor':
+
$value_set['saksigndato'] = date( $this->db->datetime_format() );
+
$value_set['saksbehandlerid'] = $data['my_initials'];
+ break;
+ case 'is_budget_responsible':
+
$value_set['budsjettsigndato'] = date( $this->db->datetime_format() );
+
$value_set['budsjettansvarligid'] = $data['my_initials'];
+ break;
+ }
+ }
+
+ $value_set =
$this->db->validate_update($value_set);
+ return $this->db->query("UPDATE fm_ecobilag SET
$value_set WHERE bilagsnr = '{$data['voucher_id']}'",__LINE__,__FILE__);
+ }
+
+ return false;
+ }
}
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2012-01-03 08:17:13 UTC (rev
8475)
+++ trunk/property/inc/class.uiinvoice.inc.php 2012-01-03 11:42:41 UTC (rev
8476)
@@ -60,7 +60,8 @@
'download_sub' => true,
'receipt' => true,
'edit' => true,
- 'reporting' => true
+ 'reporting' => true,
+ 'forward' => true
);
function property_uiinvoice()
@@ -1156,6 +1157,19 @@
)
);
+
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name'
=> 'forward',
+ 'text' =>
lang('forward'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uiinvoice.forward',
+ 'target'
=> '_lightbox'
+ )),
+ 'parameters' => $parameters
+ );
+
if($this->acl_delete)
{
$datatable['rowactions']['action'][] =
array
@@ -3680,4 +3694,166 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('reporting' => $data));
}
+ /**
+ * forward voucher to other persons
+ *
+ */
+
+ public function forward()
+ {
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+
+ $user_lid = phpgw::get_var('user_lid', 'string',
'GET', 'all');
+ $voucher_id = phpgw::get_var('voucher_id', 'int',
'GET');
+ $redirect = false;
+
+ $role_check = array
+ (
+ 'is_janitor' =>
lang('janitor'),
+ 'is_supervisor' =>
lang('supervisor'),
+ 'is_budget_responsible' => lang('b -
responsible')
+ );
+
+ $roles = $this->bo->check_role();
+
+ $approve = array();
+ foreach ($roles as $role => $role_value)
+ {
+ if ($role_value && isset($role_check[$role]))
+ {
+ $approve[] = array
+ (
+ 'id' => $role,
+ 'name' =>
$role_check[$role],
+ 'selected' => 0
+ );
+ }
+ }
+
+ $values = phpgw::get_var('values');
+
+ $receipt = array();
+ if (isset($values['save']))
+ {
+ if($GLOBALS['phpgw']->session->is_repost())
+ {
+
$receipt['error'][]=array('msg'=>lang('repost'));
+ }
+
+ if(!$approve)
+ {
+
$receipt['error'][]=array('msg'=>lang('you are not approved for this task'));
+ }
+
+ if (!$receipt['error'])
+ {
+ $redirect = true;
+ $values['voucher_id'] = $voucher_id;
+ $line = $this->bo->forward($values);
+ }
+ }
+
+ $voucher = $this->bo->read_single_voucher($voucher_id);
+ $orders = array();
+ foreach ($voucher as $line)
+ {
+ $orders[] = $line['order_id'];
+ }
+
+ $approved_list = array();
+
+ $approved_list[] = array
+ (
+ 'role' => $role_check['is_janitor'],
+ 'role_sign' => 'oppsynsmannid',
+ 'initials' => $line['janitor'] ?
$line['janitor'] : '',
+ 'date' => $line['oppsynsigndato'] ?
$GLOBALS['phpgw']->common->show_date( strtotime( $line['oppsynsigndato'] ) )
:'',
+ 'user_list' => !$line['oppsynsigndato'] ?
array('options_user' =>
$this->bocommon->get_user_list_right(32,isset($line['janitor'])?$line['janitor']:'','.invoice'))
: ''
+ );
+ $approved_list[] = array
+ (
+ 'role' => $role_check['is_supervisor'],
+ 'role_sign' => 'saksbehandlerid',
+ 'initials' => $line['supervisor'] ?
$line['supervisor'] : '',
+ 'date' => $line['saksigndato'] ?
$GLOBALS['phpgw']->common->show_date( strtotime( $line['saksigndato'] ) ) :'',
+ 'user_list' => !$line['saksigndato'] ?
array('options_user' =>
$this->bocommon->get_user_list_right(64,isset($line['supervisor'])?$line['supervisor']:'','.invoice'))
: ''
+ );
+ $approved_list[] = array
+ (
+ 'role' =>
$role_check['is_budget_responsible'],
+ 'role_sign' => 'budsjettansvarligid',
+ 'initials' => $line['budget_responsible']
? $line['budget_responsible'] : '',
+ 'date' => $line['budsjettsigndato'] ?
$GLOBALS['phpgw']->common->show_date( strtotime( $line['budsjettsigndato'] ) )
:'',
+ 'user_list' => !$line['budsjettsigndato'] ?
array('options_user' =>
$this->bocommon->get_user_list_right(128,isset($line['budget_responsible'])?$line['budget_responsible']:'','.invoice'))
: ''
+ );
+
+ $my_initials =
$GLOBALS['phpgw_info']['user']['account_lid'];
+
+ foreach($approve as &$_approve)
+ {
+ if($_approve['id'] == 'is_janitor' &&
$my_initials == $line['janitor'] && $line['oppsynsigndato'])
+ {
+ $_approve['selected'] = 1;
+ $sign_orig = 'is_janitor';
+ }
+ else if($_approve['id'] == 'is_supervisor' &&
$my_initials == $line['supervisor'] && $line['saksigndato'])
+ {
+ $_approve['selected'] = 1;
+ $sign_orig = 'is_supervisor';
+ }
+ else if($_approve['id'] ==
'is_budget_responsible' && $my_initials == $line['budget_responsible'] &&
$line['budsjettsigndato'])
+ {
+ $_approve['selected'] = 1;
+ $sign_orig = 'is_budget_responsible';
+ }
+ }
+
+ unset($_approve);
+
+ $approve_list = array();
+ foreach($approve as $_approve)
+ {
+ if($_approve['id'] == 'is_janitor')
+ {
+ if(($my_initials == $line['janitor'] &&
$line['oppsynsigndato']) || !$line['oppsynsigndato'])
+ {
+ $approve_list[] = $_approve;
+ }
+ }
+ if($_approve['id'] == 'is_supervisor')
+ {
+ if(($my_initials == $line['supervisor']
&& $line['saksigndato']) || !$line['saksigndato'])
+ {
+ $approve_list[] = $_approve;
+ }
+ }
+ if($_approve['id'] == 'is_budget_responsible')
+ {
+ if(($my_initials ==
$line['budget_responsible'] && $line['budsjettsigndato']) ||
!$line['budsjettsigndato'])
+ {
+ $approve_list[] = $_approve;
+ }
+ }
+ }
+
+ $data = array
+ (
+ 'redirect'
=> $redirect ? $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uiinvoice.index', 'user_lid' => $user_lid)) : null,
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($receipt)),
+ 'from_name'
=> $GLOBALS['phpgw_info']['user']['fullname'],
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uiinvoice.forward', 'user_lid' => $user_lid, 'voucher_id' =>
$voucher_id)),
+ 'approve_list' =>
$approve_list,
+ 'approved_list' =>
$approved_list,
+ 'sign_orig'
=> $sign_orig,
+ 'my_initials' =>
$my_initials,
+ 'project_group_data' =>
$project_group_data,
+ 'orders'
=> implode('</br>', $orders),
+ 'value_amount' =>
$line['amount'],
+ 'value_currency' =>
$line['currency'],
+ 'value_process_log' =>
isset($values['process_log']) && $values['process_log'] ?
$values['process_log'] : $line['process_log']
+ );
+
+ $GLOBALS['phpgw']->xslttpl->add_file('invoice');
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('forward' => $data));
+ }
}
Modified: trunk/property/js/yahoo/invoice.index.js
===================================================================
--- trunk/property/js/yahoo/invoice.index.js 2012-01-03 08:17:13 UTC (rev
8475)
+++ trunk/property/js/yahoo/invoice.index.js 2012-01-03 11:42:41 UTC (rev
8476)
@@ -23,11 +23,13 @@
{order:0, name:'query', id:'txt_query'}
]
+ // define Link Buttons
+ var linktoolTips = [
+ ]
+
var toolTips = [
{name:'voucher_id_lnk',title:'Voucher ID', description:'click
this link to enter the list of sub-invoices',ColumnDescription:''},
- // {name:'vendor_id_lnk', title:'',
description:'',ColumnDescription: 'vendor_name'},
{name:'voucher_date_lnk', title:'Payment Date',
description:'',ColumnDescription:'payment_date'},
- //{name:'period', title:'Period', description:'click this
button to edit the period',ColumnDescription:''},
{name:'btn_export', title:'download', description:'Download
table to your browser',ColumnDescription:''}
]
@@ -409,6 +411,22 @@
}
}
+
+ this.showlightbox = function(sUrl)
+ {
+ var onDialogShow = function(e, args, o)
+ {
+ var frame = document.createElement('iframe');
+ frame.src = sUrl;
+ frame.width = "100%";
+ frame.height = "460";
+ o.setBody(frame);
+ };
+ lightbox.showEvent.subscribe(onDialogShow, lightbox);
+ lightbox.show();
+ }
+
+
//----------------------------------------------------------
YAHOO.util.Event.addListener(window, "load", function()
{
@@ -428,9 +446,3 @@
loader.insert();
});
-
-
-
-
-
-
Modified: trunk/property/js/yahoo/invoice.list_sub.js
===================================================================
--- trunk/property/js/yahoo/invoice.list_sub.js 2012-01-03 08:17:13 UTC (rev
8475)
+++ trunk/property/js/yahoo/invoice.list_sub.js 2012-01-03 11:42:41 UTC (rev
8476)
@@ -33,21 +33,8 @@
var tableYUI;
- this.showlightbox = function(sUrl)//(parameters, oRecord)
+ this.showlightbox = function(sUrl)
{
-
-//alert(sUrl);
-/*
- var oArgs = {menuaction:'property.uiinvoice.edit'};
- var sUrl = phpGWLink('index.php', oArgs);
-
- for(f=0; f<parameters.parameter.length; f++)
- {
- param_name = parameters.parameter[f].name;
- param_source = parameters.parameter[f].source;
- sUrl = sUrl + "&"+param_name+"=" +
oRecord.getData(param_source);
- }
-*/
var onDialogShow = function(e, args, o)
{
var frame = document.createElement('iframe');
Modified: trunk/property/js/yahoo/property.js
===================================================================
--- trunk/property/js/yahoo/property.js 2012-01-03 08:17:13 UTC (rev 8475)
+++ trunk/property/js/yahoo/property.js 2012-01-03 11:42:41 UTC (rev 8476)
@@ -843,9 +843,10 @@
if(typeof(linktoolTips)=='object')
{
show_link_tooltips();
- create_lightbox();
}
+ create_lightbox();
+
toolbars =
YAHOO.util.Dom.getElementsByClassName('toolbar','div');
for(i=0;i<toolbars.length;i++)
{
@@ -921,7 +922,6 @@
myDataTable.on('cellMouseoverEvent', function (oArgs)
{
- {
if (showTimer)
{
window.clearTimeout(showTimer);
@@ -938,59 +938,61 @@
var rowspepage=0;
var param1=0;
- for(var p=0;p<toolTips.length;p++)
+ if(values_ds.recordsReturned > 0)
{
- if (column.key == toolTips[p].name)
+ for(var p=0;p<toolTips.length;p++)
{
- var record = this.getRecord(target);
- if(myPaginator.getCurrentPage() > 2 &&
myDataTable.getRecordSet().getRecords()[0]==null )
+ if (column.key == toolTips[p].name)
{
- title = toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].name);
- description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].ColumnDescription);
- }
+ var record =
this.getRecord(target);
+ if(myPaginator.getCurrentPage()
> 2 && myDataTable.getRecordSet().getRecords()[0]==null )
+ {
+ title =
toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].name);
+ description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].ColumnDescription);
+ }
- if(myPaginator.getCurrentPage() == 2 &&
myDataTable.getRecordSet().getRecords()[0]==null)
- {
- title = toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].name);
- description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].ColumnDescription);
- }
- if(myPaginator.getCurrentPage() == 2 &&
myDataTable.getRecordSet().getRecords()[0]!=null)
- {
- rowspepage =
myPaginator.getRowsPerPage();
- num =
this.getRecordIndex(target)-rowspepage;
- title = toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].name);
- description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].ColumnDescription);
- }
- if(myPaginator.getCurrentPage() == 1 &&
myDataTable.getRecordSet().getRecords()[0]!=null)
- {
- title = toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].name);
- description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].ColumnDescription);
- }
- if(myPaginator.getCurrentPage() > 2 &&
myDataTable.getRecordSet().getRecords()[0]!=null)
- {
- pages =
parseInt(myPaginator.getCurrentPage()-1);
- rowspepage =
myPaginator.getRowsPerPage();
- param1 = parseInt(pages *
rowspepage);
- num =
parseInt(this.getRecordIndex(target) - param1);
- title = toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].name);
- description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].ColumnDescription);
- }
+ if(myPaginator.getCurrentPage()
== 2 && myDataTable.getRecordSet().getRecords()[0]==null)
+ {
+ title =
toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].name);
+ description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].ColumnDescription);
+ }
+ if(myPaginator.getCurrentPage()
== 2 && myDataTable.getRecordSet().getRecords()[0]!=null)
+ {
+ rowspepage =
myPaginator.getRowsPerPage();
+ num =
this.getRecordIndex(target)-rowspepage;
+ title =
toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].name);
+ description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].ColumnDescription);
+ }
+ if(myPaginator.getCurrentPage()
== 1 && myDataTable.getRecordSet().getRecords()[0]!=null)
+ {
+ title =
toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].name);
+ description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[this.getRecordIndex(target)].getData(toolTips[p].ColumnDescription);
+ }
+ if(myPaginator.getCurrentPage()
> 2 && myDataTable.getRecordSet().getRecords()[0]!=null)
+ {
+ pages =
parseInt(myPaginator.getCurrentPage()-1);
+ rowspepage =
myPaginator.getRowsPerPage();
+ param1 = parseInt(pages
* rowspepage);
+ num =
parseInt(this.getRecordIndex(target) - param1);
+ title =
toolTips[p].title ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].name);
+ description =
toolTips[p].description ||
myDataTable.getRecordSet().getRecords()[num].getData(toolTips[p].ColumnDescription);
+ }
- var xy =
[parseInt(oArgs.event.clientX,10) + 10 ,parseInt(oArgs.event.clientY,10) + 10 ];
+ var xy =
[parseInt(oArgs.event.clientX,10) + 10 ,parseInt(oArgs.event.clientY,10) + 10 ];
- showTimer = window.setTimeout(function()
- {
- tt.setBody("<table
class='tooltip-table'><tr class='tooltip'><td
class='nolink'>"+title+"</td></tr><tr><td>"+description+"</td></tr></table>");
- tt.cfg.setProperty('xy',xy);
- tt.show();
- hideTimer =
window.setTimeout(function()
+ showTimer =
window.setTimeout(function()
{
- tt.hide();
- },5000);
- },100);
+ tt.setBody("<table
class='tooltip-table'><tr class='tooltip'><td
class='nolink'>"+title+"</td></tr><tr><td>"+description+"</td></tr></table>");
+
tt.cfg.setProperty('xy',xy);
+ tt.show();
+ hideTimer =
window.setTimeout(function()
+ {
+ tt.hide();
+ },5000);
+ },100);
+ }
}
}
- }
});
myDataTable.on('cellMouseoutEvent', function (oArgs)
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2012-01-03 08:17:13 UTC (rev 8475)
+++ trunk/property/setup/phpgw_no.lang 2012-01-03 11:42:41 UTC (rev 8476)
@@ -803,6 +803,7 @@
force year for period property no Overstyr år for periode
format type property no Format type
formats property no Formater
+forward property no Videresend
fraction property no Fraksjon
from property no Fra
from date property no Fra dato
Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl 2012-01-03 08:17:13 UTC (rev
8475)
+++ trunk/property/templates/base/invoice.xsl 2012-01-03 11:42:41 UTC (rev
8476)
@@ -1522,7 +1522,7 @@
</xsl:template>
<!-- New template-->
- <xsl:template match="approved_list">
+ <xsl:template match="approved_list" xmlns:php="http://php.net/xsl";>
<tr>
<td align="left" style="white-space: nowrap;">
<xsl:value-of select="role"/>
@@ -1532,7 +1532,108 @@
<xsl:value-of select="initials"/>
<xsl:text>: </xsl:text>
<xsl:value-of select="date"/>
+ </xsl:if>
+ </td>
+ <td align="left" style="white-space: nowrap;">
+ <xsl:if test="date = ''">
+ <select name="values[forward][{role_sign}]">
+ <xsl:attribute name="title">
+ <xsl:value-of select="role"/>
+ </xsl:attribute>
+ <xsl:apply-templates
select="user_list/options_user"/>
+ </select>
</xsl:if>
</td>
</tr>
</xsl:template>
+
+
+ <!-- forward voucher -->
+ <xsl:template xmlns:php="http://php.net/xsl"; match="forward">
+ <xsl:choose>
+ <xsl:when test="normalize-space(redirect) != ''">
+ <script>
+ window.parent.location = '<xsl:value-of
select="redirect"/>';
+ window.close();
+ </script>
+ </xsl:when>
+ </xsl:choose>
+ <form name="form" method="post" action="{form_action}">
+ <table cellpadding="0" cellspacing="0" width="100%">
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <tr>
+ <td align="left"
colspan="2">
+
<xsl:call-template name="msgbox"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates select="approved_list"/>
+ <tr>
+ <input type="hidden"
name="values[sign_orig]" value="{sign_orig}"/>
+ <input type="hidden"
name="values[my_initials]" value="{my_initials}"/>
+ <td class="th_text" align="left"
valign="top" style="white-space: nowrap;">
+ <xsl:value-of
select="php:function('lang', 'approve')"/>
+ </td>
+ <td class="th_text" valign="top"
align="left">
+ <select name="values[approve]">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'grant')"/>
+ </xsl:attribute>
+ <option value="">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="approve_list"/>
+ </select>
+ </td>
+ </tr>
+
+<!--
+ <tr>
+ <td class="th_text" align="left"
valign="top" style="white-space: nowrap;">
+ <xsl:value-of
select="php:function('lang', 'voucher process log')"/>
+ </td>
+ <td align="left">
+ <textarea cols="60" rows="10"
name="values[process_log]" wrap="virtual">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="php:function('lang', 'voucher process log')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="value_process_log"/>
+ </textarea>
+ </td>
+ </tr>
+-->
+ <tr height="50">
+ <td>
+ <xsl:variable name="lang_send">
+ <xsl:value-of
select="php:function('lang', 'save')"/>
+ </xsl:variable>
+ <input type="submit"
name="values[save]" value="{$lang_send}" title="{$lang_send}">
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td class="th_text" align="left"
valign="top" >
+ <xsl:value-of
select="php:function('lang', 'order id')"/>
+ </td>
+ <td align="left" class="th_text"
valign="top">
+ <xsl:value-of
disable-output-escaping="yes" select="orders"/>
+ </td>
+ </tr> </table>
+ </form>
+ </xsl:template>
+
+ <!-- New template-->
+ <xsl:template match="options_user">
+ <option value="{lid}">
+ <xsl:if test="selected = 'selected'">
+ <xsl:attribute name="selected"
value="selected"/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes"
select="lastname"/>
+ <xsl:text>, </xsl:text>
+ <xsl:value-of disable-output-escaping="yes"
select="firstname"/>
+ </option>
+ </xsl:template>
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8476] property: enable forwarding un-processed vouchers,
Sigurd Nes <=