[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc functions.inc.php,1.7,1.8 class.soX
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc functions.inc.php,1.7,1.8 class.soXport.inc.php,1.2,1.3 class.uiXport.inc.php,1.2,1.3 |
|
Date: |
Sat, 26 Oct 2002 05:03:41 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv21733/inc
Modified Files:
functions.inc.php class.soXport.inc.php class.uiXport.inc.php
Log Message:
no message
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/functions.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** functions.inc.php 16 Oct 2002 15:27:09 -0000 1.7
--- functions.inc.php 26 Oct 2002 09:03:39 -0000 1.8
***************
*** 198,204 ****
{
! $GLOBALS['phpgw']->db->query("select config_value from
phpgw_config where config_name = 'fmwrkorder_id'");
$GLOBALS['phpgw']->db->next_record();
! $id_1 = $GLOBALS['phpgw']->db->f('config_value');
$GLOBALS['phpgw']->db->query("select next_wo_num from
span_pmprjinf");
--- 198,204 ----
{
! $GLOBALS['phpgw']->db->query("select value from
IDGenerator where name = 'workorder'");
$GLOBALS['phpgw']->db->next_record();
! $id_1 = $GLOBALS['phpgw']->db->f('value');
$GLOBALS['phpgw']->db->query("select next_wo_num from
span_pmprjinf");
***************
*** 210,216 ****
else
{
! $GLOBALS['phpgw']->db->query("select config_value from
phpgw_config where config_name = 'fmwrkorder_id'");
$GLOBALS['phpgw']->db->next_record();
! $id = $GLOBALS['phpgw']->db->f('config_value');
return $id;
--- 210,216 ----
else
{
! $GLOBALS['phpgw']->db->query("select value from
IDGenerator where name = 'workorder'");
$GLOBALS['phpgw']->db->next_record();
! $id = $GLOBALS['phpgw']->db->f('value');
return $id;
***************
*** 221,227 ****
--- 221,241 ----
//------------- integration with FacilityCenter
+ function increment_wrkorderid($next_id)
+ {
+ $GLOBALS['phpgw']->db->query("update IDGenerator set
value='$next_id' where name='workorder'");
+ }
+
+ function create_project_id()
+ {
+ $GLOBALS['phpgw']->db->query("select value from IDGenerator
where name = 'project'");
+ $GLOBALS['phpgw']->db->next_record();
+ $id = $GLOBALS['phpgw']->db->f('value');
+ $GLOBALS['phpgw']->db->query("update IDGenerator set value=
value + 1 where name='project'");
+
+ return $id;
+ }
function next_id($table='')
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soXport.inc.php 23 Oct 2002 18:43:17 -0000 1.2
--- class.soXport.inc.php 26 Oct 2002 09:03:39 -0000 1.3
***************
*** 85,88 ****
--- 85,114 ----
return $maalerinfo;
}
+
+ function gabnr_to_objekt($Gnr,$Bnr,$sekjonnr)
+ {
+ //Finn dima fra Boei
+ $sql = "select boei_gabnr.objekt_id,
boei_gabnr.bygg_id, boei_gabnr.seksjons_id from boei_gabnr, boei_objekt,
boei_eier "
+ . "where substring(boei_gabnr.gabnr,5,5)='$Gnr' and "
+ . " substring(boei_gabnr.gabnr,10,4)='$Bnr' and "
+ . " substring(boei_gabnr.gabnr,18,3)='$sekjonnr'
and "
+ . " boei_gabnr.objekt_id=boei_objekt.objekt_id and
"
+ . " boei_objekt.eier_id=boei_eier.eier_id and "
+ . " (boei_eier.eiertype_id=0 or
boei_eier.eiertype_id=1)";
+
+ $GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
+ $GLOBALS['phpgw']->db->next_record();
+
+ // if ($GLOBALS['phpgw']->db->f(0))
+ {
+
$dima=$GLOBALS['phpgw']->db->f('objekt_id').$GLOBALS['phpgw']->db->f('bygg_id').$GLOBALS['phpgw']->db->f('seksjons_id');
+ }
+ // else
+ {
+ // $dima='';
+ }
+ return $dima;
+ }
+
function check_pmwrkord_code($pmwrkord_code)
{
***************
*** 183,187 ****
while ($this->db->next_record())
{
- // $periode[$i]['periode'] =
$this->db->f('periode');
$periode[$i] = $this->db->f('periode');
$i++;
--- 209,212 ----
***************
*** 359,363 ****
. " 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__);
--- 384,387 ----
***************
*** 541,548 ****
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;
--- 565,574 ----
function select_vendor_class($spvend_code)
{
! // $sql= "select pmlabor_code from spvend where
spvend_code='$spvend_code'";
! $sql= "select klasse from bokalk_leverandoerer where
resknr='$spvend_code'";
!
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
! $pmlabor_code = $this->db->f('klasse');
return $pmlabor_code;
***************
*** 597,611 ****
}
- /*
- 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)
--- 623,626 ----
***************
*** 669,674 ****
{
! $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');
--- 684,689 ----
{
! $this->db->query("update IDGenerator set value = value
+ 1 where name = 'Ecobatchid'");
! $this->db->query("select value from IDGenerator where
name = 'Ecobatchid'");
$this->db->next_record();
$bilagsnr = $this->db->f('value');
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uiXport.inc.php 23 Oct 2002 18:43:17 -0000 1.2
--- class.uiXport.inc.php 26 Oct 2002 09:03:39 -0000 1.3
***************
*** 43,47 ****
global
$convert,$download,$tsvfile,$private,$conv_type,$fcat_id,
$art,$type,$dim_b,$invoice_num,$kid_nr,$abid,$janitor,$supervisor,
!
$budget_responsible,$num_days,$sday,$smonth,$syear,$eday,$emonth,$eyear,$sdate,$edate;
if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
--- 43,47 ----
global
$convert,$download,$tsvfile,$private,$conv_type,$fcat_id,
$art,$type,$dim_b,$invoice_num,$kid_nr,$abid,$janitor,$supervisor,
!
$budget_responsible,$num_days,$sday,$smonth,$syear,$eday,$emonth,$eyear,$sdate,$edate,$cancel;
if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
***************
*** 54,57 ****
--- 54,62 ----
}
+ if ($cancel && $tsvfile)
+ {
+ unlink ($tsvfile);
+ }
+
if ($convert)
{
***************
*** 168,177 ****
.$type.'&dim_b='.$dim_b.'&invoice_num='.$invoice_num.'&kid_nr='.$kid_nr.'&janitor='.$janitor.'&supervisor='.$supervisor
.'&budget_responsible='.$budget_responsible.'&num_days='.$num_days.'&sdate='.$sdate.'&sday='.$sday.'&smonth='.$smonth.'&syear='.$syear.'&edate='.$edate
!
.'&conv_type='.$conv_type.'&download=&convert=true&tsvfile='.$tsvfile).
'">'.lang('OK').'</a> | ';
echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.import&abid='.$abid.'&art='.$art.'&type='
.$type.'&dim_b='.$dim_b.'&invoice_num='.$invoice_num.'&kid_nr='.$kid_nr.'&janitor='.$janitor.'&supervisor='.$supervisor
.'&budget_responsible='.$budget_responsible.'&num_days='.$num_days.'&sdate='.$sdate.'&edate='.$edate.'&tsvfile='.$tsvfile
! .'&conv_type='.$conv_type).
'">'.lang('Cancel').'</a>';
}
--- 173,182 ----
.$type.'&dim_b='.$dim_b.'&invoice_num='.$invoice_num.'&kid_nr='.$kid_nr.'&janitor='.$janitor.'&supervisor='.$supervisor
.'&budget_responsible='.$budget_responsible.'&num_days='.$num_days.'&sdate='.$sdate.'&sday='.$sday.'&smonth='.$smonth.'&syear='.$syear.'&edate='.$edate
!
.'&conv_type='.$conv_type.'&download=&convert=true&tsvfile='.$tsvfile).
'">'.lang('Import').'</a> | ';
echo '<a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.import&abid='.$abid.'&art='.$art.'&type='
.$type.'&dim_b='.$dim_b.'&invoice_num='.$invoice_num.'&kid_nr='.$kid_nr.'&janitor='.$janitor.'&supervisor='.$supervisor
.'&budget_responsible='.$budget_responsible.'&num_days='.$num_days.'&sdate='.$sdate.'&edate='.$edate.'&tsvfile='.$tsvfile
! .'&conv_type='.$conv_type .
'&cancel=true'). '">'.lang('Cancel').'</a>';
}
***************
*** 457,460 ****
--- 462,466 ----
$this->$config->read_repository();
$fil_katalog =
$this->$config->config_data['export_path'];
+ // echo 'fil_katalog: '.$fil_katalog .'<br>';
$dir_handle = opendir($fil_katalog);
***************
*** 469,473 ****
}
closedir($dir_handle);
! sort($myfilearray);
for ($i=0;$i<count($myfilearray);$i++)
{
--- 475,479 ----
}
closedir($dir_handle);
! @sort($myfilearray);
for ($i=0;$i<count($myfilearray);$i++)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc functions.inc.php,1.7,1.8 class.soXport.inc.php,1.2,1.3 class.uiXport.inc.php,1.2,1.3,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Kemner,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: property add_workorder.php,1.8,1.9 edit_workorder.php,1.7,1.8 invoice_paid.php,1.6,1.7 edit_project.php,1.3,1.4 add_project.php,1.2,1.3 invoice_consume.php,1.2,1.3 id_controle.php,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Kemner,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: property add_workorder.php,1.8,1.9 edit_workorder.php,1.7,1.8 invoice_paid.php,1.6,1.7 edit_project.php,1.3,1.4 add_project.php,1.2,1.3 invoice_consume.php,1.2,1.3 id_controle.php,1.1,1.2
- Index(es):