[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.16,1.17 class.boXp
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.16,1.17 class.boXport.inc.php,1.1,1.2 class.soXport.inc.php,1.1,1.2 class.uiXport.inc.php,1.1,1.2 |
|
Date: |
Wed, 23 Oct 2002 14:43:21 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv24868/inc
Modified Files:
header.inc.php class.boXport.inc.php class.soXport.inc.php
class.uiXport.inc.php
Log Message:
no message
Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/header.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** header.inc.php 16 Oct 2002 15:22:56 -0000 1.16
--- header.inc.php 23 Oct 2002 18:43:17 -0000 1.17
***************
*** 149,152 ****
--- 149,154 ----
$t->set_var('sub_invoice_import',$phpgw->link('/index.php','menuaction=property.uiXport.import&sub=p_invoice'));
$t->set_var('sublang_invoice_import',lang('Import
invoice'));
+
$t->set_var('sub_invoice_export',$phpgw->link('/index.php','menuaction=property.uiXport.export&sub=p_invoice'));
+ $t->set_var('sublang_invoice_export',lang('Export
invoice'));
}
else
***************
*** 154,157 ****
--- 156,160 ----
$t->set_var('sublang_invoice_investment_value','');
$t->set_var('sublang_invoice_import','');
+ $t->set_var('sublang_invoice_export','');
}
***************
*** 171,174 ****
--- 174,178 ----
$t->set_var('sublang_invoice_import','');
$t->set_var('sub_invoice_import','');
+ $t->set_var('sublang_invoice_export','');
}
if ($sub == p_activity && $admin_activity)
Index: class.boXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boXport.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.boXport.inc.php 16 Oct 2002 15:32:15 -0000 1.1
--- class.boXport.inc.php 23 Oct 2002 18:43:17 -0000 1.2
***************
*** 159,214 ****
! function export($conv_type,$cat_id='')
{
include (PHPGW_APP_INC . '/export/' . $conv_type);
! $buffer=array();
! $contacts = new export_conv;
! // Read in user custom fields, if any
! $customfields = array();
! while (list($col,$descr) =
@each($GLOBALS['phpgw_info']['user']['preferences']['addressbook']))
! {
! if ( substr($col,0,6) == 'extra_' )
! {
! $field = ereg_replace('extra_','',$col);
! $field = ereg_replace('
','_',$field);
! $customfields[$field] = ucfirst($field);
! }
! }
! $extrafields = array(
! 'ophone' => 'ophone',
! 'address2' => 'address2',
! 'address3' => 'address3'
! );
! if ($contacts->type != 'vcard')
! {
! $contacts->qfields =
$contacts->stock_contact_fields;# + $extrafields;# + $customfields;
! }
!
! if (!empty($cat_id))
! {
! $buffer =
$contacts->export_start_file($buffer,$cat_id);
! }
! else
! {
! $buffer = $contacts->export_start_file($buffer);
! }
!
! for ($i=0;$i<count($contacts->ids);$i++)
! {
! $buffer =
$contacts->export_start_record($buffer);
! while( list($name,$value) =
each($contacts->currentrecord) )
! {
! $buffer =
$contacts->export_new_attrib($buffer,$name,$value);
! }
! $buffer = $contacts->export_end_record($buffer);
! }
!
! // Here, buffer becomes a string suitable for printing
! $buffer = $contacts->export_end_file($buffer);
$tsvfilename =
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $tsvfilename;
return $buffer;
}
--- 159,182 ----
! function export($conv_type,$download)
{
include (PHPGW_APP_INC . '/export/' . $conv_type);
! // $buffer=array();
! $invoice = new export_conv;
! $buffer = $invoice->overfor($download);
$tsvfilename =
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $tsvfilename;
return $buffer;
+ }
+
+ function roleback($conv_type,$role_back_date,$roleback_file)
+ {
+ include (PHPGW_APP_INC . '/export/' . $conv_type);
+ $invoice = new export_conv;
+ $buffer =
$invoice->RullTilbake($role_back_date,$roleback_file);
+ return $buffer;
+
}
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.soXport.inc.php 16 Oct 2002 15:32:15 -0000 1.1
--- class.soXport.inc.php 23 Oct 2002 18:43:17 -0000 1.2
***************
*** 70,86 ****
function anleggsnr_to_objekt($anleggsnr)
{
! $GLOBALS['phpgw']->db->query("select
fm_bms.point_name,fm_bms.objekt_id,fm_bms.bygg_id,fm_bms.seksjons_id,boei_bydel.omraade_id
"
. " from fm_bms $this->join boei_objekt ON
fm_bms.objekt_id = boei_objekt.objekt_id $this->join "
. " boei_bydel ON boei_objekt.bydel_id = boei_bydel.bydel_id
where fm_bms.id='$anleggsnr'");
! $GLOBALS['phpgw']->db->next_record();
! $objekt_id = $GLOBALS['phpgw']->db->f('objekt_id');
! $bygg_id = $GLOBALS['phpgw']->db->f('bygg_id');
! $seksjons_id = $GLOBALS['phpgw']->db->f('seksjons_id');
$dima=$objekt_id.$bygg_id.$seksjons_id;
$maalerinfo['dima']=$dima;
!
$maalerinfo['maalernr']=$GLOBALS['phpgw']->db->f('point_name');
!
$maalerinfo['omraade']=$GLOBALS['phpgw']->db->f('omraade_id');
return $maalerinfo;
}
--- 70,86 ----
function anleggsnr_to_objekt($anleggsnr)
{
! $this->db->query("select
fm_bms.point_name,fm_bms.objekt_id,fm_bms.bygg_id,fm_bms.seksjons_id,boei_bydel.omraade_id
"
. " from fm_bms $this->join boei_objekt ON
fm_bms.objekt_id = boei_objekt.objekt_id $this->join "
. " boei_bydel ON boei_objekt.bydel_id = boei_bydel.bydel_id
where fm_bms.id='$anleggsnr'");
! $this->db->next_record();
! $objekt_id = $this->db->f('objekt_id');
! $bygg_id = $this->db->f('bygg_id');
! $seksjons_id = $this->db->f('seksjons_id');
$dima=$objekt_id.$bygg_id.$seksjons_id;
$maalerinfo['dima']=$dima;
! $maalerinfo['maalernr']=$this->db->f('point_name');
! $maalerinfo['omraade']=$this->db->f('omraade_id');
return $maalerinfo;
}
***************
*** 88,94 ****
{
! $GLOBALS['phpgw']->db->query("select count(*) from
fm_wo_wrkorders where id='$pmwrkord_code'");
! $GLOBALS['phpgw']->db->next_record();
! return $GLOBALS['phpgw']->db->f(0);
}
--- 88,94 ----
{
! $this->db->query("select count(*) from fm_wo_wrkorders
where id='$pmwrkord_code'");
! $this->db->next_record();
! return $this->db->f(0);
}
***************
*** 97,100 ****
--- 97,108 ----
$pmwrkord_code=$fields['pmwrkord_code'];
+ if ($pmwrkord_code)
+ {
+ $pmwrkord_code_value="'$pmwrkord_code'";
+ }
+ else
+ {
+ $pmwrkord_code_value="Null";
+ }
$bilagsnr=$fields['bilagsnr'];
$splitt=$fields['splitt'];
***************
*** 109,113 ****
--- 117,131 ----
$spvend_code=$fields['spvend_code'];
$dimb=$fields['dimb'];
+ if ($dimb)
+ {
+ $dimb_value="'$dimb'";
+ }
+ else
+ {
+ $dimb_value="Null";
+ }
+
$oppsynsmannid=$fields['oppsynsmannid'];
+
if ($oppsynsmannid)
{
***************
*** 134,137 ****
--- 152,166 ----
$dima=$fields['dima'];
$dimd=$fields['dimd'];
+
+ if ($dimd)
+ {
+ $dimd_value="'$dimd'";
+ }
+ else
+ {
+ $dimd_value="Null";
+ }
+
+
$mvakode=$fields['mvakode'];
$belop=$fields['belop'];
***************
*** 139,152 ****
$merknad=$fields['merknad'];
! $sql= "INSERT INTO t_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad)"
! . " values
('$pmwrkord_code','$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code','$dimb',$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr','$spbudact_code','$dima','$dimd','$mvakode',CONVERT(MONEY,"."'$belop'".",0),'$periode','$merknad')";
//echo 'sql'.$sql.'<br>';
$this->db->query($sql,__LINE__,__FILE__);
}
}
?>
--- 168,693 ----
$merknad=$fields['merknad'];
! $sql= "INSERT INTO t_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr','$spbudact_code','$dima',$dimd_value,'$mvakode',CONVERT(MONEY,"."'$belop'".",0),'$periode','$merknad')";
//echo 'sql'.$sql.'<br>';
$this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ function select_periods_with_invoice_to_transfer()
+ {
+ $sql= "select distinct periode from v_ecohovedbilag
where not budsjettsigndato is null and (not saksigndato is null or not
oppsynsigndato is null) and not utbetalingsigndato is null ";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ // $periode[$i]['periode'] =
$this->db->f('periode');
+ $periode[$i] = $this->db->f('periode');
+ $i++;
+ }
+ return $periode;
+ }
+
+ function select_invoice_roleback($day,$month,$year,$Filnavn)
+ {
+ //echo 'Dato: '.$Dato.'<br>';
+ //echo 'Filnavn: '.$Filnavn.'<br>';
+
+ $sql="select * from t_ecobilagoverf where filnavn='$Filnavn'
and datepart(year,overftid)= $year and datepart(month,overftid)=$month and
datepart(day,overftid)= $day";
+ $this->db->query($sql,__LINE__,__FILE__);
+ //echo 'sql: '.$sql.'<br>';
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $invoice_roleback[$i]['id'] =
$this->db->f('id');
+ $invoice_roleback[$i]['bilagsnr'] =
$this->db->f('bilagsnr');
+ $invoice_roleback[$i]['kidnr'] =
$this->db->f('kidnr');
+ $invoice_roleback[$i]['typeid'] =
$this->db->f('typeid');
+ $invoice_roleback[$i]['kildeid'] =
$this->db->f('kildeid');
+ $invoice_roleback[$i]['pmwrkord_code'] =
$this->db->f('pmwrkord_code');
+ $invoice_roleback[$i]['belop'] =
$this->db->f('belop');
+ $invoice_roleback[$i]['fakturadato'] =
$this->db->f('fakturadato');
+ $invoice_roleback[$i]['periode'] =
$this->db->f('periode');
+ $invoice_roleback[$i]['forfallsdato'] =
$this->db->f('forfallsdato');
+ $invoice_roleback[$i]['fakturanr'] =
$this->db->f('fakturanr');
+ $invoice_roleback[$i]['spbudact_code'] =
$this->db->f('spbudact_code');
+ $invoice_roleback[$i]['regtid'] =
$this->db->f('regtid');
+ // $invoice_roleback[$i]['overftid'] =
$this->db->f('overftid');
+ $invoice_roleback[$i]['artid'] =
$this->db->f('artid');
+ $invoice_roleback[$i]['godkjentbelop'] =
$this->db->f('godkjentbelop');
+ $invoice_roleback[$i]['spvend_code'] =
$this->db->f('spvend_code');
+ $invoice_roleback[$i]['dima'] =
$this->db->f('dima');
+ $invoice_roleback[$i]['dimb'] =
$this->db->f('dimb');
+ $invoice_roleback[$i]['mvakode'] =
$this->db->f('mvakode');
+ $invoice_roleback[$i]['dimd'] =
$this->db->f('dimd');
+ if($this->db->f('oppsynsmannid'))
+ {
+ $invoice_roleback[$i]['oppsynsmannid']
= $this->db->f('oppsynsmannid');
+ }
+ if($this->db->f('saksbehandlerid'))
+ {
+
$invoice_roleback[$i]['saksbehandlerid'] =
$this->db->f('saksbehandlerid');
+ }
+
+ $invoice_roleback[$i]['budsjettansvarligid']
= $this->db->f('budsjettansvarligid');
+
+ if($this->db->f('oppsynsigndato'))
+ {
+ $invoice_roleback[$i]['oppsynsigndato']
= $this->db->f('oppsynsigndato');
+ }
+ if($this->db->f('saksigndato'))
+ {
+ $invoice_roleback[$i]['saksigndato']
= $this->db->f('saksigndato');
+ }
+
+ $invoice_roleback[$i]['budsjettsigndato']
= $this->db->f('budsjettsigndato');
+ $invoice_roleback[$i]['merknad'] =
$this->db->f('merknad');
+ $invoice_roleback[$i]['splitt'] =
$this->db->f('splitt');
+ // $invoice_roleback[$i]['ordrebelop'] =
$this->db->f('ordrebelop');
+ // $invoice_roleback[$i]['filnavn'] =
$this->db->f('filnavn');
+ $invoice_roleback[$i]['utbetalingid'] =
$this->db->f('utbetalingid');
+ $invoice_roleback[$i]['utbetalingsigndato']
= $this->db->f('utbetalingsigndato');
+ $i++;
+ }
+ // print_r($invoice_roleback);
+ return $invoice_roleback;
+ }
+
+ //roleback function
+ function bilag_update_overf($BilagOverf)
+ {
+
+ //remove the id-field (which has to be first)from the
array
+ //array_shift ($BilagOverf);
+ //$BilagOverf = array_splice ($BilagOverf,0,1);
+
+ //$bilag_field_values = "'" . implode("','",
$BilagOverf)."'";
+ //$bilag_field_names = implode(",",
array_keys($BilagOverf));
+
+ $pmwrkord_code=$BilagOverf['pmwrkord_code'];
+ if ($pmwrkord_code)
+ {
+ $pmwrkord_code_value="'$pmwrkord_code'";
+ }
+ else
+ {
+ $pmwrkord_code_value="Null";
+ }
+ $bilagsnr=$BilagOverf['bilagsnr'];
+ $splitt=$BilagOverf['splitt'];
+ $kildeid=$BilagOverf['kildeid'];
+ $kidnr=$BilagOverf['kidnr'];
+ $typeid=$BilagOverf[typeid];
+ $fakturadato=$BilagOverf['fakturadato'];
+ $forfallsdato=$BilagOverf['forfallsdato'];
+ $regtid=$BilagOverf['regtid'];
+ $artid=$BilagOverf['artid'];
+ $godkjentbelop=$BilagOverf['godkjentbelop'];
+ $spvend_code=$BilagOverf['spvend_code'];
+ $dimb=$BilagOverf['dimb'];
+ if ($dimb)
+ {
+ $dimb_value="'$dimb'";
+ }
+ else
+ {
+ $dimb_value="Null";
+ }
+
+ $oppsynsmannid=$BilagOverf['oppsynsmannid'];
+
+ if ($oppsynsmannid)
+ {
+ $oppsynsmannid_value="'$oppsynsmannid'";
+ }
+ else
+ {
+ $oppsynsmannid_value="Null";
+ }
+
+ $saksbehandlerid=$BilagOverf['saksbehandlerid'];
+ if ($saksbehandlerid)
+ {
+ $saksbehandlerid_value="'$saksbehandlerid'";
+ }
+ else
+ {
+ $saksbehandlerid_value="Null";
+ }
+
+ $budsjettansvarligid=$BilagOverf['budsjettansvarligid'];
+
+ $utbetalingid=$BilagOverf['utbetalingid'];
+
+ if ($utbetalingid)
+ {
+ $utbetalingid_value="'$utbetalingid'";
+ }
+ else
+ {
+ $utbetalingid_value="Null";
+ }
+
+ $fakturanr=$BilagOverf['fakturanr'];
+ $spbudact_code=$BilagOverf['spbudact_code'];
+ $dima=$BilagOverf['dima'];
+ $dimd=$BilagOverf['dimd'];
+
+ if ($dimd)
+ {
+ $dimd_value="'$dimd'";
+ }
+ else
+ {
+ $dimd_value="Null";
+ }
+
+
+ $mvakode=$BilagOverf['mvakode'];
+ $belop=$BilagOverf['belop'];
+ $periode=$BilagOverf['periode'];
+ $merknad=$BilagOverf['merknad'];
+ $oppsynsigndato=$BilagOverf['oppsynsigndato'];
+ $saksigndato=$BilagOverf['saksigndato'];
+ $budsjettsigndato=$BilagOverf['budsjettsigndato'];
+ $utbetalingsigndato=$BilagOverf['utbetalingsigndato'];
+
+
+ $sql= "INSERT INTO t_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
+ . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr','$spbudact_code','$dima',$dimd_value,'$mvakode',CONVERT(MONEY,"."'$belop'".",0),'$periode','$merknad',$utbetalingid_value,'$oppsynsigndato','$saksigndato','$budsjettsigndato','$utbetalingsigndato')";
+
+ // $sql="INSERT INTO t_ecobilag ($bilag_field_names)
values ($bilag_field_values) ";
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ }
+
+ function add_OverfBilag ($oRsOverfBilag)
+ {
+ $id =
$oRsOverfBilag['id'];
+ $bilagsnr =
$oRsOverfBilag['bilagsnr'];
+ $kidnr =
$oRsOverfBilag['kidnr'];
+ $typeid =
$oRsOverfBilag['typeid'];
+ $kildeid =
$oRsOverfBilag['kildeid'];
+ $pmwrkord_code =
$oRsOverfBilag['pmwrkord_code'];
+ $belop =
$oRsOverfBilag['belop'];
+ $fakturadato =
$oRsOverfBilag['fakturadato'];
+ $periode =
$oRsOverfBilag['periode'];
+ $forfallsdato =
$oRsOverfBilag['forfallsdato'];
+ $fakturanr =
$oRsOverfBilag['fakturanr'];
+ $spbudact_code =
$oRsOverfBilag['spbudact_code'];
+ $regtid =
$oRsOverfBilag['regtid'];
+ $artid =
$oRsOverfBilag['artid'];
+ $godkjentbelop =
$oRsOverfBilag['godkjentbelop'];
+ $spvend_code =
$oRsOverfBilag['spvend_code'];
+ $dima =
$oRsOverfBilag['dima'];
+ $dimb =
$oRsOverfBilag['dimb'];
+ $mvakode =
$oRsOverfBilag['mvakode'];
+ $dimd =
$oRsOverfBilag['dimd'];
+ $saksbehandlerid =
$oRsOverfBilag['saksbehandlerid'];
+ $budsjettansvarligid=
$oRsOverfBilag['budsjettansvarligid'];
+ $saksigndato =
$oRsOverfBilag['saksigndato'];
+ $budsjettsigndato =
$oRsOverfBilag['budsjettsigndato'];
+ $merknad =
$oRsOverfBilag['merknad'];
+ $splitt =
$oRsOverfBilag['splitt'];
+ $utbetalingid =
$oRsOverfBilag['utbetalingid'];
+ $utbetalingsigndato =
$oRsOverfBilag['utbetalingsigndato'];
+ $filnavn =
$oRsOverfBilag['filnavn'];
+ $ordrebelop =
$oRsOverfBilag['ordrebelop'];
+ $overftid = date("M d Y
g:iA");
+
+
+
+
+ // $bilag_field_names = implode(",",
array_keys($oRsOverfBilag));
+ // $bilag_field_values = "'" . implode("','",
$oRsOverfBilag)."'";
+ //print_r($bilag_field_values);
+
+ $sql="INSERT INTO t_ecobilagoverf
(id,bilagsnr,kidnr,typeid,kildeid,pmwrkord_code,belop,fakturadato,periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,godkjentbelop,spvend_code,dima,dimb,mvakode,dimd,saksbehandlerid,budsjettansvarligid,saksigndato,budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,ordrebelop,overftid)"
+ . "values
('$id','$bilagsnr','$kidnr','$typeid','$kildeid','$pmwrkord_code',CONVERT(MONEY,"."'$belop'".",0),'$fakturadato','$periode','$forfallsdato','$fakturanr','$spbudact_code','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code','$dima','$dimb','$mvakode','$dimd','$saksbehandlerid','$budsjettansvarligid','$saksigndato','$budsjettsigndato','$merknad','$splitt','$utbetalingid','$utbetalingsigndato','$filnavn',CONVERT(MONEY,"."'$ordrebelop'".",0),'$overftid')
";
+ $this->db->query($sql,__LINE__,__FILE__);
+ //echo 'sql ' . $sql.'<br>';
+ }
+
+ function delete_from_t_ecobilag($id)
+ {
+ $sql="delete from t_ecobilag where id='$id'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ // Velg ut alle hoved bilag som skal overføres
+ function hoved_bilag ($periode)
+ {
+ $sql= "select v_ecohovedbilag.*,t_ecobruker.initialer as
saksbehandler from v_ecohovedbilag left outer join t_ecobruker on
v_ecohovedbilag.budsjettansvarligid=t_ecobruker.spemp_code where
periode='$periode' and not budsjettsigndato is null and (not saksigndato is
null or not oppsynsigndato is null)";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $hoved_bilag[$i]['id'] = $this->db->f('id');
+ $hoved_bilag[$i]['bilagsnr'] =
$this->db->f('bilagsnr');
+ $hoved_bilag[$i]['kidnr'] =
$this->db->f('kidnr');
+ $hoved_bilag[$i]['typeid'] =
$this->db->f('typeid');
+ $hoved_bilag[$i]['kildeid'] =
$this->db->f('kildeid');
+ $hoved_bilag[$i]['pmwrkord_code'] =
$this->db->f('pmwrkord_code');
+ $hoved_bilag[$i]['belop'] =
$this->db->f('belop');
+ $hoved_bilag[$i]['fakturadato'] =
$this->db->f('fakturadato');
+ $hoved_bilag[$i]['periode'] =
$this->db->f('periode');
+ $hoved_bilag[$i]['forfallsdato'] =
$this->db->f('forfallsdato');
+ $hoved_bilag[$i]['fakturanr'] =
$this->db->f('fakturanr');
+ $hoved_bilag[$i]['spbudact_code'] =
$this->db->f('spbudact_code');
+ $hoved_bilag[$i]['regtid'] =
$this->db->f('regtid');
+ $hoved_bilag[$i]['artid'] =
$this->db->f('artid');
+ $hoved_bilag[$i]['godkjentbelop'] =
$this->db->f('godkjentbelop');
+ $hoved_bilag[$i]['spvend_code'] =
$this->db->f('spvend_code');
+ $hoved_bilag[$i]['dima'] =
$this->db->f('dima');
+ $hoved_bilag[$i]['dimb'] =
$this->db->f('dimb');
+ $hoved_bilag[$i]['mvakode'] =
$this->db->f('mvakode');
+ $hoved_bilag[$i]['dimd'] =
$this->db->f('dimd');
+ if($this->db->f('oppsynsmannid'))
+ {
+ $hoved_bilag[$i]['oppsynsmannid']
= $this->db->f('oppsynsmannid');
+ }
+ if($this->db->f('saksbehandlerid'))
+ {
+ $hoved_bilag[$i]['saksbehandlerid']
= $this->db->f('saksbehandlerid');
+ }
+
+ $hoved_bilag[$i]['budsjettansvarligid'] =
$this->db->f('budsjettansvarligid');
+
+ if($this->db->f('oppsynsigndato'))
+ {
+ $hoved_bilag[$i]['oppsynsigndato']
= $this->db->f('oppsynsigndato');
+ }
+ if($this->db->f('saksigndato'))
+ {
+ $hoved_bilag[$i]['saksigndato'] =
$this->db->f('saksigndato');
+ }
+
+ $hoved_bilag[$i]['budsjettsigndato'] =
$this->db->f('budsjettsigndato');
+ $hoved_bilag[$i]['merknad'] =
$this->db->f('merknad');
+ $hoved_bilag[$i]['splitt'] =
$this->db->f('splitt');
+ $hoved_bilag[$i]['utbetalingid'] =
$this->db->f('utbetalingid');
+ $hoved_bilag[$i]['utbetalingsigndato'] =
$this->db->f('utbetalingsigndato');
+ $hoved_bilag[$i]['saksbehandler'] =
$this->db->f('saksbehandler');
+ $i++;
+ }
+ return $hoved_bilag;
+ }
+
+ //Velg ut alle underbilag
+
+ function select_underbilag ($bilagsnr)
+ {
+ $sql= "select * from t_ecobilag where
bilagsnr='$bilagsnr'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $underbilag[$i]['id'] = $this->db->f('id');
+ $underbilag[$i]['bilagsnr'] =
$this->db->f('bilagsnr');
+ $underbilag[$i]['kidnr'] =
$this->db->f('kidnr');
+ $underbilag[$i]['typeid'] =
$this->db->f('typeid');
+ $underbilag[$i]['kildeid'] =
$this->db->f('kildeid');
+ $underbilag[$i]['pmwrkord_code'] =
$this->db->f('pmwrkord_code');
+ $underbilag[$i]['belop'] =
$this->db->f('belop');
+ $underbilag[$i]['fakturadato'] =
$this->db->f('fakturadato');
+ $underbilag[$i]['periode'] =
$this->db->f('periode');
+ $underbilag[$i]['forfallsdato'] =
$this->db->f('forfallsdato');
+ $underbilag[$i]['fakturanr'] =
$this->db->f('fakturanr');
+ $underbilag[$i]['spbudact_code'] =
$this->db->f('spbudact_code');
+ $underbilag[$i]['regtid'] =
$this->db->f('regtid');
+ $underbilag[$i]['artid'] =
$this->db->f('artid');
+ $underbilag[$i]['godkjentbelop'] =
$this->db->f('godkjentbelop');
+ $underbilag[$i]['spvend_code'] =
$this->db->f('spvend_code');
+ $underbilag[$i]['dima'] = $this->db->f('dima');
+ $underbilag[$i]['dimb'] = $this->db->f('dimb');
+ $underbilag[$i]['mvakode'] =
$this->db->f('mvakode');
+ $underbilag[$i]['dimd'] = $this->db->f('dimd');
+ if($this->db->f('oppsynsmannid'))
+ {
+ $underbilag[$i]['oppsynsmannid']
= $this->db->f('oppsynsmannid');
+ }
+ if($this->db->f('saksbehandlerid'))
+ {
+ $underbilag[$i]['saksbehandlerid']
= $this->db->f('saksbehandlerid');
+ }
+
+ $underbilag[$i]['budsjettansvarligid'] =
$this->db->f('budsjettansvarligid');
+
+ if($this->db->f('oppsynsigndato'))
+ {
+ $underbilag[$i]['oppsynsigndato']
= $this->db->f('oppsynsigndato');
+ }
+ if($this->db->f('saksigndato'))
+ {
+ $underbilag[$i]['saksigndato'] =
$this->db->f('saksigndato');
+ }
+
+ $underbilag[$i]['budsjettsigndato'] =
$this->db->f('budsjettsigndato');
+ $underbilag[$i]['merknad'] =
$this->db->f('merknad');
+ $underbilag[$i]['splitt'] =
$this->db->f('splitt');
+ $underbilag[$i]['utbetalingid'] =
$this->db->f('utbetalingid');
+ $underbilag[$i]['utbetalingsigndato'] =
$this->db->f('utbetalingsigndato');
+ $i++;
+
+ }
+
+ return $underbilag;
+ }
+
+ // Hent leverandørklasse
+
+ function select_vendor_class($spvend_code)
+ {
+ $sql= "select pmlabor_code from spvend where
spvend_code='$spvend_code'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ $pmlabor_code = $this->db->f('pmlabor_code');
+ return $pmlabor_code;
+ }
+ /* function update_avvik($avvik)
+ {
}
+ */
+ function log_to_deviation_table($oRsBilag)
+ {
+ $bilagsnr=$oRsBilag['bilagsnr'];
+ $fakturadato=$oRsBilag['fakturadato'];
+ $forfallsdato=$oRsBilag['forfallsdato'];
+ $oppsynsmannid=$oRsBilag['oppsynsmannid'];
+ $oppsynsigndato=$oRsBilag['oppsynsigndato'];
+ $saksbehandlerid=$oRsBilag['saksbehandlerid'];
+ $saksigndato=$oRsBilag['saksigndato'];
+ $budsjettansvarligid=$oRsBilag['budsjettansvarligid'];
+ $budsjettsigndato=$oRsBilag['budsjettsigndato'];
+ $artid=$oRsBilag['artid'];
+ $spvend_code=$oRsBilag['spvend_code'];
+ $belop=$oRsBilag['belop'];
+ $godkjentbelop=$oRsBilag['godkjentbelop'];
+
+ $sql="INSERT INTO t_ecoavvik
(bilagsnr,fakturadato,forfallsdato,oppsynsmannid,oppsynsigndato,saksbehandlerid,saksigndato,budsjettansvarligid,budsjettsigndato,artid,spvend_code,belop,godkjentbelop)
values "
+ .
"($bilagsnr','$fakturadato','$forfallsdato','$oppsynsmannid','$oppsynsigndato','$saksbehandlerid','$saksigndato','$budsjettansvarligid','$budsjettsigndato','$artid','$spvend_code','$belop','$godkjentbelop')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ function delete_avvik($bilagsnr)
+ {
+ $sql="delete from t_ecoavvik where
bilagsnr='$bilagsnr'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+ function delete_invoice($bilagsnr)
+ {
+ $sql="delete from t_ecobilagoverf where
bilagsnr='$bilagsnr'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+
+ //Hent DIM C
+ function select_dimc($pmwrkord_code)
+ {
+ $sql= "select formaal_id from boei_leieobjekt,fm_wo_wrkorders
where boei_leieobjekt.objekt_id=fm_wo_wrkorders.objekt_id and
boei_leieobjekt.leie_id=fm_wo_wrkorders.leie_id and
fm_wo_wrkorders.id='$pmwrkord_code'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ $dimc = $this->db->f('formaal_id');
+ return $dimc;
+ }
+
+ /*
+ function select_dimc($pmwrkord_code)
+ {
+ $sql= "select spbldrom.saclass_code from spbldrom,pmwrkord
where spbldrom.spbldrom_code=pmwrkord.spbldrom_code and
pmwrkord_code='$pmwrkord_code'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ $dimc = $this->db->f('pmlabor_code');
+ return $dimc;
+ }
+
+ */
+ //Oppdater beløp på arbeidsordre
+ /* function update_actual_cost($dimd,$pmwrkord_code,$belop)
+ {
+ if ($dimd % 2 == 0)
+ {
+ $sql="update fm_wo_wrkorders set
act_mtrl_cost=act_mtrl_cost +
substr($belop,0,(strlen($belop)-2)).substr($belop,(strlen($belop)-3),2) where
pmwrkord_code='$pmwrkord_code'";
+ }
+ else
+ {
+ $sql="update fm_wo_wrkorders set
act_vendor_cost=act_vendor_cost +
substr($belop,0,(strlen($belop)-2)).substr($belop,(strlen($belop)-3),2) where
pmwrkord_code='$pmwrkord_code'";
+ }
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ }
+
+ */
+ //korriger ved tilbakerulling
+ //Oppdater beløp på arbeidsordre operator="-" ved tilbakerulling
+ function
correct_actual_cost($pmwrkord_code,$Belop,$actual_cost_field,$operator)
+ {
+ $Belop=$Belop/100;
+
+ $sql="update fm_wo_wrkorders set
$actual_cost_field=$actual_cost_field $operator $Belop where
id='$pmwrkord_code'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+
+ //Lagre start melding
+ function log_start($batchid)
+ {
+ $tid=date("M d Y g:iA");
+ $sql= "insert t_ecologg (batchid,melding,tid) values
('$batchid','Start transfer','$tid')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+ function log_end($batchid)
+ {
+ $tid=date("M d Y g:iA");
+ $sql= "insert t_ecologg (batchid,melding,tid) values
('$batchid','End transfer','$tid')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ function log_error($batchid,$error_desr)
+ {
+ $tid=date("M d Y g:iA");
+ $sql= "insert t_ecologg (batchid,ecobilagid,status,melding,tid)
values ('$batchid',NULL,0,'$error_desr','$tid')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ //Logg transaksjon
+ function log_transaction($batchid,$bilagid)
+ {
+ $message=lang('Invoice tranferred');
+ $tid=date("M d Y g:iA");
+ $sql= "insert t_ecologg
(batchid,ecobilagid,melding,tid) values ('$batchid','$bilagid'
,'$message','$tid')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ function increment_batchid()
+ {
+
+ $this->db->query("update IDGenerator set value = value
+ 1 where name = 'Bilagsnummer'");
+ $this->db->query("select value from IDGenerator where
name = 'Bilagsnummer'");
+ $this->db->next_record();
+ $bilagsnr = $this->db->f('value');
+ return $bilagsnr;
+
+ }
+
+ function next_batchid()
+ {
+
+ $this->db->query("select value from IDGenerator where
name = 'Ecobatchid'");
+ $this->db->next_record();
+ $batchid = $this->db->f('value')+1;
+
+ return $batchid;
+ }
+
+
}
+
+
?>
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uiXport.inc.php 16 Oct 2002 15:32:15 -0000 1.1
--- class.uiXport.inc.php 23 Oct 2002 18:43:17 -0000 1.2
***************
*** 28,31 ****
--- 28,32 ----
$this->browser = CreateObject('phpgwapi.browser');
$this->invoice = CreateObject('property.invoice');
+ $this->$config =
CreateObject('phpgwapi.config','property');
$this->start = $this->bo->start;
***************
*** 58,65 ****
$errorcount = 0;
- if (!$edate && !$num_days)
- {
- $error[$errorcount++] = lang('Please -
select either payment date or number of days from invoice date !');
- }
if ($conv_type=='none')
{
--- 59,62 ----
***************
*** 126,129 ****
--- 123,132 ----
}
+ if (!$edate && !$num_days)
+ {
+ $error[$errorcount++] = lang('Please -
select either payment date or number of days from invoice date !');
+ }
+
+
$invoice_common=array(
'bilagsnr'
=> $this->invoice->next_bilagsnr(),
***************
*** 384,392 ****
function export()
{
! global
$convert,$tsvfilename,$cat_id,$download,$conv_type;
if ($convert)
{
! if ($conv_type == 'none')
{
$GLOBALS['phpgw_info']['flags']['noheader'] = False;
--- 387,398 ----
function export()
{
! global
$convert,$tsvfilename,$download,$conv_type,$roleback_file,$role_back_date;
if ($convert)
{
! // echo 'conv_type: '.$conv_type .'<br>';
! // echo 'roleback_file: '.$roleback_file .'<br>';
!
! if (($conv_type == 'none') &&
($roleback_file=='none') ):
{
$GLOBALS['phpgw_info']['flags']['noheader'] = False;
***************
*** 399,421 ****
$GLOBALS['phpgw']->common->phpgw_exit();
}
!
! $buffer = $this->bo->export($conv_type,$cat_id);
!
! if(($download == 'on') || ($conv_type ==
'Palm_PDB') )
{
! // filename, default
application/octet-stream, length of file, default nocache True
!
$this->browser->content_header($tsvfilename,'application/x-octet-stream',strlen($buffer));
! echo $buffer;
}
! else
{
!
$GLOBALS['phpgw']->common->phpgw_header();
! echo parse_navbar();
! echo "<pre>\n";
! echo $buffer;
! echo "\n</pre>\n";
! echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export')
. '">' . lang('OK') . '</a>';
!
$GLOBALS['phpgw']->common->phpgw_footer();
}
}
else
--- 405,430 ----
$GLOBALS['phpgw']->common->phpgw_exit();
}
! elseif(!($conv_type == 'none') &&
($roleback_file=='none')):
{
! $buffer =
$this->bo->export($conv_type,$download);
}
! elseif(!($conv_type == 'none') &&
!($roleback_file=='none')):
{
! //$buffer='RullTilbake';
! $buffer =
$this->bo->roleback($conv_type,$roleback_file,$role_back_date);
}
+ elseif(($conv_type == 'none') &&
!($roleback_file=='none')):
+ {
+ $buffer=lang('Please choose a
conversion type');
+ }
+ endif;
+
+ $GLOBALS['phpgw']->common->phpgw_header();
+ echo parse_navbar();
+ echo "<pre>\n";
+ echo $buffer;
+ echo "\n</pre>\n";
+ echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export')
. '">' . lang('OK') . '</a>';
+ // $GLOBALS['phpgw']->common->phpgw_footer();
}
else
***************
*** 424,428 ****
echo parse_navbar();
! set_time_limit(0);
$this->template->set_file(array('export' =>
'export.tpl'));
--- 433,437 ----
echo parse_navbar();
! //set_time_limit(0);
$this->template->set_file(array('export' =>
'export.tpl'));
***************
*** 445,448 ****
--- 454,479 ----
$conv .= ' <option
value="'.$myfilearray[$i].'">'.$fname.'</option>'."\n";
}
+ //----------------
+ $this->$config->read_repository();
+ $fil_katalog =
$this->$config->config_data['export_path'];
+
+ $dir_handle = opendir($fil_katalog);
+ $i=0; $myfilearray = '';
+ while ($file = readdir($dir_handle))
+ {
+ if ((substr($file, 0, 1) != '.') &&
is_file($fil_katalog . SEP . $file) )
+ {
+ $myfilearray[$i] = $file;
+ $i++;
+ }
+ }
+ closedir($dir_handle);
+ sort($myfilearray);
+ for ($i=0;$i<count($myfilearray);$i++)
+ {
+ $fname = ereg_replace('_','
',$myfilearray[$i]);
+ $roleback_file_name .= ' <option
value="'.$myfilearray[$i].'">'.$fname.'</option>'."\n";
+ }
+ //----------------
$this->template->set_var('lang_cancel',lang('Cancel'));
***************
*** 453,460 ****
$this->template->set_var('export_text',lang('Export to accounting system'));
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export'));
!
$this->template->set_var('filename',lang('Export file name'));
$this->template->set_var('conv',$conv);
$this->template->set_var('debug',lang(''));
!
$this->template->set_var('download',lang('Submit'));
$this->template->set_var('start',$this->start);
$this->template->set_var('sort',$this->sort);
--- 484,498 ----
$this->template->set_var('export_text',lang('Export to accounting system'));
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export'));
!
$this->template->set_var('filename',lang('Roleback file name'));
!
$this->template->set_var('lang_date',lang('Roleback date'));
!
$this->template->set_var('lang_popup_calendar',lang('Calendar'));
!
$this->template->set_var('lang_select_conversion',lang('Select the type of
conversion'));
!
$this->template->set_var('lang_export_to_file',lang('Export to file (Uncheck to
debug output in browser)'));
!
!
$this->template->set_var('conv',$conv);
+
$this->template->set_var('roleback_file_name',$roleback_file_name);
$this->template->set_var('debug',lang(''));
! $this->template->set_var('download',lang('Ok'));
$this->template->set_var('start',$this->start);
$this->template->set_var('sort',$this->sort);
***************
*** 463,469 ****
$this->template->set_var('query',$this->query);
$this->template->set_var('cat_id',$this->cat_id);
$this->template->pparse('out','export');
! $GLOBALS['phpgw']->common->phpgw_footer();
}
}
--- 501,521 ----
$this->template->set_var('query',$this->query);
$this->template->set_var('cat_id',$this->cat_id);
+
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] = 'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+
+ $dateformat= (implode($sep,$dlarr));
+
$this->template->set_var('dateformat',$dateformat);
+ $start_dateout =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+
$this->template->set_var('start_date',$start_dateout);
+
+
$this->template->pparse('out','export');
! // $GLOBALS['phpgw']->common->phpgw_footer();
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc header.inc.php,1.16,1.17 class.boXport.inc.php,1.1,1.2 class.soXport.inc.php,1.1,1.2 class.uiXport.inc.php,1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc/export Ecolink,NONE,1.1
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default export.tpl,NONE,1.1 id_controle.tpl,NONE,1.1
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc/export Ecolink,NONE,1.1
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default export.tpl,NONE,1.1 id_controle.tpl,NONE,1.1
- Index(es):