[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.acl2.inc.php export/Agresso ...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.acl2.inc.php export/Agresso ... |
|
Date: |
Fri, 27 Jan 2006 17:03:30 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/01/27 17:03:30
Modified files:
inc : class.acl2.inc.php
inc/export : Agresso Ecolink GABNr Kemner_kvittering
inc/import : Import_fra_BKK_csv Import_fra_Service
Import_fra_Service_xml
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.acl2.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/export/Agresso.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/export/Ecolink.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/export/GABNr.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/export/Kemner_kvittering.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/import/Import_fra_BKK_csv.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/import/Import_fra_Service.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/import/Import_fra_Service_xml.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
Patches:
Index: property/inc/class.acl2.inc.php
diff -u property/inc/class.acl2.inc.php:1.6 property/inc/class.acl2.inc.php:1.7
--- property/inc/class.acl2.inc.php:1.6 Fri Jan 27 14:05:42 2006
+++ property/inc/class.acl2.inc.php Fri Jan 27 17:03:30 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.acl2.inc.php,v 1.6 2006/01/27 14:05:42 sigurdne
Exp $
+ * @version $Id: class.acl2.inc.php,v 1.7 2006/01/27 17:03:30 sigurdne
Exp $
*/
/**
@@ -38,8 +38,22 @@
$expected_args[2] =
Array('name'=>'app_id','default'=>$GLOBALS['phpgw']->applications->data[$GLOBALS['phpgw_info']['flags']['currentapp']]['id'],
'type'=>'number');
$recieved_args = func_get_args();
$args = safe_args($expected_args,
$recieved_args,__LINE__,__FILE__);
- $this->db = $GLOBALS['phpgw']->db;
- $this->db2 = $this->db;
+ // $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->db2 = CreateObject('phpgwapi.db');
+ $this->db2->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
+ $this->db2->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
+ $this->db2->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
+ $this->db2->User =
$GLOBALS['phpgw_info']['server']['db_user'];
+ $this->db2->Password =
$GLOBALS['phpgw_info']['server']['db_pass'];
+
+ // $this->db2 = $this->db;
$this->account_id = $args['account_id'];
$this->host_id = $args['host_id'];
$this->app_id = $args['app_id'];
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.28 property/inc/export/Agresso:1.29
--- property/inc/export/Agresso:1.28 Wed Jan 25 18:19:12 2006
+++ property/inc/export/Agresso Fri Jan 27 17:03:30 2006
@@ -8,7 +8,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.28 2006/01/25 18:19:12 sigurdne Exp $
+ * @version $Id: Agresso,v 1.29 2006/01/27 17:03:30 sigurdne Exp $
*/
/**
@@ -27,13 +27,13 @@
{
$GLOBALS['phpgw_info']['flags']['currentapp'] =
'property';
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->db = $GLOBALS['phpgw']->db;
+ // $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');
-
+ $this->db = $this->bocommon->new_db();
}
function
select_periods_with_invoice_to_transfer($pre_transfer='')
Index: property/inc/export/Ecolink
diff -u property/inc/export/Ecolink:1.7 property/inc/export/Ecolink:1.8
--- property/inc/export/Ecolink:1.7 Thu May 12 21:26:28 2005
+++ property/inc/export/Ecolink Fri Jan 27 17:03:30 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage export
- * @version $Id: Ecolink,v 1.7 2005/05/12 21:26:28 sigurdne Exp $
+ * @version $Id: Ecolink,v 1.8 2006/01/27 17:03:30 sigurdne Exp $
*/
/**
@@ -22,13 +22,13 @@
function export_conv()
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->db = $GLOBALS['phpgw']->db;
+ // $this->db = $GLOBALS['phpgw']->db;
$this->soXport = CreateObject('property.soXport');
- $this->$config =
CreateObject('phpgwapi.config','property');
- $this->$config->read_repository();
+ $this->config =
CreateObject('phpgwapi.config','property');
+ $this->config->read_repository();
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
-
+ $this->db = $this->bocommon->new_db();
}
function select_periods_with_invoice_to_transfer()
@@ -343,7 +343,7 @@
if($antall > 0)
{
- $fil_katalog =
$this->$config->config_data['export_path'];
+ $fil_katalog =
$this->config->config_data['export_path'];
if(unlink ($fil_katalog. SEP . $Filnavn))
{
@@ -367,7 +367,7 @@
function LagFilnavn ($batchid)
{
- $fil_katalog =
$this->$config->config_data['export_path'];
+ $fil_katalog =
$this->config->config_data['export_path'];
//Beregn løpenr
$StartLopeNr = ($batchid % 30) + 70;
$LopeNr = $StartLopeNr;
Index: property/inc/export/GABNr
diff -u property/inc/export/GABNr:1.8 property/inc/export/GABNr:1.9
--- property/inc/export/GABNr:1.8 Thu May 12 21:26:28 2005
+++ property/inc/export/GABNr Fri Jan 27 17:03:30 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage export
- * @version $Id: GABNr,v 1.8 2005/05/12 21:26:28 sigurdne Exp $
+ * @version $Id: GABNr,v 1.9 2006/01/27 17:03:30 sigurdne Exp $
*/
/**
@@ -23,15 +23,13 @@
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->soXport =
CreateObject($this->currentapp.'.soXport');
- $this->$config =
CreateObject('phpgwapi.config','property');
+ $this->config =
CreateObject('phpgwapi.config','property');
$this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->solocation =
CreateObject($this->currentapp.'.solocation');
+ $this->config->read_repository();
- $this->$config->read_repository();
-
- $this->db = $GLOBALS['phpgw']->db;
-
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
+ // $this->db = $GLOBALS['phpgw']->db;
+ $this->db = $this->socommon->new_db();
$this->join = $this->socommon->join;
@@ -50,7 +48,7 @@
function LagFilnavn ($batchid)
{
- $fil_katalog =
$this->$config->config_data['export_path'];
+ $fil_katalog =
$this->config->config_data['export_path'];
//Beregn løpenr
$StartLopeNr = ($batchid % 30) + 70;
$LopeNr = $StartLopeNr;
Index: property/inc/export/Kemner_kvittering
diff -u property/inc/export/Kemner_kvittering:1.4
property/inc/export/Kemner_kvittering:1.5
--- property/inc/export/Kemner_kvittering:1.4 Thu May 12 21:26:28 2005
+++ property/inc/export/Kemner_kvittering Fri Jan 27 17:03:30 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage export
- * @version $Id: Kemner_kvittering,v 1.4 2005/05/12 21:26:28 sigurdne
Exp $
+ * @version $Id: Kemner_kvittering,v 1.5 2006/01/27 17:03:30 sigurdne
Exp $
*/
/**
@@ -23,11 +23,11 @@
{
$this->soXport = CreateObject('property.soXport');
- $this->$config =
CreateObject('phpgwapi.config','property');
- $this->$config->read_repository();
- $this->db = $GLOBALS['phpgw']->db;
+ $this->config =
CreateObject('phpgwapi.config','property');
+ $this->config->read_repository();
+ // $this->db = $GLOBALS['phpgw']->db;
$this->socommon =
CreateObject($this->currentapp.'.socommon');
-
+ $this->db = $this->socommon->new_db();
$this->join = $this->socommon->join;
}
@@ -74,7 +74,7 @@
function LagFilnavn ($batchid)
{
- $fil_katalog =
$this->$config->config_data['export_path'];
+ $fil_katalog =
$this->config->config_data['export_path'];
//Beregn løpenr
$StartLopeNr = ($batchid % 30) + 70;
$LopeNr = $StartLopeNr;
Index: property/inc/import/Import_fra_BKK_csv
diff -u property/inc/import/Import_fra_BKK_csv:1.1
property/inc/import/Import_fra_BKK_csv:1.2
--- property/inc/import/Import_fra_BKK_csv:1.1 Fri Jan 6 12:55:30 2006
+++ property/inc/import/Import_fra_BKK_csv Fri Jan 27 17:03:30 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_BKK_csv,v 1.1 2006/01/06 12:55:30 sigurdne
Exp $
+ * @version $Id: Import_fra_BKK_csv,v 1.2 2006/01/27 17:03:30 sigurdne
Exp $
*/
/**
@@ -75,7 +75,8 @@
$this->config->read_repository();
$this->meter_table =
$this->config->config_data['meter_table'];
- $this->db = $GLOBALS['phpgw']->db;
+ // $this->db = $GLOBALS['phpgw']->db;
+ $this->db = $this->bocommon->new_db();
$this->join = $this->bocommon->join;
Index: property/inc/import/Import_fra_Service
diff -u property/inc/import/Import_fra_Service:1.14
property/inc/import/Import_fra_Service:1.15
--- property/inc/import/Import_fra_Service:1.14 Thu May 12 21:26:28 2005
+++ property/inc/import/Import_fra_Service Fri Jan 27 17:03:30 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_Service,v 1.14 2005/05/12 21:26:28 sigurdne
Exp $
+ * @version $Id: Import_fra_Service,v 1.15 2006/01/27 17:03:30 sigurdne
Exp $
*/
/**
@@ -42,11 +42,12 @@
function import_conv()
{
- $this->db = $GLOBALS['phpgw']->db;
+ // $this->db = $GLOBALS['phpgw']->db;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->soXport =
CreateObject($this->currentapp.'.soXport');
$this->invoice =
CreateObject($this->currentapp.'.boinvoice');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->db = $this->bocommon->new_db();
$this->dateformat = $this->bocommon->dateformat;
$this->datetimeformat =
$this->bocommon->datetimeformat;
$this->next_bilagsnr =
$this->invoice->next_bilagsnr();
Index: property/inc/import/Import_fra_Service_xml
diff -u property/inc/import/Import_fra_Service_xml:1.14
property/inc/import/Import_fra_Service_xml:1.15
--- property/inc/import/Import_fra_Service_xml:1.14 Thu May 12 21:26:28 2005
+++ property/inc/import/Import_fra_Service_xml Fri Jan 27 17:03:30 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_Service_xml,v 1.14 2005/05/12 21:26:28
sigurdne Exp $
+ * @version $Id: Import_fra_Service_xml,v 1.15 2006/01/27 17:03:30
sigurdne Exp $
*/
/**
@@ -42,11 +42,12 @@
function import_conv()
{
- $this->db = $GLOBALS['phpgw']->db;
+ // $this->db = $GLOBALS['phpgw']->db;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->soXport =
CreateObject($this->currentapp.'.soXport');
$this->invoice =
CreateObject($this->currentapp.'.boinvoice');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->db = $this->bocommon->new_db();
$this->dateformat = $this->bocommon->dateformat;
$this->datetimeformat =
$this->bocommon->datetimeformat;
$this->next_bilagsnr =
$this->invoice->next_bilagsnr();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.acl2.inc.php export/Agresso ...,
Sigurd Nes <=