[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16566] Stable: Merge 16557:16565 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16566] Stable: Merge 16557:16565 from trunk |
|
Date: |
Mon, 10 Apr 2017 08:07:03 -0400 (EDT) |
Revision: 16566
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16566
Author: sigurdne
Date: 2017-04-10 08:07:03 -0400 (Mon, 10 Apr 2017)
Log Message:
-----------
Stable: Merge 16557:16565 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
branches/Version-2_0-branch/setup/manageheader.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-10 12:05:51 UTC (rev 16565)
+++ branches/Version-2_0-branch 2017-04-10 12:07:03 UTC (rev 16566)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/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,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556
\ 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,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
2017-04-10 12:05:51 UTC (rev 16565)
+++ branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
2017-04-10 12:07:03 UTC (rev 16566)
@@ -1964,8 +1964,7 @@
$continuous = false;
$cached_info = phpgwapi_cache::system_get('property',
"budget_order_{$order_id}");
-
- if ($cached_info)
+ if ($cached_info && is_array($cached_info))
{
return $cached_info;
}
Modified: branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
2017-04-10 12:05:51 UTC (rev 16565)
+++ branches/Version-2_0-branch/property/inc/class.uibudget.inc.php
2017-04-10 12:07:03 UTC (rev 16566)
@@ -516,7 +516,7 @@
if ($acl_add)
{
$data['datatable']['new_item'] =
self::link(array(
- 'menuaction' =>
'property.uiasync.edit'
+ 'menuaction' =>
'property.uibudget.edit'
));
}
Modified:
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
2017-04-10 12:05:51 UTC (rev 16565)
+++
branches/Version-2_0-branch/property/inc/cron/default/oppdater_betalte_faktura_BK.php
2017-04-10 12:07:03 UTC (rev 16566)
@@ -55,6 +55,7 @@
function execute()
{
+ $start = time();
//curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/art
//curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/ansvar?id=013000
@@ -66,6 +67,7 @@
if ($this->debug)
{
}
+ set_time_limit(2000);
try
{
@@ -75,8 +77,31 @@
{
$this->receipt['error'][] = array('msg' =>
$e->getMessage());
}
+
+ $msg = 'Tidsbruk: ' . (time() - $start) . ' sekunder';
+ $this->cron_log($msg, $cron);
+ echo "$msg\n";
+ $this->receipt['message'][] = array('msg' => $msg);
+
}
+ function cron_log( $receipt = '' )
+ {
+
+ $insert_values = array(
+ $this->cron,
+ date($this->db->datetime_format()),
+ $this->function_name,
+ $receipt
+ );
+
+ $insert_values =
$this->db->validate_insert($insert_values);
+
+ $sql = "INSERT INTO fm_cron_log
(cron,cron_date,process,message) "
+ . "VALUES ($insert_values)";
+ $this->db->query($sql, __LINE__, __FILE__);
+ }
+
private function update_order()
{
$config = CreateObject('phpgwapi.config',
'property')->read();
@@ -107,9 +132,12 @@
{
if(!$this->check_payment($voucher['voucher_id']))
{
+ $this->receipt['error'][] = array('msg'
=> "{$voucher['voucher_id']} er ikke betalt");
continue;
}
+ $this->receipt['message'][] = array('msg' =>
"{$voucher['voucher_id']} er betalt");
+
$ok = false;
$order_type =
$socommon->get_order_type($voucher['order_id']);
switch ($order_type)
@@ -143,7 +171,8 @@
if($ok)
{
- $vouchers_ok = $voucher;
+ $vouchers_ok[] = $voucher;
+ // $i = 60;
}
}
@@ -153,6 +182,7 @@
$cols = array_keys($metadata);
foreach ($vouchers_ok as $voucher)
{
+ $this->db->transaction_begin();
$value_set = array();
$this->db->query("SELECT * FROM fm_ecobilag
WHERE external_voucher_id= '{$voucher['voucher_id']}'", __LINE__, __FILE__);
$this->db->next_record();
@@ -161,18 +191,22 @@
$value_set[$col] = $this->db->f($col);
}
$value_set['filnavn'] = date('d.m.Y-H:i:s',
phpgwapi_datetime::user_localtime());
+ $value_set['ordrebelop'] = $value_set['belop'];
+ unset($value_set['pre_transfer']);
$_cols = implode(',', array_keys($value_set));
$values =
$this->db->validate_insert(array_values($value_set));
$this->db->query("INSERT INTO fm_ecobilagoverf
({$_cols}) VALUES ({$values})", __LINE__, __FILE__);
$this->db->query("DELETE FROM fm_ecobilag WHERE
external_voucher_id= '{$voucher['voucher_id']}'", __LINE__, __FILE__);
+ $this->db->transaction_commit();
+ $this->receipt['message'][] = array('msg' =>
"{$voucher['voucher_id']} er overført til historikk");
}
}
function check_payment( $voucher_id )
{
- //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/tjeneste?id=88010
- $url = $this->soap_url;
+ //curl -s -u portico:BgPor790gfol
http://tjenester.usrv.ubergenkom.no/api/agresso/utlignetfaktura?bilagsNr=917039148
+ $url =
"{$this->soap_url}/utlignetfaktura?bilagsNr={$voucher_id}";
$username = $this->soap_username; //'portico';
$password = $this->soap_password;
//'BgPor790gfol';
@@ -187,11 +221,15 @@
$result = curl_exec($ch);
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ if(!$httpCode)
+ {
+ throw new Exception("No connection: {$url}");
+ }
curl_close($ch);
$result = json_decode($result, true);
- return false;
+ return $result;
}
Modified:
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
===================================================================
---
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
2017-04-10 12:05:51 UTC (rev 16565)
+++
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
2017-04-10 12:07:03 UTC (rev 16566)
@@ -108,6 +108,15 @@
throw new Exception("Ordrenummer
'{$values['order_id']}' er utenfor serien:<br/>" . __FILE__ . '<br/>linje:' .
__LINE__);
}
+ if($this->ordered_amount)
+ {
+ $quantity =
$received_amount/$this->ordered_amount;
+ }
+ else //should not happen, but just in case...
+ {
+ $quantity = 0.8;
+ }
+
$param = array(
'voucher_type' => $voucher_type,
'order_id' => $values['order_id'],
@@ -114,7 +123,7 @@
'lines' => array(
array(
'UnitCode' => 'STK',
- 'Quantity' =>
($received_amount/$this->ordered_amount),
+ 'Quantity' => $quantity,
)
)
);
Modified: branches/Version-2_0-branch/setup/manageheader.php
===================================================================
--- branches/Version-2_0-branch/setup/manageheader.php 2017-04-10 12:05:51 UTC
(rev 16565)
+++ branches/Version-2_0-branch/setup/manageheader.php 2017-04-10 12:07:03 UTC
(rev 16566)
@@ -390,6 +390,14 @@
$detected .= '<li class="warn">' . lang('you
may need imagick for image manipulation') . "</li>\n";
}
+ if(function_exists('curl_init'))
+ {
+ $detected .= '<li>' . lang('You appear to have
curl enabled') . "</li>\n";
+ }
+ else
+ {
+ $detected .= '<li class="warn">' . lang('you
may need curl for integration capabilities') . "</li>\n";
+ }
/* Not currently supported
if (extension_loaded('odbc') ||
function_exists('odbc_connect'))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16566] Stable: Merge 16557:16565 from trunk,
sigurdne <=