[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8462] property: adjustments
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8462] property: adjustments |
|
Date: |
Fri, 30 Dec 2011 15:21:57 +0000 |
Revision: 8462
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8462
Author: sigurdne
Date: 2011-12-30 15:21:56 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
property: adjustments
Modified Paths:
--------------
trunk/property/inc/class.sobudget.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/cron/default/Import_fra_basware_X205.php
trunk/property/inc/export/default/Basware_X114
trunk/property/setup/default_records.inc.php
trunk/property/setup/tables_update.inc.php
Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php 2011-12-29 20:48:39 UTC (rev
8461)
+++ trunk/property/inc/class.sobudget.inc.php 2011-12-30 15:21:56 UTC (rev
8462)
@@ -34,6 +34,7 @@
class property_sobudget
{
+ var $sum_actual_cost = 0;
function __construct()
{
$this->cats =
CreateObject('phpgwapi.categories', -1, 'property', '.project');
@@ -770,13 +771,18 @@
$this->db->query($sql,__LINE__,__FILE__);
+ $sum_actual_cost = 0;
while ($this->db->next_record())
{
-
$actual_cost[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('dimb')]
+= round($this->db->f('actual_cost'));
+ $_actual_cost =
round($this->db->f('actual_cost'));
+ $sum_actual_cost += $_actual_cost;
+
$actual_cost[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('dimb')]
+= $_actual_cost;
$accout_info[$this->db->f($b_account_field)] =
true;
$district[$this->db->f('district_id')] = true;
$ecodimb[(int)$this->db->f('dimb')] = true;
}
+
+ $this->sum_actual_cost = $sum_actual_cost;
//_debug_array($actual_cost);die();
$result = array();
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2011-12-29 20:48:39 UTC (rev
8461)
+++ trunk/property/inc/class.soinvoice.inc.php 2011-12-30 15:21:56 UTC (rev
8462)
@@ -169,7 +169,7 @@
$no_q = false;
if ($voucher_id)
{
- $filtermethod = " WHERE bilagsnr = " .
(int)$voucher_id;
+ $filtermethod = " WHERE bilagsnr = " .
(int)$voucher_id . " OR bilagsnr_ut = '{$voucher_id}'";
$no_q = true;
}
Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-12-29
20:48:39 UTC (rev 8461)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2011-12-30
15:21:56 UTC (rev 8462)
@@ -224,7 +224,7 @@
$server =
$this->config->config_data['common']['host'];
$user =
$this->config->config_data['common']['user'];
$password =
$this->config->config_data['common']['password'];
- $directory_remote =
rtrim($this->config->config_data['common']['remote_basedir'],'/');
+ $directory_remote =
rtrim($this->config->config_data['import']['remote_basedir'],'/');
$directory_local =
rtrim($this->config->config_data['import']['local_path'],'/');
$port = 22;
Modified: trunk/property/inc/export/default/Basware_X114
===================================================================
--- trunk/property/inc/export/default/Basware_X114 2011-12-29 20:48:39 UTC
(rev 8461)
+++ trunk/property/inc/export/default/Basware_X114 2011-12-30 15:21:56 UTC
(rev 8462)
@@ -581,7 +581,7 @@
$this->db->transaction_begin();
}
-
+ $bilagsnr_ut = '';
$get_bilagsnr_ut = false;
foreach ($oRsBilag as $line)
{
@@ -601,7 +601,6 @@
$this->db->query("UPDATE fm_ecobilag SET
bilagsnr_ut = {$bilagsnr_ut} WHERE bilagsnr = '$voucher_id'");
}
-
$tranfser_bilag = array($bilagsnr_ut);
$localtime = phpgwapi_datetime::user_localtime();
@@ -735,6 +734,7 @@
$oRsOverfBilag['filnavn'] = $Filnavn?
basename($Filnavn) : date('d.m.Y-H:i:s', phpgwapi_datetime::user_localtime());
$oRsOverfBilag['ordrebelop']= $line[$BelopFelt];
$oRsOverfBilag['pmwrkord_code'] =
$line['order_id'];
+ $oRsOverfBilag['bilagsnr_ut'] = $bilagsnr_ut;
//Kopier verdier til fm_ecobilagoverf
if ($download=='on' && !$this->debug)
@@ -953,7 +953,7 @@
$connection =
$this->phpftp_connect();
}
- $basedir =
$this->config->config_data['common']['remote_basedir'];
+ $basedir =
$this->config->config_data['export']['remote_basedir'];
if($basedir)
{
$remote_file = $basedir . '/' .
basename($Filnavn);
Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php 2011-12-29 20:48:39 UTC
(rev 8461)
+++ trunk/property/setup/default_records.inc.php 2011-12-30 15:21:56 UTC
(rev 8462)
@@ -774,15 +774,6 @@
$receipt = $custom_config->add_attrib(array
(
'section_id' =>
$receipt_section_common['section_id'],
- 'input_type' => 'text',
- 'name' => 'remote_basedir',
- 'descr' => 'basedir on remote
server',
- )
- );
-
- $receipt = $custom_config->add_attrib(array
- (
- 'section_id' =>
$receipt_section_common['section_id'],
'attrib_id' =>
$receipt['attrib_id'],
'input_type' => 'listbox',
'name' => 'invoice_approval',
@@ -826,6 +817,15 @@
)
);
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_import['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'remote_basedir',
+ 'descr' => 'basedir on remote
server',
+ )
+ );
+
//export
$receipt_section_export = $custom_config->add_section(array
(
@@ -866,3 +866,13 @@
'descr' => 'path on local sever
to store exported files for pre approved vouchers',
)
);
+
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_export['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'remote_basedir',
+ 'descr' => 'basedir on remote
server to receive files',
+ )
+ );
+
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2011-12-29 20:48:39 UTC (rev
8461)
+++ trunk/property/setup/tables_update.inc.php 2011-12-30 15:21:56 UTC (rev
8462)
@@ -5640,16 +5640,6 @@
$receipt = $custom_config->add_attrib(array
(
'section_id' =>
$receipt_section_common['section_id'],
- 'input_type' => 'text',
- 'name' => 'remote_basedir',
- 'descr' => 'basedir on remote
server',
- 'value' =>
$config->config_data['invoice_ftp_basedir'],
- )
- );
-
- $receipt = $custom_config->add_attrib(array
- (
- 'section_id' =>
$receipt_section_common['section_id'],
'attrib_id' =>
$receipt['attrib_id'],
'input_type' => 'listbox',
'name' => 'invoice_approval',
@@ -5697,6 +5687,15 @@
)
);
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_import['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'remote_basedir',
+ 'descr' => 'basedir on remote
server to fetch files from',
+ )
+ );
+
//export
$receipt_section_export = $custom_config->add_section(array
(
@@ -5740,6 +5739,16 @@
)
);
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_export['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'remote_basedir',
+ 'descr' => 'basedir on remote
server to receive files',
+ )
+ );
+
+
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
{
$GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.630';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8462] property: adjustments,
Sigurd Nes <=