From 5e93fd4043d239545560c4e93923a03d535d552f Mon Sep 17 00:00:00 2001
From: Steve Blamey <blameys@blueloop.net>
Date: Mon, 11 Jun 2018 12:15:38 +0100
Subject: [PATCH] Update Work Order Review Resources view

Show correct Time Required and Time Used on Time based operations
---
 .../controllers/MfworkordersController.php    |  2 +-
 .../mfworkorders/reviewresources.tpl          | 18 +++++-
 ...30_mfoperation_overview_column_changes.php | 59 +++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 schema/phinx/migrations/20180611104830_mfoperation_overview_column_changes.php

diff --git a/modules/public_pages/erp/manufacturing/controllers/MfworkordersController.php b/modules/public_pages/erp/manufacturing/controllers/MfworkordersController.php
index a75e306c..c4e1992c 100755
--- a/modules/public_pages/erp/manufacturing/controllers/MfworkordersController.php
+++ b/modules/public_pages/erp/manufacturing/controllers/MfworkordersController.php
@@ -739,7 +739,7 @@ public function reviewResources()
 
 		$sh->addConstraint(new Constraint('stitem_id', '=', $transaction->stitem_id));
 
-		$sh->setFields(array('id', 'op_no', 'remarks', 'centre', 'resource', 'resource_qty', 'volume_period', 'volume_target', 'volume_uom_id'));
+		$sh->setFields(array('id', 'op_no', 'remarks', 'centre', 'resource', 'resource_qty', 'volume_period', 'volume_target', 'batch_op', 'volume_uom_id'));
 
 		parent::index($elements, $sh);
 
diff --git a/modules/public_pages/erp/manufacturing/templates/mfworkorders/reviewresources.tpl b/modules/public_pages/erp/manufacturing/templates/mfworkorders/reviewresources.tpl
index 6d9204a3..a3323818 100755
--- a/modules/public_pages/erp/manufacturing/templates/mfworkorders/reviewresources.tpl
+++ b/modules/public_pages/erp/manufacturing/templates/mfworkorders/reviewresources.tpl
@@ -1,5 +1,5 @@
 {** 
- *	(c) 2017 uzERP LLP (support#uzerp.com). All rights reserved. 
+ *	(c) 2018 uzERP LLP (support#uzerp.com). All rights reserved. 
  * 
  *	Released under GPLv3 license; see LICENSE. 
  **}
@@ -58,13 +58,25 @@
 						{$model->resource_qty}
 					{/grid_cell}
 					{grid_cell model=$model cell_num=6 field="resource_qty" class='numeric'}
-						{if $model->volume_target>0}
+						{if $model->volume_target>0 && $stockitem->cost_basis == 'VOLUME'}
 							{($stockitem->convertToUoM($stockitem->uom_id,$model->volume_uom_id,$transaction->order_qty)/$model->volume_target)|round:2} {$model->getFormatted('volume_period')}
+						{else}
+							{if $model->batch_op == 't' && (!is_null($stockitem->batch_size) && $stockitem->batch_size > 0)}
+								{$model->volume_target} {$model->getFormatted('volume_period')}
+							{else}
+								{($stockitem->convertToUoM($stockitem->uom_id,$model->volume_uom_id,$transaction->order_qty)*$model->volume_target)|round:2} {$model->getFormatted('volume_period')}
+							{/if}
 						{/if}
 					{/grid_cell}
 					{grid_cell model=$model cell_num=7 field="resource_qty" class='numeric'}
-						{if $model->volume_target>0}
+						{if $model->volume_target>0 && $stockitem->cost_basis == 'VOLUME'}
 							{($stockitem->convertToUoM($stockitem->uom_id,$model->volume_uom_id,$transaction->made_qty)/$model->volume_target)|round:2} {$model->getFormatted('volume_period')}
+						{else}
+							{if $model->batch_op == 't' && (!is_null($stockitem->batch_size) && $stockitem->batch_size > 0) && $transaction->made_qty > 0}
+								{$model->volume_target} {$model->getFormatted('volume_period')}
+							{else}
+								{($stockitem->convertToUoM($stockitem->uom_id,$model->volume_uom_id,$transaction->made_qty)*$model->volume_target)|round:2} {$model->getFormatted('volume_period')}
+							{/if}
 						{/if}
 					{/grid_cell}
 				{/grid_row}
diff --git a/schema/phinx/migrations/20180611104830_mfoperation_overview_column_changes.php b/schema/phinx/migrations/20180611104830_mfoperation_overview_column_changes.php
new file mode 100644
index 00000000..cd167787
--- /dev/null
+++ b/schema/phinx/migrations/20180611104830_mfoperation_overview_column_changes.php
@@ -0,0 +1,59 @@
+<?php
+
+
+use UzerpPhinx\UzerpMigration;
+
+class MfoperationOverviewColumnChanges extends UzerpMigration
+{
+    /**
+     * Add batch_op flag
+     */
+    public function up()
+    {
+        $view_name = 'mf_operationsoverview';
+        $view_owner = 'www-data';
+        $view = <<<'VIEW'
+CREATE OR REPLACE VIEW mf_operationsoverview AS 
+SELECT o.id,
+    o.op_no,
+    o.start_date,
+    o.end_date,
+    o.remarks,
+    o.stitem_id,
+    o.mfcentre_id,
+    o.mfresource_id,
+    o.usercompanyid,
+    o.volume_period,
+    o.volume_uom_id,
+    o.quality_target,
+    o.uptime_target,
+    o.volume_target,
+    o.resource_qty,
+    o.batch_op,
+    o.std_cost,
+    o.std_lab,
+    o.std_ohd,
+    o.latest_cost,
+    o.latest_lab,
+    o.latest_ohd,
+    o.created,
+    o.createdby,
+    o.alteredby,
+    o.lastupdated,
+    (s.item_code::text || ' - '::text) || s.description::text AS stitem,
+    s.obsolete_date,
+    u.uom_name AS volume_uom,
+    c.centre,
+    r.description AS resource
+    FROM mf_operations o
+    JOIN st_items s ON o.stitem_id = s.id
+    JOIN st_uoms u ON o.volume_uom_id = u.id
+    JOIN mf_centres c ON o.mfcentre_id = c.id
+    JOIN mf_resources r ON o.mfresource_id = r.id;
+VIEW;
+
+        $this->query("DROP VIEW {$view_name}");
+        $this->query($view);
+        $this->query("ALTER TABLE {$view_name} OWNER TO \"{$view_owner}\"");
+    }
+}