[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13550] property: modify main screen messages
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13550] property: modify main screen messages |
|
Date: |
Thu, 02 Jul 2015 11:19:32 +0000 |
Revision: 13550
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13550
Author: sigurdne
Date: 2015-07-02 11:19:29 +0000 (Thu, 02 Jul 2015)
Log Message:
-----------
property: modify main screen messages
Modified Paths:
--------------
trunk/property/inc/class.hook_helper.inc.php
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/class.uiwo_hour.inc.php
trunk/property/inc/hook_settings.inc.php
Modified: trunk/property/inc/class.hook_helper.inc.php
===================================================================
--- trunk/property/inc/class.hook_helper.inc.php 2015-07-02 11:01:51 UTC
(rev 13549)
+++ trunk/property/inc/class.hook_helper.inc.php 2015-07-02 11:19:29 UTC
(rev 13550)
@@ -1085,8 +1085,11 @@
unset($pending_approvals);
}
- if (
isset($prefs['property']['mainscreen_showvendor_reminder'])
- && $prefs['property']['mainscreen_showvendor_reminder']
== 'yes' )
+ //Sigurd: Consider remove
+
+// if (
isset($prefs['property']['mainscreen_showvendor_reminder'])
+// && $prefs['property']['mainscreen_showvendor_reminder']
== 'yes' )
+ if(false)
{
$total_records = 0;
$title = 'dummy';
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2015-07-02 11:01:51 UTC (rev
13549)
+++ trunk/property/inc/class.soproject.inc.php 2015-07-02 11:19:29 UTC (rev
13550)
@@ -1656,32 +1656,6 @@
}
$receipt['notice_owner'][] =
lang('Status confirmed') . ': ' . $project['status'];
}
-
- /*
- // Handled in _update_status_workorder();
- if($close_pending_action)
- {
- $action_params = array
- (
- 'appname' => 'property',
- 'location' =>
'.project.workorder',
- 'id' => 0,
- 'responsible' => $this->account,
- 'responsible_type' => 'user',
- 'action' => 'approval',
- 'remark' => '',
- 'deadline' => ''
- );
-
-
- foreach($workorders as $workorder_id)
- {
- $action_params['id'] = $workorder_id;
-
execMethod('property.sopending_action.close_pending_action', $action_params);
- }
- unset($action_params);
- }
- */
}
if(isset($project['project_group']) &&
$project['project_group'])
@@ -2942,6 +2916,10 @@
'deadline' => ''
);
+ /*
+ * Sigurd: Consider remove
+ */
+/*
$action_params_progress = array
(
'appname' =>
'property',
@@ -2953,7 +2931,7 @@
'remark' => '',
'deadline' => ''
);
-
+ */
$this->db->query("SELECT * FROM
fm_workorder_status WHERE id = '{$status_new}'");
$this->db->next_record();
if($this->db->f('approved'))
@@ -2962,12 +2940,12 @@
}
if($this->db->f('in_progress'))
{
-
execMethod('property.sopending_action.close_pending_action',
$action_params_progress);
+//
execMethod('property.sopending_action.close_pending_action',
$action_params_progress);
}
if($this->db->f('delivered') ||
$this->db->f('closed'))
{
execMethod('property.sopending_action.close_pending_action',
$action_params_approved);
-
execMethod('property.sopending_action.close_pending_action',
$action_params_progress);
+//
execMethod('property.sopending_action.close_pending_action',
$action_params_progress);
}
}
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2015-07-02 11:01:51 UTC (rev
13549)
+++ trunk/property/inc/class.sotts.inc.php 2015-07-02 11:19:29 UTC (rev
13550)
@@ -1568,6 +1568,10 @@
execMethod('property.sopending_action.close_pending_action', $action_params);
unset($action_params);
}
+ /*
+ * Sigurd: Consider remove
+ */
+ /*
if ($this->db->f('in_progress') )
{
$action_params = array
@@ -1585,6 +1589,7 @@
execMethod('property.sopending_action.close_pending_action', $action_params);
unset($action_params);
}
+ */
if ($this->db->f('delivered') )
{
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2015-07-02 11:01:51 UTC
(rev 13549)
+++ trunk/property/inc/class.soworkorder.inc.php 2015-07-02 11:19:29 UTC
(rev 13550)
@@ -1562,6 +1562,8 @@
execMethod('property.sopending_action.close_pending_action', $action_params);
unset($action_params);
}
+ //Sigurd: Consider remove
+ /*
if($this->db->f('in_progress'))
{
$action_params = array
@@ -1578,7 +1580,8 @@
execMethod('property.sopending_action.close_pending_action', $action_params);
unset($action_params);
- }
+ }*/
+
if($this->db->f('delivered') ||
$this->db->f('closed'))
{
$action_params = array
@@ -2953,6 +2956,8 @@
execMethod('property.sopending_action.close_pending_action', $action_params);
unset($action_params);
}
+ //Sigurd: Consider remove
+ /*
if($this->db->f('in_progress'))
{
$action_params = array
@@ -2969,7 +2974,7 @@
execMethod('property.sopending_action.close_pending_action', $action_params);
unset($action_params);
- }
+ }*/
if($this->db->f('delivered') ||
$this->db->f('closed'))
{
$action_params = array
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2015-07-02 11:01:51 UTC (rev
13549)
+++ trunk/property/inc/class.uitts.inc.php 2015-07-02 11:19:29 UTC (rev
13550)
@@ -3005,6 +3005,8 @@
$receipt['message'][]=array('msg'=>lang('%1 is notified',$_address));
$historylog->add('M',$id,"{$_to}{$attachment_log}");
$receipt['message'][]=array('msg'=>lang('Workorder is sent by email!'));
+ //Sigurd: Consider remove
+ /*
$action_params = array
(
'appname'
=> 'property',
@@ -3018,6 +3020,7 @@
);
$reminds =
execMethod('property.sopending_action.set_pending_action', $action_params);
+ */
}
}
else
Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php 2015-07-02 11:01:51 UTC (rev
13549)
+++ trunk/property/inc/class.uiwo_hour.inc.php 2015-07-02 11:19:29 UTC (rev
13550)
@@ -1369,7 +1369,8 @@
QRcode::png($code_text,$filename);
$sms_data['encoded_text'] =
'data:image/png;base64,' . base64_encode(file_get_contents($filename));
}
-
+ $lang_reminder = '';
+/*
$action_params = array
(
'appname' =>
'property',
@@ -1383,8 +1384,6 @@
);
- $lang_reminder = '';
-/*
$pending_action =
execMethod('property.sopending_action.get_pending_action', $action_params);
$lang_reminder = '';
@@ -1685,7 +1684,8 @@
$sms->websend2pv($this->account,$to_sms_phone,str_replace(array('__order_id__'),
array($workorder_id), $this->config->config_data['sms_client_order_notice']));
$historylog->add('MS',$workorder_id,$to_sms_phone);
}
-
+ //Sigurd: Consider remove
+ /*
if(
$this->boworkorder->order_sent_adress )
{
$action_params = array
@@ -1702,6 +1702,7 @@
$reminds =
execMethod('property.sopending_action.set_pending_action', $action_params);
}
+ */
}
else
{
Modified: trunk/property/inc/hook_settings.inc.php
===================================================================
--- trunk/property/inc/hook_settings.inc.php 2015-07-02 11:01:51 UTC (rev
13549)
+++ trunk/property/inc/hook_settings.inc.php 2015-07-02 11:19:29 UTC (rev
13550)
@@ -92,8 +92,8 @@
create_select_box('Default ticket status
4','tts_status_4',$_status_tts,'The default status when entering the helpdesk
and mainscreen');
create_input_box('Custom title on main screen
tickets','mainscreen_tts_title_4');
- create_select_box('show pending vendor reminders on main
screen','mainscreen_showvendor_reminder',$yes_and_no,'Reminder issued to
vendors');
- create_input_box('Custom title on pending vendor
reminders','mainscreen_showvendor_reminder_title');
+// create_select_box('show pending vendor reminders on main
screen','mainscreen_showvendor_reminder',$yes_and_no,'Reminder issued to
vendors');
+// create_input_box('Custom title on pending vendor
reminders','mainscreen_showvendor_reminder_title');
create_select_box('show your pending request for approvals on main
screen','mainscreen_showapprovals_request',$yes_and_no,'Your requests for
Approvals waiting decisions');
create_input_box('Custom title on pending request for
approvals','mainscreen_showapprovals_request_title');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13550] property: modify main screen messages,
Sigurd Nes <=