[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8179] voucher handling: preiodization
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8179] voucher handling: preiodization |
|
Date: |
Wed, 23 Nov 2011 21:20:19 +0000 |
Revision: 8179
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8179
Author: sigurdne
Date: 2011-11-23 21:20:19 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
voucher handling: preiodization
Modified Paths:
--------------
trunk/property/inc/class.boXport.inc.php
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.soXport.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiXport.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/inc/cron/default/Import_fra_basware_X205.php
trunk/property/inc/export/default/Basware_X114
trunk/property/js/yahoo/invoice.index.js
trunk/property/templates/base/invoice.xsl
Modified: trunk/property/inc/class.boXport.inc.php
===================================================================
--- trunk/property/inc/class.boXport.inc.php 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/inc/class.boXport.inc.php 2011-11-23 21:20:19 UTC (rev
8179)
@@ -291,11 +291,11 @@
return $buffer;
}
- function rollback($conv_type,$role_back_date,$rollback_file)
+ function
rollback($conv_type,$role_back_date,$rollback_file,$rollback_voucher)
{
include (PHPGW_SERVER_ROOT .
"/property/inc/export/{$GLOBALS['phpgw_info']['user']['domain']}/{$conv_type}");
$invoice = new export_conv;
- $buffer =
$invoice->RullTilbake($role_back_date,$rollback_file);
+ $buffer =
$invoice->RullTilbake($role_back_date,$rollback_file,$rollback_voucher);
return $buffer;
}
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/inc/class.boinvoice.inc.php 2011-11-23 21:20:19 UTC (rev
8179)
@@ -257,11 +257,19 @@
return $this->so->update_period($voucher_id,$period);
}
+ function update_periodization($voucher_id='',$periodization='')
+ {
+ return
$this->so->update_periodization($voucher_id,$periodization);
+ }
+
+ function update_periodization_start($voucher_id='',$period='')
+ {
+ return
$this->so->update_periodization_start($voucher_id,$period);
+ }
+
function increment_bilagsnr()
{
-
return $this->so->increment_bilagsnr();
-
}
function next_bilagsnr()
Modified: trunk/property/inc/class.soXport.inc.php
===================================================================
--- trunk/property/inc/class.soXport.inc.php 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/inc/class.soXport.inc.php 2011-11-23 21:20:19 UTC (rev
8179)
@@ -294,6 +294,8 @@
$data['pmwrkord_code'],
$data['fakturadato'],
$data['periode'],
+ $data['periodization'],
+ $data['periodization_start'],
$data['forfallsdato'],
$data['fakturanr'],
$data['spbudact_code'],
@@ -328,7 +330,7 @@
$values = $this->db->validate_insert($values);
$sql="INSERT INTO fm_ecobilagoverf
(id,bilagsnr,kidnr,typeid,kildeid,project_id,kostra_id,pmwrkord_code,fakturadato,"
- . "
periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
+ . "
periode,periodization,periodization_start,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
. "
dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
. "
budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,overftid,item_type,item_id,external_ref,"
. "
currency,process_log,process_code,belop,godkjentbelop,ordrebelop)"
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/inc/class.soinvoice.inc.php 2011-11-23 21:20:19 UTC (rev
8179)
@@ -229,11 +229,11 @@
$sql = "SELECT
pmwrkord_code,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
- . "
forfallsdato,periode,artid,kidnr,kreditnota,currency "
+ . "
forfallsdato,periode,periodization,periodization_start,artid,kidnr,kreditnota,currency
"
. " FROM {$table} {$this->join}
fm_vendor ON fm_vendor.id = {$table}.spvend_code WHERE bilagsnr = {$voucher_id}
"
. " GROUP BY
bilagsnr,pmwrkord_code,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
- . "
forfallsdato,periode,artid,kidnr,kreditnota,currency";
+ . "
forfallsdato,periode,periodization,periodization_start,artid,kidnr,kreditnota,currency";
$this->db->query($sql,__LINE__,__FILE__);
@@ -294,6 +294,9 @@
$invoice[$i]['voucher_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_voucher_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['payment_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_payment_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['period']
= $this->db->f('periode');
+ $invoice[$i]['periodization']
= $this->db->f('periodization');
+ $invoice[$i]['periodization_start']
= $this->db->f('periodization_start');
+
$invoice[$i]['type']
= $art_list[$this->db->f('artid')];
$invoice[$i]['kidnr']
= $this->db->f('kidnr');
$invoice[$i]['kreditnota']
= $this->db->f('kreditnota');
@@ -902,7 +905,33 @@
return $receipt;
}
+ function update_periodization($voucher_id='',$periodization='')
+ {
+ $receipt = array();
+ $this->db->transaction_begin();
+ $this->db->query("UPDATE fm_ecobilag set
periodization='$periodization' where bilagsnr='$voucher_id'");
+
+ $this->db->transaction_commit();
+
+ $receipt['message'][] = array('msg'=>lang('voucher
periodization is updated'));
+ return $receipt;
+ }
+
+ function
update_periodization_start($voucher_id='',$periodization_start='')
+ {
+ $receipt = array();
+ $this->db->transaction_begin();
+
+ $this->db->query("UPDATE fm_ecobilag set
periodization_start='$periodization_start' where bilagsnr='$voucher_id'");
+
+ $this->db->transaction_commit();
+
+ $receipt['message'][] = array('msg'=>lang('voucher
periodization start is updated'));
+ return $receipt;
+ }
+
+
function increment_bilagsnr()
{
$this->db->query("UPDATE fm_idgenerator set value =
value + 1 where name = 'Bilagsnummer'");
@@ -1442,6 +1471,63 @@
*/
public function get_deposition()
{
+
+
+ $sql = "SELECT "
+// ." fm_project.location_code as location,"
+ . "fm_project.loc1 as eiendom,"
+// . "fm_workorder.address as adresse,"
+// . "fm_workorder.*,"
+ . "bilagsnr,"
+// . "kidnr,"
+ . "belop,"
+ . "godkjentbelop,"
+ . "fakturadato,"
+ . "periode,"
+ . "forfallsdato,"
+ . "fakturanr,"
+ . "spvend_code as vendor,"
+// . "dima,"
+// . "fm_ecobilag.loc1 as eiendom,"
+ . "dimb as kostnadssted,"
+// . "mvakode,"
+// . "dimd,"
+ . "saksbehandlerid,"
+ . "budsjettansvarligid,"
+ . "utbetalingid,"
+ . "oppsynsigndato,"
+ . "saksigndato,"
+ . "budsjettsigndato,"
+ . "utbetalingsigndato,"
+ . "merknad,"
+ . "kreditnota"
+// . "kostra_id,"
+// . "item_type,"
+// . "item_id"
+// . "external_ref,"
+// . "currency,"
+// . "process_log'"
+ . ' FROM fm_workorder'
+ . " {$this->join} fm_project ON
(fm_workorder.project_id = fm_project.id)"
+ . " {$this->join} fm_ecobilag ON (fm_workorder.id =
fm_ecobilag.pmwrkord_code)"
+ . " ORDER BY periode ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ $values = array();
+ while ($this->db->next_record())
+ {
+ $orders[] = $this->db->f('id');
+ $values[] = $this->db->Record;
+ }
+
+ return $values;
+
+
+
+
+
+
+
$this->db->query("SELECT id FROM fm_workorder_status
WHERE delivered IS NOT NULL");
$delivered = array();
while ($this->db->next_record())
Modified: trunk/property/inc/class.uiXport.inc.php
===================================================================
--- trunk/property/inc/class.uiXport.inc.php 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/inc/class.uiXport.inc.php 2011-11-23 21:20:19 UTC (rev
8179)
@@ -605,9 +605,9 @@
$receipt['error'][] = array('msg'=>
lang('No conversion type could be located.') .' - ' . lang('Please choose a
conversion type from the list'));
}
- if(!$values['file'])
+ if(!$values['file'] && !$values['voucher_id'])
{
- $receipt['error'][] =
array('msg'=>lang('Please choose a file'));
+ $receipt['error'][] =
array('msg'=>lang('Please choose a file or a voucher'));
}
if(!$receipt['error'])
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/inc/class.uiinvoice.inc.php 2011-11-23 21:20:19 UTC (rev
8179)
@@ -246,6 +246,23 @@
$receipt =
$this->bo->update_period($voucher_id_for_period,$period);
}
+ // Edit Periodization
+ $periodization = phpgw::get_var('periodization');
+ $voucher_id_for_periodization =
phpgw::get_var('voucher_id_for_periodization');
+ if( phpgw::get_var('phpgw_return_as') == 'json' &&
isset($periodization) && $periodization != '')
+ {
+ $receipt =
$this->bo->update_periodization($voucher_id_for_periodization,$periodization);
+ }
+
+ // Edit Periodization
+ $periodization_start =
phpgw::get_var('periodization_start');
+ $voucher_id_for_periodization_start =
phpgw::get_var('voucher_id_for_periodization_start');
+ if( phpgw::get_var('phpgw_return_as') == 'json' &&
isset($periodization_start) && $periodization_start != '')
+ {
+ $receipt =
$this->bo->update_periodization_start($voucher_id_for_periodization_start,$periodization_start);
+ }
+
+
$datatable = array();
$values_combo_box = array();
@@ -1253,8 +1270,10 @@
'dir' =>
$datatable['sorting']['sort'],
'currentPage' =>
$datatable['sorting']['currentPage'],
'records' =>
array(),
- 'sum_amount' =>
$this->bo->sum_amount
+ 'sum_amount' =>
$this->bo->sum_amount,
+ 'periodization' => $paid ?
array() : execMethod('property.bogeneric.get_list',
array('type'=>'periodization'))
);
+
// values for datatable
if(isset($datatable['rows']['row']) &&
is_array($datatable['rows']['row']))
{
Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-11-23
16:30:23 UTC (rev 8178)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-11-23
21:20:19 UTC (rev 8179)
@@ -523,6 +523,11 @@
$budget_responsible_contact_id =
$this->responsible->get_responsible($criteria_budget_responsible);
$budget_responsible_user_id =
$this->responsible->get_contact_user_id($budget_responsible_contact_id);
$order_info['budget_responsible'] =
$GLOBALS['phpgw']->accounts->get($budget_responsible_user_id)->lid;
+ //FIXME - this should be configurable
+ if(!$order_info['budget_responsible'])
+ {
+ $order_info['budget_responsible'] = 'karhal';
+ }
return $order_info;
}
Modified: trunk/property/inc/export/default/Basware_X114
===================================================================
--- trunk/property/inc/export/default/Basware_X114 2011-11-23 16:30:23 UTC
(rev 8178)
+++ trunk/property/inc/export/default/Basware_X114 2011-11-23 21:20:19 UTC
(rev 8179)
@@ -153,7 +153,7 @@
}
- protected function select_invoice_rollback($date, $Filnavn)
+ protected function select_invoice_rollback($date,
$Filnavn,$rollback_voucher)
{
$date_array = phpgwapi_datetime::date_array($date);
$day = $date_array['day'];
@@ -184,7 +184,15 @@
break;
}
- $sql="SELECT * FROM fm_ecobilagoverf WHERE
filnavn='$Filnavn' AND $datepart_year=$year AND $datepart_month=$month AND
$datepart_day= $day";
+ if($rollback_voucher)
+ {
+ $rollback_voucher = (int)$rollback_voucher;
+ $sql="SELECT * FROM fm_ecobilagoverf WHERE
bilagsnr = {$rollback_voucher}";
+ }
+ else
+ {
+ $sql="SELECT * FROM fm_ecobilagoverf WHERE
filnavn='$Filnavn' AND $datepart_year=$year AND $datepart_month=$month AND
$datepart_day= $day";
+ }
$this->db->query($sql,__LINE__,__FILE__);
$invoice_rollback = array();
@@ -201,6 +209,8 @@
'belop'
=> $this->db->f('belop'),
'fakturadato' =>
$this->db->f('fakturadato'),
'periode'
=> $this->db->f('periode'),
+ 'periodization' =>
$this->db->f('periodization'),
+ 'periodization_start' =>
$this->db->f('periodization_start'),
'forfallsdato' =>
$this->db->f('forfallsdato'),
'fakturanr'
=> $this->db->f('fakturanr'),
'spbudact_code' =>
$this->db->f('spbudact_code'),
@@ -268,6 +278,8 @@
$BilagOverf['dimd'],
$BilagOverf['mvakode'],
$BilagOverf['periode'],
+ $BilagOverf['periodization'],
+ $BilagOverf['periodization_start'],
$this->db->db_addslashes($BilagOverf['merknad']),
$BilagOverf['utbetalingid'],
$BilagOverf['oppsynsigndato'],
@@ -289,7 +301,7 @@
$sql= "INSERT INTO fm_ecobilag
(project_id,kostra_id,pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,"
. "
fakturadato,forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,"
. "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,"
- . "
periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,"
+ . "
periode,periodization,periodization_start,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,"
. "
item_type,item_id,external_ref,belop,godkjentbelop,currency,process_log,process_code)"
. " VALUES ({$values})";
@@ -394,9 +406,9 @@
$this->log_error($batchid,$error_desr);
}
- public function RullTilbake($Filnavn, $date)
+ public function RullTilbake($Filnavn, $date,$rollback_voucher)
{
- $voucher = $this->select_invoice_rollback($date,
$Filnavn);
+ $voucher = $this->select_invoice_rollback($date,
$Filnavn,$rollback_voucher);
$this->db->transaction_begin();
foreach ($voucher as $line)
@@ -433,16 +445,21 @@
{
$fil_katalog =
$this->config->config_data['export_path'];
- if(unlink ($fil_katalog. '/' . $Filnavn))
+ if($rollback_voucher)
{
$this->db->transaction_commit();
$receipt['message'][]= array('msg' =>
$antall . ' ' . lang('bilag/underbilag rullet tilbake'));
+ }
+ else if(unlink ($fil_katalog. '/' . $Filnavn))
+ {
+ $this->db->transaction_commit();
+ $receipt['message'][]= array('msg' =>
$antall . ' ' . lang('bilag/underbilag rullet tilbake'));
$receipt['message'][]= array('msg' =>
lang('File %1 is deleted',$Filnavn));
}
else
{
$this->db->transaction_abort();
- $receipt['message'][]= array('msg' =>
'Noe gikk galt!');
+ $receipt['error'][]= array('msg' =>
'Noe gikk galt!');
}
}
else
@@ -817,6 +834,8 @@
'belop'
=> $this->db->f('belop'),
'fakturadato' =>
$this->db->f('fakturadato'),
'periode'
=> $this->db->f('periode'),
+ 'periodization' =>
$this->db->f('periodization'),
+ 'periodization_start' =>
$this->db->f('periodization_start'),
'forfallsdato' =>
$this->db->f('forfallsdato'),
'fakturanr'
=> $this->db->f('fakturanr'),
'spbudact_code' =>
$this->db->f('spbudact_code'),
Modified: trunk/property/js/yahoo/invoice.index.js
===================================================================
--- trunk/property/js/yahoo/invoice.index.js 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/js/yahoo/invoice.index.js 2011-11-23 21:20:19 UTC (rev
8179)
@@ -171,36 +171,34 @@
*/
var myPeriodizationDropDown = function(elCell, oRecord, oColumn, oData)
{
- var d = new Date();
- Year = d.getFullYear();
+ var periodization = values_ds.periodization;
+
+ for(i=0; i<periodization.length; i++)
+ {
+// alert(periodization[i].name);
+ }
+
var _label = new String(oData);
+//alert(_label);
tmp_count = oRecord._oData.counter_num;
voucher_id = oRecord._oData.voucher_id_num
elCell.innerHTML = "<div
id=\"divPeriodizationDropDown"+tmp_count+"\"></div>";
- var tmp_button = new YAHOO.widget.Button({
- type:"menu",
- id:"oPeriodizationDropDown"+tmp_count,
- label: "<en>" +_label.substring(4)+"</en>",
- value: oData,
- container: "divPeriodizationDropDown"+tmp_count,
- menu: [
- { text: Year +"01", value: Year +"01",
onclick: { fn: onPeriodizationDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"02", value: Year +"02", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"03", value: Year +"03", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"04", value: Year +"04", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
-
- { text: Year
+"05", value: Year +"05", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"06", value: Year +"06", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"07", value: Year +"07", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"08", value: Year +"08", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"09", value: Year +"09", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"10", value: Year +"10", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"11", value: Year +"11", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} },
- { text: Year
+"12", value: Year +"12", onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id} } ]});
+ var tmp_button = new YAHOO.widget.Button({
+ type:"menu",
+ id:"oPeriodizationDropDown"+tmp_count,
+// label: "<en>" +periodization[0].id+"</en>",
+ label: "<en>" +_label+"</en>",
+ value: oData,
+ container: "divPeriodizationDropDown"+tmp_count,
+ menu: [
+ { text: periodization[0].name, value:
periodization[0].id, onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id, id: periodization[0].id} },
+ { text: periodization[1].name,
value: periodization[1].id, onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id, id: periodization[1].id} },
+ { text: periodization[2].name,
value: periodization[2].id, onclick: { fn: onPeriodizationDropDownItemClick,
idvoucher: voucher_id, id: periodization[2].id} }
+ ]});
//Define this variable in the window scope (GLOBAL)
- eval("window.oPeriodizationDropDown"+tmp_count+" = tmp_button");
+ eval("window.oPeriodizationDropDown"+tmp_count+" = tmp_button");
}
@@ -210,11 +208,13 @@
*/
this.onPeriodizationDropDownItemClick = function(p_sType, p_aArgs, p_oItem)
{
+ // alert(p_oItem.cfg.getProperty("onclick").id);
+ // console.log(p_oItem.id);
//Use a diferente id for voucher. This variables wil be empty
in PARTICULAR_SETTING
path_values.voucher_id_for_periodization =
p_oItem.cfg.getProperty("onclick").idvoucher;
//'text' is the option selected
- path_values.periodization = p_oItem.cfg.getProperty('text');
-
+// path_values.periodization = p_oItem.cfg.getProperty('value');
+ path_values.periodization =
p_oItem.cfg.getProperty("onclick").id;
maintain_pagination_order();
//call INDEX. Update Periodization Method is inside of INDEX
execute_ds();
@@ -258,20 +258,19 @@
value: oData,
container:
"divPeriodization_startDropDown"+tmp_count,
menu: [
- { text: Year-1 +"11", value: Year-1
+"11", onclick: { fn: onPeriodization_startDropDownItemClick, idvoucher:
voucher_id} },
- { text: Year-1 +"12", value: Year-1
+"12", onclick: { fn: onPeriodization_startDropDownItemClick, idvoucher:
voucher_id} },
{ text: Year +"01", value: Year +"01",
onclick: { fn: onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"02", value: Year +"02", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"03", value: Year +"03", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"04", value: Year +"04", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"05", value: Year +"05", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"06", value: Year +"06", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"07", value: Year +"07", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"08", value: Year +"08", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"09", value: Year +"09", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"10", value: Year +"10", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"11", value: Year +"11", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} },
- { text: Year
+"12", value: Year +"12", onclick: { fn:
onPeriodization_startDropDownItemClick, idvoucher: voucher_id} } ]});
+ { text: Year +"02",
value: Year +"02", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"03",
value: Year +"03", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"04",
value: Year +"04", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"05",
value: Year +"05", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"06",
value: Year +"06", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"07",
value: Year +"07", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"08",
value: Year +"08", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"09",
value: Year +"09", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"10",
value: Year +"10", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"11",
value: Year +"11", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year +"12",
value: Year +"12", onclick: { fn: onPeriodization_startDropDownItemClick,
idvoucher: voucher_id} },
+ { text: Year+1 +"01", value: Year+1
+"01", onclick: { fn: onPeriodization_startDropDownItemClick, idvoucher:
voucher_id} } ]});
//Define this variable in the window scope (GLOBAL)
eval("window.oPeriodization_startDropDown"+tmp_count+" =
tmp_button");
@@ -283,9 +282,9 @@
this.onPeriodization_startDropDownItemClick = function(p_sType, p_aArgs,
p_oItem)
{
//Use a diferente id for voucher. This variables wil be empty
in PARTICULAR_SETTING
- path_values.voucher_id_for_Periodization_start =
p_oItem.cfg.getProperty("onclick").idvoucher;
+ path_values.voucher_id_for_periodization_start =
p_oItem.cfg.getProperty("onclick").idvoucher;
//'text' is the option selected
- path_values.Periodization_start =
p_oItem.cfg.getProperty('text');
+ path_values.periodization_start =
p_oItem.cfg.getProperty('text');
maintain_pagination_order();
//call INDEX. Update Periodization_start Method is inside of
INDEX
@@ -293,8 +292,6 @@
}
-
-
/********************************************************************************
*
*/
Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl 2011-11-23 16:30:23 UTC (rev
8178)
+++ trunk/property/templates/base/invoice.xsl 2011-11-23 21:20:19 UTC (rev
8179)
@@ -1086,7 +1086,7 @@
<!-- rollback -->
- <xsl:template match="rollback">
+ <xsl:template match="rollback" xmlns:php="http://php.net/xsl";>
<xsl:apply-templates select="menu"/>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -1123,13 +1123,25 @@
<td valign="top">
<xsl:variable
name="lang_file_statustext"><xsl:value-of
select="lang_file_statustext"/></xsl:variable>
<xsl:variable
name="select_file"><xsl:value-of select="select_file"/></xsl:variable>
- <select
name="{$select_file}" class="forms"
onMouseover="window.status='{$lang_file_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="{$select_file}" class="forms" title="{$lang_file_statustext}">
<option
value=""><xsl:value-of select="lang_no_file"/></option>
<xsl:apply-templates select="rollback_file_list"/>
</select>
</td>
</tr>
<tr>
+ <td valign="top">
+ <xsl:value-of
select="php:function('lang', 'voucher')" />
+ </td>
+ <td valign="top">
+ <input type="text"
id="voucher_id" name="values[voucher_id]" value="">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'voucher')" />
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
<td valign="top">
<xsl:value-of
select="lang_date"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8179] voucher handling: preiodization,
Sigurd Nes <=