[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15294] Stable: Merge 15292:15293 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15294] Stable: Merge 15292:15293 from trunk |
Date: |
Thu, 16 Jun 2016 07:58:35 +0000 (UTC) |
Revision: 15294
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15294
Author: sigurdne
Date: 2016-06-16 07:58:34 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
Stable: Merge 15292:15293 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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
+ /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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
Modified:
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2016-06-16 07:53:04 UTC (rev 15293)
+++
branches/Version-2_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2016-06-16 07:58:34 UTC (rev 15294)
@@ -294,9 +294,8 @@
$this->receipt['message'][] = array('msg' =>
"Oppdaterer melding #{$id} for agresso prosjekt {$external_project}: gammelt
beløp: {$old_actual_cost}, nytt beløp: {$new_actual_cost}");
$this->historylog->add('AC', $id, $new_actual_cost,
$old_actual_cost);
- $value_set = array
- (
- 'external_project' => $external_project,
+ $value_set = array(
+ 'external_project_id' => $external_project,
'actual_cost' => $new_actual_cost,
'actual_cost_year' => date('Y'),
'modified_date' => time()
@@ -335,7 +334,7 @@
return false;
}
- $this->db->query("UPDATE fm_tts_tickets SET
external_project = '{$external_project}' WHERE id={$id}", __LINE__, __FILE__);
+ $this->db->query("UPDATE fm_tts_tickets SET
external_project_id = '{$external_project}' WHERE id={$id}", __LINE__,
__FILE__);
$ok = true;
if (preg_match('/(^C|^P)/i', $prosjektstatus))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15294] Stable: Merge 15292:15293 from trunk,
sigurdne <=