fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [6621] Property: more on invoice handling


From: Sigurd Nes
Subject: [Fmsystem-commits] [6621] Property: more on invoice handling
Date: Sat, 20 Nov 2010 15:18:01 +0000

Revision: 6621
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6621
Author:   sigurdne
Date:     2010-11-20 15:18:00 +0000 (Sat, 20 Nov 2010)
Log Message:
-----------
Property: more on invoice handling

Modified Paths:
--------------
    trunk/property/inc/class.boinvoice.inc.php
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/inc/class.uigeneric.inc.php
    trunk/property/inc/class.uiinvoice.inc.php
    trunk/property/js/yahoo/invoice.list_sub.js
    trunk/property/js/yahoo/property.js
    trunk/property/templates/base/invoice.xsl

Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php  2010-11-20 09:36:54 UTC (rev 
6620)
+++ trunk/property/inc/class.boinvoice.inc.php  2010-11-20 15:18:00 UTC (rev 
6621)
@@ -573,5 +573,42 @@
                        }
                        return $values;
                }
+
+               public function get_single_line($id)
+               {
+                       $line = $this->so->get_single_line($id);
+
+                       $soXport    = CreateObject('property.soXport');
+                       $soworkorder = CreateObject('property.soworkorder');
+                       $sos_agreement = CreateObject('property.sos_agreement');
+                       if( $line['order_id'] )
+                       {
+                               if($order_type = 
$soXport->check_order($line['order_id']))
+                               {
+                                       if($order_type == 'workorder')
+                                       {
+                                               $workorder      = 
$soworkorder->read_single($line['order_id']);
+                                               if($workorder['vendor_id'] && 
($workorder['vendor_id'] != $line['vendor_id']))
+                                               {
+                                                       $line['vendor']         
=  $this->get_vendor_name($workorder['vendor_id']) . ' => ' . 
$this->get_vendor_name($line['vendor_id']);
+                                               }
+                                       }
+                                       if($order_type == 's_agreement')
+                                       {
+                                               $s_agreement = 
$sos_agreement->read_single(array('s_agreement_id'=>$line['order_id']));
+                                               if($s_agreement['vendor_id'] && 
($s_agreement['vendor_id'] != $line['vendor_id']))
+                                               {
+                                                       $line['vendor']         
= $this->get_vendor_name($s_agreement['vendor_id']) . ' => ' . 
$this->get_vendor_name($line['vendor_id']);
+                                               }
+                                       }
+                                       $line['order_type'] = $order_type;
+                               }
+                       }
+
+                       if(!isset($line['vendor']))
+                       {
+                               $line['vendor'] = 
$this->get_vendor_name($line['vendor_id']);
+                       }
+                       return $line;
+               }
        }
-

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2010-11-20 09:36:54 UTC (rev 
6620)
+++ trunk/property/inc/class.soinvoice.inc.php  2010-11-20 15:18:00 UTC (rev 
6621)
@@ -910,9 +910,23 @@
                        $this->db->query("DELETE FROM fm_ecobilag WHERE 
bilagsnr ='" . $bilagsnr  ."'",__LINE__,__FILE__);
                }
 
-               function read_single_voucher($bilagsnr)
+               function read_single_voucher($bilagsnr = 0, $id = 0)
                {
-                       $sql = "SELECT * from fm_ecobilag WHERE bilagsnr 
='$bilagsnr'";
+                       $bilagsnr =(int)$bilagsnr;
+                       $id = (int)$id;
+                       if($bilagsnr)
+                       {
+                               $sql = "SELECT * from fm_ecobilag WHERE 
bilagsnr ='$bilagsnr'";
+                       }
+                       else if ($id)
+                       {
+                               $sql = "SELECT * from fm_ecobilag WHERE id 
='$id'";
+                       }
+                       else
+                       {
+                               return array();
+                       }                       
+
                        $this->db->query($sql,__LINE__,__FILE__);
 
                        $values = array();
@@ -920,7 +934,7 @@
                        {
                                $values[] = array
                                (
-                                       'location_code'         => 
$this->db->f('id'),
+                                       'id'                            => 
$this->db->f('id'),
                                        'art'                           => 
$this->db->f('artid'),
                                        'type'                          => 
$this->db->f('typeid'),
                                        'dim_a'                         => 
$this->db->f('dima'),
@@ -940,6 +954,7 @@
                                        'b_account_id'          => 
$this->db->f('spbudact_code'),
                                        'amount'                        => 
$this->db->f('belop'),
                                        'order'                         => 
$this->db->f('pmwrkord_code'),
+                                       'order_id'                      => 
$this->db->f('pmwrkord_code'),
                                        'kostra_id'                     => 
$this->db->f('kostra_id'),
                                        'currency'                      => 
$this->db->f('currency')
                                );
@@ -1196,4 +1211,11 @@
                        $this->db->next_record();
                        return $this->db->f('cnt');
                }
+
+
+               public function get_single_line($id)
+               {
+                       $line = $this->read_single_voucher(0, $id);
+                       return $line[0];
+               }
        }

Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php  2010-11-20 09:36:54 UTC (rev 
6620)
+++ trunk/property/inc/class.uigeneric.inc.php  2010-11-20 15:18:00 UTC (rev 
6621)
@@ -472,6 +472,54 @@
                                $datatable['sorting']['sort']                   
= $this->sort; // ASC / DESC
                        }
 
+                       //-- BEGIN----------------------------- JSON CODE 
------------------------------
+               //values for Pagination
+               $json = array
+               (
+                       'recordsReturned'       => 
$datatable['pagination']['records_returned'],
+                               'totalRecords'          => 
(int)$datatable['pagination']['records_total'],
+                       'startIndex'            => 
$datatable['pagination']['records_start'],
+                               'sort'                          => 
$datatable['sorting']['order'],
+                       'dir'                           => 
$datatable['sorting']['sort'],
+                               'records'                       => array()
+               );
+
+                       // values for datatable
+               if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row']))
+               {
+                       foreach( $datatable['rows']['row'] as $row )
+                       {
+                               $json_row = array();
+                               foreach( $row['column'] as $column)
+                               {
+                                       if(isset($column['format']) && 
$column['format']== "link" && $column['java_link']==true)
+                                       {
+                                               $json_row[$column['name']] = 
"<a href='#' id='".$column['link']."' 
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
+                                       }
+                                       else if(isset($column['format']) && 
$column['format']== "link")
+                                       {
+                                               $json_row[$column['name']] = 
"<a href='".$column['link']."'>" .$column['value']."</a>";
+                                       }
+                                       else
+                                       {
+                                         $json_row[$column['name']] = 
$column['value'];
+                                       }
+                               }
+                               $json['records'][] = $json_row;
+                       }
+               }
+
+                       // right in datatable
+                       if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
+                       {
+                               $json['rights'] = 
$datatable['rowactions']['action'];
+                       }
+
+                       if( phpgw::get_var('phpgw_return_as') == 'json' )
+                       {
+                       return $json;
+                       }
+
                        phpgwapi_yui::load_widget('dragdrop');
                        phpgwapi_yui::load_widget('datatable');
                        phpgwapi_yui::load_widget('menu');
@@ -481,53 +529,6 @@
                        phpgwapi_yui::load_widget('paginator');
                        phpgwapi_yui::load_widget('animation');
 
-                       //-- BEGIN----------------------------- JSON CODE 
------------------------------
-               //values for Pagination
-                       $json = array
-                       (
-                               'recordsReturned'       => 
$datatable['pagination']['records_returned'],
-                               'totalRecords'          => 
(int)$datatable['pagination']['records_total'],
-                               'startIndex'            => 
$datatable['pagination']['records_start'],
-                                       'sort'                          => 
$datatable['sorting']['order'],
-                               'dir'                           => 
$datatable['sorting']['sort'],
-                                       'records'                       => 
array()
-                       );
-
-                               // values for datatable
-                       if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row'])){
-                               foreach( $datatable['rows']['row'] as $row )
-                               {
-                                       $json_row = array();
-                                       foreach( $row['column'] as $column)
-                                       {
-                                               if(isset($column['format']) && 
$column['format']== "link" && $column['java_link']==true)
-                                               {
-                                                       
$json_row[$column['name']] = "<a href='#' id='".$column['link']."' 
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
-                                               }
-                                               elseif(isset($column['format']) 
&& $column['format']== "link")
-                                               {
-                                                 $json_row[$column['name']] = 
"<a href='".$column['link']."'>" .$column['value']."</a>";
-                                               }else
-                                               {
-                                                 $json_row[$column['name']] = 
$column['value'];
-                                               }
-                                       }
-                                       $json['records'][] = $json_row;
-                               }
-                       }
-
-                               // right in datatable
-                               if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
-                               {
-                                       $json ['rights'] = 
$datatable['rowactions']['action'];
-                               }
-
-                               if( phpgw::get_var('phpgw_return_as') == 'json' 
)
-                               {
-                               return $json;
-                               }
-
-
                        $datatable['json_data'] = json_encode($json);
                        //-------------------- JSON CODE ----------------------
 

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2010-11-20 09:36:54 UTC (rev 
6620)
+++ trunk/property/inc/class.uiinvoice.inc.php  2010-11-20 15:18:00 UTC (rev 
6621)
@@ -49,7 +49,6 @@
                var $public_functions = array
                (
                        'index'                 => true,
-                       'edit_period'   => true,
                        'list_sub'              => true,
                        'consume'               => true,
                        'remark'                => true,
@@ -59,7 +58,8 @@
                        'view_order'    => true,
                        'download'              => true,
                        'download_sub'  => true,
-                       'receipt'               => true
+                       'receipt'               => true,
+                       'edit'                  => true
                );
 
                function property_uiinvoice()
@@ -1070,13 +1070,13 @@
                                // right in datatable
                                if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
                                {
-                                       $json ['rights'] = 
$datatable['rowactions']['action'];
+                                       $json['rights'] = 
$datatable['rowactions']['action'];
                                }
 
                                // message when editting & deleting records
                                if(isset($receipt) && is_array($receipt) && 
count($receipt))
                                {
-                                       $json ['message'][] = $receipt;
+                                       $json['message'][] = $receipt;
                                }
 
                                if( phpgw::get_var('phpgw_return_as') == 'json' 
)
@@ -1290,7 +1290,9 @@
                                array(
                                        'col_name'=>'external_ref'              
,'label'=>lang('external_ref'), 'className'=>'centerClasss', 'sortable'=>false, 
'sort_field'=>'',                       'visible'=>true),
                                array(
-                                       'col_name'=>'counter',          
'visible'=>false)
+                                       'col_name'=>'counter',          
'visible'=>false),
+                               array(
+                                       'col_name'=>'id',               
'visible'=>false)
                                );
 
 
@@ -1519,6 +1521,10 @@
                                                {
                                                        
$json_row[$uicols[$i]['col_name']]  = $invoices['counter'];
                                                }                               
        
+                                               elseif($i == 16)
+                                               {
+                                                       
$json_row[$uicols[$i]['col_name']]  = $invoices['id'];
+                                               }                               
        
                                        }
 
                                        if($invoices['workorder_id'])
@@ -1578,55 +1584,95 @@
                                $datatable['sorting']['sort']                   
= phpgw::get_var('sort', 'string'); // ASC / DESC
                        }
 
-                       phpgwapi_yui::load_widget('dragdrop');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('menu');
-                       phpgwapi_yui::load_widget('connection');
-                       phpgwapi_yui::load_widget('loader');
-                       phpgwapi_yui::load_widget('tabview');
-                       phpgwapi_yui::load_widget('paginator');
-                       //FIXME this one is only needed when $lookup==true - so 
there is probably an error
-                       phpgwapi_yui::load_widget('animation');
 
 //-- BEGIN----------------------------- JSON CODE 
------------------------------
 
                //values for Pagination
-                       $json = array
-                       (
-                               'recordsReturned'       => 
$datatable['pagination']['records_returned'],
-                               'totalRecords'          => 
(int)$datatable['pagination']['records_total'],
-                               'startIndex'            => 
$datatable['pagination']['records_start'],
-                                       'sort'                          => 
$datatable['sorting']['order'],
-                               'dir'                           => 
$datatable['sorting']['sort'],
-                                       'records'                       => 
array()
-                       );
+                       $json = array
+                       (
+                               'recordsReturned'       => 
$datatable['pagination']['records_returned'],
+                       'totalRecords'          => 
(int)$datatable['pagination']['records_total'],
+                       'startIndex'            => 
$datatable['pagination']['records_start'],
+                               'sort'                          => 
$datatable['sorting']['order'],
+                       'dir'                           => 
$datatable['sorting']['sort'],
+                               'records'                       => array()
+               );
 
-                               // values for datatable
-                       $json['records']        = $datatable['rows']['row'];
+                       // values for datatable
+               $json['records']        = $datatable['rows']['row'];
 
-                               // right in datatable
-                               $json ['rights']        = 
$datatable['rowactions']['action'];
+                       // right in datatable
+                       $json['rights'] = $datatable['rowactions']['action'];
 
-                               $json['sum']            = number_format($sum, 
2, ',', '');
+                       $json['sum']            = number_format($sum, 2, ',', 
'');
 
-                               // message when editting & deleting records
-                               if(isset($receipt) && is_array($receipt) && 
count($receipt))
-                               {
-                                       $json ['message']= 
$GLOBALS['phpgw']->common->msgbox($this->bocommon->msgbox_data($receipt));
-                               }
+                       // message when editting & deleting records
+                       if(isset($receipt) && is_array($receipt) && 
count($receipt))
+                       {
+                               $json['message']= 
$GLOBALS['phpgw']->common->msgbox($this->bocommon->msgbox_data($receipt));
+                       }
 
-                               // query parameters
-                               if(isset($current_Consult) && 
is_array($current_Consult))
-                               {
-                                       $json ['current_consult'] = 
$current_Consult;
-                               }
+                       // query parameters
+                       if(isset($current_Consult) && 
is_array($current_Consult))
+                       {
+                               $json['current_consult'] = $current_Consult;
+                       }
 
-                               if( phpgw::get_var('phpgw_return_as') == 'json' 
)
-                               {
-                               return $json;
-                               }
 
+//-------------- menu
+                       $datatable['rowactions']['action'] = array();
 
+                       $parameters = array
+                       (
+                               'parameter' => array
+                               (
+                                       array
+                                       (
+                                               'name'          => 'id',
+                                               'source'        => 'id'
+                                       ),
+                               )
+                       );
+
+                       if($this->acl_edit)
+                       {
+                               $datatable['rowactions']['action'][] = array
+                               (
+                                       'my_name'               => 'edit',
+                                       'text'                  => lang('edit'),
+                                       'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
+                                                                               
(
+                                                                               
        'menuaction'            => 'property.uiinvoice.edit',
+                                                                               
        'voucher_id'            => $voucher_id,
+                                                                               
        'user_lid'                      => $this->user_lid,
+                                                                               
        'target'                        => '_lightbox'
+                                                                               
)),
+                                       'parameters'    => $parameters
+                               );
+                       }
+
+                       if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
+                       {
+                               $json['rights'] = 
$datatable['rowactions']['action'];
+                       }
+
+//--------------
+
+                       if( phpgw::get_var('phpgw_return_as') == 'json' )
+                       {
+                       return $json;
+                       }
+
+                       phpgwapi_yui::load_widget('dragdrop');
+                       phpgwapi_yui::load_widget('datatable');
+                       phpgwapi_yui::load_widget('menu');
+                       phpgwapi_yui::load_widget('connection');
+                       phpgwapi_yui::load_widget('loader');
+                       phpgwapi_yui::load_widget('tabview');
+                       phpgwapi_yui::load_widget('paginator');
+                       //FIXME this one is only needed when $lookup==true - so 
there is probably an error
+                       phpgwapi_yui::load_widget('animation');
+
                        $datatable['json_data'] = json_encode($json);
 //-------------------- JSON CODE ----------------------
 
@@ -1662,50 +1708,60 @@
 
                        // Prepare YUI Library
                        $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'invoice.list_sub', 'property' );
-
                }
 
-               function edit_period()
+               public function edit()
                {
-                       $GLOBALS['phpgw']->xslttpl->add_file(array('invoice'));
+                       $GLOBALS['phpgw_info']['flags']['noframework'] =  true;
 
-                       $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+                       $id                     = phpgw::get_var('id', 'int', 
'GET' , 0);
+                       $user_lid       = phpgw::get_var('user_lid', 'string', 
'GET');
+                       $voucher_id     = phpgw::get_var('voucher_id', 'int', 
'GET');
+                       $redirect       = false;
 
-                       $voucher_id     = phpgw::get_var('voucher_id', 'int');
-                       $period         = phpgw::get_var('period', 'int');
-                       $submit         = phpgw::get_var('submit', 'bool');
+_debug_array($id);
+                       $values = phpgw::get_var('values');
+                       
 
                        $receipt = array();
-                       if($submit)
+                       if (isset($values['save']))
                        {
-                               $receipt        = 
$this->bo->update_period($voucher_id,$period);
-                       }
+                               if($GLOBALS['phpgw']->session->is_repost())
+                               {
+                                       
$receipt['error'][]=array('msg'=>lang('repost'));
+                               }
 
-                       $function_msg   = lang('Edit period');
+                               if(!isset($values['address']) || 
!$values['address'])
+                               {
+                                       
$receipt['error'][]=array('msg'=>lang('Missing address'));
+                               }
 
-                       $link_data = array
-                       (
-                               'menuaction'    => 
'property.uiinvoice.edit_period',
-                               'voucher_id'    => $voucher_id);
+                               if(!isset($values['details']) || 
!$values['details'])
+                               {
+                                       
$receipt['error'][]=array('msg'=>lang('Please give som details'));
+                               }
 
+                               if (!$receipt['error'])
+                               {
+                                       $redirect = true;
+                               }
+                       }
 
-                       $msgbox_data = $this->bocommon->msgbox_data($receipt);
+                       $line = $this->bo->get_single_line($id);
+                       _debug_array($line);
 
                        $data = array
                        (
-                               'msgbox_data'           => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
-                               'period_list'           => 
$this->bo->period_list($period),
-                               'function_msg'          => $function_msg,
-                               'form_action'           => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
-                               'lang_save'             => lang('save'),
-                               'select_name'           => 'period'
+                               'redirect'              => $redirect ? 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uiinvoice.list_sub', 'user_lid' => $user_lid, 'voucher_id' => 
$voucher_id)) : null,
+                               'msgbox_data'   => 
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($receipt)),
+                               'from_name'             => 
$GLOBALS['phpgw_info']['user']['fullname'],
+                               'from_address'  => 
$GLOBALS['phpgw_info']['user']['preferences']['property']['email'],
+                               'form_action'           => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'property.uiinvoice.edit', 'id' => $id, 'user_lid' => $user_lid, 'voucher_id' 
=> $voucher_id)),
+                               'support_address'       => $support_address,
                        );
 
-//_debug_array($data);
-
-                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
$function_msg;
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_period' => $data));
-               //      $GLOBALS['phpgw']->xslttpl->pp();
+            $GLOBALS['phpgw']->xslttpl->add_file('invoice');
+                       $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('edit' => $data));
                }
 
                function remark()
@@ -2198,12 +2254,12 @@
                                // right in datatable
                                if(isset($datatable['rowactions']['action']) && 
is_array($datatable['rowactions']['action']))
                                {
-                                       $json ['rights'] = 
$datatable['rowactions']['action'];
+                                       $json['rights'] = 
$datatable['rowactions']['action'];
                                }
                                // query parameters
                                if(isset($current_Consult) && 
is_array($current_Consult))
                                {
-                                       $json ['current_consult'] = 
$current_Consult;
+                                       $json['current_consult'] = 
$current_Consult;
                                }
 
                                if( phpgw::get_var('phpgw_return_as') == 'json' 
)

Modified: trunk/property/js/yahoo/invoice.list_sub.js
===================================================================
--- trunk/property/js/yahoo/invoice.list_sub.js 2010-11-20 09:36:54 UTC (rev 
6620)
+++ trunk/property/js/yahoo/invoice.list_sub.js 2010-11-20 15:18:00 UTC (rev 
6621)
@@ -32,6 +32,35 @@
 
                var tableYUI;
 
+
+       this.showlightbox = function(sUrl)//(parameters, oRecord)
+       {
+
+//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');
+                       frame.src = sUrl;
+                       frame.width = "100%";
+                       frame.height = "350";
+                       o.setBody(frame);
+               };
+               lightbox.showEvent.subscribe(onDialogShow, lightbox);
+               lightbox.show();
+       }
+
+
        
/********************************************************************************/
                this.onSave = function()
                {

Modified: trunk/property/js/yahoo/property.js
===================================================================
--- trunk/property/js/yahoo/property.js 2010-11-20 09:36:54 UTC (rev 6620)
+++ trunk/property/js/yahoo/property.js 2010-11-20 15:18:00 UTC (rev 6621)
@@ -319,7 +319,6 @@
        }
 
 
-
  
/********************************************************************************
  *
  */
@@ -634,6 +633,12 @@
                                                {
                                                        
window.open(sUrl,'_blank');
                                                }
+                                               else 
if(substr_count(sUrl,'target=_lightbox')>0)
+                                               {
+                                                       //have to be defined as 
a local function. Example in invoice.list_sub.js
+                                                       //console.log(sUrl); // 
firebug
+                                                       showlightbox(sUrl);
+                                               }
                                                else
                                                {
                                                        
window.open(sUrl,'_self');

Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl   2010-11-20 09:36:54 UTC (rev 
6620)
+++ trunk/property/templates/base/invoice.xsl   2010-11-20 15:18:00 UTC (rev 
6621)
@@ -20,74 +20,12 @@
                        <xsl:when test="debug">
                                <xsl:apply-templates select="debug"/>
                        </xsl:when>
-                       <xsl:when test="edit_period">
-                               <xsl:apply-templates select="edit_period"/>
-                       </xsl:when>
-                       <xsl:when test="list_voucher">
-                               <xsl:apply-templates select="list_voucher"/>
-                       </xsl:when>
-                       <xsl:when test="list_voucher_paid">
-                               <xsl:apply-templates 
select="list_voucher_paid"/>
-                       </xsl:when>
-                       <xsl:when test="consume">
-                               <xsl:apply-templates select="consume"/>
-                       </xsl:when>
                        <xsl:when test="remark">
                                <xsl:apply-templates select="remark"/>
                        </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:apply-templates select="list_invoice_sub"/>
-                       </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
        
-       <xsl:template match="edit_period">
-               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
-               <form method="post" action="{$form_action}">
-               <div align="center">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td>
-                               <xsl:variable name="select_name"><xsl:value-of 
select="select_name"/></xsl:variable>
-                               <select name="{$select_name}" class="forms" >
-                                       <xsl:apply-templates 
select="period_list"/>
-                               </select>
-                               </td>
-                       </tr>
-                       <tr height="50">
-                               <td>
-                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-                                       <input type="submit" name="submit" 
value="{$lang_save}" >
-                                       </input>
-                               </td>
-                       </tr>
-               </table>
-               </div>
-               </form> 
-       </xsl:template>
-
-       <xsl:template match="period_list">
-       <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{$id}"><xsl:value-of 
disable-output-escaping="yes" select="name"/></option>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
-       
-       
        <xsl:template match="remark">
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
@@ -122,104 +60,7 @@
        </xsl:template>
 
 
-<!-- list_voucher -->
 
-       <xsl:template match="list_voucher">
-               <xsl:apply-templates select="menu"/> 
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-
-                       <tr>
-                               <td>
-                                       <xsl:call-template name="cat_filter"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:call-template 
name="user_lid_filter"/>
-                               </td>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="3" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                               </td>
-                               <td colspan="3" width="100%" class="small_text" 
valign="top" align="left">
-                                       <xsl:call-template name="download"/>
-                               </td>
-                       </tr>
-               </table>
-               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
-               <form method="post" name="form" action="{$form_action}">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:apply-templates 
select="table_header_list_voucher"/>
-                       
-                       <xsl:choose>
-                               <xsl:when 
test="values_list_voucher[voucher_id]">
-                                       <xsl:apply-templates 
select="values_list_voucher"/>
-
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:variable name="img_check"><xsl:value-of 
select="img_check"/></xsl:variable>
-                       <tr>
-                               <td></td>
-                               <td></td>
-                               <td></td>
-                               <td class="small_text" align="right">
-                                       <xsl:value-of select="sum"/>
-                               </td>
-                               <td></td>
-                               <td></td>
-                               <td></td>
-                               <td></td>
-                               <td></td>
-                               <td align="center">
-                               <a 
href="javascript:check_all_radio('sign_none')"><img src="{$img_check}" 
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
-                               </td>
-                               <td align="center">
-                                <a 
href="javascript:check_all_radio('sign_janitor')"><img src="{$img_check}" 
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
-                               </td>
-                               <td align="center">
-                                <a 
href="javascript:check_all_radio('sign_supervisor')"><img src="{$img_check}" 
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
-                               </td>
-                               <td align="center">
-                                 <a 
href="javascript:check_all_radio('sign_budget_responsible')"><img 
src="{$img_check}" border="0" height="16" width="21" 
alt="{lang_select_all}"/></a>
-                               </td>
-                               <td align="right">
-                                 <a 
href="javascript:check_all_checkbox('values[transfer]')"><img 
src="{$img_check}" border="0" height="16" width="21" 
alt="{lang_select_all}"/></a>
-                               </td>
-                         </tr>
-                       
-                       <tr height="50">
-                               <td>
-                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-                                       <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_save_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-
-               </table>
-               </form> 
-               <xsl:choose>
-                       <xsl:when test="table_add_invoice !=''">
-                               <xsl:apply-templates 
select="table_add_invoice"/>
-                       </xsl:when>
-               </xsl:choose>   
-       </xsl:template>
-
        <xsl:template match="table_add_invoice">
                <table align = "left">
                        <tr>
@@ -239,813 +80,8 @@
                        </tr>
                </table>
        </xsl:template>
-       
-       
-       <xsl:template match="table_header_list_voucher">
-               <xsl:variable name="sort_voucher"><xsl:value-of 
select="sort_voucher"/></xsl:variable>
-               <xsl:variable name="sort_voucher_date"><xsl:value-of 
select="sort_voucher_date"/></xsl:variable>
-               <xsl:variable name="sort_vendor_id"><xsl:value-of 
select="sort_vendor_id"/></xsl:variable>
-                       <tr class="th">
-                               <td class="th_text" width="5%" align="right">
-                                       <a href="{$sort_voucher}"><xsl:value-of 
select="lang_voucher"/></a>
-                               </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <a 
href="{$sort_voucher_date}"><xsl:value-of select="lang_voucher_date"/></a>
-                               </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of select="lang_days"/>
-                               </td>
-                               <td class="th_text" width="8%" align="right">
-                                       <xsl:value-of select="lang_sum"/>
-                               </td>
-                               <td class="th_text" width="4%" align="right">
-                                       <a 
href="{$sort_vendor_id}"><xsl:value-of select="lang_vendor_id"/></a>
-                               </td>
-                               <td class="th_text" width="3%" align="right">
-                                       <xsl:value-of 
select="lang_num_sub_invoice"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_type"/>
-                               </td>
-                               <td class="th_text" width="3%" align="right">
-                                       <xsl:value-of select="lang_period"/>
-                               </td>
-                               <td class="th_text" width="3%" align="right">
-                                       <xsl:value-of select="lang_kredit"/>
-                               </td>
-                               <td class="th_text" width="3%" align="right">
-                                       <xsl:value-of select="lang_none"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_janitor"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_supervisor"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of 
select="lang_budget_responsible"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_transfer"/>
-                               </td>
-                               <xsl:choose>
-                                       <xsl:when test="//acl_delete!=''">
-                                               <td class="th_text" width="5%" 
align="center">
-                                                       <xsl:value-of 
select="lang_delete"/>
-                                               </td>
-                                       </xsl:when>
-                               </xsl:choose>
-                               <td class="th_text" width="1%" align="right">
-                                       <xsl:value-of select="lang_front"/>
-                               </td>
 
-                       </tr>
-       </xsl:template>
 
-       <xsl:template match="values_list_voucher">
-
-                       <xsl:variable name="counter"><xsl:value-of 
select="counter"/></xsl:variable>
-                       <xsl:variable name="current_user"><xsl:value-of 
select="current_user"/></xsl:variable>
-                       <tr>
-                               <xsl:attribute name="class">
-                                       <xsl:choose>
-                                               <xsl:when test="@class">
-                                                       <xsl:value-of 
select="@class"/>
-                                               </xsl:when>
-                                               <xsl:when test="position() mod 
2 = 0">
-                                                       
<xsl:text>row_off</xsl:text>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       
<xsl:text>row_on</xsl:text>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-
-                               <td class="small_text" align="right">
-                                       <input type="hidden" 
name="values[counter][{$counter}]" value="{counter}">
-                                       </input>
-                                       <input type="hidden" 
name="values[voucher_id][{$counter}]" value="{voucher_id}">
-                                       </input>
-                                       <xsl:variable 
name="link_sub"><xsl:value-of select="link_sub"/>&amp;voucher_id=<xsl:value-of 
select="voucher_id"/></xsl:variable>
-                                       <xsl:variable 
name="lang_sub_help"><xsl:value-of select="lang_sub_help"/></xsl:variable>
-                                       <xsl:variable 
name="lang_sub"><xsl:value-of select="lang_sub"/></xsl:variable>
-                                       <a href="{$link_sub}"
-                                       
onMouseOver="overlib('{$lang_sub_help}', CAPTION, '{$lang_sub}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of select="voucher_id"/></a> 
                                
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:variable 
name="lang_payment_date"><xsl:value-of 
select="lang_payment_date"/></xsl:variable>
-                                       <xsl:variable 
name="payment_date"><xsl:value-of select="payment_date"/></xsl:variable>
-                                       <a href="javascript:void()"
-                                       onMouseOver="overlib('{$payment_date}', 
CAPTION, '{$lang_payment_date}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="voucher_date"/></a>                                                     
          
-                               </td>
-                               <td class="small_text" align="right">
-                                       <input type="hidden" 
name="values[sign_orig][{$counter}]" value="{sign_orig}">
-                                       </input>
-                                       <input type="hidden" 
name="values[num_days_orig][{$counter}]" value="{num_days}">
-                                       </input>
-                                       <input type="hidden" 
name="values[timestamp_voucher_date][{$counter}]" 
value="{timestamp_voucher_date}">
-                                       </input>
-                                       <input type="text" size="2" 
name="values[num_days][{$counter}]" value="{num_days}">
-                                       </input>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:value-of select="amount"/>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:variable 
name="vendor"><xsl:value-of select="vendor"/></xsl:variable>
-                                       <xsl:variable 
name="vendor_id"><xsl:value-of select="vendor_id"/></xsl:variable>
-                                       <a href="javascript:void()"
-                                       onMouseOver="overlib('{$vendor}', 
CAPTION, '{$vendor_id}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of select="vendor_id"/></a>
-
-                               </td>
-                               <td class="small_text" align="right">
-                                       <input type="hidden" 
name="values[invoice_count][{$counter}]" value="{invoice_count}">
-                                       </input>
-                                       <xsl:value-of select="invoice_count"/>
-                               </td>
-                               <td class="small_text" align="center">
-                                       <xsl:value-of select="type"/>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:variable 
name="link_period"><xsl:value-of 
select="link_period"/>&amp;voucher_id=<xsl:value-of 
select="voucher_id"/>&amp;period=<xsl:value-of select="period"/></xsl:variable>
-                                       <xsl:variable 
name="lang_period_help"><xsl:value-of select="lang_period_help"/></xsl:variable>
-                                       <xsl:variable 
name="lang_period"><xsl:value-of select="lang_period"/></xsl:variable>
-                                       <a href="javascript:var 
w=window.open('{$link_period}','','width=150,height=150')"
-                                       
onMouseOver="overlib('{$lang_period_help}', CAPTION, '{$lang_period}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of select="period"/></a>     
                                
-                               </td>
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="kreditnota='1'">
-                                                       <input type="checkbox" 
name="values[kreditnota][{$counter}]" value="true" checked="checked" 
onMouseout="window.status='';return true;">
-                                                       </input>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[kreditnota][{$counter}]" value="true" 
onMouseout="window.status='';return true;">
-                                                       </input>                
                                        
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="is_janitor">
-                                                       <input type="radio" 
name="values[sign][{$counter}]" value="sign_none" 
onMouseout="window.status='';return true;">
-                                                       </input>                
                                        
-                                               </xsl:when>
-                                               <xsl:when test="is_supervisor">
-                                                       <input type="radio" 
name="values[sign][{$counter}]" value="sign_none" 
onMouseout="window.status='';return true;">
-                                                       </input>                
                                        
-                                               </xsl:when>
-                                               <xsl:when 
test="is_budget_responsible">
-                                                       <input type="radio" 
name="values[sign][{$counter}]" value="sign_none" 
onMouseout="window.status='';return true;">
-                                                       </input>                
                                        
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="right">
-       
-                                       <xsl:choose>
-                                               <xsl:when test="is_janitor='1'">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="jan_date=''">
-                                                                       <input 
type="radio" name="values[sign][{$counter}]" value="sign_janitor" 
onMouseout="window.status='';return true;">
-                                                                       
</input>                                                        
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="janitor = $current_user">
-                                                                               
        <input type="radio" name="values[sign][{$counter}]" 
value="sign_janitor" checked="checked" onMouseout="window.status='';return 
true;">
-                                                                               
        </input>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <input type="checkbox" name="" value="" checked="checked" 
disabled="disabled" ></input>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="jan_date=''">
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="" value="" checked="checked" disabled="disabled" ></input>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-
-                                       <xsl:value-of select="janitor"/>
-                               </td>
-                               <td class="small_text" align="right">
-                               
-                                       <xsl:choose>
-                                               <xsl:when 
test="is_supervisor='1'"><xsl:value-of select="super_date"/>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="super_date=''">
-                                                                       <input 
type="radio" name="values[sign][{$counter}]" value="sign_supervisor" 
onMouseout="window.status='';return true;">
-                                                                       
</input>                                                        
-                                                               </xsl:when>
-                                                               <xsl:when 
test="super_date!=''">
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="supervisor = $current_user">
-                                                                               
        <input type="radio" name="values[sign][{$counter}]" 
value="sign_supervisor" checked="checked" onMouseout="window.status='';return 
true;">
-                                                                               
        </input>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <input type="checkbox" name="" value="" checked="checked" 
disabled="disabled" ></input>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="super_date=''">
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="" value="" checked="checked" disabled="disabled" ></input>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-
-                                       <xsl:value-of select="supervisor"/>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:choose>
-                                               <xsl:when 
test="is_budget_responsible='1'">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="budget_date=''">
-                                                                       <input 
type="radio" name="values[sign][{$counter}]" value="sign_budget_responsible" 
onMouseout="window.status='';return true;">
-                                                                       
</input>                                                        
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="budget_responsible = $current_user">
-                                                                               
        <input type="radio" name="values[sign][{$counter}]" 
value="sign_budget_responsible" checked="checked" 
onMouseout="window.status='';return true;">
-                                                                               
        </input>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <input type="checkbox" name="" value="" checked="checked" 
disabled="disabled" ></input>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="budget_date=''">
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="" value="" checked="checked" disabled="disabled" ></input>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of 
select="budget_responsible"/>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:choose>
-                                               <xsl:when 
test="is_transfer='1'">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="transfer_date=''">
-                                                                       <input 
type="checkbox" name="values[transfer][{$counter}]" value="true" 
onMouseout="window.status='';return true;">
-                                                                       </input>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="values[transfer][{$counter}]" value="true" 
checked="checked" onMouseout="window.status='';return true;">
-                                                                       
</input>                                                        
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="transfer_id!=''">
-                                                                       <input 
type="checkbox" name="" value="" checked="checked" disabled="disabled" ></input>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:value-of select="transfer_id"/>
-                               </td>
-                               <xsl:choose>
-                                       <xsl:when test="//acl_delete!=''">
-                                               <xsl:variable 
name="lang_delete_statustext"><xsl:value-of 
select="lang_delete_statustext"/></xsl:variable>
-                                               <td class="small_text" 
align="center">
-                                                       <xsl:variable 
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
-                                                       <a 
href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
-                                               </td>
-                                       </xsl:when>
-                               </xsl:choose>
-
-                               <xsl:variable 
name="lang_front_statustext"><xsl:value-of 
select="lang_front_statustext"/></xsl:variable>
-                               <td class="small_text" align="center">
-                                       <xsl:variable 
name="link_front"><xsl:value-of select="link_front"/></xsl:variable>
-                                       <a href="{$link_front}" 
onMouseover="window.status='{$lang_front_statustext}';return true;" 
onMouseout="window.status='';return true;" target="_blank"><xsl:value-of 
select="text_front"/></a>
-                               </td>
-
-                       </tr>
-       </xsl:template>
-
-
-
-<!-- list_voucher_paid -->
-
-       <xsl:template match="list_voucher_paid">
-               <script type="text/javascript">
-                       self.name="first_Window";
-                       function abook()
-                       {
-                               Window1=window.open('<xsl:value-of 
select="addressbook_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
-                       }               
-                       function property_lookup()
-                       {
-                               Window1=window.open('<xsl:value-of 
select="property_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
-                       }               
-               </script>
-
-               <xsl:apply-templates select="menu"/> 
-               <xsl:variable name="form_action"><xsl:value-of 
select="link_url"/></xsl:variable>
-               <div align="left">
-               <form method="post" name="form" action="{$form_action}">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-
-                       <tr>
-                               <td>
-                                       <input type="text" id="start_date" 
name="start_date" size="10" value="{start_date}" readonly="readonly" 
onMouseout="window.status='';return true;" >
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_start_date_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <img id="start_date-trigger" 
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}" 
style="cursor:pointer; cursor:hand;" />
-                               </td>
-                               <td>
-                                       <input type="text" id="end_date" 
name="end_date" size="10" value="{end_date}" readonly="readonly" 
onMouseout="window.status='';return true;" >
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_end_date_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <img id="end_date-trigger" 
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}" 
style="cursor:pointer; cursor:hand;" />
-                               </td>
-                               <td>
-                                       <input type="text" size="8" 
name="workorder_id" value="{workorder_id}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_workorder_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <a href="javascript:void()"
-                                       
onMouseOver="overlib('{lang_workorder_statustext}', CAPTION, 
'{lang_workorder}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="lang_workorder"/></a>                                     
-                               </td>
-
-                               <td align="left">
-                                       <input type="text" name="vendor_id" 
value="{vendor_id}" size="4"  onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_vendor_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <a href="javascript:abook()"
-                                       
onMouseOver="overlib('{lang_select_vendor_statustext}', CAPTION, 
'{lang_vendor}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="lang_vendor"/></a>                                        
-
-                                       <input type="hidden" 
name="vendor_name"></input>
-                               </td>
-                       </tr>
-                       
-                       <tr>
-                               <td>
-                                       <xsl:call-template name="cat_select"/>
-                               </td>
-                               <td align="left">
-                                       <xsl:call-template 
name="user_lid_select"/>
-                               </td>
-
-                               <td align="left">
-                               <xsl:variable 
name="lang_account_class_statustext"><xsl:value-of 
select="lang_account_class_statustext"/></xsl:variable>
-                               <xsl:variable 
name="select_account_class_name"><xsl:value-of 
select="select_account_class_name"/></xsl:variable>
-                                       <select 
name="{$select_account_class_name}" class="forms" 
onMouseover="window.status='{$lang_account_class_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                               <option value=""><xsl:value-of 
select="lang_no_account_class"/></option>
-                                                       <xsl:apply-templates 
select="account_class_list"/>
-                                       </select>
-
-                               </td>
-
-                               <td align="left">
-                                       <input type="text" name="loc1" 
value="{loc1}" size="4" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_property_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <a href="javascript:property_lookup()"
-                                       
onMouseOver="overlib('{lang_select_property_statustext}', CAPTION, 
'{lang_property}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="lang_property"/></a>                                      
-
-                                       <input type="hidden" 
name="loc1_name"></input>
-                               </td>
-
-                               <td align="left">
-                                       <input type="text" name="voucher_id" 
value="{voucher_id}" size="8" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_voucher_id_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <xsl:text> </xsl:text>
-                                       <xsl:value-of select="lang_voucher_id"/>
-                               </td>
-
-                               <td align="left">
-                                       <xsl:variable 
name="lang_search"><xsl:value-of select="lang_search"/></xsl:variable>
-                                       <input type="submit" 
name="submit_search" value="{$lang_search}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_search_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="11" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                               </td>
-                       </tr>
-               </table>
-               </form>
-               </div>
-
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:apply-templates 
select="table_header_list_voucher_paid"/>
-                       
-                       <xsl:choose>
-                               <xsl:when 
test="values_list_voucher_paid[voucher_id]">
-                                       <xsl:apply-templates 
select="values_list_voucher_paid"/>
-                                       <tr>
-                                               <td></td>
-                                               <td></td>
-                                               <td></td>
-                                               <td class="th_text" 
align="right">
-                                                       <xsl:value-of 
select="sum"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:variable name="img_check"><xsl:value-of 
select="img_check"/></xsl:variable>
-               </table>
-       </xsl:template>
-       
-       
-       <xsl:template match="table_header_list_voucher_paid">
-               <xsl:variable name="sort_voucher"><xsl:value-of 
select="sort_voucher"/></xsl:variable>
-               <xsl:variable name="sort_voucher_date"><xsl:value-of 
select="sort_voucher_date"/></xsl:variable>
-               <xsl:variable name="sort_vendor_id"><xsl:value-of 
select="sort_vendor_id"/></xsl:variable>
-                       <tr class="th">
-                               <td class="th_text" width="5%" align="right">
-                                       <a href="{$sort_voucher}"><xsl:value-of 
select="lang_voucher"/></a>
-                               </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <a 
href="{$sort_voucher_date}"><xsl:value-of select="lang_voucher_date"/></a>
-                               </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of select="lang_days"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_sum"/>
-                               </td>
-                               <td class="th_text" width="4%" align="right">
-                                       <a 
href="{$sort_vendor_id}"><xsl:value-of select="lang_vendor_id"/></a>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of 
select="lang_num_sub_invoice"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_type"/>
-                               </td>
-                               <td class="th_text" width="3%" align="right">
-                                       <xsl:value-of select="lang_period"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_janitor"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_supervisor"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of 
select="lang_budget_responsible"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_transfer"/>
-                               </td>
-                       </tr>
-       </xsl:template>
-
-       <xsl:template match="values_list_voucher_paid">
-
-                       <xsl:variable name="counter"><xsl:value-of 
select="counter"/></xsl:variable>
-                       <xsl:variable name="current_user"><xsl:value-of 
select="current_user"/></xsl:variable>
-                       <tr>
-                               <xsl:attribute name="class">
-                                       <xsl:choose>
-                                               <xsl:when test="@class">
-                                                       <xsl:value-of 
select="@class"/>
-                                               </xsl:when>
-                                               <xsl:when test="position() mod 
2 = 0">
-                                                       
<xsl:text>row_off</xsl:text>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       
<xsl:text>row_on</xsl:text>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-
-                               <td align="right">
-                                       <xsl:variable 
name="link_sub"><xsl:value-of select="link_sub"/>&amp;voucher_id=<xsl:value-of 
select="voucher_id"/>&amp;paid=true</xsl:variable>
-                                       <xsl:variable 
name="lang_sub_help"><xsl:value-of select="lang_sub_help"/></xsl:variable>
-                                       <xsl:variable 
name="lang_sub"><xsl:value-of select="lang_sub"/></xsl:variable>
-                                       <a href="{$link_sub}"
-                                       
onMouseOver="overlib('{$lang_sub_help}', CAPTION, '{$lang_sub}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of select="voucher_id"/></a> 
                                
-                               </td>
-                               <td align="right">
-                                       <xsl:variable 
name="lang_payment_date"><xsl:value-of 
select="lang_payment_date"/></xsl:variable>
-                                       <xsl:variable 
name="payment_date"><xsl:value-of select="payment_date"/></xsl:variable>
-                                       <a href="javascript:void()"
-                                       onMouseOver="overlib('{$payment_date}', 
CAPTION, '{$lang_payment_date}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="voucher_date"/></a>                                                     
          
-                               </td>
-                               <td align="right">
-                                       <xsl:value-of select="num_days"/>
-                               </td>
-                               <td align="right">
-                                       <xsl:value-of select="amount"/>
-                               </td>
-                               <td align="right">
-                                       <xsl:variable 
name="vendor"><xsl:value-of select="vendor"/></xsl:variable>
-                                       <xsl:variable 
name="vendor_id"><xsl:value-of select="vendor_id"/></xsl:variable>
-                                       <a href="javascript:void()"
-                                       onMouseOver="overlib('{$vendor}', 
CAPTION, '{$vendor_id}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of select="vendor_id"/></a>
-
-                               </td>
-                               <td align="right">
-                                       <xsl:value-of select="invoice_count"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="type"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="period"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="jan_date"/> - 
<xsl:value-of select="janitor"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="super_date"/> - 
<xsl:value-of select="supervisor"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="budget_date"/> - 
<xsl:value-of select="budget_responsible"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="transfer_date"/> 
- <xsl:value-of select="transfer_id"/>
-                               </td>
-                       </tr>
-       </xsl:template>
-
-
-<!-- consume -->
-
-       <xsl:template match="consume">
-               <script type="text/javascript">
-                       self.name="first_Window";
-                       function abook()
-                       {
-                               Window1=window.open('<xsl:value-of 
select="addressbook_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
-                       }               
-                       function property_lookup()
-                       {
-                               Window1=window.open('<xsl:value-of 
select="property_link"/>',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
-                       }               
-               </script>
-
-               <xsl:apply-templates select="menu"/> 
-               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
-               <div align="left">
-               <form method="post" name="form" action="{$form_action}">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td>
-                                       <input type="text" id="start_date" 
name="start_date" size="10" value="{start_date}" readonly="readonly" 
onMouseout="window.status='';return true;" >
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_start_date_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <img id="start_date-trigger" 
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}" 
style="cursor:pointer; cursor:hand;" />
-                               </td>
-                               <td>
-                                       <input type="text" id="end_date" 
name="end_date" size="10" value="{end_date}" readonly="readonly" 
onMouseout="window.status='';return true;" >
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_end_date_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <img id="end_date-trigger" 
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}" 
style="cursor:pointer; cursor:hand;" />
-                               </td>
-                               <td>
-                                       <input type="text" size="8" 
name="workorder_id" value="{workorder_id}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_workorder_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <a href="javascript:void()"
-                                       
onMouseOver="overlib('{lang_workorder_statustext}', CAPTION, 
'{lang_workorder}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="lang_workorder"/></a>                                     
-                               </td>
-
-                               <td align="left">
-                                       <input type="text" name="vendor_id"  
onClick="abook()" value="{vendor_id}" size="4"  
onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_vendor_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <a href="javascript:abook()"
-                                       
onMouseOver="overlib('{lang_select_vendor_statustext}', CAPTION, 
'{lang_vendor}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="lang_vendor"/></a>                                        
-
-                                       <input type="hidden" name="vendor_name" 
value="{vendor_name}"></input>
-                               </td>
-                       </tr>
-                       
-                       <tr>
-                               <td>
-                                       <xsl:call-template name="cat_select"/>
-                               </td>
-                               <td align="left">
-                                       <xsl:call-template 
name="select_district"/>
-                               </td>
-                               <td align="left">
-                               <xsl:variable 
name="lang_account_class_statustext"><xsl:value-of 
select="lang_account_class_statustext"/></xsl:variable>
-                               <xsl:variable 
name="select_account_class_name"><xsl:value-of 
select="select_account_class_name"/></xsl:variable>
-                                       <select 
name="{$select_account_class_name}" class="forms" 
onMouseover="window.status='{$lang_account_class_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                               <option value=""><xsl:value-of 
select="lang_no_account_class"/></option>
-                                                       <xsl:apply-templates 
select="account_class_list"/>
-                                       </select>
-
-                               </td>
-                               
-                               <td align="left">
-                                       <input type="text" name="loc1" 
onClick="property_lookup()" value="{loc1}" size="4" 
onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_property_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <a href="javascript:property_lookup()"
-                                       
onMouseOver="overlib('{lang_select_property_statustext}', CAPTION, 
'{lang_property}')"
-                                       onMouseOut="nd()">
-                                       <xsl:value-of 
select="lang_property"/></a>                                      
-
-                                       <input type="hidden" 
name="loc1_name"></input>
-                               </td>
-                               <td align="left">
-                                       <xsl:variable 
name="lang_search"><xsl:value-of select="lang_search"/></xsl:variable>
-                                       <input type="submit" 
name="submit_search" value="{$lang_search}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_search_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-               </table>
-               </form>
-               </div>
-
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="vendor_name!=''">
-                                       <tr>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="lang_vendor"/>
-                                               </td>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="vendor_name"/>
-                                               </td>
-                                               <td width="50%">
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="loc1!=''">
-                                       <tr>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="lang_property"/>
-                                               </td>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="loc1"/>
-                                               </td>
-                                               <td width="50%">
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="workorder_id!=''">
-                                       <tr>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="lang_workorder"/>
-                                               </td>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="workorder_id"/>
-                                               </td>
-                                               <td width="50%">
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-
-               </table>
-
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:apply-templates select="table_header_consume"/>
-                       
-                       <xsl:choose>
-                               <xsl:when test="values_consume[consume]">
-                                       <xsl:apply-templates 
select="values_consume"/>
-
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td>
-                               </td>
-                               <td>
-                               </td>
-                               <td class="th_text" align="right">
-                                       <xsl:value-of select="lang_sum"/>
-                               </td>
-                               <td class="th_text" align="right">
-                                       <xsl:value-of select="sum"/>
-                               </td>
-                       </tr>
-               </table>
-       </xsl:template>
-       
        <xsl:template match="account_class_list">
        <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
                <xsl:choose>
@@ -1058,56 +94,7 @@
                </xsl:choose>
        </xsl:template>
 
-       <xsl:template match="table_header_consume">
-                       <tr class="th">
-                               <td class="th_text" width="10%" align="right">
-                                       <xsl:value-of select="lang_district"/>
-                               </td>
-                               <td class="th_text" width="10%" align="right">
-                                       <xsl:value-of select="lang_period"/>
-                               </td>
-                               <td class="th_text" width="25%" align="right">
-                                       <xsl:value-of 
select="lang_budget_account"/>
-                               </td>
-                               <td class="th_text" width="55%" align="right">
-                                       <xsl:value-of select="lang_consume"/>
-                               </td>
-                       </tr>
-       </xsl:template>
 
-       <xsl:template match="values_consume">
-                       <tr>
-                               <xsl:attribute name="class">
-                                       <xsl:choose>
-                                               <xsl:when test="@class">
-                                                       <xsl:value-of 
select="@class"/>
-                                               </xsl:when>
-                                               <xsl:when test="position() mod 
2 = 0">
-                                                       
<xsl:text>row_off</xsl:text>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       
<xsl:text>row_on</xsl:text>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-
-                               <td align="right">
-                                       <xsl:value-of select="district_id"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="period"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="account_class"/>
-                               </td>
-
-                               <td align = "right">
-                                       <xsl:variable 
name="link_voucher"><xsl:value-of select="link_voucher"/></xsl:variable>
-                                       <a href="{$link_voucher}" 
onMouseover="window.status='{consume}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="consume"/></a>
-                               </td>
-                       </tr>
-       </xsl:template>
-
 <!-- debug-->
 
        <xsl:template match="debug">
@@ -2197,304 +1184,90 @@
                </div>
        </xsl:template>
 
-
-<!--list_invoice_sub-->
-
-       <xsl:template match="list_invoice_sub">
-               <xsl:apply-templates select="menu"/> 
-               <table width="80%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
+<!-- edit single voucher line  -->
+       <xsl:template match="edit" xmlns:php="http://php.net/xsl";>
+       <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="3">
+                                               <td align="left" colspan="2">
                                                        <xsl:call-template 
name="msgbox"/>
                                                </td>
                                        </tr>
                                </xsl:when>
                        </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="vendor!=''">
-                                       <tr>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="lang_vendor"/>
-                                               </td>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="vendor"/>
-                                               </td>
-                                               <td width="50%" 
class="small_text" valign="top" align="right">
-                                                       <xsl:call-template 
name="download"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="voucher_id!=''">
-                                       <tr>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="lang_voucher_id"/>
-                                               </td>
-                                               <td width="25%" class="th_text" 
align="left">
-                                                       <xsl:value-of 
select="voucher_id"/>
-                                               </td>
-                                               <td width="50%">
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-               </table>
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
-               <form method="post" name="form" action="{$form_action}">
-                       <xsl:apply-templates 
select="table_header_list_invoice_sub"/>
-                       
-                       <xsl:choose>
-                               <xsl:when test="values_list_invoice_sub[id]">
-                                       <xsl:apply-templates 
select="values_list_invoice_sub"/>
-                                       <xsl:variable 
name="img_check"><xsl:value-of select="img_check"/></xsl:variable>
-                                       <tr>
-                                               <td></td>
-                                               <td align="center">
-                                                       <a 
href="javascript:check_all_checkbox('values[close_order]')"><img 
src="{$img_check}" border="0" height="16" width="21" 
alt="{lang_select_all}"/></a>
-                                               </td>
-                                               <td></td>
-                                               <td></td>
-                                               <td></td>
-                                               <td class="small_text" 
align="right">
-                                                       <xsl:value-of 
select="sum"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>   
-                       <tr height="50">
-                               <td>
-                                       <xsl:choose>
-                                               <xsl:when test="paid=''">
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-                                                       <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                               
<xsl:value-of select="lang_save_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </xsl:when>
-                                       </xsl:choose>
+
+                       <tr class="th">
+                               <td class="th_text" valign="top">
+                                       <xsl:value-of 
select="php:function('lang', 'address')" />
                                </td>
+                               <td class="th_text" valign="top">
+                                       <input type="text" 
name="values[address]" value="{support_address}">
+                                               <xsl:attribute name="size">
+                                                       <xsl:text>60</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'address')" />
+                                               </xsl:attribute>
+                                       </input>
+                               </td>
                        </tr>
-               </form> 
                        <tr>
-                               <td>
-                                       <xsl:variable 
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
-                                       <xsl:variable 
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
-                                       <form method="post" 
action="{$done_action}">
-                                               <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-                                                       <xsl:attribute 
name="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_done_statustext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </form>
+                               <td class="th_text" valign="top">
+                                       <xsl:value-of 
select="php:function('lang', 'from')" />
                                </td>
+                               <td class="th_text" valign="top">
+                                       <xsl:value-of select="from_name"/>
+                               </td>
                        </tr>
-
-               </table>
-       </xsl:template>
-
-       <xsl:template match="table_header_list_invoice_sub">
-               <xsl:variable name="sort_workorder"><xsl:value-of 
select="sort_workorder"/></xsl:variable>
-               <xsl:variable name="sort_budget_account"><xsl:value-of 
select="sort_budget_account"/></xsl:variable>
-               <xsl:variable name="sort_sum"><xsl:value-of 
select="sort_sum"/></xsl:variable>
-               <xsl:variable name="sort_dima"><xsl:value-of 
select="sort_dima"/></xsl:variable>
-                       <tr class="th">
-                               <td class="th_text" width="5%" align="right">
-                                       <a 
href="{$sort_workorder}"><xsl:value-of select="lang_workorder"/></a>
+                       <tr>
+                               <td class="th_text" valign="top">
+                                       <xsl:value-of 
select="php:function('lang', 'from adress')" />
                                </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of 
select="lang_close_order"/>
+                               <td class="th_text" valign="top">
+                                       <input type="text" 
name="values[from_address]" value="{from_address}">
+                                               <xsl:attribute name="size">
+                                                       <xsl:text>60</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'address')" />
+                                               </xsl:attribute>
+                                       </input>
                                </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of 
select="lang_charge_tenant"/>
+                       </tr>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of 
select="php:function('lang', 'description')" />
                                </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of select="lang_invoice_id"/>
+                               <td>
+                                       <textarea cols="60" rows="10" 
name="values[details]" wrap="virtual" onMouseout="window.status='';return 
true;">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'details')" />
+                                               </xsl:attribute>
+                                               <xsl:value-of 
select="value_details"/>          
+                                       </textarea>
                                </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <a 
href="{$sort_budget_account}"><xsl:value-of select="lang_budget_account"/></a>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <a href="{$sort_sum}"><xsl:value-of 
select="lang_sum"/></a>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <a href="{$sort_dima}"><xsl:value-of 
select="lang_dima"/></a>
-                               </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of select="lang_dimb"/>
-                               </td>
-                               <td class="th_text" width="5%" align="right">
-                                       <xsl:value-of select="lang_dimd"/>
-                               </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of select="lang_tax_code"/>
-                               </td>
-                               <td class="th_text" width="2%" align="right">
-                                       <xsl:value-of select="lang_remark"/>
-                               </td>
                        </tr>
-       </xsl:template>
 
-       <xsl:template match="values_list_invoice_sub">
-
-                       <xsl:variable name="counter"><xsl:value-of 
select="counter"/></xsl:variable>
-                       <xsl:variable name="current_user"><xsl:value-of 
select="current_user"/></xsl:variable>
-                       <tr>
-                               <xsl:attribute name="class">
-                                       <xsl:choose>
-                                               <xsl:when test="@class">
-                                                       <xsl:value-of 
select="@class"/>
-                                               </xsl:when>
-                                               <xsl:when test="position() mod 
2 = 0">
-                                                       
<xsl:text>row_off</xsl:text>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       
<xsl:text>row_on</xsl:text>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:attribute>
-
-                               <td align="right">
-                                       <input type="hidden" 
name="values[counter][{$counter}]" value="{counter}">
+                       <tr height="50">
+                               <td>
+                                       <xsl:variable 
name="lang_send"><xsl:value-of select="php:function('lang', 'send')" 
/></xsl:variable>                                    
+                                       <input type="submit" 
name="values[save]" value="{$lang_send}" title='{$lang_send}'>
                                        </input>
-                                       <input type="hidden" 
name="values[id][{$counter}]" value="{id}">
-                                       </input>
-                                       <input type="hidden" 
name="values[workorder_id][{$counter}]" value="{workorder_id}">
-                                       </input>
-                                       <xsl:variable 
name="link_order"><xsl:value-of 
select="link_order"/>&amp;order_id=<xsl:value-of 
select="workorder_id"/></xsl:variable>
-                                       <a href="{$link_order}" 
target="_blank"><xsl:value-of select="workorder_id"/></a>
                                </td>
-                               <td class="small_text" align="center">
-                                       <xsl:choose>
-                                               <xsl:when 
test="workorder_id=''">
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="paid=''">
-                                                                       <input 
type="hidden" name="values[close_order_orig][{$counter}]" value="{closed}">
-                                                                       </input>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="closed='1'">
-                                                                               
        <input type="checkbox" name="values[close_order][{$counter}]" 
value="true" checked="checked" onMouseout="window.status='';return true;">
-                                                                               
        </input>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <input type="checkbox" name="values[close_order][{$counter}]" 
value="true" onMouseout="window.status='';return true;">
-                                                                               
        </input>                                                        
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="closed='1'">
-                                                                               
        <b>x</b>
-                                                                               
</xsl:when>
-                                                                       
</xsl:choose>
-                                                               
</xsl:otherwise>                                                                
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="center">
-                                       <xsl:choose>
-                                               <xsl:when 
test="charge_tenant='1'">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="claim_issued=''">
-                                                                       
<xsl:variable name="link_claim"><xsl:value-of 
select="link_claim"/>&amp;project_id=<xsl:value-of 
select="project_id"/></xsl:variable>
-                                                                       <a 
href="{$link_claim}" target="_blank"><xsl:value-of select="//lang_claim"/></a>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                                       <b>x</b>
-                                               </xsl:when>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:value-of select="invoice_id"/>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:choose>
-                                               <xsl:when test="paid='true'">
-                                                       <xsl:value-of 
select="budget_account"/>                         
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="text" 
size="7" name="values[budget_account][{$counter}]" value="{budget_account}">
-                                                       </input>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:value-of select="amount"/>
-                               </td>
-                               <td class="small_text" align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="paid='true'">
-                                                       <xsl:value-of 
select="dima"/>                           
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="text" 
size="7" name="values[dima][{$counter}]" value="{dima}">
-                                                       </input>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:choose>
-                                               <xsl:when test="paid='true'">
-                                                       <xsl:value-of 
select="dimb"/>                           
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:variable 
name="lang_dimb_statustext"><xsl:value-of 
select="lang_dimb_statustext"/></xsl:variable>
-                                                       <select 
name="values[dimb][{$counter}]" class="forms" 
onMouseover="window.status='{$lang_dimb_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                               <option 
value=""></option>
-                                                               
<xsl:apply-templates select="dimb_list"/>
-                                                       </select>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="paid='true'">
-                                                       <xsl:value-of 
select="dimd"/>                           
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="text" 
size="4" name="values[dimd][{$counter}]" value="{dimd}">
-                                                       </input>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="paid='true'">
-                                                       <xsl:value-of 
select="tax_code"/>                               
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:variable 
name="lang_tax_code_statustext"><xsl:value-of 
select="lang_tax_code_statustext"/></xsl:variable>
-                                                       <select 
name="values[tax_code][{$counter}]" class="forms" 
onMouseover="window.status='{$lang_tax_code_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                               
<xsl:apply-templates select="tax_code_list"/>
-                                                       </select>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td class="small_text" align="right">
-                                       <xsl:choose>
-                                               <xsl:when test="remark='1'">
-                                                       <xsl:variable 
name="link_remark"><xsl:value-of select="link_remark"/>&amp;id=<xsl:value-of 
select="id"/>&amp;paid=<xsl:value-of select="paid"/></xsl:variable>
-                                                       <xsl:variable 
name="lang_remark_help"><xsl:value-of select="lang_remark_help"/></xsl:variable>
-                                                       <xsl:variable 
name="lang_remark"><xsl:value-of select="lang_remark"/></xsl:variable>
-                                                       <a href="javascript:var 
w=window.open('{$link_remark}','','width=550,height=400,scrollbars')"
-                                                       
onMouseOver="overlib('{$lang_remark_help}', CAPTION, '{$lang_remark}')"
-                                                       onMouseOut="nd()">
-                                                       <xsl:value-of 
select="lang_remark"/></a>                                        
-                                               </xsl:when>
-                                       </xsl:choose>
-                               </td>
-
                        </tr>
+
+               </table>
+               </form>
        </xsl:template>
+
+




reply via email to

[Prev in Thread] Current Thread [Next in Thread]