[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8465] Merge 8461:8464 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8465] Merge 8461:8464 from trunk |
|
Date: |
Fri, 30 Dec 2011 15:51:03 +0000 |
Revision: 8465
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8465
Author: sigurdne
Date: 2011-12-30 15:51:02 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
Merge 8461:8464 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/property/setup/default_records.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-12-30
15:47:04 UTC (rev 8464)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-12-30
15:51:02 UTC (rev 8465)
@@ -777,6 +777,11 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiXport.export')),
'text' =>
lang('Export invoice')
);
+ $children['rollback'] = array
+ (
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiXport.rollback')),
+ 'text' =>
lang('Roll back')
+ );
}
if ( $acl->check('.invoice', PHPGW_ACL_ADD,
'property') )
Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2011-12-30 15:47:04 UTC (rev 8464)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2011-12-30 15:51:02 UTC (rev 8465)
@@ -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: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2011-12-30 15:47:04 UTC (rev 8464)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2011-12-30 15:51:02 UTC (rev 8465)
@@ -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: branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
2011-12-30 15:47:04 UTC (rev 8464)
+++ branches/Version-1_0-branch/property/inc/class.uiXport.inc.php
2011-12-30 15:51:02 UTC (rev 8465)
@@ -591,6 +591,8 @@
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=>16, 'acl_location'=> $this->acl_location));
}
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
'property::invoice::rollback';
+
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
'search_field'));
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2011-12-30 15:47:04 UTC (rev 8464)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2011-12-30 15:51:02 UTC (rev 8465)
@@ -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: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-12-30 15:47:04 UTC (rev 8464)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2011-12-30 15:51:02 UTC (rev 8465)
@@ -276,8 +276,8 @@
'merknad'
=> $this->db->f('merknad',true),
'splitt'
=> $this->db->f('splitt'),
'ordrebelop' =>
$this->db->f('ordrebelop'),
- 'utbetalingid' =>
$this->db->f('utbetalingid'),
- 'utbetalingsigndato' =>
$this->db->f('utbetalingsigndato'),
+ // 'utbetalingid' =>
$this->db->f('utbetalingid'),
+ // 'utbetalingsigndato' =>
$this->db->f('utbetalingsigndato'),
'external_ref' =>
$this->db->f('external_ref'),
'currency'
=> $this->db->f('currency'),
'process_log' =>
$this->db->f('process_log',true),
@@ -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: branches/Version-1_0-branch/property/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/default_records.inc.php
2011-12-30 15:47:04 UTC (rev 8464)
+++ branches/Version-1_0-branch/property/setup/default_records.inc.php
2011-12-30 15:51:02 UTC (rev 8465)
@@ -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: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-12-30 15:47:04 UTC (rev 8464)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-12-30 15:51:02 UTC (rev 8465)
@@ -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] [8465] Merge 8461:8464 from trunk,
Sigurd Nes <=