[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16826] Stable: Merge 16820:16825 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16826] Stable: Merge 16820:16825 from trunk |
|
Date: |
Sun, 4 Jun 2017 14:37:32 -0400 (EDT) |
Revision: 16826
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16826
Author: sigurdne
Date: 2017-06-04 14:37:32 -0400 (Sun, 04 Jun 2017)
Log Message:
-----------
Stable: Merge 16820:16825 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.boproject.inc.php
branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php
branches/Version-2_0-branch/property/inc/class.soproject.inc.php
branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-2_0-branch/property/inc/hook_settings.inc.php
branches/Version-2_0-branch/property/templates/base/workorder.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch 2017-06-04 18:37:32 UTC (rev 16826)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16787
/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,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819
\ 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,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.boproject.inc.php
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/inc/class.boproject.inc.php
2017-06-04 18:37:32 UTC (rev 16826)
@@ -868,6 +868,7 @@
$record_history[$i]['value_new_value']
= '';
}
+ $record_history[$i]['#'] = $i +1;
$i++;
}
Modified: branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php
2017-06-04 18:37:32 UTC (rev 16826)
@@ -760,7 +760,7 @@
{
$record_history[$i]['value_new_value']
= '';
}
-
+ $record_history[$i]['#'] = $i +1;
$i++;
}
Modified: branches/Version-2_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2017-06-04 18:37:32 UTC (rev 16826)
@@ -38,6 +38,7 @@
var $total_records = 0;
private $global_lock = false;
private $vendor_list = array();
+ protected $historylog;
function __construct()
{
@@ -57,6 +58,8 @@
$this->grants = $this->acl->get_grants2('property',
'.project');
$this->config = CreateObject('phpgwapi.config',
'property');
$this->config->read();
+ $this->historylog = CreateObject('property.historylog',
'project');
+
}
function select_status_list()
@@ -2694,6 +2697,9 @@
private function transfer_budget( $id, $budget, $year )
{
+
+ $historylog = & $this->historylog;
+
$this->db->transaction_begin();
$id = (int)$id;
@@ -2762,6 +2768,8 @@
}
$this->update_budget($id, $year,
$periodization_id, $new_budget, true, 'update', true);
+ $historylog->add('B', $id, $new_budget);
+ $historylog->add('RM', $id, 'Budsjett oppdatert
via masseoppdatering');
}
else if ($project_type_id == 1 || $project_type_id ==
4)//operation or maintenance
{
@@ -2769,6 +2777,10 @@
{
$this->db->query("UPDATE
fm_project_budget SET active = 0 WHERE project_id = {$id}", __LINE__,
__FILE__); // previous
$this->update_budget($id, $year,
$periodization_id, (int)$budget['budget_amount'], true, 'update', true);
+
+ $historylog->add('B', $id,
(int)$budget['budget_amount']);
+ $historylog->add('RM', $id, 'Budsjett
oppdatert via masseoppdatering');
+
}
}
Modified: branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
2017-06-04 18:37:32 UTC (rev 16826)
@@ -37,8 +37,8 @@
var $total_records = 0;
protected $global_lock = false;
-
- function __construct()
+ protected $historylog;
+ function __construct()
{
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bocommon = CreateObject('property.bocommon');
@@ -51,6 +51,7 @@
$this->acl = & $GLOBALS['phpgw']->acl;
$this->acl->set_account_id($this->account);
$this->grants = $this->acl->get_grants2('property',
'.project');
+ $this->historylog = CreateObject('property.historylog',
'workorder');
}
function next_id()
@@ -1203,7 +1204,7 @@
function add( $workorder )
{
$receipt = array();
- $historylog = CreateObject('property.historylog',
'workorder');
+ $historylog = & $this->historylog;
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
$workorder['billable_hours'] = (float)str_replace(',',
'.', $workorder['billable_hours']);
@@ -1404,7 +1405,7 @@
{
$config = CreateObject('phpgwapi.config','property');
$config->read_repository();
- $historylog = CreateObject('property.historylog',
'workorder');
+ $historylog = & $this->historylog;
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
$workorder['billable_hours'] = (float)str_replace(',',
'.', $workorder['billable_hours']);
@@ -1859,7 +1860,7 @@
if ($orders && is_array($orders))
{
$lang_closed = lang('closed');
- $historylog_workorder =
CreateObject('property.historylog', 'workorder');
+ $historylog_workorder = & $this->historylog;
foreach ($orders as $id)
{
@@ -1907,7 +1908,7 @@
$lang_reopen = lang('Re-opened');
- $historylog_workorder =
CreateObject('property.historylog', 'workorder');
+ $historylog_workorder = & $this->historylog;
foreach ($orders as $id)
{
@@ -2700,6 +2701,8 @@
* */
public function transfer_budget( $id, $budget, $year )
{
+ $historylog = & $this->historylog;
+
if ($this->db->get_transaction())
{
$this->global_lock = true;
@@ -2731,6 +2734,7 @@
phpgwapi_cache::system_clear('property',
"budget_order_{$id}");
+ $updated_budget = false;
if ($continuous)
{
$this->db->query("UPDATE fm_workorder_budget
SET active = 0 WHERE order_id = {$id} AND year = {$latest_year}", __LINE__,
__FILE__);
@@ -2737,6 +2741,8 @@
if ($budget['budget_amount'])
{
$this->_update_order_budget($id, $year,
$periodization_id, (int)$budget['budget_amount'],
(int)$budget['budget_amount'], (int)$budget['budget_amount'], $action =
'update', true);
+ $historylog->add('B', $id,
(int)$budget['budget_amount']);
+ $updated_budget = true;
}
}
else if ($project_type_id == 1)//operation
@@ -2756,6 +2762,8 @@
$transferred = $this->_update_order_budget($id,
$latest_year, $periodization_id, $paid_last_year, $paid_last_year,
$paid_last_year, $action = 'update', $activate = 0);
$this->_update_order_budget($id, $year,
$periodization_id, (int)$budget['budget_amount'],
(int)$budget['budget_amount'], (int)$budget['budget_amount'], $action =
'update', true);
+ $historylog->add('B', $id,
(int)$budget['budget_amount']);
+ $updated_budget = true;
$this->db->query("UPDATE fm_workorder_budget
SET active = 0 WHERE order_id = {$id} AND year = {$latest_year}", __LINE__,
__FILE__);
@@ -2819,8 +2827,15 @@
}
$this->_update_order_budget($id, $year,
$periodization_id, $new_budget, $new_budget, $new_budget, $action = 'update',
true);
+ $historylog->add('B', $id, (int)$new_budget);
+ $updated_budget = true;
}
//die();
+ if($updated_budget)
+ {
+ $historylog->add('RM', $id, 'Budsjett oppdatert
via masseoppdatering');
+ }
+
if (!$this->global_lock)
{
$this->db->transaction_commit();
@@ -3021,7 +3036,7 @@
$order_id = $data['order_id'];
$status = $data['status'];
- $historylog = CreateObject('property.historylog',
'workorder');
+ $historylog = & $this->historylog;
$this->db->query("SELECT status FROM fm_workorder WHERE
id = {$order_id}", __LINE__, __FILE__);
$this->db->next_record();
Modified: branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2017-06-04 18:37:32 UTC (rev 16826)
@@ -1883,11 +1883,12 @@
$history_def = array
(
- array('key' => 'value_date', 'label' =>
lang('Date'), 'sortable' => true),
- array('key' => 'value_user', 'label' =>
lang('User'), 'Action' => true),
- array('key' => 'value_action', 'label' =>
lang('action'), 'sortable' => true),
- array('key' => 'value_old_value', 'label' =>
lang('old value'), 'sortable' => true),
- array('key' => 'value_new_value', 'label' =>
lang('new value'), 'sortable' => true)
+ array('key' => '#', 'label' => '#',
'sortable' =>true),
+ array('key' => 'value_date', 'label' =>
lang('Date'), 'sortable' => false),
+ array('key' => 'value_user', 'label' =>
lang('User'), 'sortable' => false),
+ array('key' => 'value_action', 'label' =>
lang('action'), 'sortable' => false),
+ array('key' => 'value_old_value', 'label' =>
lang('old value'), 'sortable' => false),
+ array('key' => 'value_new_value', 'label' =>
lang('new value'), 'sortable' => false)
);
$datatable_def[] = array
Modified: branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2017-06-04 18:37:32 UTC (rev 16826)
@@ -1647,6 +1647,15 @@
'required' => true
));
+ $b_account_list =
execMethod('property.bogeneric.get_list', array(
+ 'type' => 'budget_account',
'selected' => $values['b_account_id'] ? $values['b_account_id'] :
$project['b_account_id'], 'add_empty' => true, 'filter' => array('active' =>
1)));
+
+ foreach ($b_account_list as &$entry)
+ {
+ $entry['name'] = "{$entry['id']}
{$entry['name']}";
+ }
+ unset($entry);
+
$ecodimb_data =
$this->bocommon->initiate_ecodimb_lookup(array
(
'ecodimb' => $project['ecodimb'] ?
$project['ecodimb'] : $values['ecodimb'],
@@ -1718,14 +1727,19 @@
$history_def = array
(
array(
+ 'key' => '#',
+ 'label' => '#',
+ 'sortable' =>true,
+ 'resizeable' => true),
+ array(
'key' => 'value_date',
'label' => lang('Date'),
- 'sortable' => true,
+ 'sortable' =>false,
'resizeable' => true),
array(
'key' => 'value_user',
'label' => lang('User'),
- 'Action' => true,
+ 'sortable' =>false,
'resizeable' => true),
array(
'key' => 'value_action',
@@ -1735,12 +1749,12 @@
array(
'key' => 'value_old_value',
'label' => lang('old value'),
- 'sortable' => true,
+ 'sortable' => false,
'resizeable' => true),
array(
'key' => 'value_new_value',
'label' => lang('New Value'),
- 'sortable' => true,
+ 'sortable' => false,
'resizeable' => true)
);
@@ -2486,6 +2500,8 @@
'menuaction' =>
'property.uiproject.edit')),
'b_group_data' => $b_group_data,
'b_account_data' => $b_account_data,
+ 'b_account_as_listbox' =>
$GLOBALS['phpgw_info']['user']['preferences']['property']['b_account_as_listbox'],
+ 'b_account_list' => array('options' =>
$b_account_list),
'value_start_date' => $values['start_date'],
'value_end_date' => $values['end_date'],
'value_tender_deadline' =>
$values['tender_deadline'],
Modified: branches/Version-2_0-branch/property/inc/hook_settings.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/hook_settings.inc.php
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/inc/hook_settings.inc.php
2017-06-04 18:37:32 UTC (rev 16826)
@@ -260,6 +260,8 @@
create_select_box('Default project status', 'project_status',
$_status_project, 'The default status for your projects');
create_select_box('Default workorder status', 'workorder_status',
$_status_workorder, 'The default status for your workorders');
+ create_select_box('Budget account as listbox', 'b_account_as_listbox',
$yes_and_no, 'The input type for budget account');
+
create_select_box('Default project categories', 'project_category',
$_categories_project, 'The default category for your projects and workorders');
create_select_box('Default district-filter', 'default_district',
$_districts, 'Your default district-filter ');
Modified: branches/Version-2_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-06-04 18:34:24 UTC (rev 16825)
+++ branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-06-04 18:37:32 UTC (rev 16826)
@@ -699,25 +699,52 @@
<label>
<xsl:value-of
select="$lang_budget_account"/>
</label>
- <input type="hidden"
id="b_account_id" name="values[b_account_id]"
value="{b_account_data/value_b_account_id}"/>
- <input type="text"
id="b_account_name" name="values[b_account_name]"
value="{b_account_data/value_b_account_id}
{b_account_data/value_b_account_name}" class="pure-input-1-2">
- <xsl:choose>
- <xsl:when
test="mode='edit'">
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
+ <xsl:choose>
+ <xsl:when
test="b_account_as_listbox = 1">
+ <select
name="values[b_account_id]" class="pure-input-1-2">
+
<xsl:attribute name="title">
<xsl:value-of select="$lang_budget_account"/>
</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:attribute name="disabled">
-
<xsl:text>disabled</xsl:text>
-
</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </input>
- <div id="b_account_container"/>
+
<xsl:choose>
+
<xsl:when test="mode='edit'">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_budget_account"/>
+
</xsl:attribute>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:otherwise>
+
</xsl:choose>
+
<xsl:apply-templates select="b_account_list/options"/>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <input
type="hidden" id="b_account_id" name="values[b_account_id]"
value="{b_account_data/value_b_account_id}"/>
+ <input
type="text" id="b_account_name" name="values[b_account_name]"
value="{b_account_data/value_b_account_id}
{b_account_data/value_b_account_name}" class="pure-input-1-2">
+
<xsl:choose>
+
<xsl:when test="mode='edit'">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_budget_account"/>
+
</xsl:attribute>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:otherwise>
+
</xsl:choose>
+ </input>
+ <div
id="b_account_container"/>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<xsl:if test="enable_unspsc = 1">
<div class="pure-control-group">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16826] Stable: Merge 16820:16825 from trunk,
sigurdne <=