[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8564] property: manual invoice
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8564] property: manual invoice |
|
Date: |
Thu, 12 Jan 2012 15:20:40 +0000 |
Revision: 8564
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8564
Author: sigurdne
Date: 2012-01-12 15:20:40 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
property: manual invoice
Modified Paths:
--------------
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2012-01-12 15:16:44 UTC (rev
8563)
+++ trunk/property/inc/class.boinvoice.inc.php 2012-01-12 15:20:40 UTC (rev
8564)
@@ -27,6 +27,7 @@
* @version $Id$
*/
+ phpgw::import_class('phpgwapi.datetime');
/**
* Description
* @package property
@@ -363,6 +364,137 @@
}
}
+ public function add_invoice($values)
+ {
+ $soXport = CreateObject('property.soXport');
+ if($values['loc1']=$values['location']['loc1'])
+ {
+ $values['dima']=implode('',$values['location']);
+ }
+
+ $values['spbudact_code'] =
$values['b_account_id'];
+ $values['fakturanr'] =
$values['invoice_num'];
+ $values['spvend_code'] = $values['vendor_id'];
+ $values['belop'] =
$values['amount'];
+ $values['godkjentbelop'] = $values['amount'];
+
+ $_dateformat = $this->bocommon->dateformat;
+
+
+ $values['fakturadato'] =
date($_dateformat,phpgwapi_datetime::date_to_timestamp($values['invoice_date']));
+ $values['forfallsdato'] =
date($_dateformat,phpgwapi_datetime::date_to_timestamp($values['payment_date']));
+ $values['overftid'] =
date($_dateformat,phpgwapi_datetime::date_to_timestamp($values['paid_date']));
+ $values['periode'] =
date('Ym',phpgwapi_datetime::date_to_timestamp($values['paid_date']));
+
+ $values['kildeid'] = 1;
+ //_debug_array($values);die();
+ if($values['order_id'] && $order_type =
$soXport->check_order($values['order_id']))
+ {
+ if($order_type=='workorder')
+ {
+ $soworkorder =
CreateObject('property.soworkorder');
+ $soproject =
CreateObject('property.soproject');
+ $workorder =
$soworkorder->read_single($values['order_id']);
+ $project =
$soproject->read_single($workorder['project_id']);
+
+ $values['spvend_code'] =
$workorder['vendor_id'];
+ $values['spbudact_code'] =
$workorder['b_account_id'];
+ $values['location_code'] =
$project['location_code'];
+ $values['dima']
= str_replace('-','',$project['location_code']);
+ $values['vendor_name'] =
$this->get_vendor_name($workorder['vendor_id']);
+ $values['pmwrkord_code'] =
$values['order_id'];
+ $values['project_id'] =
$workorder['project_id'];
+ if(!$values['dimb'])
+ {
+ $values['dimb']
= $workorder['ecodimb'];
+ }
+
+ $values =
$this->set_responsible($values,$workorder['user_id'],$workorder['b_account_id']);
+
+ if($values['auto_tax'])
+ {
+ $values['mvakode'] =
$soXport->auto_tax($values['dima']);
+ $values['mvakode'] =
$soXport->tax_b_account_override($values['mvakode'],$values['spbudact_code']);
+ $values['mvakode'] =
$soXport->tax_vendor_override($values['mvakode'],$values['spvend_code']);
+ $values['kostra_id'] =
$soXport->get_kostra_id($values['dima']);
+ }
+
+ $buffer[0]=$values;
+ }
+
+ if($order_type=='s_agreement')
+ {
+ $sos_agreement =
CreateObject('property.sos_agreement');
+ $s_agreement =
$sos_agreement->read_single(array('s_agreement_id'=>$values['order_id']));
+
+ $values['spvend_code'] =
$s_agreement['vendor_id'];
+ $values['spbudact_code'] =
$s_agreement['b_account_id'];
+ $values['vendor_name'] =
$this->get_vendor_name($s_agreement['vendor_id']);
+ $values['pmwrkord_code'] =
intval($values['order_id']);
+ $values =
$this->set_responsible($values,$s_agreement['user_id'],$s_agreement['b_account_id']);
+
+
+ $s_agreement_detail =
$sos_agreement->read(array('allrows'=>true,'s_agreement_id'=>$values['order_id'],'detail'=>true));
+
+ $sum_agreement=0;
+ for
($i=0;$i<count($s_agreement_detail);$i++)
+ {
+ $sum_agreement = $sum_agreement
+ $s_agreement_detail[$i]['cost'];
+ }
+
+
+ for
($i=0;$i<count($s_agreement_detail);$i++)
+ {
+ $buffer[$i]=$values;
+
+ $buffer[$i]['location_code']
=$s_agreement_detail[$i]['location_code'];
+ $buffer[$i]['dima']
=str_replace('-','',$s_agreement_detail[$i]['location_code']);
+
+
+ $buffer[$i]['belop'] =
round($values['belop'] / $sum_agreement * $s_agreement_detail[$i]['cost'],2);
+ $buffer[$i]['godkjentbelop']
=$buffer[$i]['belop'];
+
+ if($values['auto_tax'])
+ {
+ $buffer[$i]['mvakode']
= $soXport->auto_tax($buffer[$i]['dima']);
+ $buffer[$i]['mvakode']
=
$soXport->tax_b_account_override($buffer[$i]['mvakode'],$buffer[$i]['spbudact_code']);
+ $buffer[$i]['mvakode']
=
$soXport->tax_vendor_override($buffer[$i]['mvakode'],$buffer[$i]['spvend_code']);
+
$buffer[$i]['kostra_id'] = $soXport->get_kostra_id($buffer[$i]['dima']);
+ }
+ }
+ }
+ }
+ else
+ {
+ if($values['auto_tax'])
+ {
+ $values['mvakode'] =
$soXport->auto_tax($values['loc1']);
+ $values['mvakode'] =
$soXport->tax_b_account_override($values['mvakode'],$values['spbudact_code']);
+ $values['mvakode'] =
$soXport->tax_vendor_override($values['mvakode'],$values['spvend_code']);
+ $values['kostra_id'] =
$soXport->get_kostra_id($values['loc1']);
+ }
+
+ $buffer[0]=$values;
+ }
+
+ if($debug)
+ {
+ return $buffer;
+ }
+
+ if($soXport->add($buffer)>0)
+ {
+ $receipt['message'][] =
array('msg'=>lang('Invoice %1 is added',$soXport->voucher_id));
+ $receipt['voucher_id'] = $soXport->voucher_id;
+ }
+ else
+ {
+ $receipt['error'][] =
array('msg'=>lang('Invoice is NOT added!'));
+ }
+ return $receipt;
+
+ }
+
function add($values,$debug='')
{
$this->soXport = CreateObject('property.soXport');
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2012-01-12 15:16:44 UTC
(rev 8563)
+++ trunk/property/inc/class.boworkorder.inc.php 2012-01-12 15:20:40 UTC
(rev 8564)
@@ -481,6 +481,11 @@
function read_single($workorder_id)
{
+ if(!$workorder_id)
+ {
+ return array();
+ }
+
$contacts = CreateObject('property.sogeneric');
$contacts->get_location_info('vendor',false);
$workorder
= $this->so->read_single($workorder_id);
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2012-01-12 15:16:44 UTC
(rev 8563)
+++ trunk/property/inc/class.soworkorder.inc.php 2012-01-12 15:20:40 UTC
(rev 8564)
@@ -629,6 +629,10 @@
// $this->update_actual_cost_global();
// $this->update_planned_cost_global();
+ if(!$workorder_id)
+ {
+ return array();
+ }
$sql = "SELECT fm_workorder.*, fm_chapter.descr as
chapter ,fm_workorder.user_id as user_id FROM fm_workorder"
// . " $this->join fm_project on
fm_workorder.project_id=fm_project.id"
. " $this->left_join fm_chapter on "
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2012-01-12 15:16:44 UTC
(rev 8563)
+++ trunk/property/inc/class.uiworkorder.inc.php 2012-01-12 15:20:40 UTC
(rev 8564)
@@ -1930,72 +1930,31 @@
$referer = parse_url(phpgw::get_var('HTTP_REFERER',
'string' , 'SERVER'));
parse_str($referer['query']); // produce $menuaction
- if(phpgw::get_var('cancel', 'bool') || $menuaction !=
'property.uiworkorder.edit')
+ if(phpgw::get_var('cancel', 'bool'))
{
-
$GLOBALS['phpgw']->session->appsession('session_data','add_values','');
$redirect = true;
}
//_debug_array( $menuaction);die();
-
if(!$GLOBALS['phpgw']->session->appsession('session_data','add_values') &&
phpgw::get_var('add', 'bool'))
+ if($add_invoice = phpgw::get_var('add', 'bool'))
{
- $values['art']
= phpgw::get_var('art', 'int');
- $values['type']
= phpgw::get_var('type');
- $values['dim_b']
= phpgw::get_var('dim_b', 'int');
- $values['invoice_num'] =
phpgw::get_var('invoice_num');
- $values['kid_nr']
= phpgw::get_var('kid_nr');
- $values['vendor_id'] =
phpgw::get_var('vendor_id', 'int');
- $values['vendor_name'] =
phpgw::get_var('vendor_name');
- $values['janitor']
= phpgw::get_var('janitor');
- $values['supervisor'] =
phpgw::get_var('supervisor');
- $values['budget_responsible'] =
phpgw::get_var('budget_responsible');
- $values['invoice_date'] =
urldecode(phpgw::get_var('invoice_date'));
- $values['num_days']
= phpgw::get_var('num_days', 'int');
- $values['payment_date'] =
urldecode(phpgw::get_var('payment_date'));
- $values['sday']
= phpgw::get_var('sday', 'int');
- $values['smonth']
= phpgw::get_var('smonth', 'int');
- $values['syear']
= phpgw::get_var('syear', 'int');
- $values['eday']
= phpgw::get_var('eday', 'int');
- $values['emonth']
= phpgw::get_var('emonth', 'int');
- $values['eyear']
= phpgw::get_var('eyear', 'int');
- $values['auto_tax'] =
phpgw::get_var('auto_tax', 'bool');
- $values['merknad']
= phpgw::get_var('merknad');
- $values['b_account_id'] =
phpgw::get_var('b_account_id', 'int');
- $values['b_account_name'] =
phpgw::get_var('b_account_name');
- $values['amount']
= phpgw::get_var('amount'); // float - has to accept string until client side
validation is in place.
+ $values = phpgw::get_var('values');
if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['currency']))
{
$values['amount'] =
str_ireplace($GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],'',$values['amount']);
}
-
$values['amount'] =
str_replace(array(' ',','),array('','.'),$values['amount']);
- $values['order_id'] =
phpgw::get_var('order_id');
-
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record','property');
$values =
$this->bocommon->collect_locationdata($values,$insert_record);
-
-
$GLOBALS['phpgw']->session->appsession('session_data','add_values',$values);
+ $values['b_account_id'] =
phpgw::get_var('b_account_id');
+ $values['project_group'] =
phpgw::get_var('project_group');
+ $values['dimb'] = phpgw::get_var('ecodimb');
+ $values['vendor_id'] =
phpgw::get_var('vendor_id');
}
- else
- {
- $values =
$GLOBALS['phpgw']->session->appsession('session_data','add_values');
-
$GLOBALS['phpgw']->session->appsession('session_data','add_values','');
- }
- $location_code =
phpgw::get_var('location_code');
- $add_invoice = phpgw::get_var('add', 'bool');
-
- $workorder =
$this->bo->read_single($order_id);
-//_debug_array($workorder); die();
- if($location_code)
- {
- $values['location_data'] =
$bolocation->read_single($location_code,array('tenant_id'=>$tenant_id,'p_num'=>$p_num));
- }
-
if($add_invoice && is_array($values))
{
- $redirect = true;
$order = false;
if($values['order_id'] &&
!ctype_digit($values['order_id']))
{
@@ -2030,7 +1989,7 @@
$receipt['error'][] =
array('msg'=>lang('Please - select budget responsible!'));
}
- if (!$values['invoice_num'])
+ if (!$values['invoice_id'])
{
$receipt['error'][] =
array('msg'=>lang('Please - enter a invoice num!'));
}
@@ -2051,43 +2010,20 @@
//_debug_array($values);
if (!is_array($receipt['error']))
{
- if($values['invoice_date'])
- {
- $sdateparts =
phpgwapi_datetime::date_array($values['invoice_date']);
- $values['sday'] =
$sdateparts['day'];
- $values['smonth'] =
$sdateparts['month'];
- $values['syear'] =
$sdateparts['year'];
- unset($sdateparts);
-
- $edateparts =
phpgwapi_datetime::date_array($values['payment_date']);
- $values['eday'] =
$edateparts['day'];
- $values['emonth'] =
$edateparts['month'];
- $values['eyear'] =
$edateparts['year'];
- unset($edateparts);
- }
-
$values['regtid'] =
date($this->bocommon->datetimeformat);
-
$_receipt = array();//local errors
- $receipt =
$this->bo->add_invoice($values,$debug);
+ $receipt =
execMethod('property.boinvoice.add_invoice',$values);
if(!$receipt['message'] &&
$values['order_id'] && !$receipt[0]['spvend_code'])
{
$_receipt['error'][] =
array('msg'=>lang('vendor is not defined in order %1', $values['order_id']));
-
- $debug = false;// try again..
- if($receipt[0]['location_code'])
- {
- //
$values['location_data'] =
$bolocation->read_single($receipt['location_code'],array('tenant_id'=>$tenant_id,'p_num'=>$p_num));
- }
}
if(!$_receipt['error']) // all ok
{
unset($values);
-
$GLOBALS['phpgw']->session->appsession('session_data','add_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiinvoice.add'));
+ $redirect = true;
}
}
else
@@ -2095,19 +2031,39 @@
if($values['location'])
{
$location_code=implode("-",
$values['location']);
- $values['location_data'] =
$bolocation->read_single($location_code,isset($values['extra'])?$values['extra']:'');
+ $_location =
$bolocation->read_single($location_code,isset($values['extra'])?$values['extra']:'');
+ unset($_location['attributes']);
+ $values['location_data'] =
$_location;
}
-
$GLOBALS['phpgw']->session->appsession('session_data','add_values','');
}
}
- $project =
execMethod('property.boproject.read_single_mini',$workorder['project_id']);
-//_debug_array($project);
- $_location_data =
$bolocation->read_single($workorder['location_code']);
-//_debug_array($workorder);die();
+ if($workorder =
$this->bo->read_single($values['order_id'] ? $values['order_id'] : $order_id))
+ {
+ $project =
execMethod('property.boproject.read_single_mini',$workorder['project_id']);
+ }
+
+ if(isset($values['location_data']) &&
$values['location_data'])
+ {
+ $_location_data = $values['location_data'];
+ }
+ else if (isset($workorder['location_data']) &&
$workorder['location_data'])
+ {
+ $_location_data = $workorder['location_data'];
+ }
+ else if (isset($project['location_data']) &&
$project['location_data'])
+ {
+ $_location_data = $project['location_data'];
+ }
+ else
+ {
+ $_location_data = array();
+ }
+//_debug_array($project);die();
+
$location_data=$bolocation->initiate_ui_location(array
(
- 'values' =>
isset($values['location_data'])?$values['location_data']:
$workorder['location_data'] ? $workorder['location_data'] :
$project['location_data'] ,
+ 'values' => $_location_data,
'type_id' => 2, // calculated
from location_types
'no_link' => false, // disable
lookup links for location type less than type_id
'tenant' => false,
@@ -2143,9 +2099,9 @@
$link_data = array
- (
- 'menuaction' =>
'property.uiworkorder.add_invoice'
- );
+ (
+ 'menuaction' =>
'property.uiworkorder.add_invoice'
+ );
if($_receipt)
{
@@ -2156,7 +2112,9 @@
$jscal = CreateObject('phpgwapi.jscalendar');
$jscal->add_listener('invoice_date');
$jscal->add_listener('payment_date');
+ $jscal->add_listener('paid_date');
+ $order_id = isset($values['order_id']) &&
$values['order_id'] ? $values['order_id'] : $order_id;
$account_lid =
$GLOBALS['phpgw']->accounts->get($this->account)->lid;
$data = array
(
@@ -2167,19 +2125,16 @@
'action_url'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property' .'.uiinvoice.add')),
'value_invoice_date'
=> isset($values['invoice_date'])?$values['invoice_date']:'',
'value_payment_date'
=> isset($values['payment_date'])?$values['payment_date']:'',
- 'value_belop'
=> isset($values['belop'])?$values['belop']:'',
+ 'value_payment_date'
=> isset($values['paid_date'])?$values['paid_date']:'',
'vendor_data'
=> $vendor_data,
'ecodimb_data'
=> $ecodimb_data,
'project_group_data'
=> $project_group_data,
- 'value_vendor_id'
=> isset($values['vendor_id'])?$values['vendor_id']:'',
- 'value_vendor_name'
=> isset($values['vendor_name'])?$values['vendor_name']:'',
'value_kid_nr'
=> isset($values['kid_nr'])?$values['kid_nr']:'',
- 'value_dim_b'
=> isset($values['dim_b'])?$values['dim_b']:'',
- 'value_invoice_num'
=> isset($values['invoice_num'])?$values['invoice_num']:'',
+ 'value_invoice_id'
=> isset($values['invoice_id'])?$values['invoice_id']:'',
'value_merknad'
=> isset($values['merknad'])?$values['merknad']:'',
'value_num_days'
=> isset($values['num_days'])?$values['num_days']:'',
'value_amount'
=> isset($values['amount'])?$values['amount']:'',
- 'value_order_id'
=> phpgw::get_var('order_id'),
+ 'value_order_id'
=> $order_id,
'art_list'
=> array('options' =>
execMethod('property.boinvoice.get_lisfm_ecoart',
isset($values['art'])?$values['art']:'')),
'type_list'
=> array('options' =>
execMethod('property.boinvoice.get_type_list',
isset($values['type'])?$values['type']:'')),
'janitor_list'
=> array('options_lid' =>
$this->bocommon->get_user_list_right(32,isset($values['janitor'])?$values['janitor']:$account_lid,'.invoice')),
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2012-01-12 15:16:44 UTC (rev 8563)
+++ trunk/property/setup/phpgw_no.lang 2012-01-12 15:20:40 UTC (rev 8564)
@@ -709,7 +709,7 @@
enter the floor id property no angi etasje ID
enter the general address property no angi generell adresse
enter the input text for records property no Angi ledetekst
for datafelt
-enter the invoice date property no angi faktura dato
+enter the invoice date property no angi fakturadato
enter the meter id property no angi måler ID
enter the method id property no Angi metode ID
enter the name for the column property no Angi navn for kolonne i
database
@@ -894,10 +894,10 @@
investment value property no Avskrivning
invoice property no Faktura
invoice address property no Fakturaadresse
-invoice date property no Faktura dato
+invoice date property no Fakturadato
invoice id property no Faktura ID
invoice is not added! property no Fakturaen er IKKE lagt til!
-invoice number property no Faktura nr
+invoice number property no FakturaNr
invoice tranferred property no bilag er overført
is id property no Er ID
is registered property no er registert
@@ -1842,8 +1842,8 @@
view ticket detail property no vis meldingsdetalj
view workorder property no Vis bestilling
voucher property no Bilag
-voucher date property no Bilags dato
-voucher id property no Bilags nr
+voucher date property no BilagsDato
+voucher id property no BilagsNr
voucher is updated property no Bilag er oppdatert
voucher is updated: property no Bilag er oppdatert:
voucher period is updated property no bilags periode er
oppdatert
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2012-01-12 15:16:44 UTC (rev
8563)
+++ trunk/property/templates/base/workorder.xsl 2012-01-12 15:20:40 UTC (rev
8564)
@@ -559,7 +559,6 @@
<xsl:variable name="lang_add_invoice_statustext">
<xsl:value-of select="php:function('lang', 'add invoice')"/>
</xsl:variable>
- <!--
<tr>
<td valign="top">
<a href="javascript:showlightbox_manual_invoide({value_workorder_id})"
title="{$lang_add_invoice_statustext}">
@@ -574,7 +573,7 @@
<div class="bd" style="text-align:center;"> </div>
</div>
</td>
- </tr>-->
+ </tr>
</xsl:when>
</xsl:choose>
<tr>
@@ -878,7 +877,7 @@
<xsl:value-of
select="php:function('lang', 'Auto TAX')"/>
</td>
<td>
- <input type="checkbox"
name="auto_tax" value="True" checked="checked" >
+ <input type="checkbox"
name="values[auto_tax]" value="True" checked="checked" >
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Set tax')"/>
</xsl:attribute>
@@ -897,7 +896,7 @@
<xsl:value-of
select="php:function('lang', 'janitor')"/>
</td>
<td valign="top">
- <select name="janitor"
class="forms">
+ <select
name="values[oppsynsmannid]" class="forms">
<option
value="">
<xsl:value-of select="php:function('lang', 'no janitor')"/>
</option>
@@ -910,7 +909,7 @@
<xsl:value-of
select="php:function('lang', 'supervisor')"/>
</td>
<td valign="top">
- <select
name="supervisor" class="forms">
+ <select
name="values[saksbehandlerid]" class="forms">
<option
value="">
<xsl:value-of select="php:function('lang', 'no supervisor')"/>
</option>
@@ -923,7 +922,7 @@
<xsl:value-of
select="php:function('lang', 'B - responsible')"/>
</td>
<td valign="top">
- <select
name="budget_responsible" class="forms">
+ <select
name="values[budsjettansvarligid]" class="forms">
<option
value="">
<xsl:value-of select="php:function('lang', 'Select B-Responsible')"/>
</option>
@@ -936,7 +935,7 @@
<xsl:value-of
select="php:function('lang', 'order id')"/>
</td>
<td>
- <input type="text"
name="order_id" value="{value_order_id}" >
+ <input type="text"
name="values[order_id]" value="{value_order_id}" >
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Order # that initiated the
invoice')"/>
</xsl:attribute>
@@ -948,7 +947,7 @@
<xsl:value-of
select="php:function('lang', 'art')"/>
</td>
<td valign="top">
- <select name="art"
class="forms" >
+ <select
name="values[artid]" class="forms" >
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'You have to select type of
invoice')"/>
</xsl:attribute>
@@ -964,7 +963,7 @@
<xsl:value-of
select="php:function('lang', 'Type invoice II')"/>
</td>
<td valign="top">
- <select name="type"
class="forms">
+ <select
name="values[typeid]" class="forms">
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Select the type invoice. To do not
use type - select NO TYPE')"/>
</xsl:attribute>
@@ -977,10 +976,22 @@
</tr>
<tr>
<td valign="top">
+ <xsl:value-of
select="php:function('lang', 'voucher id')"/>
+ </td>
+ <td>
+ <input type="text"
name="values[voucher_id]" value="{value_voucher_id}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'voucher id')"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
<xsl:value-of
select="php:function('lang', 'Invoice Number')"/>
</td>
<td>
- <input type="text"
name="invoice_num" value="{value_invoice_num}">
+ <input type="text"
name="values[invoice_id]" value="{value_invoice_id}">
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Enter Invoice Number')"/>
</xsl:attribute>
@@ -992,7 +1003,7 @@
<xsl:value-of
select="php:function('lang', 'KID nr')"/>
</td>
<td>
- <input type="text"
name="kid_nr" value="{value_kid_nr}" >
+ <input type="text"
name="values[kidnr]" value="{value_kid_nr}" >
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'Enter Kid nr')"/>
</xsl:attribute>
@@ -1004,7 +1015,7 @@
<xsl:value-of
select="php:function('lang', 'amount')"/>
</td>
<td>
- <input type="text"
name="amount" value="{value_amount}">
+ <input type="text"
name="values[amount]" value="{value_amount}">
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'amount of the invoice')"/>
</xsl:attribute>
@@ -1016,7 +1027,7 @@
<xsl:value-of
select="php:function('lang', 'invoice date')"/>
</td>
<td>
- <input type="text"
id="invoice_date" name="invoice_date" size="10" value="{value_invoice_date}"
readonly="readonly" >
+ <input type="text"
id="invoice_date" name="values[invoice_date]" size="10"
value="{value_invoice_date}" readonly="readonly" >
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'Enter the invoice date')"/>
</xsl:attribute>
@@ -1029,7 +1040,7 @@
<xsl:value-of
select="php:function('lang', 'payment date')"/>
</td>
<td>
- <input type="text"
id="payment_date" name="payment_date" size="10" value="{value_payment_date}"
readonly="readonly">
+ <input type="text"
id="payment_date" name="values[payment_date]" size="10"
value="{value_payment_date}" readonly="readonly">
<xsl:attribute
name="title">
<xsl:value-of select="php:function('lang', 'payment date')"/>
</xsl:attribute>
@@ -1039,10 +1050,23 @@
</tr>
<tr>
<td valign="top">
+ <xsl:value-of
select="php:function('lang', 'paid')"/>
+ </td>
+ <td>
+ <input type="text"
id="paid_date" name="values[paid_date]" size="10" value="{value_paid_date}"
readonly="readonly">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'paid')"/>
+ </xsl:attribute>
+ </input>
+ <img
id="paid_date-trigger" src="{img_cal}" alt="{$lang_datetitle}"
title="{$lang_datetitle}" style="cursor:pointer; cursor:hand;"/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
<xsl:value-of
select="php:function('lang', 'remark')"/>
</td>
<td>
- <textarea cols="60"
rows="10" name="merknad">
+ <textarea cols="60"
rows="10" name="values[merknad]">
<xsl:value-of
select="value_merknad"/>
</textarea>
</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8564] property: manual invoice,
Sigurd Nes <=