[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16719] Stable: Merge 16715:16718 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16719] Stable: Merge 16715:16718 from trunk |
|
Date: |
Wed, 10 May 2017 10:17:43 -0400 (EDT) |
Revision: 16719
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16719
Author: sigurdne
Date: 2017-05-10 10:17:42 -0400 (Wed, 10 May 2017)
Log Message:
-----------
Stable: Merge 16715:16718 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.sotts.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/inc/hook_config.inc.php
branches/Version-2_0-branch/property/templates/base/config.tpl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-10 14:15:29 UTC (rev 16718)
+++ branches/Version-2_0-branch 2017-05-10 14:17:42 UTC (rev 16719)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sotts.inc.php
2017-05-10 14:15:29 UTC (rev 16718)
+++ branches/Version-2_0-branch/property/inc/class.sotts.inc.php
2017-05-10 14:17:42 UTC (rev 16719)
@@ -1804,12 +1804,15 @@
if ($this->db->f('approved'))
{
+ $sosubstitute =
CreateObject('property.sosubstitute');
+ $users_for_substitute =
$sosubstitute->get_users_for_substitute($this->account);
+ $take_responsibility_for =
array($this->account);
+
$action_params = array
(
'appname' => 'property',
'location' => '.ticket',
'id' => $id,
- 'responsible' => $this->account,
'responsible_type' => 'user',
'action' => 'approval',
'remark' => '',
@@ -1816,8 +1819,24 @@
'deadline' => ''
);
-
execMethod('property.sopending_action.close_pending_action', $action_params);
+ $approvals =
execMethod('property.sopending_action.get_pending_action', $action_params);
+
+ foreach ($approvals as $approval)
+ {
+
if(in_array($approval['responsible'],$users_for_substitute))
+ {
+ $take_responsibility_for[] =
$approval['responsible'];
+ }
+ }
+
+ foreach ($take_responsibility_for as
$__account_id)
+ {
+ $action_params['responsible'] =
$__account_id;
+
execMethod('property.sopending_action.close_pending_action', $action_params);
+ }
+
unset($action_params);
+
}
/*
* Sigurd: Consider remove
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-05-10 14:15:29 UTC (rev 16718)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-05-10 14:17:42 UTC (rev 16719)
@@ -1918,6 +1918,12 @@
{
$values['assignedto'] = $this->account;
}
+
+ if (!empty($values['approval']) &&
!empty($this->bo->config->config_data['ticket_approval_status']))
+ {
+ $values['status'] =
$this->bo->config->config_data['ticket_approval_status'];
+ }
+
/*
if(isset($values_attribute) &&
is_array($values_attribute))
{
@@ -2227,6 +2233,7 @@
}
$_budget_amount = $this->_get_budget_amount($id);
+ $sosubstitute = CreateObject('property.sosubstitute');
if (isset($values['approval']) && $values['approval']
&& $this->bo->config->config_data['workorder_approval'])
{
@@ -2258,8 +2265,16 @@
'deadline' => ''
);
$bcc = '';//$coordinator_email;
+
foreach ($values['approval'] as $_account_id =>
$_address)
{
+ $substitute =
$sosubstitute->get_substitute($_account_id);
+
+ if($substitute)
+ {
+ $_account_id = $substitute;
+ }
+
$prefs =
$this->bocommon->create_preferences('property', $_account_id);
if (!empty($prefs['email']))
{
@@ -2287,7 +2302,7 @@
phpgwapi_cache::message_set($exc->getMessage(),'error');
}
}
-
+
}
if (!empty($values['do_approve']) &&
is_array($values['do_approve']))
@@ -2303,19 +2318,46 @@
'deadline' => ''
);
+// foreach ($values['do_approve'] as $_account_id
=> $_dummy)
+// {
+// $action_params['responsible'] =
$_account_id;
+//
if(!execMethod('property.sopending_action.get_pending_action', $action_params))
+// {
+//
execMethod('property.sopending_action.set_pending_action', $action_params);
+// }
+//
execMethod('property.sopending_action.close_pending_action', $action_params);
+// $historylog->add('AA', $id,
$GLOBALS['phpgw']->accounts->get($_account_id)->__toString() .
"::{$_budget_amount}");
+// }
+
+////
foreach ($values['do_approve'] as $_account_id
=> $_dummy)
{
- $action_params['responsible'] =
$_account_id;
-
if(!execMethod('property.sopending_action.get_pending_action', $action_params))
+ $users_for_substitute =
$sosubstitute->get_users_for_substitute($_account_id);
+
+ $approvals =
execMethod('property.sopending_action.get_pending_action', $action_params);
+
+ $take_responsibility_for =
array($_account_id);
+ foreach ($approvals as $approval)
{
-
execMethod('property.sopending_action.set_pending_action', $action_params);
+
if(in_array($approval['responsible'],$users_for_substitute))
+ {
+
$take_responsibility_for[] = $approval['responsible'];
+ }
}
-
execMethod('property.sopending_action.close_pending_action', $action_params);
- $historylog->add('AA', $id,
$GLOBALS['phpgw']->accounts->get($_account_id)->__toString() .
"::{$_budget_amount}");
+ foreach ($take_responsibility_for as
$__account_id)
+ {
+ $action_params['responsible'] =
$__account_id;
+
if(!execMethod('property.sopending_action.get_pending_action', $action_params))
+ {
+
execMethod('property.sopending_action.set_pending_action', $action_params);
+ }
+
execMethod('property.sopending_action.close_pending_action', $action_params);
+ $historylog->add('AA', $id,
$GLOBALS['phpgw']->accounts->get($__account_id)->__toString() .
"::{$_budget_amount}");
+ }
+ unset($action_params['responsible']);
}
}
-
// end approval
// -------- end order section
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-05-10 14:15:29 UTC (rev 16718)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-05-10 14:17:42 UTC (rev 16719)
@@ -3411,6 +3411,7 @@
catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(),
'error');
+ throw $e;
}
$criteria = array
Modified: branches/Version-2_0-branch/property/inc/hook_config.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/hook_config.inc.php
2017-05-10 14:15:29 UTC (rev 16718)
+++ branches/Version-2_0-branch/property/inc/hook_config.inc.php
2017-05-10 14:17:42 UTC (rev 16719)
@@ -249,6 +249,34 @@
}
/**
+ * Get HTML listbox with ticket order status that are to be set when
asking for approval
+ *
+ * @param $config
+ * @return string HTML checkboxes to be placed in a table
+ */
+ function ticket_approval_status( $config )
+ {
+ $status_assigned = isset($config['ticket_approval_status']) ?
$config['ticket_approval_status'] : '';
+ $status_entries = execMethod('property.botts.get_status_list',
$status_assigned);
+
+ $out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ foreach ($status_entries as $status)
+ {
+ $selected = '';
+ if (1 == $status['selected'])
+ {
+ $selected = ' selected = "selected"';
+ }
+
+ $out .= <<<HTML
+ <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
+HTML;
+ }
+
+ return $out;
+ }
+
+ /**
* Get HTML listbox with workorder status that are to be set when
asking for approval
*
* @param $config
Modified: branches/Version-2_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/config.tpl
2017-05-10 14:15:29 UTC (rev 16718)
+++ branches/Version-2_0-branch/property/templates/base/config.tpl
2017-05-10 14:17:42 UTC (rev 16719)
@@ -123,6 +123,14 @@
</td>
</tr>
<tr>
+ <td>{lang_ticket_status_on_approval}:</td>
+ <td>
+ <select
name="newsettings[ticket_approval_status]">
+ {hook_ticket_approval_status}
+ </select>
+ </td>
+ </tr>
+ <tr>
<td>{lang_approval_amount_limit}:</td>
<td>
<input
name="newsettings[approval_amount_limit]" value="{value_approval_amount_limit}">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16719] Stable: Merge 16715:16718 from trunk,
sigurdne <=