[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16260] Stable: Merge 16256:16259 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16260] Stable: Merge 16256:16259 from trunk |
|
Date: |
Mon, 6 Feb 2017 11:31:33 -0500 (EST) |
Revision: 16260
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16260
Author: sigurdne
Date: 2017-02-06 11:31:32 -0500 (Mon, 06 Feb 2017)
Log Message:
-----------
Stable: Merge 16256:16259 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplannerfrontend/session.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-06 16:25:05 UTC (rev 16259)
+++ branches/Version-2_0-branch 2017-02-06 16:31:32 UTC (rev 16260)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16188
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259
\ No newline at end of property
Modified: branches/Version-2_0-branch/eventplannerfrontend/session.php
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/session.php
2017-02-06 16:25:05 UTC (rev 16259)
+++ branches/Version-2_0-branch/eventplannerfrontend/session.php
2017-02-06 16:31:32 UTC (rev 16260)
@@ -47,6 +47,11 @@
$login = $c->config_data['anonymous_user'];
$passwd = $c->config_data['anonymous_passwd'];
$_POST['submitit'] = "";
+ $domain = phpgw::get_var('domain', 'string', 'GET');
+ if (strstr($login, '#') === false && $domain)
+ {
+ $login .= "#{$domain}";
+ }
$GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login, $passwd);
if (!$GLOBALS['sessionid'])
Modified: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-02-06 16:25:05 UTC (rev 16259)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-02-06 16:31:32 UTC (rev 16260)
@@ -3364,7 +3364,7 @@
phpgw::no_access();
}
- $start_from = 45001065;
+ $start_from = 45001336;
$sql = "SELECT id, status FROM fm_workorder WHERE id >=
$start_from";
$db = & $GLOBALS['phpgw']->db;
$db->query($sql, __LINE__, __FILE__);
Modified:
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
2017-02-06 16:25:05 UTC (rev 16259)
+++
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
2017-02-06 16:31:32 UTC (rev 16260)
@@ -81,11 +81,6 @@
public function execute()
{
- if
(isset($this->config->config_data['import']['check_archive']) &&
$this->config->config_data['import']['check_archive'])
- {
- $this->check_archive();
- }
-
$this->get_files();
$dirname =
$this->config->config_data['import']['local_path'];
// prevent path traversal
@@ -162,59 +157,7 @@
$this->remind();
}
- protected function check_archive()
- {
- $dirname =
$this->config->config_data['import']['local_path'];
- if (preg_match('/\./', $dirname) || !is_dir($dirname))
- {
- return array();
- }
-
- $archive = "{$dirname}/archive";
- $file_list = array();
- $dir = new DirectoryIterator($archive);
- if (is_object($dir))
- {
- foreach ($dir as $file)
- {
- if ($file->isDot() || !$file->isFile()
|| !$file->isReadable() || strcasecmp(end(explode(".", $file->getPathname())),
'xml') != 0)
- {
- continue;
- }
-
- $file_list[] = (string)$file;
- }
- }
-
- foreach ($file_list as $file)
- {
- $file_parts = explode('_', basename($file,
'.xml'));
- $external_voucher_id = $file_parts[2];
-
- $duplicate = false;
- $sql = "SELECT bilagsnr FROM fm_ecobilag WHERE
external_voucher_id = '{$external_voucher_id}'";
- $this->db->query($sql, __LINE__, __FILE__);
- if ($this->db->next_record())
- {
- $duplicate = true;
- }
-
- $sql = "SELECT bilagsnr FROM fm_ecobilagoverf
WHERE external_voucher_id = '{$external_voucher_id}'";
- $this->db->query($sql, __LINE__, __FILE__);
- if ($this->db->next_record())
- {
- $duplicate = true;
- }
-
- if (!$duplicate)
- {
- rename("{$archive}/{$file}",
"{$dirname}/{$file}");
- $this->receipt['message'][] =
array('msg' => "fil tilbakeført fra arkiv til importkø:
{$external_voucher_id}");
- }
- }
- }
-
protected function remind()
{
if
(!isset($GLOBALS['phpgw_info']['server']['smtp_server']) ||
!$GLOBALS['phpgw_info']['server']['smtp_server'])
@@ -736,19 +679,22 @@
{
$bilagsnr =
$this->import_end_file($buffer);
- $received_amount =
$this->get_total_received((int)$order_id);
- $order_type =
$this->bocommon->socommon->get_order_type($order_id);
+
if($this->config->config_data['export']['auto_receive_order'])
+ {
+ $received_amount =
$this->get_total_received((int)$order_id);
+ $order_type =
$this->bocommon->socommon->get_order_type($order_id);
- switch ($order_type)
- {
- case 'workorder':
- $received =
createObject('property.boworkorder')->receive_order( (int)$order_id,
$received_amount );
- break;
- case 'ticket':
- $received =
createObject('property.botts')->receive_order( (int)$order_id, $received_amount
);
- break;
- default:
- throw new
Exception('Order type not supported');
+ switch ($order_type)
+ {
+ case 'workorder':
+ $received =
createObject('property.boworkorder')->receive_order( (int)$order_id,
$received_amount );
+ break;
+ case 'ticket':
+ $received =
createObject('property.botts')->receive_order( (int)$order_id, $received_amount
);
+ break;
+ default:
+ throw new
Exception('Order type not supported');
+ }
}
}
Modified:
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
===================================================================
---
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
2017-02-06 16:25:05 UTC (rev 16259)
+++
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
2017-02-06 16:31:32 UTC (rev 16260)
@@ -329,10 +329,9 @@
}
}
}
-// if (!$workorder['order_sent'])
+
if (!empty($transfer_action) && $transfer_action == 'workorder')
{
-
$exporter_ordre = new lag_agresso_ordre_fra_workorder();
try
{
@@ -342,5 +341,4 @@
{
phpgwapi_cache::message_set($exc->getMessage(),
'error');
}
-
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16260] Stable: Merge 16256:16259 from trunk,
sigurdne <=