[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.hist...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.hist... |
|
Date: |
Fri, 16 Mar 2007 08:57:05 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/03/16 08:57:05
Modified files:
inc : class.botts.inc.php class.historylog.inc.php
inc/cron : forward_mail_as_sms.php lag_lang_filer.php
oppdater_antall_leieobjekt.php
oppdater_namssakstatus_pr_leietaker.php
oppdater_utgaatt_objekt.php
organize_drawing.php synkroniser_med_boei.php
inc/export : Agresso
tutorials/property/examples: install.apache.sh
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.historylog.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/forward_mail_as_sms.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/lag_lang_filer.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/oppdater_antall_leieobjekt.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/oppdater_namssakstatus_pr_leietaker.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/oppdater_utgaatt_objekt.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/organize_drawing.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/synkroniser_med_boei.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/property/inc/export/Agresso?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/property/tutorials/property/examples/install.apache.sh?cvsroot=phpgroupware&r1=1.5&r2=1.6
Patches:
Index: inc/class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- inc/class.botts.inc.php 26 Jan 2007 14:53:46 -0000 1.31
+++ inc/class.botts.inc.php 16 Mar 2007 08:57:05 -0000 1.32
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.botts.inc.php,v 1.31 2007/01/26 14:53:46 sigurdne
Exp $
+ * @version $Id: class.botts.inc.php,v 1.32 2007/03/16 08:57:05 sigurdne
Exp $
*/
/**
@@ -279,7 +279,7 @@
$tickets[$i]['delay']=($tickets[$i]['finnish_date2']-$tickets[$i]['finnish_date'])/(24*3600);
$tickets[$i]['finnish_date']=$tickets[$i]['finnish_date2'];
}
- $tickets[$i]['finnish_date'] =
(isset($tickets[$i]['finnish_date'])?$GLOBALS['phpgw']->common->show_date($tickets[$i]['finnish_date'],$this->dateformat):'');
+ $tickets[$i]['finnish_date'] =
(isset($tickets[$i]['finnish_date']) && $tickets[$i]['finnish_date'] ?
$GLOBALS['phpgw']->common->show_date($tickets[$i]['finnish_date'],$this->dateformat):'');
if ($tickets[$i]['status'] == 'X')
{
@@ -314,7 +314,7 @@
$ticket['group_lid'] =
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
- if($ticket['finnish_date2'])
+ if(isset($ticket['finnish_date2']) &&
$ticket['finnish_date2'])
{
$ticket['finnish_date']=$ticket['finnish_date2'];
}
Index: inc/class.historylog.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.historylog.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.historylog.inc.php 26 Jan 2007 14:53:46 -0000 1.14
+++ inc/class.historylog.inc.php 16 Mar 2007 08:57:05 -0000 1.15
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.historylog.inc.php,v 1.14 2007/01/26 14:53:46
sigurdne Exp $
+ * @version $Id: class.historylog.inc.php,v 1.15 2007/03/16 08:57:05
sigurdne Exp $
*/
/**
@@ -90,13 +90,7 @@
$this->appname = $appname;
- // $this->db = $GLOBALS['phpgw']->db;
- $this->db = CreateObject('phpgwapi.db');
- $this->db->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
- $this->db->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
- $this->db->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
- $this->db->User =
$GLOBALS['phpgw_info']['server']['db_user'];
- $this->db->Password =
$GLOBALS['phpgw_info']['server']['db_pass'];
+ $this->db = clone($GLOBALS['phpgw']->db);
}
function delete($record_id,$attrib_id='')
Index: inc/cron/forward_mail_as_sms.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/cron/forward_mail_as_sms.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/cron/forward_mail_as_sms.php 27 Feb 2007 10:42:09 -0000 1.2
+++ inc/cron/forward_mail_as_sms.php 16 Mar 2007 08:57:05 -0000 1.3
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: forward_mail_as_sms.php,v 1.2 2007/02/27 10:42:09
sigurdne Exp $
+ * @version $Id: forward_mail_as_sms.php,v 1.3 2007/03/16 08:57:05
sigurdne Exp $
*/
/**
@@ -102,7 +102,10 @@
function execute($cron='')
{
$receipt = $this->check_for_new_mail();
+ if($receipt)
+ {
$this->cron_log($receipt,$cron);
+ }
if(!$cron)
{
@@ -172,7 +175,15 @@
$msg = $j . ' messages er sendt';
$this->receipt['message'][]=array('msg'=> $msg);
+
+ if($j>0)
+ {
return $msg;
}
+ else
+ {
+ return false;
+ }
+ }
}
?>
Index: inc/cron/lag_lang_filer.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/cron/lag_lang_filer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/cron/lag_lang_filer.php 27 Feb 2007 10:11:29 -0000 1.1
+++ inc/cron/lag_lang_filer.php 16 Mar 2007 08:57:05 -0000 1.2
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: lag_lang_filer.php,v 1.1 2007/02/27 10:11:29 sigurdne
Exp $
+ * @version $Id: lag_lang_filer.php,v 1.2 2007/03/16 08:57:05 sigurdne
Exp $
*/
/**
@@ -60,7 +60,7 @@
$this->execute($cron);
}
else
- {
$this->confirm($execute=False);
}
}
function confirm($execute='')
{
$link_data = array
(
'menuaction' =>
$this->currentapp.'.custom_functions.index',
'function' =>$this->function_name,
'execute' => $execute,
);
if(!$execute)
{
$lang_confirm_msg = 'Vil du virkelig
utføre denne operasjonen';
}
+ {
$this->confirm($execute=False);
}
}
function confirm($execute='')
{
$link_data = array
(
'menuaction' =>
$this->currentapp.'.custom_functions.index',
'function' =>$this->function_name,
'execute' => $execute,
);
if(!$execute)
{
$lang_confirm_msg = lang('do you want to
perform this action');
}
$lang_yes = lang('yes');
$GLOBALS['phpgw']->xslttpl->add_file(array('confirm_custom'));
$msgbox_data =
$this->bocommon->msgbox_data($this->receipt);
Index: inc/cron/oppdater_antall_leieobjekt.php
===================================================================
RCS file:
/sources/phpgroupware/property/inc/cron/oppdater_antall_leieobjekt.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/cron/oppdater_antall_leieobjekt.php 27 Feb 2007 10:11:29 -0000
1.1
+++ inc/cron/oppdater_antall_leieobjekt.php 16 Mar 2007 08:57:05 -0000
1.2
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: oppdater_antall_leieobjekt.php,v 1.1 2007/02/27
10:11:29 sigurdne Exp $
+ * @version $Id: oppdater_antall_leieobjekt.php,v 1.2 2007/03/16
08:57:05 sigurdne Exp $
*/
/**
@@ -40,12 +40,9 @@
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->db =
$this->bocommon->new_db();
- $this->db2 =
$this->bocommon->new_db();
- $this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
-
- $this->join = $this->bocommon->join;
- $this->left_join =
$this->bocommon->left_join;
+ $this->db = &
$GLOBALS['phpgw']->db;
+ $this->db2 =
clone($this->db);
+ $this->join =
$this->db->join;
}
function pre_run($data='')
@@ -84,7 +81,7 @@
if(!$execute)
{
- $lang_confirm_msg = 'Vil du virkelig
utføre denne operasjonen';
+ $lang_confirm_msg = lang('do you want to
perform this action');
}
$lang_yes = lang('yes');
Index: inc/cron/oppdater_namssakstatus_pr_leietaker.php
===================================================================
RCS file:
/sources/phpgroupware/property/inc/cron/oppdater_namssakstatus_pr_leietaker.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/cron/oppdater_namssakstatus_pr_leietaker.php 27 Feb 2007 10:11:29
-0000 1.1
+++ inc/cron/oppdater_namssakstatus_pr_leietaker.php 16 Mar 2007 08:57:05
-0000 1.2
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: oppdater_namssakstatus_pr_leietaker.php,v 1.1
2007/02/27 10:11:29 sigurdne Exp $
+ * @version $Id: oppdater_namssakstatus_pr_leietaker.php,v 1.2
2007/03/16 08:57:05 sigurdne Exp $
*/
/**
@@ -40,20 +40,20 @@
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->db =
$this->bocommon->new_db();
- $this->db2 =
$this->bocommon->new_db();
+ $this->db = &
$GLOBALS['phpgw']->db;
+ $this->db2 =
clone($this->db);
+ $this->join =
$this->db->join;
+ $this->like =
$this->db->like;
+ $this->left_join = " LEFT JOIN ";
- $this->join = $this->bocommon->join;
- $this->left_join =
$this->bocommon->left_join;
- $this->like = $this->bocommon->like;
-
- $this->db_boei =
CreateObject($this->currentapp.'.db_mssql');
+ $this->db_boei =
CreateObject('phpgwapi.db',false,$GLOBALS['external_db']['boei']['db_type']);
$this->db_boei->Host =
$GLOBALS['external_db']['boei']['db_host'];
$this->db_boei->Type =
$GLOBALS['external_db']['boei']['db_type'];
$this->db_boei->Database =
$GLOBALS['external_db']['boei']['db_name'];
$this->db_boei->User =
$GLOBALS['external_db']['boei']['db_user'];
$this->db_boei->Password =
$GLOBALS['external_db']['boei']['db_pass'];
$this->db_boei->Halt_On_Error = 'yes';
+ $this->db_boei->connect();
}
function pre_run($data='')
@@ -92,7 +92,7 @@
if(!$execute)
{
- $lang_confirm_msg = 'Vil du virkelig
utføre denne operasjonen';
+ $lang_confirm_msg = lang('do you want to
perform this action');
}
$lang_yes = lang('yes');
Index: inc/cron/oppdater_utgaatt_objekt.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/cron/oppdater_utgaatt_objekt.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/cron/oppdater_utgaatt_objekt.php 27 Feb 2007 10:11:29 -0000
1.1
+++ inc/cron/oppdater_utgaatt_objekt.php 16 Mar 2007 08:57:05 -0000
1.2
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: oppdater_utgaatt_objekt.php,v 1.1 2007/02/27 10:11:29
sigurdne Exp $
+ * @version $Id: oppdater_utgaatt_objekt.php,v 1.2 2007/03/16 08:57:05
sigurdne Exp $
*/
/**
@@ -40,12 +40,14 @@
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->db =
$this->bocommon->new_db();
- $this->db2 =
$this->bocommon->new_db();
+ $this->db = &
$GLOBALS['phpgw']->db;
+ $this->db2 =
clone($this->db);
$this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
- $this->join = $this->bocommon->join;
- $this->left_join =
$this->bocommon->left_join;
+ $this->join =
$this->db->join;
+ $this->like =
$this->db->like;
+ $this->left_join = " LEFT JOIN ";
+
}
function pre_run($data='')
@@ -84,7 +86,7 @@
if(!$execute)
{
- $lang_confirm_msg = 'Vil du virkelig
utføre denne operasjonen';
+ $lang_confirm_msg = lang('do you want to
perform this action');
}
$lang_yes = lang('yes');
Index: inc/cron/organize_drawing.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/cron/organize_drawing.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/cron/organize_drawing.php 27 Feb 2007 10:11:29 -0000 1.1
+++ inc/cron/organize_drawing.php 16 Mar 2007 08:57:05 -0000 1.2
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: organize_drawing.php,v 1.1 2007/02/27 10:11:29 sigurdne
Exp $
+ * @version $Id: organize_drawing.php,v 1.2 2007/03/16 08:57:05 sigurdne
Exp $
*/
/**
@@ -116,11 +116,11 @@
{
if(!$execute)
{
- $lang_confirm_msg = 'Gå videre
for å se hva som blir lagt til';
+ $lang_confirm_msg = 'Ga videre
for aa se hva som blir lagt til';
}
else
{
- $lang_confirm_msg = 'Vil du
virkelig utføre denne operasjonen';
+ $lang_confirm_msg = lang('do you
want to perform this action');
}
}
$lang_yes = lang('yes');
@@ -138,7 +138,7 @@
'message' =>
$this->receipt['message'],
'lang_confirm_msg' =>
$lang_confirm_msg,
'lang_yes' =>
$lang_yes,
- 'lang_yes_statustext' => 'Organisere
tegninger i register og på disk',
+ 'lang_yes_statustext' => 'Organisere
tegninger i register og pa disk',
'lang_no_statustext' => 'tilbake',
'lang_no' =>
lang('no'),
'lang_done' =>
'Avbryt',
@@ -146,7 +146,7 @@
);
$appname = 'Organisere tegninger';
- $function_msg = 'Organisere tegninger i register og
på disk';
+ $function_msg = 'Organisere tegninger i register og
pa disk';
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('confirm' => $data));
$GLOBALS['phpgw']->xslttpl->pp();
Index: inc/cron/synkroniser_med_boei.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/cron/synkroniser_med_boei.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/cron/synkroniser_med_boei.php 27 Feb 2007 10:11:29 -0000 1.1
+++ inc/cron/synkroniser_med_boei.php 16 Mar 2007 08:57:05 -0000 1.2
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: synkroniser_med_boei.php,v 1.1 2007/02/27 10:11:29
sigurdne Exp $
+ * @version $Id: synkroniser_med_boei.php,v 1.2 2007/03/16 08:57:05
sigurdne Exp $
*/
/**
@@ -40,27 +40,20 @@
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->db =
$this->bocommon->new_db();
+ $this->db = &
$GLOBALS['phpgw']->db;
+ $this->join =
$this->db->join;
+ $this->like =
$this->db->like;
+ $this->left_join = " LEFT JOIN ";
- $this->join =
$this->bocommon->join;
- $this->left_join =
$this->bocommon->left_join;
- $this->like =
$this->bocommon->like;
-
- $this->db_boei =
CreateObject($this->currentapp.'.db_mssql');
+ $this->db_boei =
CreateObject('phpgwapi.db',false,$GLOBALS['external_db']['boei']['db_type']);
$this->db_boei->Host =
$GLOBALS['external_db']['boei']['db_host'];
$this->db_boei->Type =
$GLOBALS['external_db']['boei']['db_type'];
$this->db_boei->Database =
$GLOBALS['external_db']['boei']['db_name'];
$this->db_boei->User =
$GLOBALS['external_db']['boei']['db_user'];
$this->db_boei->Password =
$GLOBALS['external_db']['boei']['db_pass'];
$this->db_boei->Halt_On_Error = 'yes';
-
- $this->db_boei2 =
CreateObject($this->currentapp.'.db_mssql');
- $this->db_boei2->Host =
$GLOBALS['external_db']['boei']['db_host'];
- $this->db_boei2->Type =
$GLOBALS['external_db']['boei']['db_type'];
- $this->db_boei2->Database =
$GLOBALS['external_db']['boei']['db_name'];
- $this->db_boei2->User =
$GLOBALS['external_db']['boei']['db_user'];
- $this->db_boei2->Password =
$GLOBALS['external_db']['boei']['db_pass'];
- $this->db_boei2->Halt_On_Error = 'yes';
+ $this->db_boei->connect();
+ $this->db_boei2 = clone($this->db_boei);
}
function pre_run($data='')
@@ -99,7 +92,7 @@
if(!$execute)
{
- $lang_confirm_msg = 'Vil du virkelig
utføre denne operasjonen';
+ $lang_confirm_msg = lang('do you want to
perform this action');
}
$lang_yes = lang('yes');
@@ -133,6 +126,7 @@
function execute($cron='')
{
+ set_time_limit(120);
$receipt = $this->legg_til_eier_phpgw();
$this->cron_log($receipt,$cron);
$receipt = $this->legg_til_gateadresse_phpgw();
@@ -204,9 +198,8 @@
'category' => $category,
);
}
-
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei->transaction_begin();
for ($i=0; $i<count($owner); $i++)
{
@@ -233,7 +226,16 @@
{
$category =
$this->db_boei->f('category');
}
- $owner[]= array (
+ $owner_utf[]= array (
+ 'id' => $this->db_boei->f('id'),
+ 'org_name' =>
$this->db->db_addslashes(utf8_encode($this->db_boei->f('org_name'))),
+ 'remark' =>
$this->db->db_addslashes(utf8_encode($this->db_boei->f('org_name'))),
+ 'category' => $category,
+ 'entry_date' => time(),
+ 'owner_id' => 6
+ );
+
+ $owner_latin[]= array (
'id' => $this->db_boei->f('id'),
'org_name' =>
$this->db->db_addslashes($this->db_boei->f('org_name')),
'remark' =>
$this->db->db_addslashes($this->db_boei->f('org_name')),
@@ -241,23 +243,25 @@
'entry_date' => time(),
'owner_id' => 6
);
+
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
- for ($i=0; $i<count($owner); $i++)
+ for ($i=0; $i<count($owner_utf); $i++)
{
- $sql2 = "INSERT INTO fm_owner
(id,org_name,remark,category,entry_date,owner_id)"
- . "VALUES (" .
$this->bocommon->validate_db_insert($owner[$i]) . ")";
+ $sql2_utf = "INSERT INTO fm_owner
(id,org_name,remark,category,entry_date,owner_id)"
+ . "VALUES (" .
$this->bocommon->validate_db_insert($owner_utf[$i]) . ")";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei->query($sql2,__LINE__,__FILE__);
+ $sql2_latin = "INSERT INTO fm_owner
(id,org_name,remark,category,entry_date,owner_id)"
+ . "VALUES (" .
$this->bocommon->validate_db_insert($owner_latin[$i]) . ")";
- $owner_msg[]=$owner[$i]['org_name'];
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei->query($sql2_latin,__LINE__,__FILE__);
+
+ $owner_msg[]=$owner_utf[$i]['org_name'];
}
- $this->db->transaction_commit();
- $this->db_boei->transaction_commit();
+ // $this->db->transaction_commit();
+ // $this->db_boei->transaction_commit();
$msg = count($owner) . ' eier er lagt til: ' .
@implode(",", $owner_msg);
$this->receipt['message'][]=array('msg'=> $msg);
@@ -284,20 +288,24 @@
);
}
-
$this->db->transaction_begin();
$this->db_boei->transaction_begin();
for ($i=0; $i<count($gate); $i++)
{
- $sql2 = "INSERT INTO fm_streetaddress
(id,descr)"
+ $sql = "DELETE from fm_streetaddress WHERE id =
" . (int)$gate[$i]['id'];
+ $sql2_latin = "INSERT INTO fm_streetaddress
(id,descr)"
. " VALUES (" . $gate[$i]['id'] . ",
'". $gate[$i]['descr']. "')";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei->query($sql2,__LINE__,__FILE__);
+ $sql2_utf = "INSERT INTO fm_streetaddress
(id,descr)"
+ . " VALUES (" . $gate[$i]['id'] . ",
'". utf8_encode($gate[$i]['descr']). "')";
- $gate_msg[]=$gate[$i]['descr'];
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db_boei->query($sql,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei->query($sql2_latin,__LINE__,__FILE__);
+ $gate_msg[]=utf8_encode($gate[$i]['descr']);
}
$this->db->transaction_commit();
@@ -321,7 +329,15 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
while ($this->db_boei->next_record())
{
- $objekt[]= array (
+ $objekt_utf[]= array (
+ 'location_code' =>
$this->db_boei->f('objekt_id'),
+ 'loc1' =>
$this->db_boei->f('objekt_id'),
+ 'loc1_name' =>
utf8_encode($this->db_boei->f('navn')),
+ 'part_of_town_id' =>
$this->db_boei->f('bydel_id'),
+ 'owner_id' =>
$this->db_boei->f('eier_id'),
+ 'kostra_id' =>
$this->db_boei->f('tjenestested')
+ );
+ $objekt_latin[]= array (
'location_code' =>
$this->db_boei->f('objekt_id'),
'loc1' =>
$this->db_boei->f('objekt_id'),
'loc1_name' =>
$this->db_boei->f('navn'),
@@ -332,23 +348,25 @@
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei->transaction_begin();
for ($i=0; $i<count($objekt); $i++)
{
- $sql2 = "INSERT INTO fm_location1
(location_code, loc1, loc1_name, part_of_town_id, owner_id, kostra_id) "
- . "VALUES (" .
$this->bocommon->validate_db_insert($objekt[$i]) . ")";
+ $sql2_utf = "INSERT INTO fm_location1
(location_code, loc1, loc1_name, part_of_town_id, owner_id, kostra_id) "
+ . "VALUES (" .
$this->bocommon->validate_db_insert($objekt_utf[$i]) . ")";
+ $sql2_latin = "INSERT INTO fm_location1
(location_code, loc1, loc1_name, part_of_town_id, owner_id, kostra_id) "
+ . "VALUES (" .
$this->bocommon->validate_db_insert($objekt_latin[$i]) . ")";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei->query($sql2_latin,__LINE__,__FILE__);
- $obj_msg[]=$objekt[$i]['loc1'];
+ $obj_msg[]=$objekt_utf[$i]['loc1'];
}
- $this->db->transaction_commit();
- $this->db_boei->transaction_commit();
+ // $this->db->transaction_commit();
+ // $this->db_boei->transaction_commit();
$msg = count($objekt) . ' Objekt er lagt til: ' .
@implode(",", $obj_msg);
$this->receipt['message'][]=array('msg'=> $msg);
@@ -368,8 +386,13 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
while ($this->db_boei->next_record())
{
-
- $bygg[]= array (
+ $bygg_utf[]= array (
+ 'location_code' =>
$this->db_boei->f('location_code'),
+ 'loc1' =>
$this->db_boei->f('objekt_id'),
+ 'loc2' =>
$this->db_boei->f('bygg_id'),
+ 'loc2_name' =>
utf8_encode($this->db_boei->f('byggnavn')),
+ );
+ $bygg_latin[]= array (
'location_code' =>
$this->db_boei->f('location_code'),
'loc1' =>
$this->db_boei->f('objekt_id'),
'loc2' =>
$this->db_boei->f('bygg_id'),
@@ -377,23 +400,25 @@
);
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei->transaction_begin();
for ($i=0; $i<count($bygg); $i++)
{
- $sql2 = "INSERT INTO fm_location2
(location_code, loc1, loc2, loc2_name) "
- . "VALUES (" .
$this->bocommon->validate_db_insert($bygg[$i]) . ")";
+ $sql2_utf = "INSERT INTO fm_location2
(location_code, loc1, loc2, loc2_name) "
+ . "VALUES (" .
$this->bocommon->validate_db_insert($bygg_utf[$i]) . ")";
+ $sql2_latin = "INSERT INTO fm_location2
(location_code, loc1, loc2, loc2_name) "
+ . "VALUES (" .
$this->bocommon->validate_db_insert($bygg_latin[$i]) . ")";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei->query($sql2_latin,__LINE__,__FILE__);
- $bygg_msg[]=$bygg[$i]['location_code'];
+ $bygg_msg[]=$bygg_utf[$i]['location_code'];
}
- $this->db->transaction_commit();
- $this->db_boei->transaction_commit();
+ // $this->db->transaction_commit();
+ // $this->db_boei->transaction_commit();
$msg = count($bygg) . ' Bygg er lagt til: ' .
@implode(",", $bygg_msg);
$this->receipt['message'][]=array('msg'=> $msg);
@@ -417,8 +442,15 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
while ($this->db_boei->next_record())
{
-
- $seksjon[]= array (
+ $seksjon_utf[]= array (
+ 'location_code' =>
$this->db_boei->f('location_code'),
+ 'loc1' =>
$this->db_boei->f('objekt_id'),
+ 'loc2' =>
$this->db_boei->f('bygg_id'),
+ 'loc3' =>
$this->db_boei->f('seksjons_id'),
+ 'loc3_name' =>
utf8_encode($this->db_boei->f('beskrivelse')),
+ 'fellesareal' =>
$this->db_boei->f('totalt_fellesareal')
+ );
+ $seksjon_latin[]= array (
'location_code' =>
$this->db_boei->f('location_code'),
'loc1' =>
$this->db_boei->f('objekt_id'),
'loc2' =>
$this->db_boei->f('bygg_id'),
@@ -428,23 +460,25 @@
);
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei->transaction_begin();
for ($i=0; $i<count($seksjon); $i++)
{
- $sql2 = "INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, fellesareal) "
- . "VALUES (" .
$this->bocommon->validate_db_insert($seksjon[$i]) . ")";
+ $sql2_utf = "INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, fellesareal) "
+ . "VALUES (" .
$this->bocommon->validate_db_insert($seksjon_utf[$i]) . ")";
+ $sql2_latin = "INSERT INTO fm_location3
(location_code, loc1, loc2, loc3, loc3_name, fellesareal) "
+ . "VALUES (" .
$this->bocommon->validate_db_insert($seksjon_latin[$i]) . ")";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei->query($sql2_latin,__LINE__,__FILE__);
- $seksjon_msg[]=$seksjon[$i]['location_code'];
+
$seksjon_msg[]=$seksjon_utf[$i]['location_code'];
}
- $this->db->transaction_commit();
- $this->db_boei->transaction_commit();
+ // $this->db->transaction_commit();
+ // $this->db_boei->transaction_commit();
$msg = count($seksjon) . ' Seksjon er lagt til: ' .
@implode(",", $seksjon_msg);
$this->receipt['message'][]=array('msg'=> $msg);
@@ -470,8 +504,26 @@
while ($this->db_boei->next_record())
{
-
- $leieobjekt[]= array (
+ $leieobjekt_utf[]= array (
+ 'location_code' =>
$this->db_boei->f('location_code'),
+ 'loc1' =>
$this->db_boei->f('objekt_id'),
+ 'loc4' =>
$this->db_boei->f('leie_id'),
+ 'leieobjekttype_id'=>
$this->db_boei->f('leieobjekttype_id'),
+ 'loc2' =>
$this->db_boei->f('bygg_id'),
+ 'loc3' =>
$this->db_boei->f('seksjons_id'),
+ 'category' =>
$this->db_boei->f('formaal_id'),
+ 'street_id' =>
$this->db_boei->f('gateadresse_id'),
+ 'street_number' =>
utf8_encode($this->db_boei->f('gatenr')),
+ 'etasje' =>
utf8_encode($this->db_boei->f('etasje')),
+ 'antallrom' =>
$this->db_boei->f('antallrom'),
+ 'boareal' =>
$this->db_boei->f('boareal'),
+ 'livslopsstd' =>
$this->db_boei->f('livslopsstd'),
+ 'heis' =>
$this->db_boei->f('heis'),
+ 'driftsstatus_id' =>
$this->db_boei->f('driftsstatus_id'),
+ 'tenant_id' =>
$this->db_boei->f('leietaker_id'),
+ 'beregnet_boa' =>
$this->db_boei->f('beregnet_boa')
+ );
+ $leieobjekt_latin[]= array (
'location_code' =>
$this->db_boei->f('location_code'),
'loc1' =>
$this->db_boei->f('objekt_id'),
'loc4' =>
$this->db_boei->f('leie_id'),
@@ -493,24 +545,27 @@
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei->transaction_begin();
for ($i=0; $i<count($leieobjekt); $i++)
{
- $sql2 = "INSERT INTO fm_location4
(location_code, loc1, loc4, leieobjekttype_id, loc2, loc3, category, street_id,
street_number, etasje, antallrom, boareal, livslopsstd, heis, driftsstatus_id,
+ $sql2_utf = "INSERT INTO fm_location4
(location_code, loc1, loc4, leieobjekttype_id, loc2, loc3, category, street_id,
street_number, etasje, antallrom, boareal, livslopsstd, heis, driftsstatus_id,
+ tenant_id, beregnet_boa)"
+ . "VALUES (" .
$this->bocommon->validate_db_insert($leieobjekt_utf[$i]) . ")";
+ $sql2_latin = "INSERT INTO fm_location4
(location_code, loc1, loc4, leieobjekttype_id, loc2, loc3, category, street_id,
street_number, etasje, antallrom, boareal, livslopsstd, heis, driftsstatus_id,
tenant_id, beregnet_boa)"
- . "VALUES (" .
$this->bocommon->validate_db_insert($leieobjekt[$i]) . ")";
+ . "VALUES (" .
$this->bocommon->validate_db_insert($leieobjekt_latin[$i]) . ")";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei->query($sql2_latin,__LINE__,__FILE__);
-
$leieobjekt_msg[]=$leieobjekt[$i]['location_code'];
+
$leieobjekt_msg[]=$leieobjekt_utf[$i]['location_code'];
}
- $this->db->transaction_commit();
- $this->db_boei->transaction_commit();
+ // $this->db->transaction_commit();
+ // $this->db_boei->transaction_commit();
$msg = count($leieobjekt) . ' Leieobjekt er lagt til: '
. @implode(",", $leieobjekt_msg);
$this->receipt['message'][]=array('msg'=> $msg);
@@ -531,7 +586,17 @@
while ($this->db_boei->next_record())
{
- $leietaker[]= array (
+ $leietaker_utf[]= array (
+ 'id' =>
$this->db_boei->f('leietaker_id'),
+ 'first_name' =>
utf8_encode($this->db_boei->f('fornavn')),
+ 'last_name' =>
utf8_encode($this->db_boei->f('etternavn')),
+ 'category' =>
$this->db_boei->f('kjonn_juridisk') + 1,
+ 'status_eco' =>
$this->db_boei->f('namssakstatusokonomi_id'),
+ 'status_drift' =>
$this->db_boei->f('namssakstatusdrift_id'),
+ 'entry_date' => time(),
+ 'owner_id' => 6
+ );
+ $leietaker_latin[]= array (
'id' =>
$this->db_boei->f('leietaker_id'),
'first_name' =>
$this->db_boei->f('fornavn'),
'last_name' =>
$this->db_boei->f('etternavn'),
@@ -543,22 +608,24 @@
);
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei->transaction_begin();
for ($i=0; $i<count($leietaker); $i++)
{
- $sql2 = "INSERT INTO fm_tenant (id, first_name,
last_name, category, status_eco, status_drift,entry_date,owner_id)"
- . "VALUES (" .
$this->bocommon->validate_db_insert($leietaker[$i]) . ")";
+ $sql2_utf = "INSERT INTO fm_tenant (id,
first_name, last_name, category, status_eco, status_drift,entry_date,owner_id)"
+ . "VALUES (" .
$this->bocommon->validate_db_insert($leietaker_utf[$i]) . ")";
+ $sql2_latin = "INSERT INTO fm_tenant (id,
first_name, last_name, category, status_eco, status_drift,entry_date,owner_id)"
+ . "VALUES (" .
$this->bocommon->validate_db_insert($leietaker_latin[$i]) . ")";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei->query($sql2_latin,__LINE__,__FILE__);
- $leietaker_msg[]= '['
.$leietaker[$i]['last_name'] . ', ' . $leietaker[$i]['first_name'] . ']';
+ $leietaker_msg[]= '['
.$leietaker_utf[$i]['last_name'] . ', ' . $leietaker_utf[$i]['first_name'] .
']';
}
- $this->db->transaction_commit();
- $this->db_boei->transaction_commit();
+ // $this->db->transaction_commit();
+ // $this->db_boei->transaction_commit();
$msg = count($leietaker) . ' Leietaker er lagt til: ' .
@implode(",", $leietaker_msg);
$this->receipt['message'][]=array('msg'=> $msg);
@@ -576,13 +643,22 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei2->transaction_begin();
$i=0;
while ($this->db_boei->next_record())
{
- $sql2 = " UPDATE fm_location4 SET "
+ $sql2_utf = " UPDATE fm_location4 SET "
+ . " tenant_id = '" .
$this->db_boei->f('leietaker_id') . "',"
+ . " category = '" .
$this->db_boei->f('formaal_id') . "',"
+ . " etasje = '" .
utf8_encode($this->db_boei->f('etasje')) . "',"
+ . " street_id = '" .
$this->db_boei->f('gateadresse_id') . "',"
+ . " street_number = '" .
utf8_encode($this->db_boei->f('gatenr')) . "',"
+ . " driftsstatus_id = '" .
$this->db_boei->f('driftsstatus_id') . "',"
+ . " boareal = '" . $this->db_boei->f('boareal')
. "'"
+ . " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "' AND loc4= '" .
$this->db_boei->f('leie_id') . "'";
+ $sql2_latin = " UPDATE fm_location4 SET "
. " tenant_id = '" .
$this->db_boei->f('leietaker_id') . "',"
. " category = '" .
$this->db_boei->f('formaal_id') . "',"
. " etasje = '" . $this->db_boei->f('etasje') .
"',"
@@ -592,13 +668,13 @@
. " boareal = '" . $this->db_boei->f('boareal')
. "'"
. " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "' AND loc4= '" .
$this->db_boei->f('leie_id') . "'";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei2->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei2->query($sql2_latin,__LINE__,__FILE__);
$i++;
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_commit();
+ // $this->db_boei2->transaction_commit();
$msg = $i . ' Leieobjekt er oppdatert';
$this->receipt['message'][]=array('msg'=> $msg);
@@ -616,13 +692,21 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei2->transaction_begin();
$i=0;
while ($this->db_boei->next_record())
{
- $sql2 = " UPDATE fm_location1 SET "
+ $sql2_utf = " UPDATE fm_location1 SET "
+ . " loc1_name = '" .
utf8_encode($this->db_boei->f('navn')) . "',"
+ . " sum_boa = '" . $this->db_boei->f('sum_boa')
. "',"
+ . " ant_leieobjekt = '" .
$this->db_boei->f('ant_leieobjekt') . "',"
+ . " part_of_town_id = '" .
$this->db_boei->f('bydel_id') . "',"
+ . " owner_id = '" .
$this->db_boei->f('eier_id') . "',"
+ . " kostra_id = '" .
$this->db_boei->f('tjenestested') . "'"
+ . " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "'";
+ $sql2_latin = " UPDATE fm_location1 SET "
. " loc1_name = '" . $this->db_boei->f('navn')
. "',"
. " sum_boa = '" . $this->db_boei->f('sum_boa')
. "',"
. " ant_leieobjekt = '" .
$this->db_boei->f('ant_leieobjekt') . "',"
@@ -631,12 +715,12 @@
. " kostra_id = '" .
$this->db_boei->f('tjenestested') . "'"
. " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "'";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei2->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei2->query($sql2_latin,__LINE__,__FILE__);
$i++;
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_commit();
+ // $this->db_boei2->transaction_commit();
$msg = $i . ' Objekt er oppdatert';
$this->receipt['message'][]=array('msg'=> $msg);
@@ -655,24 +739,29 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei2->transaction_begin();
$i=0;
while ($this->db_boei->next_record())
{
- $sql2 = " UPDATE fm_location2 SET "
+ $sql2_utf = " UPDATE fm_location2 SET "
+ . " loc2_name = '" .
utf8_encode($this->db_boei->f('byggnavn')) . "',"
+ . " sum_boa = '" . $this->db_boei->f('sum_boa')
. "',"
+ . " ant_leieobjekt = '" .
$this->db_boei->f('ant_leieobjekt') . "'"
+ . " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "' AND loc2= '" .
$this->db_boei->f('bygg_id') . "'";
+ $sql2_latin = " UPDATE fm_location2 SET "
. " loc2_name = '" .
$this->db_boei->f('byggnavn') . "',"
. " sum_boa = '" . $this->db_boei->f('sum_boa')
. "',"
. " ant_leieobjekt = '" .
$this->db_boei->f('ant_leieobjekt') . "'"
. " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "' AND loc2= '" .
$this->db_boei->f('bygg_id') . "'";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei2->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei2->query($sql2_utf,__LINE__,__FILE__);
$i++;
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_commit();
+ // $this->db_boei2->transaction_commit();
$msg = $i . ' Bygg er oppdatert';
$this->receipt['message'][]=array('msg'=> $msg);
@@ -694,23 +783,28 @@
$i=0;
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei2->transaction_begin();
while ($this->db_boei->next_record())
{
- $sql2 = " UPDATE fm_location3 SET "
+ $sql2_utf = " UPDATE fm_location3 SET "
+ . " loc3_name = '" .
utf8_encode($this->db_boei->f('beskrivelse')) . "',"
+ . " sum_boa = '" . $this->db_boei->f('sum_boa')
. "',"
+ . " ant_leieobjekt = '" .
$this->db_boei->f('ant_leieobjekt') . "'"
+ . " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "' AND loc2= '" .
$this->db_boei->f('bygg_id') . "' AND loc3= '" .
$this->db_boei->f('seksjons_id') . "'";
+ $sql2_latin = " UPDATE fm_location3 SET "
. " loc3_name = '" .
$this->db_boei->f('beskrivelse') . "',"
. " sum_boa = '" . $this->db_boei->f('sum_boa')
. "',"
. " ant_leieobjekt = '" .
$this->db_boei->f('ant_leieobjekt') . "'"
. " WHERE loc1 = '" .
$this->db_boei->f('objekt_id') . "' AND loc2= '" .
$this->db_boei->f('bygg_id') . "' AND loc3= '" .
$this->db_boei->f('seksjons_id') . "'";
- $this->db->query($sql2,__LINE__,__FILE__);
- $this->db_boei2->query($sql2,__LINE__,__FILE__);
+ $this->db->query($sql2_utf,__LINE__,__FILE__);
+
$this->db_boei2->query($sql2_latin,__LINE__,__FILE__);
$i++;
}
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_commit();
+ // $this->db_boei2->transaction_commit();
$msg = $i . ' Seksjoner er oppdatert';
$this->receipt['message'][]=array('msg'=> $msg);
@@ -728,8 +822,8 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
- $this->db->transaction_begin();
- $this->db_boei->transaction_begin();
+ // $this->db->transaction_begin();
+ // $this->db_boei->transaction_begin();
while ($this->db_boei->next_record())
{
@@ -762,8 +856,8 @@
$this->db_boei->query($sql,__LINE__,__FILE__);
}
- $this->db->transaction_commit();
- $this->db_boei->transaction_commit();
+ // $this->db->transaction_commit();
+ // $this->db_boei->transaction_commit();
$msg = $i . ' oppsagtdato er oppdatert';
$this->receipt['message'][]=array('msg'=> $msg);
Index: inc/export/Agresso
===================================================================
RCS file: /sources/phpgroupware/property/inc/export/Agresso,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- inc/export/Agresso 26 Jan 2007 14:58:55 -0000 1.34
+++ inc/export/Agresso 16 Mar 2007 08:57:05 -0000 1.35
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage export
- * @version $Id: Agresso,v 1.34 2007/01/26 14:58:55 sigurdne Exp $
+ * @version $Id: Agresso,v 1.35 2007/03/16 08:57:05 sigurdne Exp $
*/
/**
@@ -543,7 +543,7 @@
$Filnavn = $this->LagFilnavn($batchid,$pre_transfer);
if (!$Filnavn)
{
- $message='LagFilnavn'.lang('Alle løpenr for
filnavn er i bruk!');
+ $message='LagFilnavn'.lang('Alle loepenr for
filnavn er i bruk!');
$this->errorhandler($message);
return $message;
}
@@ -595,7 +595,7 @@
else
{
//Ikke lovlig
- $message = lang('Avvik mellom
fakturabeløp og godkjent beløp på splittet faktura!');
+ $message = lang('Avvik mellom
fakturabelop og godkjent belop pa splittet faktura!');
$this->errorhandler($message);
return $message;
}
@@ -669,7 +669,7 @@
$Fakturaref = '000000000';// verdi: 0,
type: i4, plass: 401 - 409
$Inkassokode = sprintf("%-6s",'');// verdi:
Blank, type: c6, plass: 410 - 415
$Bet_mottager = sprintf("%-8s",'');// verdi:
Blank, type: c8, plass: 416 - 423
- $Att_ansvarlig =
sprintf("%-6s",$oRsBilag[$k]['saksbehandler']);// verdi: Blank, type: c6,
plass: 424 - 429
+ $Att_ansvarlig =
sprintf("%-6s",utf8_decode($oRsBilag[$k]['saksbehandler']));// verdi: Blank,
type: c6, plass: 424 - 429
$vendor_info =
$this->get_vendor_info($oRsBilag[$k]['spvend_code']);
@@ -692,7 +692,7 @@
$Stat_Provins = sprintf("%-50s",'');// verdi:
Blank, type: c50, plass: 640 - 689
$Sted = sprintf("%-50s",'');// verdi:
Blank, type: c50, plass: 690 - 739
$Bank_Postgiro_kontonr =
sprintf("%-35s",str_replace(" ","",$vendor_info['konto_nr']));// verdi:
konto_nr, type: c35, plass: 740 - 774
- $Betalingsmåte = sprintf("%-2s",'');// verdi:
Blank, type: c2, plass: 775 - 776
+ $Betalingsmate = sprintf("%-2s",'');// verdi:
Blank, type: c2, plass: 775 - 776
$Mva_reg_nr = sprintf("%-25s",'');// verdi:
Blank, type: c25, plass: 777 - 801
$Postnummer = sprintf("%-15s",'');// verdi:
Blank, type: c15, plass: 802 - 816
$Val_dok = sprintf("%-3s",'');// verdi:
Blank, type: c3, plass: 817 - 819
@@ -827,14 +827,14 @@
if($oRsOverfBilag['pmwrkord_code'])
{
- $Tekst =
sprintf("%-50s",substr($this->get_order_title($oRsOverfBilag['pmwrkord_code']),0,50));//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));//
verdi: Tekst, type: text (50), plass: 201 - 250
+ $Tekst =
sprintf("%-50s",substr(utf8_decode($this->get_order_title($oRsOverfBilag['pmwrkord_code'])),0,50));//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));//
verdi: Tekst, type: text (50), plass: 201 - 250
}
else
{
$Tekst =
sprintf("%-50s",'');//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));//
verdi: Tekst, type: text (50), plass: 201 - 250
}
- $Fakturanr =
sprintf("%-15s",$oRsOverfBilag['fakturanr']);// verdi: Fakturanr, type: c15,
plass: 283 - 297
+ $Fakturanr =
sprintf("%-15s",utf8_decode($oRsOverfBilag['fakturanr']));// verdi: Fakturanr,
type: c15, plass: 283 - 297
$Ordrenummer =
sprintf("%-9s",$oRsOverfBilag['pmwrkord_code']);// verdi: Infodoc ordrenr,
type: i4, plass: 342 - 350
@@ -853,7 +853,7 @@
$Bilagsnr . $Periode . $ESL .
$Fakturanr . $Forfall . $Rab_forf . $Rabatt . $Avt_Kon . $Ordrenummer .
$Kid . $Bet_overforing . $Status .
$Resk_type . $Resk_nr . $Forskudd . $Fakturaref . $Fakturaref .
$Inkassokode . $Bet_mottager .
$Att_ansvarlig . $Resk_navn . $Postadresse . $Stat_Provins . $Sted .
- $Bank_Postgiro_kontonr . $Betalingsmåte
. $Mva_reg_nr . $Postnummer . $Val_dok ."\r\n";
+ $Bank_Postgiro_kontonr . $Betalingsmate
. $Mva_reg_nr . $Postnummer . $Val_dok ."\r\n";
if($i==$last_record)
{
@@ -908,7 +908,7 @@
$Bilagsnr . $Periode . $ESL .
$Fakturanr . $Forfall . $Rab_forf . $Rabatt . $Avt_Kon . $Ordrenummer .
$Kid . $Bet_overforing .
$Status . $Resk_type . $Resk_nr . $Forskudd . $Fakturaref . $Fakturaref .
$Inkassokode . $Bet_mottager .
$Att_ansvarlig . $Resk_navn . $Postadresse . $Stat_Provins . $Sted .
- $Bank_Postgiro_kontonr .
$Betalingsmåte . $Mva_reg_nr . $Postnummer . $Val_dok ."\r\n";
+ $Bank_Postgiro_kontonr .
$Betalingsmate . $Mva_reg_nr . $Postnummer . $Val_dok ."\r\n";
}
//Slett post i fm_ecobilag
@@ -951,12 +951,12 @@
if($transfer_ok)
{
$this->db->transaction_commit();
- $message = 'Godkjent: periode:
'.$Periode.' antall bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn;
+ $message = 'Godkjent: periode:
'.$Periode.' antall bilag/underbilag overfort:'.$antall . ' , fil: ' . $Filnavn;
}
else
{
$this->db->transaction_abort();
- $message = 'Noe gikk galt med
overføring av godkjendte fakturaer!';
+ $message = 'Noe gikk galt med
overforing av godkjendte fakturaer!';
}
}
elseif($download=='on' && $pre_transfer &&
!$this->debug):
@@ -983,7 +983,7 @@
if($transfer_ok)
{
$this->db->transaction_commit();
- $message = 'Ankomstregistrering:
periode: '.$Periode.' antall bilag/underbilag overført:'.$antall . ' , fil: ' .
$Filnavn;
+ $message = 'Ankomstregistrering:
periode: '.$Periode.' antall bilag/underbilag overfort:'.$antall . ' , fil: ' .
$Filnavn;
}
else
{
Index: tutorials/property/examples/install.apache.sh
===================================================================
RCS file:
/sources/phpgroupware/property/tutorials/property/examples/install.apache.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tutorials/property/examples/install.apache.sh 16 Jan 2007 13:35:08
-0000 1.5
+++ tutorials/property/examples/install.apache.sh 16 Mar 2007 08:57:05
-0000 1.6
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Id: install.apache.sh,v 1.5 2007/01/16 13:35:08 sigurdne Exp $
+# $Id: install.apache.sh,v 1.6 2007/03/16 08:57:05 sigurdne Exp $
#/**
# * installscript for APACHE with PHP, IMAP, POSTGRESQL, MYSQL, LIBXML, XSLT,
FREEDTS(MSSQL) and EACCELERATOR
@@ -49,13 +49,13 @@
# *
# * @var string PHP, PHPTAR
# */
-PHPTAR="php-5.2.0.tar.bz2"
-PHP="php-5.2.0"
+PHPTAR="php-5.2.1.tar.bz2"
+PHP="php-5.2.1"
#/**
-# * Name of the MMCACHE tarball e.g turck-mmcache-2.4.6.tar.gz
+# * Name of the EACCELERATOR tarball e.g eaccelerator-0.9.5.tar.bz2
# *
-# * @var string MMCACHE, MMCACHETAR
+# * @var string EACCELERATOR, EACCELERATORTAR
# */
EACCELERATORTAR="eaccelerator-0.9.5.tar.bz2"
EACCELERATOR="eaccelerator-0.9.5"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.hist...,
Sigurd Nes <=