[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc/export Ecolink, 1.16, 1.17 Kemner_k
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc/export Ecolink, 1.16, 1.17 Kemner_kvittering, 1.6, 1.7 |
|
Date: |
Sun, 21 Sep 2003 03:31:45 -0400 |
Update of /cvsroot/phpgroupware/property/inc/export
In directory subversions:/tmp/cvs-serv7639/inc/export
Modified Files:
Ecolink Kemner_kvittering
Log Message:
no message
Index: Ecolink
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/export/Ecolink,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Ecolink 18 Sep 2003 14:00:49 -0000 1.16
--- Ecolink 21 Sep 2003 07:31:42 -0000 1.17
***************
*** 6,16 ****
--- 6,297 ----
function export_conv()
{
+ $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $this->db = $GLOBALS['phpgw']->db;
$this->soXport = CreateObject('property.soXport');
$this->$config =
CreateObject('phpgwapi.config','property');
$this->$config->read_repository();
+ $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
}
+ function select_periods_with_invoice_to_transfer()
+ {
+ $sql= "SELECT DISTINCT periode from fm_ecobilag where
budsjettsigndato is not null and (saksigndato is not null or oppsynsigndato is
not null) and utbetalingsigndato is not null ";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $periode[] = $this->db->f('periode');
+ }
+ return $periode;
+ }
+
+ function log_end($batchid)
+ {
+ $tid=date($this->soXport->datetimeformat);
+ $sql= "insert into fm_ecologg (batchid,melding,tid)
values ('$batchid','End transfer','$tid')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ function log_error($batchid,$error_desr)
+ {
+ $tid=date($this->datetimeformat);
+ $sql= "insert into fm_ecologg
(batchid,ecobilagid,status,melding,tid) values
('$batchid',NULL,0,'$error_desr','$tid')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ function increment_batchid()
+ {
+
+ $this->db->query("update fm_idgenerator set value =
value + 1 where name = 'Ecobatchid'");
+ $this->db->query("select value from fm_idgenerator
where name = 'Ecobatchid'");
+ $this->db->next_record();
+ $bilagsnr = $this->db->f('value');
+ return $bilagsnr;
+
+ }
+
+ function next_batchid()
+ {
+
+ $this->db->query("select value from fm_idgenerator
where name = 'Ecobatchid'");
+ $this->db->next_record();
+ $batchid = $this->db->f('value')+1;
+
+ return $batchid;
+ }
+
+ //Lagre start melding
+ function log_start($batchid)
+ {
+ $tid=date($this->soXport->datetimeformat);
+ $sql= "insert into fm_ecologg (batchid,melding,tid)
values ('$batchid','Start transfer','$tid')";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ function select_invoice_roleback($day,$month,$year,$Filnavn)
+ {
+
+ switch($GLOBALS['phpgw_info']['server']['db_type'])
+ {
+ case 'mssql':
+ $datepart_year =
"datepart(year,overftid)";
+ $datepart_month =
"datepart(month,overftid)";
+ $datepart_day =
"datepart(day,overftid)";
+ break;
+ case 'mysql':
+ $datepart_year =
"YEAR(overftid)";
+ $datepart_month =
"MONTH(overftid)";
+ $datepart_day =
"DAYOFMONTH(overftid)";
+ break;
+ case 'pgsql':
+ $datepart_year =
"date_part('year',overftid)";
+ $datepart_month =
"date_part('month',overftid)";
+ $datepart_day =
"date_part('day',overftid)";
+ break;
+ }
+
+
+ $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__);
+ //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]['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]['loc1'] =
$this->db->f('loc1');
+ $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]['utbetalingid'] =
$this->db->f('utbetalingid');
+ $invoice_roleback[$i]['utbetalingsigndato']
= $this->db->f('utbetalingsigndato');
+ $i++;
+ }
+ // _debug_array($invoice_roleback);
+ return $invoice_roleback;
+ }
+
+
+ //roleback function
+ function bilag_update_overf($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'];
+ $loc1=$BilagOverf['loc1'];
+ $dimd=$BilagOverf['dimd'];
+
+ if ($dimd)
+ {
+ $dimd_value="'$dimd'";
+ }
+ else
+ {
+ $dimd_value="Null";
+ }
+ $oppsynsigndato=$BilagOverf['oppsynsigndato'];
+ if ($oppsynsigndato)
+ {
+ $oppsynsigndato_value="'$oppsynsigndato'";
+ }
+ else
+ {
+ $oppsynsigndato_value="Null";
+ }
+ $saksigndato=$BilagOverf['saksigndato'];
+ if ($saksigndato)
+ {
+ $saksigndato_value="'$saksigndato'";
+ }
+ else
+ {
+ $saksigndato_value="Null";
+ }
+
+
+ $mvakode=$BilagOverf['mvakode'];
+ $belop=$BilagOverf['belop'];
+ $periode=$BilagOverf['periode'];
+ $merknad=$BilagOverf['merknad'];
+ $budsjettsigndato=$BilagOverf['budsjettsigndato'];
+ $utbetalingsigndato=$BilagOverf['utbetalingsigndato'];
+
+ $belop=$this->bocommon->moneyformat($belop);
+
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
+
+ $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,belop,periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
+ . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr','$spbudact_code','$dima','$loc1',$dimd_value,'$mvakode',$belop,'$periode','$merknad',$utbetalingid_value,$oppsynsigndato_value,$saksigndato_value,'$budsjettsigndato','$utbetalingsigndato')";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ }
+
+
+ //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_workorder set
$actual_cost_field=$actual_cost_field $operator $Belop where
id='$pmwrkord_code'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ // Hent leverandørklasse
+
+ function select_vendor_class($spvend_code)
+ {
+ $sql= "select contact_value from
phpgw_addressbook_extra where contact_id=$spvend_code and
contact_name='klasse'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ $pmlabor_code = $this->db->f('contact_value');
+
+ return $pmlabor_code;
+ }
function overfor($download)
***************
*** 20,31 ****
if ($download=='on')
{
! $this->soXport->increment_batchid;
//Lagre melding
! $this->soXport->log_start($batchid);
}
//Velg ut alle perioder som har bilag som skal overføres
! $periode =
$this->soXport->select_periods_with_invoice_to_transfer();
//_debug_array($periode);
--- 301,312 ----
if ($download=='on')
{
! $this->increment_batchid();
//Lagre melding
! $this->log_start($batchid);
}
//Velg ut alle perioder som har bilag som skal overføres
! $periode =
$this->select_periods_with_invoice_to_transfer();
//_debug_array($periode);
***************
*** 38,42 ****
if ($download=='on')
{
! $this->soXport->log_end($batchid); //Lagre
melding
}
--- 319,323 ----
if ($download=='on')
{
! $this->log_end($batchid); //Lagre melding
}
***************
*** 52,56 ****
//Lagre feilmelding
! $this->soXport->log_error($batchid,$error_desr);
}
--- 333,337 ----
//Lagre feilmelding
! $this->log_error($batchid,$error_desr);
}
***************
*** 78,86 ****
*/
!
$BilagOverf=$this->soXport->select_invoice_roleback($day,$month,$year,$Filnavn);
! // print_r($BilagOverf);
for ($i=0;$i<count($BilagOverf);$i++)
{
!
$this->soXport->bilag_update_overf($BilagOverf[$i]);
--- 359,369 ----
*/
!
$BilagOverf=$this->select_invoice_roleback($day,$month,$year,$Filnavn);
! // _debug_array($BilagOverf);
! $this->db->transaction_begin();
!
for ($i=0;$i<count($BilagOverf);$i++)
{
! $this->bilag_update_overf($BilagOverf[$i]);
***************
*** 107,111 ****
$operator='-';
!
$this->soXport->correct_actual_cost($BilagOverf[$i]['pmwrkord_code'],$Belop,$actual_cost_field,$operator);
}
--- 390,394 ----
$operator='-';
!
$this->correct_actual_cost($BilagOverf[$i]['pmwrkord_code'],$Belop,$actual_cost_field,$operator);
}
***************
*** 120,131 ****
if($antall > 0)
! {
! $receipt['message'][]= array('msg' => $antall .
' ' . lang('bilag/underbilag rullet tilbake'));
!
$fil_katalog =
$this->$config->config_data['export_path'];
! unlink ($fil_katalog. SEP . $Filnavn);
!
! $receipt['message'][]= array('msg' =>
lang('File %1 is deleted',$Filnavn));
}
else
--- 403,420 ----
if($antall > 0)
! {
$fil_katalog =
$this->$config->config_data['export_path'];
! if(unlink ($fil_katalog. SEP . $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();
! $message = 'Noe gikk galt!';
! }
}
else
***************
*** 201,205 ****
//Hent leverandørklasse
! $pmlabor_code
=$this->soXport->select_vendor_class($oRsBilag[$k]['spvend_code']);
//Bestem belops felt
--- 490,494 ----
//Hent leverandørklasse
! $pmlabor_code
=$this->select_vendor_class($oRsBilag[$k]['spvend_code']);
//Bestem belops felt
***************
*** 293,297 ****
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$k]['bilagsnr']);
//print_r($oRsUnderbilag);
! // $GLOBALS['phpgw']->db->transaction_begin();
$underbilag_count= count($oRsUnderbilag);
--- 582,586 ----
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$k]['bilagsnr']);
//print_r($oRsUnderbilag);
! $this->db->transaction_begin();
$underbilag_count= count($oRsUnderbilag);
***************
*** 332,336 ****
}
$operator='+';
!
$this->soXport->correct_actual_cost($oRsUnderbilag[$i]['pmwrkord_code'],$Belop,$actual_cost_field,$operator);
}
}
--- 621,625 ----
}
$operator='+';
!
$this->correct_actual_cost($oRsUnderbilag[$i]['pmwrkord_code'],$Belop,$actual_cost_field,$operator);
}
}
***************
*** 396,400 ****
$fp = fopen($Filnavn, "wb");
fwrite($fp,$buffer);
! fclose($fp);
}
else
--- 685,698 ----
$fp = fopen($Filnavn, "wb");
fwrite($fp,$buffer);
! if(fclose($fp))
! {
! $this->db->transaction_commit();
!
! }
! else
! {
! $this->db->transaction_abort();
! $message = 'Noe gikk galt!';
! }
}
else
***************
*** 402,406 ****
$message = $buffer;
}
- $GLOBALS['phpgw']->db->transaction_commit();
return $message;
--- 700,703 ----
Index: Kemner_kvittering
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/export/Kemner_kvittering,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Kemner_kvittering 1 Sep 2003 19:26:55 -0000 1.6
--- Kemner_kvittering 21 Sep 2003 07:31:42 -0000 1.7
***************
*** 38,50 ****
function select_periods_with_invoice_to_transfer()
{
! $sql= "SELECT DISTINCT periode from fm_ecobilag where
budsjettsigndato is not null and (saksigndato is not null or oppsynsigndato is
not null) and utbetalingsigndato is not null and spvend_code ='20003' ";
$this->db->query($sql,__LINE__,__FILE__);
- $i = 0;
while ($this->db->next_record())
{
! $periode[$i] = $this->db->f('periode');
! $i++;
}
- //_debug_array($periode);
return $periode;
}
--- 38,47 ----
function select_periods_with_invoice_to_transfer()
{
! $sql= "SELECT DISTINCT periode from fm_ecobilag where
budsjettsigndato is not null and (saksigndato is not null or oppsynsigndato is
not null) and utbetalingsigndato is not null ";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
! $periode[] = $this->db->f('periode');
}
return $periode;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc/export Ecolink, 1.16, 1.17 Kemner_kvittering, 1.6, 1.7,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/inc class.uiprojects.inc.php, 1.70, 1.71
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.76, 1.77 class.soXport.inc.php, 1.35, 1.36
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/inc class.uiprojects.inc.php, 1.70, 1.71
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.76, 1.77 class.soXport.inc.php, 1.35, 1.36
- Index(es):