[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13834] formatting
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13834] formatting |
Date: |
Wed, 02 Sep 2015 10:25:10 +0000 |
Revision: 13834
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13834
Author: sigurdne
Date: 2015-09-02 10:25:08 +0000 (Wed, 02 Sep 2015)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/sms/bin/default/set_workorder_status.php
Modified: trunk/sms/bin/default/set_workorder_status.php
===================================================================
--- trunk/sms/bin/default/set_workorder_status.php 2015-09-02 09:28:25 UTC
(rev 13833)
+++ trunk/sms/bin/default/set_workorder_status.php 2015-09-02 10:25:08 UTC
(rev 13834)
@@ -55,44 +55,44 @@
$historylog_project->add('S',$project_id,'i_arbeid', $status_old);
$historylog_project->add('RM',$project_id,"Bestilling {$workorder_id} endret
av: {$sms_sender}");
}
- }
+
+ //
execMethod('property.soworkorder.check_project_status',$workorder_id);
-//
execMethod('property.soworkorder.check_project_status',$workorder_id);
+ $project_status_on_last_order_closed =
'utført';
- $project_status_on_last_order_closed = 'utført';
+ $this->db->query("SELECT count(id) AS
orders_at_project FROM fm_workorder WHERE project_id= {$project_id}", __LINE__,
__FILE__);
+ $this->db->next_record();
+ $orders_at_project = (int)
$this->db->f('orders_at_project');
- $this->db->query("SELECT count(id) AS
orders_at_project FROM fm_workorder WHERE project_id= {$project_id}", __LINE__,
__FILE__);
- $this->db->next_record();
- $orders_at_project = (int)
$this->db->f('orders_at_project');
+ $this->db->query("SELECT
count(fm_workorder.id) AS closed_orders_at_project"
+ . " FROM fm_workorder"
+ . " JOIN fm_workorder_status ON
(fm_workorder.status = fm_workorder_status.id)"
+ . " WHERE project_id= {$project_id}"
+ . " AND (fm_workorder_status.closed = 1
OR fm_workorder_status.delivered = 1)", __LINE__, __FILE__);
- $this->db->query("SELECT count(fm_workorder.id)
AS closed_orders_at_project"
- . " FROM fm_workorder"
- . " JOIN fm_workorder_status ON
(fm_workorder.status = fm_workorder_status.id)"
- . " WHERE project_id= {$project_id}"
- . " AND (fm_workorder_status.closed = 1 OR
fm_workorder_status.delivered = 1)", __LINE__, __FILE__);
+ $this->db->next_record();
+ $closed_orders_at_project = (int)
$this->db->f('closed_orders_at_project');
- $this->db->next_record();
- $closed_orders_at_project = (int)
$this->db->f('closed_orders_at_project');
+ $this->db->query("SELECT
fm_project_status.closed AS closed_project, fm_project.status as old_status"
+ . " FROM fm_project"
+ . " JOIN fm_project_status ON
(fm_project.status = fm_project_status.id)"
+ . " WHERE fm_project.id=
{$project_id}", __LINE__, __FILE__);
- $this->db->query("SELECT
fm_project_status.closed AS closed_project, fm_project.status as old_status"
- . " FROM fm_project"
- . " JOIN fm_project_status ON
(fm_project.status = fm_project_status.id)"
- . " WHERE fm_project.id= {$project_id}",
__LINE__, __FILE__);
+ $this->db->next_record();
+ $closed_project =
!!$this->db->f('closed_project');
+ $old_status =
$this->db->f('old_status');
- $this->db->next_record();
- $closed_project =
!!$this->db->f('closed_project');
- $old_status =
$this->db->f('old_status');
+ if($status == 'utført'
+ && $orders_at_project ==
$closed_orders_at_project
+ && $old_status !=
$project_status_on_last_order_closed)
+ {
+ $this->db->query("UPDATE
fm_project SET status = '{$project_status_on_last_order_closed}' WHERE id=
{$project_id}", __LINE__, __FILE__);
- if($status == 'utført'
- && $orders_at_project ==
$closed_orders_at_project
- && $old_status !=
$project_status_on_last_order_closed)
- {
- $this->db->query("UPDATE fm_project SET
status = '{$project_status_on_last_order_closed}' WHERE id= {$project_id}",
__LINE__, __FILE__);
+ $historylog_project =
CreateObject('property.historylog', 'project');
- $historylog_project =
CreateObject('property.historylog', 'project');
-
- $historylog_project->add('S',
$project_id, $project_status_on_last_order_closed, $old_status);
- $historylog_project->add('RM',
$project_id, 'Status endret ved at siste bestilling er satt til utført');
+ $historylog_project->add('S',
$project_id, $project_status_on_last_order_closed, $old_status);
+ $historylog_project->add('RM',
$project_id, 'Status endret ved at siste bestilling er satt til utført');
+ }
}
$command_output = 'success';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13834] formatting,
Sigurd Nes <=