From defa8c40050273c39dcbc6f45e40eb83111bc55c Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 25 Sep 2017 10:00:07 +0530
Subject: [PATCH] alignment changes in PO flow

---
 application/logs/log-2017-09-22.php           |   0
 application/logs/log-2017-09-24.php           | 184 +++++++++++++
 .../third_party/dompdf/lib/fonts/log.htm      |   2 +-
 application/views/alterpurchaseorder.php      | 152 +++++------
 application/views/editCapitalPo.php           |   8 +-
 application/views/editImportAmendPO.php       | 196 +++++++-------
 application/views/editRevenueAmendPO.php      | 111 ++++----
 application/views/editServiceAmendPO.php      |  68 +++--
 application/views/editimportpo.php            | 252 +++++++++---------
 application/views/importpo.php                | 227 ++++++++--------
 10 files changed, 715 insertions(+), 485 deletions(-)
 mode change 100644 => 100755 application/logs/log-2017-09-22.php
 create mode 100644 application/logs/log-2017-09-24.php

diff --git a/application/logs/log-2017-09-22.php b/application/logs/log-2017-09-22.php
old mode 100644
new mode 100755
diff --git a/application/logs/log-2017-09-24.php b/application/logs/log-2017-09-24.php
new file mode 100644
index 00000000..c6ebd32b
--- /dev/null
+++ b/application/logs/log-2017-09-24.php
@@ -0,0 +1,184 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-09-24 07:53:44 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/24septsunday/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-09-24 07:54:01 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:54:01 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:54:32 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:54:32 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:54:33 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/24septsunday/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-09-24 07:54:57 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:54:57 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:54:57 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:54:57 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:55:13 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:55:13 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:55:13 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 07:55:13 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 08:06:02 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2815
+ERROR - 2017-09-24 08:06:02 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2815
+ERROR - 2017-09-24 08:06:02 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2815
+ERROR - 2017-09-24 08:06:02 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2815
+ERROR - 2017-09-24 08:16:37 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:16:37 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:16:37 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:16:37 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:17:39 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 08:17:39 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 08:17:39 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 08:17:39 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2806
+ERROR - 2017-09-24 08:18:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:18:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:18:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:18:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:18 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:18 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:18 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:18 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:53 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:53 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:53 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:20:53 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:20 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:20 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:20 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:20 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:41 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:41 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:41 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:21:41 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:22:16 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:22:16 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:22:16 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:22:16 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2812
+ERROR - 2017-09-24 08:25:08 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2819
+ERROR - 2017-09-24 08:25:08 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2819
+ERROR - 2017-09-24 08:25:08 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2819
+ERROR - 2017-09-24 08:25:08 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2819
+ERROR - 2017-09-24 08:27:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:27:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:27:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:27:15 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:31:01 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:31:01 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:31:01 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:31:01 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:32:24 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:32:24 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:32:24 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:32:24 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 08:32:26 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:32:26 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:32:26 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:32:26 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:32:26 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:38:32 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:38:32 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:38:32 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:38:32 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:38:32 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:39:28 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:39:28 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:39:28 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:39:28 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:39:28 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:42:34 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:42:34 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:42:34 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:42:34 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:42:34 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:46:49 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:46:49 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:46:49 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:46:49 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:46:49 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:48:36 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:48:36 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:48:36 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:48:36 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:48:36 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:51:26 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:51:26 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:51:26 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:51:26 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:51:26 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:56:06 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:56:06 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:56:06 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:56:06 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:56:06 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 08:59:41 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 08:59:41 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 08:59:41 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 08:59:41 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 08:59:41 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 09:04:39 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 09:04:39 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 09:04:39 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 09:04:39 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 09:04:39 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 09:04:39 --> Severity: Notice  --> Undefined variable: INRSYN /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 5223
+ERROR - 2017-09-24 09:05:47 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 09:05:47 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 09:05:47 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 09:05:47 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 09:05:47 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 09:07:44 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 09:07:44 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 09:07:44 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 09:07:44 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 09:07:44 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 09:07:44 --> Severity: Notice  --> Undefined variable: INR /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 5223
+ERROR - 2017-09-24 09:08:27 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 09:08:27 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 09:08:27 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 09:08:27 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 09:08:27 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 09:09:07 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 09:09:07 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 09:09:07 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 09:09:07 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 09:09:07 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 09:15:12 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 09:15:12 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 09:15:12 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 09:15:12 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 09:15:12 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 09:40:03 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 09:40:03 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 09:40:03 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 09:40:03 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editimportpo.php 2820
+ERROR - 2017-09-24 09:54:59 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 09:54:59 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 09:54:59 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 09:54:59 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 09:54:59 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 10:06:58 --> Severity: Notice  --> Undefined variable: INR /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editServiceAmendPO.php 1298
+ERROR - 2017-09-24 10:10:18 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 10:10:18 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 10:10:18 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 10:10:18 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 10:10:18 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 479
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 479
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 479
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 480
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 480
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 480
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 523
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 523
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 523
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 523
+ERROR - 2017-09-24 13:11:43 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/revenuepopdf.php 523
+ERROR - 2017-09-24 13:11:44 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/24septsunday/siddharth_application/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-24 13:11:44 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/24septsunday/siddharth_application/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-24 13:13:40 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/24septsunday/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-09-24 13:39:41 --> Severity: Notice  --> Undefined variable: INRSYM /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editRevenueAmendPO.php 1468
+ERROR - 2017-09-24 13:41:28 --> Severity: Notice  --> Undefined variable: INRSYM /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editRevenueAmendPO.php 1468
+ERROR - 2017-09-24 13:41:49 --> Severity: Notice  --> Undefined variable: INR /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editRevenueAmendPO.php 1468
+ERROR - 2017-09-24 13:43:01 --> Severity: Notice  --> Undefined variable: INR /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/editRevenueAmendPO.php 1477
+ERROR - 2017-09-24 13:48:30 --> Severity: Notice  --> Undefined variable: RequistionDetails /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 211
+ERROR - 2017-09-24 13:48:30 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 212
+ERROR - 2017-09-24 13:48:30 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 213
+ERROR - 2017-09-24 13:48:30 --> Severity: Notice  --> Undefined variable: MaterialList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 259
+ERROR - 2017-09-24 13:48:30 --> Severity: Notice  --> Undefined variable: CostList /opt/lampp/htdocs/24septsunday/siddharth_application/application/views/alterpurchaseorder.php 287
+ERROR - 2017-09-24 13:50:48 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/24septsunday/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
diff --git a/application/third_party/dompdf/lib/fonts/log.htm b/application/third_party/dompdf/lib/fonts/log.htm
index 4e904465..ec95da62 100755
--- a/application/third_party/dompdf/lib/fonts/log.htm
+++ b/application/third_party/dompdf/lib/fonts/log.htm
@@ -1 +1 @@
-<span style='color: #900'>2,048 KB</span>    <span style='color: #090'>445.5121 ms</span><br />
\ No newline at end of file
+<span style='color: #900'>20,480 KB</span>    <span style='color: #090'>741.5838 ms</span><br />
\ No newline at end of file
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index 0876a5a3..cf873afb 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -2101,7 +2101,7 @@ function populateValueMainFormForDeleteItem(rowid)
                 <div class="col-md-12">
                     <div class="row">
                         <div class="col-md-3">
-                            <label>Request Type </label>
+                            <label>Request Type <span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
                             <?php
                             $options = array("-1"=>'Select Request Type');
 
@@ -2144,7 +2144,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
 							<div class="col-md-3" id="selectdeliveryby" style="display:none;">
 
-                            <b><u>Select Delivery By</u></b><br/>
+                            <b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></u></b><br/>
                             <tr>
                                 <td>
                                     <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -2155,7 +2155,7 @@ function populateValueMainFormForDeleteItem(rowid)
                             </tr>
                         </div>
 						<div class="col-md-3" style='display:none;' id='workstatus'>
-                            <label>Work Status</label>
+                            <label>Work Status<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
 							
 								
   																<?php
@@ -2184,7 +2184,7 @@ function populateValueMainFormForDeleteItem(rowid)
                     </div>
 					<div class="row">
                         <div class="col-md-3">
-                            <label>Supplier</label>
+                            <label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
                             <div >
                                 <?php
                                 $options = array("0"=>'Select Supplier');
@@ -2228,7 +2228,7 @@ function populateValueMainFormForDeleteItem(rowid)
 						  <div class="col-md-3" id="Deliveryby" style="display:none;padding: 0px;">
  
 								 <div class="col-md-12" id="Schedulediv" style="display:none;">
-                                <label >Schedule By</label>
+                                <label >Schedule By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
                                  
 								<?php
                                 $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -2237,7 +2237,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                             </div>
 						 <div class="col-md-12" id="Deliverydtdiv">
-                            <label>Delivery Date</label>
+                            <label>Delivery Date<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
                              
                                 <?php
                                 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt',  'class' => 'form-control num'  ,'required' => 'true');
@@ -2252,7 +2252,7 @@ function populateValueMainFormForDeleteItem(rowid)
                     </div>
                     <div class="row">
                         <div class="col-md-3">
-                            <label>Department Name</label>
+                            <label>Department Name<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
                             <div >
                                 <?php
                                 $options1 = array("0"=>'Select Department Name');
@@ -2274,7 +2274,7 @@ function populateValueMainFormForDeleteItem(rowid)
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <label>Cost Center Name</label>
+                            <label>Cost Center Name<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
                             <div >
                                 <?php
                                 $options2 = array("0"=>'Cost Center Name');
@@ -2297,7 +2297,7 @@ function populateValueMainFormForDeleteItem(rowid)
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <label>Available Budget In INR</label><img id="AlertImg"  src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px"  style="display:none;"/>
+                            <label>Available Budget <?php echo "($INRSYM)"?></label><img id="AlertImg"  src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px"  style="display:none;"/>
                             <div class="form-group">
                                 <?php
                                 $data = array('name' => 'AvalBuget','value' => set_value('AvalBuget'),'id'=>'AvalBuget',  'class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true');
@@ -2308,7 +2308,7 @@ function populateValueMainFormForDeleteItem(rowid)
 					
 						 <div class="col-md-3" style='display:none;' id='txtPoRange'>
 
-                            <b><u>Select Tax Range</u></b><br/>
+                            <b><u>Select Tax Range<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></u></b><br/>
                             <tr>
                                 <td>
                                     <?php echo form_label('Local', 'Local') ."&nbsp;&nbsp;". form_radio(array("name"=>"Range", "id"=>"Local", "value"=>"0", 'checked'=>set_radio('Range', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -2324,7 +2324,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
 						 <div class="col-md-3" id="currencyexchange" style='display:none;'>
                             <div class="col-md-6">
-                                <label>Currency Type</label>
+                                <label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5;">*</span></label>
                                  
                                     <?php
                                     $data = array('name' => 'txtcurrencytype','value' => set_value('txtcurrencytype'),'id'=>'txtcurrencytype',  'class' => 'form-control' ,'required' => 'true');
@@ -2742,7 +2742,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                                 <div class="col-md-12">
                                     <div class="col-md-3">
-                                        <label>Req No</label>
+                                        <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                         <div>
                                             <?php
 
@@ -2784,7 +2784,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                 </div>
 								<div class="col-md-12">
 								<div class="col-md-3">
-                                        <label>Item Code</label>
+                                        <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                         <div>
                                             <?php
                                             $options = array("0"=>'Item Code');
@@ -2886,7 +2886,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                     	
                                                 
                                     <div class="col-md-3">
-                                        <label>Quantity</label>
+                                        <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                         <div class="form-group">
                                             <?php
                                             $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
@@ -2895,7 +2895,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                         </div>
                                     </div>
                                     <div class="col-md-3">
-                                        <label><?php echo "Rate  ($INRSYM)";?></label>
+                                        <label><?php echo "Rate  ($INRSYM)";?><span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                         <div class="form-group">
                                             <?php
                                             $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
@@ -3006,7 +3006,7 @@ function populateValueMainFormForDeleteItem(rowid)
 										</div>
 									 <div class="col-md-12">
                                         <div class="col-md-5 col-md-offset-4" align="right">
-                                             <label>Other Allowances In INR</label>
+                                             <label>Other Allowances <?php echo "($INRSYM)"?></label>
                                         </div>
                                         <div class="col-md-3">
                                             <div class="form-group">
@@ -3031,7 +3031,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                         </div>
                                     </div>
                                     <div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
-                                                    <label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label>  <?php
+                                                    <label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>  <?php
                                                     $data = array('name' => 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40');
                                                     echo form_textarea($data); ?>
                                                 </div>  
@@ -3063,7 +3063,7 @@ function populateValueMainFormForDeleteItem(rowid)
 									<div align="left"> 
 										<div class="col-md-12" >
 														 <div class="col-md-3">
-														 <label>Req No</label>
+														 <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 																	<div >
 																		 <?php													
 																			
@@ -3093,7 +3093,7 @@ function populateValueMainFormForDeleteItem(rowid)
 																	</div>
 														 </div>
 														  <div class="col-md-3">
-														   <label>Avl Bud Amt In INR</label>
+														   <label>Avl Bud Amt <?php echo "($INRSYM)"?></label>
 																	<div class="form-group">
 																				<?php
 																		 $data = array('name' => 'EditRevenueAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditRevenueAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3104,7 +3104,7 @@ function populateValueMainFormForDeleteItem(rowid)
 												</div>		
 										<div class="col-md-12">
 													  <div class="col-md-2">
-													  <label>Item Code</label>
+													  <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 																<div  >
 																	 <?php
 																	$options = array("0"=>'Item Code');     
@@ -3134,9 +3134,9 @@ function populateValueMainFormForDeleteItem(rowid)
 																	?>   
 																</div>
 													 </div>
-                                                     <div class="col-md-6" style="padding:0px;">
-													 <div class="col-md-2">
-													  <label>Quantity</label>
+                                                     <div class="col-md-6" style="padding: 0px;">
+													 <div class="col-md-2" style="padding-right:0px;">
+													  <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 																<div class="form-group">
 																			<?php
 																	 $data = array('name' => 'EditRevenueQuantity','value' => set_value('EditQuantity'),'id'=>'EditRevenueQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;');
@@ -3144,8 +3144,8 @@ function populateValueMainFormForDeleteItem(rowid)
 																	?>   
 																</div>
 													 </div>
-													 <div class="col-md-2">
-													  <label><?php echo "Rate  ($INRSYM)";?></label>
+													 <div class="col-md-2" style="padding-right: 0px;">
+													  <label><?php echo "Rate  ($INRSYM)";?><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 																<div class="form-group">
 																			<?php
 																	 $data = array('name' => 'EditRevenueRate','value' => set_value('EditRate'),'id'=>'EditRevenueRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' );
@@ -3158,7 +3158,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                         $data = array('name' => 'editrevenueEmergPer','value' => set_value('editrevenueEmergPer'),'id'=>'editrevenueEmergPer',  'class' => 'form-control');
                                                          echo form_input($data); ?>
                                                         </div>
-													 <div class="col-md-2">
+													 <div class="col-md-2" style="padding: 0px;">
 													  <label><?php echo "Basic Amt  ($INRSYM)";?></label>
 																<div class="form-group">
 																			<?php
@@ -3202,7 +3202,7 @@ function populateValueMainFormForDeleteItem(rowid)
 																		</div> 
 											</div>
 											 <div class="col-md-2">
-															  <label>Discounted Amt In INR  </label>
+															  <label>Discounted Amt <?php echo "($INRSYM)"?> </label>
 															  <div class="form-group">
 																					<?php
 																			 $data = array('name' => 'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -3222,7 +3222,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                                 </div>
                                                             </div>
                                                             <div class="col-md-2" >
-                                                                <label>CGST Amt In INR</label>
+                                                                <label>CGST Amt <?php echo "($INRSYM)"?></label>
                                                                 <div class="form-group">
                                                                     <?php
                                                                     $data = array('name' => 'RevenueEditAfterCgst','value' => set_value('RevenueEditAfterCgst',0),'id'=>'RevenueEditAfterCgst',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3265,7 +3265,7 @@ function populateValueMainFormForDeleteItem(rowid)
 																		</div> 
 											</div>
 											 <div class="col-md-2">
-															  <label>Packaging Amt In INR </label>
+															  <label>Packaging Amt <?php echo "($INRSYM)"?> </label>
 															  <div class="form-group">
 																					<?php
 																			 $data = array('name' => 'txtEditAfterPackaging','value' => set_value('txtEditAfterPackaging'),'id'=>'txtEditAfterPackaging',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -3284,7 +3284,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>SGST Amt In INR</label>
+                                                            <label>SGST Amt <?php echo "($INRSYM)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'RevenueEditAfterSgst','value' => set_value('RevenueEditAfterSgst',0),'id'=>'RevenueEditAfterSgst',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3304,7 +3304,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>IGST Amt In INR</label>
+                                                            <label>IGST Amt <?php echo "($INRSYM)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'RevenueEditAfterIgst','value' => set_value('RevenueEditAfterIgst',0),'id'=>'RevenueEditAfterIgst',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3356,7 +3356,7 @@ function populateValueMainFormForDeleteItem(rowid)
 																		</div> 
 											</div>
 											 <div class="col-md-2">
-															  <label>Freight Amt In INR</label>
+															  <label>Freight Amt <?php echo "($INRSYM)"?></label>
 															  <div class="form-group">
 																					<?php
 																			 $data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -3367,7 +3367,7 @@ function populateValueMainFormForDeleteItem(rowid)
 											
 											
 											<div class="col-md-4">
-												  <label> Insurance Amt In INR (if Any)</label>
+												  <label> Insurance Amt <?php echo "($INRSYM)"?> (if Any)</label>
 												  <div class="form-group">
 																		<?php
 																 $data = array('name' => 'txtEditInsurance','value' => set_value('txtEditInsurance'),'id'=>'txtEditInsurance',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateEditTotalValue(1);','style'=>'text-align:right;');
@@ -3436,7 +3436,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                         <div align="left">
 												<div class="col-md-12">
                                                     <div class="col-md-2">
-                                                        <label>Item Code</label>
+                                                        <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                                         <div  >
                                                             <?php
                                                             $options = array("0"=>'Item Code');
@@ -3468,7 +3468,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                     </div>
                                                     <div class="col-md-6" style="padding:0px;">
                                                     <div class="col-md-3">
-                                                        <label>Quantity</label>
+                                                        <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
@@ -3477,7 +3477,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                         </div>
                                                     </div>
                                                     <div class="col-md-3">
-                                                        <label><?php echo "Rate  ($INRSYM)";?></label>
+                                                        <label><?php echo "Rate  ($INRSYM)";?><span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' );
@@ -3506,7 +3506,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                  
                                                     <div class="col-md-12">
                                                         <div class="col-md-4">
-                                                            <label>Discount Type </label>
+                                                            <label>Discount Type <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
                                                             <div>
                                                                 <?php
                                                                 $options = array("0"=>'Select Discount Type');
@@ -3528,7 +3528,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>Discount Rate </label>
+                                                            <label>Discount Rate<span class="badge" style="color:red;text-align:right;background-color: #fff ;"> </label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtDiscount','value' => set_value('txtDiscount'),'id'=>'txtDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'change();calculateDiscount(0);');
@@ -3537,7 +3537,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>Discounted Amt In INR</label>
+                                                            <label>Discounted Amt <?php echo "($INRSYM)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount'),'id'=>'txtAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3556,7 +3556,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                                 </div>
                                                             </div>
                                                             <div class="col-md-2" >
-                                                                <label>CGST Amt  In INR</label>
+                                                                <label>CGST Amt  <?php echo "($INRSYM)"?></label>
                                                                 <div class="form-group">
                                                                     <?php
                                                                     $data = array('name' => 'RevenueAfterCgst','value' => set_value('RevenueAfterCgst',0),'id'=>'RevenueAfterCgst',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3569,7 +3569,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                  
                                                     <div class="col-md-12" style="text-align:left;">
                                                         <div class="col-md-4">
-                                                            <label>Packaging Type </label>
+                                                            <label>Packaging Type <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
                                                             <div>
                                                                 <?php
                                                                 $options = array("0"=>'Select Packaging Type');
@@ -3591,7 +3591,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>Packaging Rate </label>
+                                                            <label>Packaging Rate <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtPackaging','value' => set_value('txtPackaging'),'id'=>'txtPackaging',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging(0);');
@@ -3600,7 +3600,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>Packaging Amt  In INR</label>
+                                                            <label>Packaging Amt  <?php echo "($INRSYM)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3619,7 +3619,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>SGST Amt  In INR</label>
+                                                            <label>SGST Amt  <?php echo "($INRSYM)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'RevenueAfterSgst','value' => set_value('RevenueAfterSgst',0),'id'=>'RevenueAfterSgst',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3639,7 +3639,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>IGST Amt In INR</label>
+                                                            <label>IGST Amt <?php echo "($INRSYM)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'RevenueAfterIgst','value' => set_value('RevenueAfterIgst',0),'id'=>'RevenueAfterIgst',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3652,7 +3652,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                  
                                                     <div class="col-md-12"  >
                                                         <div class="col-md-2">
-                                                            <label>Freight Type </label>
+                                                            <label>Freight Type <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
                                                             <div>
                                                                 <?php
                                                                 $options = array("0"=>'Select Freight Type');
@@ -3674,7 +3674,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
 														<div class="col-md-2" id="TripsValue" style="display:none;">
-                                                            <label>NO Of Trips</label>
+                                                            <label>NO Of Trips<span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips',  'class' => 'form-control num' ,'onchange'=>'calculateFreight(0);');
@@ -3683,7 +3683,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2">
-                                                            <label>Freight Rate </label>
+                                                            <label>Freight Rate <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
@@ -3693,7 +3693,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                         </div>
 														
                                                         <div class="col-md-2">
-                                                            <label>Freight Amt In INR</label>
+                                                            <label>Freight Amt <?php echo "($INRSYM)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3702,7 +3702,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                             </div>
                                                         </div>
 														<div class="col-md-4">
-                                                            <label> Insurance  In INR (if Any)</label>
+                                                            <label> Insurance  <?php echo "($INRSYM)"?> (if Any)</label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtInsurance','value' => set_value('txtInsurance'),'id'=>'txtInsurance',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateTotalValue(0);');
@@ -3773,7 +3773,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Item Code</label>
+                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0"=>'Item Code');
@@ -3886,7 +3886,7 @@ function populateValueMainFormForDeleteItem(rowid)
 													
                                                										   
                                                 <div class="col-md-3">
-                                                    <label>Quantity</label>
+                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ServiceQuantity','value' => set_value('ServiceQuantity'),'id'=>'ServiceQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
@@ -3895,7 +3895,7 @@ function populateValueMainFormForDeleteItem(rowid)
                                                     </div>
                                                 </div>
                                                 <div class="col-md-3">
-                                                    <label><?php echo "Rate  ($INRSYM)";?></label>
+                                                    <label><?php echo "Rate  ($INRSYM)";?><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ServiceRate','value' => set_value('ServiceRate'),'id'=>'ServiceRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()');
@@ -4010,7 +4010,7 @@ function populateValueMainFormForDeleteItem(rowid)
 													<div class="col-md-12">
                                                 <div class="col-md-8" align="right">
 																 
-													<label>Other Allowances In INR</label>
+													<label>Other Allowances <?php echo "($INRSYM)"?></label>
 														</div>
                                                 <div class="col-md-4" >                                                    
                                                     <div class="form-group">													
@@ -4039,7 +4039,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
 												</div>
                                                     <div class="col-md-12" style="padding: 0px 30px 10px 30px;"> 
-                                                    <label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label>  <?php
+                                                    <label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>  <?php
                                                     $data = array('name' => 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle',  'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
                                                     echo form_textarea($data); ?>
                                                 </div>  
@@ -4216,7 +4216,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                                                 <div class="col-md-3">
 
-                                                    Basic value in INR :
+                                                    Basic value <?php echo "($INRSYM)"?> :
 
 
 
@@ -4675,7 +4675,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                                                 <div class="col-md-3">
 
-                                                    Basic value in INR :
+                                                    Basic value <?php echo "($INRSYM)"?> :
 
 
 
@@ -5036,10 +5036,10 @@ function populateValueMainFormForDeleteItem(rowid)
                                     <th>Item Description</th>
                                     <th>Quantity</th>
                                     <th>UOM</th>
-                                    <th>Rate</th>
-                                    <th>Basic Amount</th>
-                                    <th>Tax Amount</th>
-                                    <th>Total Order Amount</th>
+                                    <th>Rate<?php echo "($INRSYM)"?></th>
+                                    <th>Basic Amount<?php echo "($INRSYM)"?></th>
+                                    <th>Tax Amount<?php echo "($INRSYM)"?></th>
+                                    <th>Total Order Amount<?php echo "($INRSYM)"?></th>
                                     <th>Action</th>
                                 </tr>
                                 </thead>
@@ -5065,7 +5065,7 @@ function populateValueMainFormForDeleteItem(rowid)
                         <br/>
                         <div class="col-md-12">
                             <div class="col-md-3">
-                                <label >Basic Amount In INR </label>
+                                <label >Basic Amount <?php echo "($INRSYM)"?> </label>
                                 <?php
                                 $data = array('name' => 'txtTotBasicAmountRevenue','value' => set_value('txtTotBasicAmountRevenue'),'id'=>'txtTotBasicAmountRevenue',  'class' => 'form-control num'  ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5073,7 +5073,7 @@ function populateValueMainFormForDeleteItem(rowid)
 
                             </div>
                             <div class="col-md-3">
-                                <label >Total Discount In INR  </label>
+                                <label >Total Discount <?php echo "($INRSYM)"?>  </label>
                                 <?php
                                 $data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount'),'id'=>'txtTotalDiscount',  'class' => 'form-control num'   ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5083,7 +5083,7 @@ function populateValueMainFormForDeleteItem(rowid)
                              
                          
                             <div class="col-md-3">
-                                <label >CGST In INR  </label>
+                                <label >CGST <?php echo "($INRSYM)"?> </label>
                                 <?php
                                 $data = array('name' => 'txtTotalCGST','value' => set_value('txtTotalCGST'),'id'=>'txtTotalCGST',  'class' => 'form-control num' ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5091,14 +5091,14 @@ function populateValueMainFormForDeleteItem(rowid)
                             </div>
 							
 							 <div class="col-md-3" id="displaySGST">
-                                <label >SGST In INR  </label>
+                                <label >SGST <?php echo "($INRSYM)"?>  </label>
                                 <?php
                                 $data = array('name' => 'txtTotalSGST','value' => set_value('txtTotalSGST'),'id'=>'txtTotalSGST',  'class' => 'form-control num' ,'readonly' => 'true');
                                 echo form_input($data);
                                 ?>
                             </div>
 							<div class="col-md-3" id="displayIGST" style="display:none;">
-                                <label > IGST In INR  </label>
+                                <label > IGST <?php echo "($INRSYM)"?>  </label>
                                 <?php
                                 $data = array('name' => 'txtTotalIGST','value' => set_value('txtTotalIGST'),'id'=>'txtTotalIGST',  'class' => 'form-control num' ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5110,7 +5110,7 @@ function populateValueMainFormForDeleteItem(rowid)
 							  
 							
                             <div class="col-md-3">
-                                <label >Total Packaging In INR  </label>
+                                <label >Total Packaging <?php echo "($INRSYM)"?> </label>
                                 <?php
                                 $data = array('name' => 'txtTotalPackaing','value' => set_value('txtTotalPackaing'),'id'=>'txtTotalPackaing',  'class' => 'form-control num'  ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5119,7 +5119,7 @@ function populateValueMainFormForDeleteItem(rowid)
 						 
                          
                             <div class="col-md-3">
-                                <label >Total Insurance In INR  </label>
+                                <label >Total Insurance <?php echo "($INRSYM)"?>  </label>
                                 <?php
                                 $data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance'),'id'=>'txtTotalInsurance',  'class' => 'form-control num' ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5130,7 +5130,7 @@ function populateValueMainFormForDeleteItem(rowid)
                        
 
                             <div class="col-md-3">
-                                <label >Total Freight In INR </label>
+                                <label >Total Freight <?php echo "($INRSYM)"?></label>
                                 <?php
                                 $data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight'),'id'=>'txtTotalFreight',  'class' => 'form-control num' ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5138,7 +5138,7 @@ function populateValueMainFormForDeleteItem(rowid)
                             </div>
                            
                             <div class="col-md-3">
-                                <label >Total Order Value In INR </label>
+                                <label >Total Order Value <?php echo "($INRSYM)"?></label>
                                 <?php
                                 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary'),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true');
                                 echo form_input($data);
@@ -5179,14 +5179,14 @@ function populateValueMainFormForDeleteItem(rowid)
                         <div class="col-md-12" style="padding:0px;">
                             
 								<div class="col-md-2">
-									<label>Basic Amount In INR</label>
+									<label>Basic Amount <?php echo "($INRSYM)"?></label>
 									<?php
 									$data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount'),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
 									echo form_input($data);
 									?>
 								</div>
 								<div class="col-md-2">
-								<label>CGST In INR</label> 
+								<label>CGST <?php echo "($INRSYM)"?></label> 
 									<?php
 								 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
 								echo form_input($data);				
@@ -5195,21 +5195,21 @@ function populateValueMainFormForDeleteItem(rowid)
 						 
 							 
 								<div class="col-md-2">
-									 <label>SGST In INR</label> 
+									 <label>SGST <?php echo "($INRSYM)"?></label> 
 									 <?php
 											 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
 											echo form_input($data);				
 											?>   
 								</div>
 								<div class="col-md-2">
-									<label>IGST In INR  </label> 
+									<label>IGST <?php echo "($INRSYM)"?> </label> 
 									<?php
 											 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
 											echo form_input($data);
 											?>   
 								</div>
 								<div class="col-md-2">
-									<label>Other Allowances In INR</label> 
+									<label>Other Allowances <?php echo "($INRSYM)"?></label> 
 									<?php
 											 $data = array('name' => 'txtTotOtherAllo','value' => set_value('txtTotOtherAllo'),'id'=>'txtTotOtherAllo',  'class' => 'form-control num'   ,'readonly' => 'true');
 											echo form_input($data);
@@ -5220,7 +5220,7 @@ function populateValueMainFormForDeleteItem(rowid)
                       
                         <div class="col-md-2">
                              
-							<label >Total Order Value In INR</label>
+							<label >Total Order Value  <?php echo "($INRSYM)"?></label>
                                 <?php
                                 $data = array('name' => 'txtTotalOrderValueSummaryService','value' => set_value('txtTotalOrderValueSummaryService'),'id'=>'txtTotalOrderValueSummaryService',  'class' => 'form-control num'  ,'readonly' => 'true');
                                 echo form_input($data);
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index c3066164..da47f06e 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -854,10 +854,10 @@ $("#PaymentMethod").select2();
                                             <th>Item Description</th>
                                             <th>Quantity</th>
                                             <th>UOM</th>
-                                            <th>Rate</th>
-                                            <th>Basic Amount</th>
-                                        <th>Tax Amount</th>
-                                            <th>Total Order Amount</th>
+                                            <th>Rate<?php echo "($INR)"?></th>
+                                            <th>Basic Amount<?php echo "($INR)"?></th>
+                                        <th>Tax Amount<?php echo "($INR)"?></th>
+                                            <th>Total Order Amount<?php echo "($INR)"?></th>
                                             <th>Actual Quantity</th>
                                             <th>Received Quantity</th>
 					<th>Pending Quantity</th>
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 7180301b..7ef144a3 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -325,7 +325,8 @@ if(!empty($RequistionDetails))
 
 
      <div class="col-md-12" style="padding: 0px;">
-                <label>Currency Type</label>
+                <label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                      
                          <?php
                          $options = array($CurCode=>$Cur);
@@ -368,7 +369,8 @@ if(!empty($RequistionDetails))
     <div class="col-md-9" style="padding: 0px;">
         <div class="col-md-4" style="padding: 0px;">
             <div class="col-md-12">
-                <label>Supplier</label>
+                <label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                      
                          <?php
                         $options = array("0"=>'Select Supplier');     
@@ -466,7 +468,8 @@ if(!empty($RequistionDetails))
         <div class="col-md-4" style="padding: 0px;">
         <div class="col-md-12">
 
-                            <b><u>Select Delivery By</u></b><br/>
+                            <b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></u></b><br/>
                             <tr>
                                 <td>
                                    <!--  <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> -->
@@ -480,7 +483,7 @@ if(!empty($RequistionDetails))
                             </tr>
                         </div>
             
-                <div class="col-md-12" id="Schedulediv" style="display:none;padding-left: 0px;padding-top: 7px;"> <br/>
+                <div class="col-md-12" id="Schedulediv" style="display:none;padding-top: 7px;"> <br/>
                        <!--  <label >Schedule </label>
                          
                         <?php
@@ -488,7 +491,8 @@ if(!empty($RequistionDetails))
                         echo Form_textarea($data);
                         ?> -->
 
-                        <label >Schedule By</label>
+                        <label >Schedule By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                          
                         <?php
                         $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverySchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -496,7 +500,7 @@ if(!empty($RequistionDetails))
                         ?>
 
                 </div>
-                <div class="col-md-12" id="Deliverydtdiv" style="padding-left: 0px;padding-top: 7px;"> <br/>
+                <div class="col-md-12" id="Deliverydtdiv" style="padding-top: 7px;"> <br/>
                            <!--  <label>Delivery Date</label>
                              
                                 <?php
@@ -505,7 +509,8 @@ if(!empty($RequistionDetails))
                                 ?> -->
 
 
-                                  <label>Dispatch Instruction</label>
+                                  <label>Dispatch Instruction<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                              
                                 <?php
                                 // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
@@ -540,7 +545,8 @@ if(!empty($RequistionDetails))
          <div class="col-md-3">
                <!--  <label>Exchange Rate </label> -->
 
-                <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></label>
+                <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?><span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                 <div class="form-group">
                     <?php
                     $data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate',$ExchangeRate),'id'=>'ExchangeRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
@@ -548,8 +554,9 @@ if(!empty($RequistionDetails))
                     ?>
                 </div>                
             </div> 
-            <div class="col-md-3" style="padding-left: 0px;">
-                <label>Place of Origin</label>
+            <div class="col-md-3">
+                <label>Place of Origin<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                         <div class="form-group">
                                     <?php
                             //  $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
@@ -633,7 +640,7 @@ if(!empty($RequistionDetails))
   </div>
   </div>
     <div class="col-md-4" style="padding:0px;">
-  <div class="col-md-6" style="padding:0px;">
+  <div class="col-md-6" style="padding-right:0px;">
   
    <label>Our Reference(S)</label>
             <div class="form-group">
@@ -659,60 +666,13 @@ if(!empty($RequistionDetails))
   </div>
   </div><!--End new fields 1 sep-->
 
-     <div class="col-md-12" style="padding: 0px;">
-       <div class="col-md-3">
-                <label for="payablefrom">Payable Terms</label>
-                    <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
-                    
-                        
-                         <?php
-                                                     
-                                               
-                                             
-                                                   if(!empty($Payment))
-                                                   {
-                                               
-                                               foreach ($Payment as $pay2)
-                                                     
-                                                   if($Terms==$pay2->PaymentID){
-                                                        //echo "$Terms";
-                                                        //echo "$pay2->PaymentTerms";
-                                                        
-                                                        ?>
-                                            <input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>">
-                                                        <?php
-                                                   
-                                                      $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
-                                                     
-                                                    }
-                                                 
-                                                    foreach ($Payment as $pay1):
-                                                     
-                                                    if($Terms!=$pay1->PaymentID){
-                                                   
-                                                      $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
-                                                     
-                                                    }
-                                                   endforeach;
-                                                   }                                                                                            echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');                                                    ?>
-                    
-           </div>
-            <div class="col-md-3" id="otheroptiondiv" style="display:none;">
-                      <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
-;">*</span></label>
-                       <div class="form-group">                        
-                           <?php
-                            
-                            $data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment',$Otherpay),'id'=>'Otherpayment',  'class' => 'form-control' ,'required' => 'true');
-                           echo form_input($data);
-                           ?>  
-                       </div>
-               </div>
+  <div class="row">
+  <div class="col-md-12"> 
+  <div class="col-md-3">
+  <div class="col-md-6" style="padding: 0px;">
+   
 
-
-
- <div class="col-md-3">
-                <label for="payablefrom">Import Options</label>
+           <label for="payablefrom">Import Options</label>
                     
                      <?php
                           //$options1 = array("0"=>'Select Import Option');       
@@ -738,14 +698,11 @@ if(!empty($RequistionDetails))
 }
 
                     echo form_dropdown('Importoption', $options2,set_value('Importoption'),'id="Importoption"' ,'class="form-control"');                                              ?>
-</div> 
-
-
-
-
-
-            <div class="col-md-1">
-                <label for="payablefrom">Insurance</label>
+            </div>
+           
+  
+    <div class="col-md-6" style="padding-right:0px;">
+         <label for="payablefrom">Insurance</label>
                    
                     
                         
@@ -783,15 +740,15 @@ if(!empty($RequistionDetails))
 
                     $data = array('name' => 'Insurance','Insurance' => set_value('Insurance',$opt1),'id'=>'Insurance',  'class' => 'form-control' ,'required' => 'true', 'readonly'=>true);
                            echo form_input($data);
-                    ?>                                     
-                    
-           </div>  
+                    ?> 
+  
 
-
-
-
-           <div class="col-md-2" id="insurancenum" style="display:none;">
-                      <label>Insurance Number<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+  </div>
+ 
+  </div>
+  <div class="col-md-9" style="padding:0px;">
+   <div class="col-md-4" id="insurancenum" style="display:none;">
+                      <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
 ;">*</span></label>
                        <div class="form-group">                        
                            <?php
@@ -801,15 +758,64 @@ if(!empty($RequistionDetails))
                            ?>  
                        </div>
                </div>  
+              
+  <div class="col-md-4" style="padding:0px;" >
+<div class="col-md-12">
+                     <label for="payablefrom">Payable Terms</label>
+                    <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
+                    
+                        
+                         <?php
+                                                     
+                                               
+                                             
+                                                   if(!empty($Payment))
+                                                   {
+                                               
+                                               foreach ($Payment as $pay2)
+                                                     
+                                                   if($Terms==$pay2->PaymentID){
+                                                        //echo "$Terms";
+                                                        //echo "$pay2->PaymentTerms";
+                                                        
+                                                        ?>
+                                            <input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>">
+                                                        <?php
+                                                   
+                                                      $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
+                                                     
+                                                    }
+                                                 
+                                                    foreach ($Payment as $pay1):
+                                                     
+                                                    if($Terms!=$pay1->PaymentID){
+                                                   
+                                                      $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
+                                                     
+                                                    }
+                                                   endforeach;
+                                                   }                                                                                            echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');                                                    ?>
+                    
+           </div>
+                    </div>
+                   
+   
+                <div class="col-md-4" id="otheroptiondiv" style="display:none;">
+                      <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
+                       <div class="form-group">                        
+                           <?php
+                            
+                            $data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment',$Otherpay),'id'=>'Otherpayment',  'class' => 'form-control' ,'required' => 'true');
+                           echo form_input($data);
+                           ?>  
+                       </div>
+               </div>
 
-
-
-
-
-
-            
-             
-    </div>
+   
+  </div> 
+  </div>
+  </div>
     </div>     
     </div>
         
@@ -840,7 +846,7 @@ if(!empty($RequistionDetails))
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Req No</label>
+                                                    <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div>
                                                         <?php
                                             
@@ -889,7 +895,7 @@ if(!empty($RequistionDetails))
                                             </div>
                                             <div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code</label>
+                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
@@ -927,7 +933,7 @@ if(!empty($RequistionDetails))
                                                 </div>
                                                 <div class="col-md-6" style="padding: 0px;">
                                                 <div class="col-md-3">
-                                                    <label>Quantity</label>
+                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
@@ -936,11 +942,11 @@ if(!empty($RequistionDetails))
                                                         ?>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-3">
+                                                <div class="col-md-3" style="padding-left: 0px;">
                                                    <!--  <label>Rate </label> -->
 
                                           
-                                            <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> </label>
+                                            <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?><span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
@@ -1456,8 +1462,8 @@ echo form_textarea($data);
                     <th>Item Name</th>
                     <th>Quantity</th>
                     <th>UOM</th>
-                    <th>Rate</th>
-                    <th>Basic Amount</th>
+                    <th>Rate<?php echo $INR?></th>
+                    <th>Basic Amount<?php echo $INR?></th>
                     <!-- <th>Tax Amount</th>
                     <th>Total Order Amount</th> -->
                     <th>Action</th>
diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php
index cf73e387..a24ea7a9 100755
--- a/application/views/editRevenueAmendPO.php
+++ b/application/views/editRevenueAmendPO.php
@@ -122,6 +122,15 @@ foreach ($POSTATUS as $PST )
 {
    $POStatus=$PST->StatusName;
 }
+if(!empty($INRSYMBOL))
+{
+
+	foreach($INRSYMBOL as $INRS)
+	{
+      $INRSYM=$INRS->FontCode2000;
+
+	}
+}
 
 ?>
 <style>
@@ -934,7 +943,7 @@ function calculateEditTaxValue()
 		<div class="col-md-9">
 			<div class="row">
 				<div class="col-md-4">
-					<label>Select Supplier</label>  
+					<label>Select Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>  
 						 <?php
 						$options = array("0"=>'Select Supplier');     
 						//print_r(  $options);
@@ -981,7 +990,7 @@ function calculateEditTaxValue()
 				</div>
 				<div class="col-md-2" style="padding:0px;">
 
-                            <b><u>Select Delivery By</u></b><br/>
+                            <b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></u></b><br/>
                             <tr>
                                                        <td> <input type="hidden" name="beforeDelivery" value="<?php echo $DeliverOption;?>">
   <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
@@ -1013,13 +1022,13 @@ function calculateEditTaxValue()
 						?>   <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"  value="<?php echo $DeliveryAddress;?>">
 					</div>
 				</div>
-				<div class="col-md-4" id="Deliverydtdiv" style="padding-left: 0px;">
+				<div class="col-md-4" id="Deliverydtdiv">
 				<?php if($DeliverOption==1){
 					$Deliverydt=null;
 				}
 					?>
 					<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt;?>">
-					<label>Delivery Date</label>		
+					<label>Delivery Date<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>		
 						<div class="form-group">
 									
 								<?php
@@ -1029,9 +1038,9 @@ function calculateEditTaxValue()
 					
 						</div>
 					</div> 
-					<div class="col-md-4" id="Schedulediv" style="display:none;padding-left: 0px;">
+					<div class="col-md-4" id="Schedulediv" style="display:none;">
 					<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule;?>">
-					<label >Schedule By</label>        
+					<label >Schedule By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>        
 									
 					<?php
 					$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverSchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -1092,7 +1101,7 @@ function calculateEditTaxValue()
 	</div>
 	</div>
 	  <div class="col-md-4" style="padding:0px;">
-	<div class="col-md-6" style="padding:0px;">
+	<div class="col-md-6" style="padding-right:0px;">
 	
 	 <label>Other Reference(S)</label>
 						<div class="form-group">
@@ -1120,7 +1129,7 @@ function calculateEditTaxValue()
 	<div class="row">
     <div class="col-md-12">    
     <div class="col-md-3">
-    <div class="col-md-12" style="padding: 0px;">
+    <div class="col-md-6" style="padding: 0px;">
     
 
       <label>Revenue Type Options</label>
@@ -1150,8 +1159,7 @@ function calculateEditTaxValue()
 
 
     </div> 
-    </div>
-	<div class="col-md-1">
+    <div class="col-md-6" style="padding-right: 0px;">
 			    <label for="insurance">Insurance</label>
 				                   <?php
 								   $optionsnew=array('1'=>'Yes','0'=>'No');
@@ -1159,7 +1167,11 @@ function calculateEditTaxValue()
 
                                                     ?>
             </div>
-			<div class="col-md-3" id="insurancenodiv" style="display:block;">
+    </div>
+    <div class="col-md-9" style="padding:0px;">
+	 
+	
+			<div class="col-md-4" id="insurancenodiv" style="display:block;">
 					  <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
 						<div class="form-group">						
 							<?php
@@ -1168,12 +1180,7 @@ function calculateEditTaxValue()
 							?>   
 						</div>
 				</div>
-	</div>
-	</div>
-
-		 <div class="col-md-12" style="padding:0px;">
-			 
-		    <div class="col-md-3">
+				<div class="col-md-4">
 			    <label for="payablefrom">Payable Terms</label>
 				    <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
 					
@@ -1214,8 +1221,7 @@ function calculateEditTaxValue()
                                                     ?>
 					
             </div>
-			
-            <div class="col-md-3" id="otheroptiondiv" style="display:none;">
+            <div class="col-md-4" id="otheroptiondiv" style="display:none;">
                        <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                         <div class="form-group">                        
                             <?php
@@ -1225,6 +1231,19 @@ function calculateEditTaxValue()
                             ?>   
                         </div>
                 </div>
+
+
+
+				 
+				</div>
+	</div>
+	</div>
+
+		 <div class="col-md-12" style="padding:0px;">
+			 
+		    
+			
+            
 		</div>
 		</div>
     </div>
@@ -1369,7 +1388,7 @@ function calculateEditTaxValue()
 				<div>
 					<div class="col-md-12" >
 								 <div class="col-md-3">
-								 <label>Req No</label>
+								 <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 											<div >
 												 <?php													
 													
@@ -1411,7 +1430,7 @@ function calculateEditTaxValue()
 						</div>		
 					<div class="col-md-12">
 							  <div class="col-md-2">
-							  <label>Item Code</label>
+							  <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 										<div  >
 											 <?php
 											 
@@ -1445,7 +1464,7 @@ function calculateEditTaxValue()
 							 </div>
 							 <div class="col-md-6" style="padding:0px;">
 							 <div class="col-md-3">
-							  <label>Quantity</label>
+							  <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 										<div class="form-group">
 													<?php
 											 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;');
@@ -1455,7 +1474,7 @@ function calculateEditTaxValue()
 										</div>
 							 </div>
 							 <div class="col-md-3">
-							  <label>Rate In INR</label>
+							  <label>Rate <?php echo "($INRSYM)"?><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 										<div class="form-group">
 													<?php
 											 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' );
@@ -1468,8 +1487,8 @@ function calculateEditTaxValue()
 		                              	$data = array('name' => 'EditAmendPer','value' => set_value('EditAmendPer'),'id'=>'EditAmendPer',  'class' => 'form-control');
 			                             echo form_input($data); ?>
 	                                   	</div>
-							 <div class="col-md-3">
-							  <label>Basic Amt In INR</label>
+							 <div class="col-md-3" style="padding-left: 0px;">
+							  <label>Basic Amt <?php echo "($INRSYM)"?></label>
 										<div class="form-group">
 													<?php
 											 $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1515,7 +1534,7 @@ function calculateEditTaxValue()
 												</div> 
 					</div>
 					 <div class="col-md-2">
-									  <label>Discounted Amt In INR</label>
+									  <label>Discounted Amt <?php echo "($INRSYM)"?></label>
 									  <div class="form-group">
 															<?php
 													 $data = array('name' => 'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1535,7 +1554,7 @@ function calculateEditTaxValue()
 												
 					</div>
 					 <div class="col-md-2" >
-									  <label>SGST Amt In INR </label>
+									  <label>SGST Amt <?php echo "($INRSYM)"?></label>
 									  <div class="form-group">
 															<?php
 													 $data = array('name' => 'txtEditAfterVat','value' => set_value('txtEditAfterVat'),'id'=>'txtEditAfterVat',  'class' => 'form-control num' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;');
@@ -1556,7 +1575,7 @@ function calculateEditTaxValue()
 												</div> 
 					</div>
 					 <div class="col-md-2">
-									  <label>IGST Amt INR</label>
+									  <label>IGST Amt <?php echo "($INRSYM)"?></label>
 									  <div class="form-group">
 															<?php
 													 $data = array('name' => 'txtEditAfterOtherTax','value' => set_value('txtEditAfterOtherTax'),'id'=>'txtEditAfterOtherTax',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1606,7 +1625,7 @@ function calculateEditTaxValue()
 												</div> 
 					</div>
 					 <div class="col-md-2">
-									  <label>Packaging Amt In INR</label>
+									  <label>Packaging Amt <?php echo "($INRSYM)"?></label>
 									  <div class="form-group">
 															<?php
 													 $data = array('name' => 'txtEditAfterPackaging','value' => set_value('txtEditAfterPackaging'),'id'=>'txtEditAfterPackaging',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1625,7 +1644,7 @@ function calculateEditTaxValue()
 												</div> 
 					</div>
 					 <div class="col-md-2">
-									  <label>CGST Amt In INR</label>
+									  <label>CGST Amt <?php echo "($INRSYM)"?></label>
 									  <div class="form-group">
 															<?php
 													 $data = array('name' => 'txtEditAfterGST','value' => set_value('txtEditAfterGST'),'id'=>'txtEditAfterGST',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1680,7 +1699,7 @@ function calculateEditTaxValue()
 												</div> 
 					</div>
 					 <div class="col-md-2">
-									  <label>Freight Amt In INR</label>
+									  <label>Freight Amt <?php echo "($INRSYM)"?></label>
 									  <div class="form-group">
 															<?php
 													 $data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1689,7 +1708,7 @@ function calculateEditTaxValue()
 												</div> 
 					</div> 
 					<div class="col-md-4">
-									  <label> Insurance Amt In INR (if Any)</label>
+									  <label> Insurance Amt <?php echo "($INRSYM)"?>(if Any)</label>
 									  <div class="form-group">
 															<?php
 													 $data = array('name' => 'txtEditInsurance','value' => set_value('txtEditInsurance'),'id'=>'txtEditInsurance',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateEditTotalValue(1);','style'=>'text-align:right;');
@@ -1704,7 +1723,7 @@ function calculateEditTaxValue()
 					<div class="col-md-12"  >
 					 
 					<div class="col-md-4 col-md-offset-8">  
-					<label>Total Order Amt In INR</label>
+					<label>Total Order Amt <?php echo "($INRSYM)"?></label>
 							<div class="form-group">
 											<?php
 									 $data = array('name' => 'txtEditTotalOrderValue','value' => set_value('txtEditTotalOrderValue'),'id'=>'txtEditTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1725,7 +1744,7 @@ function calculateEditTaxValue()
 					</div><hr/>
 					<div class="row">
 					 <div class="col-md-12" >					 						 						
-					 <div class="col-md-4 col-md-offset-8">
+					 <div class="col-md-3 col-md-offset-9">
 					 		<a class="btn btn-primary EditRevenue"  ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
 					<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>					 
 					</div>
@@ -1753,10 +1772,10 @@ function calculateEditTaxValue()
 					<th>Item Name</th>
 					<th>Quantity</th>
 					<th>UOM</th>
-					<th>Rate</th>
-					<th>Basic Amount</th>
-					 <th>Tax Amount</th>
-					<th>Total Order Amount</th>
+					<th>Rate<?php echo "($INRSYM)"?></th>
+					<th>Basic Amount<?php echo "($INRSYM)"?></th>
+					 <th>Tax Amount<?php echo "($INRSYM)"?></th>
+					<th>Total Order Amount<?php echo "($INRSYM)"?></th>
 					<th>Action</th>
                 </tr>
                 </thead>				
@@ -1879,7 +1898,7 @@ function calculateEditTaxValue()
  <div class="row" style="border:1px solid;">	 
 	<div class="col-md-12">
 		<div class="col-md-3">
-			  <label >Basic Amount  In INR </label> 
+			  <label >Basic Amount  <?php echo "($INRSYM)"?> </label> 
 				 								
 							<?php
 						 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($totBasicAmt,2,'.','')),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1889,7 +1908,7 @@ function calculateEditTaxValue()
 				 	
 		</div>
 		<div class="col-md-3">
-			  <label >Total Discount Amount  In INR </label> 
+			  <label >Total Discount Amount  <?php echo "($INRSYM)"?> </label> 
 				 							
 							<?php
 						 $data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($totDiscountAmt,2,'.','')),'id'=>'txtTotalDiscount',  'class' => 'form-control num'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1898,7 +1917,7 @@ function calculateEditTaxValue()
 				 
 		</div>
 		<div class="col-md-3" id="SGSTShow" >
-			 <label >Total  SGST Amount In INR </label> 
+			 <label >Total  SGST Amount <?php echo "($INRSYM)"?></label> 
 				 							
 							<?php
 						 $data = array('name' => 'txtTotalVat','value' => set_value('txtTotalVat',number_format($totVATAmt,2,'.','')),'id'=>'txtTotalVat',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1916,7 +1935,7 @@ function calculateEditTaxValue()
 				 
 		</div>
 		<div class="col-md-3" id="CGSTshow">
-			  <label >Total CGST Amount In INR </label> 
+			  <label >Total CGST Amount <?php echo "($INRSYM)"?> </label> 
 				 							
 							<?php
 								 $data = array('name' => 'txtTotalGST','value' => set_value('txtTotalGST',number_format($totGSTAmt,2,'.','')),'id'=>'txtTotalGST','readonly' => 'true',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);');
@@ -1930,7 +1949,7 @@ function calculateEditTaxValue()
 		 
 		 
 		<div class="col-md-3">
-			  <label >Total Packaging Amount In INR </label> 
+			  <label >Total Packaging Amount <?php echo "($INRSYM)"?></label> 
 				 								
 							<?php
 						 $data = array('name' => 'txtTotalPackaing','value' => set_value('txtTotalPackaing',number_format($totPackagingAmt,2,'.','')),'id'=>'txtTotalPackaing',  'class' => 'form-control num'  ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1939,7 +1958,7 @@ function calculateEditTaxValue()
 				 
 		</div>
 		<div class="col-md-3">
-		  <label >Total Insurance Amount  In INR </label> 
+		  <label >Total Insurance Amount  <?php echo "($INRSYM)"?> </label> 
 				 						
 							<?php
 						 $data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance',number_format($totInsuranceAmt,2,'.','')),'id'=>'txtTotalInsurance',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1948,7 +1967,7 @@ function calculateEditTaxValue()
 				 
 		</div>
 		<div class="col-md-3">
-			  <label >Total Freight Amount In INR </label> 
+			  <label >Total Freight Amount <?php echo "($INRSYM)"?></label> 
 				 								
 							<?php
 						 $data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight',number_format($totFreightAmt,2,'.','')),'id'=>'txtTotalFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1957,7 +1976,7 @@ function calculateEditTaxValue()
 				 
 		</div>
 		<div class="col-md-3">	
-<label>Total Order Amount In INR  </label>		
+<label>Total Order Amount <?php echo "($INRSYM)"?>  </label>		
 <input type="hidden" name="preTotalOdervalue" value="<?php echo $totOrderSummaryAmt;?>">
 					<?php
 				 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($totOrderSummaryAmt,2,'.','')),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true','style'=>'text-align:right;');
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php
index 45d323db..5e08d702 100755
--- a/application/views/editServiceAmendPO.php
+++ b/application/views/editServiceAmendPO.php
@@ -724,7 +724,7 @@ $(document).ready(function () {
 							<div class="col-md-9" style="padding:0px;">
 							<div class="col-md-4" style="padding:0px;">
 								<div class="col-md-12">
-									<label>Supplier</label>
+									<label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
 										  <?php
 											$options = array("0"=>'Select Supplier');     
 											//print_r(  $options);
@@ -778,7 +778,7 @@ $(document).ready(function () {
 							</div>
 							<div class="col-md-4" style="padding:0px;">
 								<div class="col-md-6" style="padding:0px;">
-									<b><u>Select Delivery By</u></b><br/>
+									<b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></u></b><br/>
 										<tr>
 											<td>
 												  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
@@ -791,7 +791,7 @@ $(document).ready(function () {
 										</tr>
 								</div>
 								<div class="col-md-6">
-									<label>Work Status</label>
+									<label>Work Status<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
 									   <?php
 								
 									
@@ -821,7 +821,7 @@ $(document).ready(function () {
 											?>	
 								</div>
 								<div class="col-md-12" id="Deliverydtdiv" style="padding-left:0px;"><br/>
-									<label>Delivery Date</label>
+									<label>Delivery Date<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
 									<?php if($DeliverOption==1){
 										$Deliverydt=null;
 										}?>
@@ -834,7 +834,7 @@ $(document).ready(function () {
 										</div>
 								</div>
 								<div class="col-md-12" id="Schedulediv" style="display:none;padding-left:0px;"><br/>
-										<label >Schedule By</label>
+										<label >Schedule By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
 										<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule?>">
 										<?php
 										$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverSchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -925,7 +925,7 @@ $(document).ready(function () {
 	<div class="row">
 	<div class="col-md-12">	
 	<div class="col-md-3">
-	<div class="col-md-12" style="padding: 0px;">
+	<div class="col-md-6" style="padding: 0px;">
 	 
 
 	  <label>Service Type Options</label>
@@ -961,10 +961,7 @@ $(document).ready(function () {
 
 
 	</div> 
-	</div>
-	<div class="col-md-9" style="padding:0px;">
-	<div class="col-md-4" style="padding:0px;" >
-	<div class="col-md-12">
+	<div class="col-md-6" style="padding-right: 0px;">
  <label>Insurance Options</label>
 						<div class="form-group">
 						
@@ -1001,6 +998,8 @@ $(document).ready(function () {
 
 	</div>
 	</div>
+	<div class="col-md-9" style="padding:0px;">
+	 
 	<div class="col-md-4" id="insuranceTxtDiv"  style="display:block;">
                      <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                        <div class="form-group">                        
@@ -1010,13 +1009,7 @@ $(document).ready(function () {
                            ?>  
                        </div>
                </div>
-	 
-	</div> 
-	</div>
-	</div><!--End new fields 1 sep-->
-							<div class="col-md-12" style="padding:0px;">
-							 
-								<div class="col-md-3">
+               <div class="col-md-4">
 			    <label>Payment Terms</label> 
 				<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms?>">
 				
@@ -1056,7 +1049,7 @@ $(document).ready(function () {
                                     
 
             </div>
-			<div class="col-md-3" id="otheroptiondiv" style="display:none;">
+            <div class="col-md-4" id="otheroptiondiv" style="display:none;">
                       <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                       
                         <div class="form-group">                        
@@ -1067,8 +1060,11 @@ $(document).ready(function () {
                             ?>   
                         </div>
                 </div>
-								 
-							</div>
+	 
+	</div> 
+	</div>
+	</div><!--End new fields 1 sep-->
+							 
 						</div>
 						</div>	
 							<div class="container-fluid">   	 
@@ -1090,7 +1086,7 @@ $(document).ready(function () {
 									 
 									<div class="col-md-12">
 												 <div class="col-md-3">
-												 <label>Req No</label>
+												 <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 															<div>
 																 <?php
 																	
@@ -1121,7 +1117,7 @@ $(document).ready(function () {
 															</div>
 												 </div>
 												  <div class="col-md-3">
-												   <label>Avail Budget Amount In INR</label>
+												   <label>Avail Budget Amount <?php echo $INRSYM?></label>
 															<div class="form-group">
 																		<?php
 																 $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -1132,7 +1128,7 @@ $(document).ready(function () {
 								 </div>
 								 <div class="col-md-12">
 												  <div class="col-md-3">
-												  <label>Item Code</label>
+												  <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 															<div>
 																 <?php
 																$options = array("0"=>'Item Code');     
@@ -1178,7 +1174,7 @@ $(document).ready(function () {
 								<div class="col-md-12">
 							
 												<div class="col-md-3">
-												  <label>Quantity</label>
+												  <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 															<div class="form-group">
 																		<?php
 																 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
@@ -1187,7 +1183,7 @@ $(document).ready(function () {
 															</div>
 												 </div>
 												 <div class="col-md-3">
-												  <label><?php echo "Rate ($INRSYM)";?></label>
+												  <label><?php echo "Rate ($INRSYM)";?><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 															<div class="form-group">
 																		<?php
 																 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
@@ -1299,7 +1295,7 @@ $(document).ready(function () {
 				</div>
 				<div class="col-md-12">
 								 <div class="col-md-5  col-md-offset-4" align="right">
-								<label>Other Allowances In INR</label>			 
+								<label>Other Allowances <?php echo $INRSYM?></label>			 
 											</div>	
 								<div class="col-md-3">
 													 <div class="form-group">
@@ -1356,10 +1352,10 @@ $(document).ready(function () {
 								<th>Item Description</th>
 								<th>Quantity</th>
 								<th>UOM</th>                                                              
-								<th>Rate</th>
-								<th>Basic Amount</th>
-								<th>Tax Amount</th>
-								<th>Total Order Amount</th>
+								<th>Rate<?php echo $INRSYM?></th>
+								<th>Basic Amount<?php echo $INRSYM?></th>
+								<th>Tax Amount<?php echo $INRSYM?></th>
+								<th>Total Order Amount<?php echo $INRSYM?></th>
 								<th>Actual Quantity</th>
 								<th>Received Quantity</th>
 								<th>Pending Quantity</th>
@@ -1481,14 +1477,14 @@ $(document).ready(function () {
 						<div class="col-md-12" style="padding:0px;">
 							 
 								<div class="col-md-2">
-									 <label>Basic Amount In INR </label> 
+									 <label>Basic Amount <?php echo $INRSYM?> </label> 
 									 <?php
 											 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount, 2, '.', '')),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
 											echo form_input($data);
 											?>   
 								</div>
 								<div class="col-md-2">
-									 <label>CGST In INR</label> 
+									 <label>CGST <?php echo $INRSYM?></label> 
 									 <?php
 											 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst',number_format($TotalCgst, 2, '.', '')),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
 											echo form_input($data);				
@@ -1497,14 +1493,14 @@ $(document).ready(function () {
 							 
 							  
 								<div class="col-md-2">
-									 <label>SGST In INR</label> 
+									 <label>SGST <?php echo $INRSYM?></label> 
 									 <?php
 											 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst',number_format($TotalSgst, 2, '.', '')),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
 											echo form_input($data);				
 											?>   
 								</div>
 								<div class="col-md-2">
-									<label>IGST In INR</label> 
+									<label>IGST <?php echo $INRSYM?></label> 
 									<?php
 											 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst',number_format($TotalIgst, 2, '.', '')),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
 											echo form_input($data);
@@ -1512,7 +1508,7 @@ $(document).ready(function () {
 								</div>
 							 
 					<div class="col-md-2">
-							<label >Other Allowances  In INR </label>							
+							<label >Other Allowances <?php echo $INRSYM?> </label>							
 								<?php
 								 $data = array('name' => 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances',number_format($Totalotherallowance, 2, '.', '')),'id'=>'ToatalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
 								echo form_input($data);
@@ -1520,7 +1516,7 @@ $(document).ready(function () {
 									
 							</div> 							
 							<div class="col-md-2">
-							<label >Total Order Value  In INR </label>	
+							<label >Total Order Value  <?php echo $INRSYM?> </label>	
 								<input type="hidden" name="preTotalordervalue" value="<?php echo $TotalSummary;?>">
 								<?php
 								 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true');
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 38505387..8d3ec919 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -373,7 +373,8 @@ tinymce.init({
 
 
      <div class="col-md-12" style="padding:0px;">
-                <label>Currency Type</label>
+                <label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                      
                 <?php
                                    
@@ -427,7 +428,8 @@ tinymce.init({
     <div class="col-md-9" style="padding:0px;">
         <div class="col-md-4" style="padding:0px;">
             <div class="col-md-12">
-                <label>Supplier</label>
+                <label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                      
                          <?php
                         $options = array("0"=>'Select Supplier');     
@@ -522,10 +524,11 @@ tinymce.init({
             </div>-->
         </div>
         <div class="col-md-4" style="padding: 0px;">
-        <div class="col-md-12" style="padding-left: 0px;">
+        <div class="col-md-12">
  
 
-                            <b><u>Select Delivery By</u></b><br/>
+                            <b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></u></b><br/>
                             <tr>
                                 <td>
                                     <?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -536,8 +539,9 @@ tinymce.init({
                             </tr>
                         </div>
             
-                <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;padding-left: 0px;"> 
-                        <label>Schedule By </label>
+                <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;"> 
+                        <label>Schedule By <span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                          
                         <?php
                         $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverySchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -545,8 +549,9 @@ tinymce.init({
                         ?>
 
                 </div>
-               <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;padding-left: 0px;"> 
-                         <label>Dispatch Instruction</label>
+               <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;"> 
+                         <label>Dispatch Instruction<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                              
                          <?php
                         // $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
@@ -579,7 +584,8 @@ tinymce.init({
          <div class="col-md-3">
                <!--  <label>Exchange Rate </label> -->
 
-                <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?></label>
+                <label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)"?><span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                 <div class="form-group">
                     <?php
                     $data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate',$ExchangeRate),'id'=>'ExchangeRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
@@ -587,8 +593,9 @@ tinymce.init({
                     ?>
                 </div>                
             </div> 
-             <div class="col-md-3" style="padding-left: 0px;">
-                <label>Place of Origin</label>
+             <div class="col-md-3">
+                <label>Place of Origin<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                         <div class="form-group">
                                     <?php
                             //  $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
@@ -651,7 +658,7 @@ tinymce.init({
   </div>
   </div>
     <div class="col-md-4" style="padding:0px;">
-  <div class="col-md-6" style="padding:0px;">
+  <div class="col-md-6" style="padding-right:0px;">
   
    <label>Our Reference(S)</label>
             <div class="form-group">
@@ -676,10 +683,95 @@ tinymce.init({
   </div> 
   </div>
   </div><!--End new fields 1 sep-->
-    <div class="col-md-12" style="padding: 0px;">
+     <div class="row">
+  <div class="col-md-12"> 
+  <div class="col-md-3">
+  <div class="col-md-6" style="padding: 0px;">
+   
+
+      <label for="payablefrom">Import Options</label>
+                   
+                    
+                        
+                         <?php
+                                                     
+                                       // $options2 = array("0"=>'Select Import Option');       
+                                             
+                                           
+
+                      if(!empty($PoTypeOptions))
+{
+      foreach ($PoTypeOptions as $payment):
+
+      if($Importoption==$payment->ConfigValue)
+      {
+
+          $options2[$payment->ConfigValue] =  $payment->ConfigValue;
+      }
+
+      endforeach;
+      foreach ($PoTypeOptions as $payment):
+
+      if($Importoption!=$payment->ConfigValue)
+      {
+
+          $options2[$payment->ConfigValue] =  $payment->ConfigValue;
+      }
+      endforeach;
+}
+
+                    echo form_dropdown('Importoption', $options2,set_value('Importoption'),'id="Importoption"' ,'class="form-control"');                                              ?>
+            </div>
            
-             <div class="col-md-3">
-                <label for="payablefrom">Payable Terms</label>
+  
+    <div class="col-md-6" style="padding-right:0px;">
+     <label for="payablefrom">Insurance</label>
+                   
+                    
+                        
+
+                    <select id='Insurance' name='Insurance'>
+                    <?php  if($Insurance==1)
+                            {
+                                  $opt1='YES';
+                                  $opt2='NO';
+                            }
+
+                            else 
+                            {
+                                $opt1='NO';
+                                $opt2='YES';   
+                             } ?>
+                        
+                        
+                        <option value=<?php echo $opt1;?>><?php echo $opt1;?></option>
+                        <option value=<?php echo $opt2;?>><?php echo $opt2;?></option>
+                    </select>
+ 
+          
+
+
+  
+
+  </div>
+ 
+  </div>
+  <div class="col-md-9" style="padding:0px;">
+ <div class="col-md-4" id="insurancenum" style="display:none;">
+                         <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
+                       <div class="form-group">                        
+                           <?php
+                            
+                            $data = array('name' => 'insurancenumber','insurancenumber' => set_value('insurancenumber'),'id'=>'insurancenumber',  'class' => 'form-control' ,'required' => 'true');
+                           echo form_input($data);
+                           ?>  
+                       </div>
+               </div>
+              
+  <div class="col-md-4" style="padding:0px;" >
+<div class="col-md-12">
+                        <label for="payablefrom">Payable Terms</label>
                     <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
                     
                         
@@ -715,7 +807,10 @@ tinymce.init({
                                                    }                                                                                            echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');                                                    ?>
                     
            </div>
-            <div class="col-md-3" id="otheroptiondiv" style="display:none;">
+                    </div>
+                   
+   
+                <div class="col-md-4" id="otheroptiondiv" style="display:none;">
                       <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
 ;">*</span></label>
                        <div class="form-group">                        
@@ -727,92 +822,10 @@ tinymce.init({
                        </div>
                </div>
 
-
-
-
-        <div class="col-md-3">
-                <label for="payablefrom">Import Options</label>
-                   
-                    
-                        
-                         <?php
-                                                     
-                                       // $options2 = array("0"=>'Select Import Option');       
-                                             
-                                           
-
-                      if(!empty($PoTypeOptions))
-{
-      foreach ($PoTypeOptions as $payment):
-
-      if($Importoption==$payment->ConfigValue)
-      {
-
-          $options2[$payment->ConfigValue] =  $payment->ConfigValue;
-      }
-
-      endforeach;
-      foreach ($PoTypeOptions as $payment):
-
-      if($Importoption!=$payment->ConfigValue)
-      {
-
-          $options2[$payment->ConfigValue] =  $payment->ConfigValue;
-      }
-      endforeach;
-}
-
-                    echo form_dropdown('Importoption', $options2,set_value('Importoption'),'id="Importoption"' ,'class="form-control"');                                              ?>
-                    
-           </div>  
-
-
-
-
-
-            <div class="col-md-1">
-                <label for="payablefrom">Insurance</label>
-                   
-                    
-                        
-
-                    <select id='Insurance' name='Insurance'>
-                    <?php  if($Insurance==1)
-                            {
-                                  $opt1='YES';
-                                  $opt2='NO';
-                            }
-
-                            else 
-                            {
-                                $opt1='NO';
-                                $opt2='YES';   
-                             } ?>
-                        
-                        
-                        <option value=<?php echo $opt1;?>><?php echo $opt1;?></option>
-                        <option value=<?php echo $opt2;?>><?php echo $opt2;?></option>
-                    </select>
-                    
-           </div>  
-
-
-
-
-           <div class="col-md-2" id="insurancenum" style="display:none;">
-                      <label>Insurance Number<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
-;">*</span></label>
-                       <div class="form-group">                        
-                           <?php
-                            
-                            $data = array('name' => 'insurancenumber','insurancenumber' => set_value('insurancenumber'),'id'=>'insurancenumber',  'class' => 'form-control' ,'required' => 'true');
-                           echo form_input($data);
-                           ?>  
-                       </div>
-               </div>   
-            
-             
-    </div>
+   
+  </div> 
+  </div>
+  </div>
     </div>     
     </div>
         
@@ -841,7 +854,7 @@ if($PONOStatus == PO_RELEASED)
                             <div class="modal-dialog">
                                 <!-- Modal content-->
                                 <form>
-                                    <div class="modal-content" style="width:950px;font-size:12px;">
+                                    <div class="modal-content" style="width:1091px;font-size:12px;">
                                         <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                             
                                             <center><h4>Add Import Purchase Order Item </h4></center>
@@ -850,7 +863,8 @@ if($PONOStatus == PO_RELEASED)
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Req No</label>
+                                                    <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff
+;">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0"=>'Req No');
@@ -905,7 +919,7 @@ if($PONOStatus == PO_RELEASED)
                                             </div>
                                             <div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code</label>
+                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
@@ -956,7 +970,7 @@ if($PONOStatus == PO_RELEASED)
                                                 </div>
                                                 <div class="col-md-6" style="padding:0px;">
                                                 <div class="col-md-3">
-                                                    <label>Quantity</label>
+                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
@@ -969,7 +983,7 @@ if($PONOStatus == PO_RELEASED)
                                                     <!-- <label>Rate </label>
  -->
 
-                                       <!--  <P id=labelRate> -->  <label id=labelRate><?php echo "Rate in $Currencycode ($Value)";?> </label><!-- </P> -->
+                                       <!--  <P id=labelRate> -->  <label id=labelRate><?php echo "Rate in $Currencycode ($Value)";?><span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span> </label><!-- </P> -->
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
@@ -1490,7 +1504,7 @@ echo form_textarea($data);
                             <div class="modal-dialog">
                                 <!-- Modal content-->
                                 <form>
-                                    <div class="modal-content" style="width:950px;font-size:12px;">
+                                    <div class="modal-content" style="width:1091px;font-size:12px;">
                                         <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                             
                                             <center><h4>Edit Import Purchase Order Item </h4></center>
@@ -1499,7 +1513,7 @@ echo form_textarea($data);
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Req No</label>
+                                                    <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div>
                                                         <?php
                                             
@@ -1543,7 +1557,7 @@ echo form_textarea($data);
                                             </div>
                                             <div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code</label>
+                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
@@ -1594,7 +1608,7 @@ echo form_textarea($data);
                                                 </div>
                                                 <div class="col-md-6" style="padding: 0px;">
                                                 <div class="col-md-3">
-                                                    <label>Quantity</label>
+                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
@@ -1606,7 +1620,7 @@ echo form_textarea($data);
                                                 <div class="col-md-3">
                                                    <!--  <label>Rate </label> -->
 
-                        <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> </label>
+                        <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> <span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange(),validateEditExceedLimit()' );
@@ -2122,7 +2136,7 @@ echo form_textarea($data);
                             <div class="modal-dialog">
                                 <!-- Modal content-->
                                 <form>
-                                    <div class="modal-content" style="width:950px; font-size: 12px;">
+                                    <div class="modal-content" style="width:1091px; font-size: 12px;">
                                         <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                             <button type="button" class="close" data-dismiss="modal">&times;</button>
                                             <center><h4>View Import Purchase Order Item </h4></center>
@@ -2131,7 +2145,7 @@ echo form_textarea($data);
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Req No</label>
+                                                    <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div>
                                                         <?php
                                             
@@ -2175,7 +2189,7 @@ echo form_textarea($data);
                                             </div>
                                             <div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code</label>
+                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
@@ -2226,7 +2240,7 @@ echo form_textarea($data);
                                                 </div>
                                                 <div class="col-md-6" style="padding: 0px;">
                                                 <div class="col-md-3">
-                                                    <label>Quantity</label>
+                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ViewQuantity','value' => set_value('ViewQuantity'),'id'=>'ViewQuantity','readonly'=>true  ,'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
@@ -2238,7 +2252,7 @@ echo form_textarea($data);
                                                 <div class="col-md-3">
                                                    <!--  <label>Rate </label> -->
 
-                                            <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?> </label>
+                                            <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)";?><span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'ViewRate','value' => set_value('ViewRate'),'id'=>'ViewRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>true ,'onchange'=>'EditRatechange()' );
@@ -2761,8 +2775,8 @@ echo form_textarea($data);
                     <th>Description</th>
                     <th>Quantity</th>
                     <th>UOM</th>
-                    <th>Rate</th>
-                    <th>Basic Amount</th>
+                    <th>Rate<?php echo $INR?></th>
+                    <th>Basic Amount<?php echo $INR?></th>
                     <th>Received Qty</th>
                     <th>Rejected Qty</th>
                     <th>Pending Qty</th>
diff --git a/application/views/importpo.php b/application/views/importpo.php
index f0a1b3dc..3ea4b43c 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -307,7 +307,8 @@ function vaildateBeforeOpenModal()
             ?>  
          </div>
         <div class="col-md-12" style="padding:0px;">
-        <label>Currency Type</label>
+        <label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
 
               <?php
                   $options = array("0"=>'Select Currency Type');
@@ -331,7 +332,8 @@ function vaildateBeforeOpenModal()
     <div class="col-md-9" style="padding:0px;">
         <div class="col-md-4" style="padding:0px;">
             <div class="col-md-12">
-                <label>Supplier</label>
+                <label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                      
                          <?php
                         $options = array("0"=>'Select Supplier');     
@@ -408,7 +410,8 @@ function vaildateBeforeOpenModal()
         <div class="col-md-4" style="padding: 0px;">
       <div class="col-md-12">
 
-                            <b><u>Select Delivery By</u></b><br/>
+                            <b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></u></b><br/>
                             <tr>
                                 <td>
                                     <?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -420,7 +423,8 @@ function vaildateBeforeOpenModal()
                         </div>
             
         <div class="col-md-12" id="Schedulediv" style="display:none;margin-top: 28px;"> 
-            <label >Schedule By </label>
+            <label >Schedule By<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span> </label>
              
             <?php
             $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -429,7 +433,8 @@ function vaildateBeforeOpenModal()
 
         </div>
         <div class="col-md-12" id="Deliverydtdiv" style="margin-top: 28px;"> 
-                            <label>Dispatch Instruction</label>
+                            <label>Dispatch Instruction<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                              
             <?php
               // $data = array('name' => 'Dispatch','value' => set_value('Dispatch'),'id'=>'Dispatch',  'class' => 'form-control'  ,'required' => 'true');
@@ -458,7 +463,8 @@ function vaildateBeforeOpenModal()
                             </div>
         </div>
          <div class="col-md-3">
-              <label id=label1>Exchange Rate </label>
+              <label id=label1>Exchange Rate <span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                 <div class="form-group">
                     <?php
                     $data = array('name' => 'ExchangeRate','value' => set_value('ExchangeRate'),'id'=>'ExchangeRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
@@ -467,7 +473,8 @@ function vaildateBeforeOpenModal()
                 </div>                
             </div> 
             <div class="col-md-3">
-                <label>Place of Origin</label>
+                <label>Place of Origin<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
                         <div class="form-group">
                                     <?php
                             //  $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
@@ -531,7 +538,7 @@ function vaildateBeforeOpenModal()
   </div>
   </div>
     <div class="col-md-4" style="padding:0px;">
-  <div class="col-md-6" style="padding:0px;">
+  <div class="col-md-6" style="padding-right:0px;">
   
    <label>Our Reference(S)</label>
             <div class="form-group">
@@ -556,9 +563,81 @@ function vaildateBeforeOpenModal()
   </div> 
   </div>
   </div><!--End new fields 1 sep-->
-     <div class="col-md-12" style="padding: 0px;">
+         <!--start new fields 1 sep-->
+  <div class="row">
+  <div class="col-md-12"> 
+  <div class="col-md-3">
+  <div class="col-md-6" style="padding: 0px;">
+   
+
+    <label for="payablefrom">Import Options</label>
+                   
+                    
+                        
+                         <?php
+                                                     
+                                        // $options1 = array("0"=>'Select Import Option');       
+                                             
+                                           
+
+                      if(!empty($PoTypeOptions))
+                      {
+                       foreach ($PoTypeOptions as $payment):
+
+                        $options3[$payment->ConfigValue] =  $payment->ConfigValue;
+                         //$options6[$pay->PaymentID] =  $pay->PaymentTerms;
+
+                        endforeach;
+                      }
+
+                    echo form_dropdown('Importoption', $options3,set_value('Importoption'),'id="Importoption"' ,'class="form-control"');                                              ?>
+            </div>
+  
+    <div class="col-md-6" style="padding-right:0px;">
  
-             <div class="col-md-3">
+            <div class="form-group">
+             <label for="payablefrom">Insurance Options</label>
+                   
+                    
+                        
+                         <?php
+                                                     
+                                        $options1 = array("0"=>'NO',"1"=>'YES');       
+                                             
+                                           
+
+                      // if(!empty($PoTypeOptions))
+                      // {
+                      //  foreach ($PoTypeOptions as $payment):
+
+                      //   $options1[$payment->ConfigValue] =  $payment->ConfigValue;
+                      //    //$options6[$pay->PaymentID] =  $pay->PaymentTerms;
+
+                      //   endforeach;
+                      // }
+
+                    echo form_dropdown('Insurance', $options1,set_value('Insurance'),'id="Insurance"' ,'class="form-control"');                                              ?>
+            </div>
+
+
+  
+
+  </div>
+  </div>
+  <div class="col-md-9" style="padding:0px;">
+ <div class="col-md-4" id="insurancenum" style="display:none;">
+                      <label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
+;">*</span></label>
+                       <div class="form-group">                        
+                           <?php
+                            
+                            $data = array('name' => 'insurancenumber','insurancenumber' => set_value('insurancenumber'),'id'=>'insurancenumber',  'class' => 'form-control' ,'required' => 'true');
+                           echo form_input($data);
+                           ?>  
+                       </div>
+               </div>
+  <div class="col-md-4" style="padding:0px;" >
+<div class="col-md-12">
                 <label for="payablefrom">Payable Terms</label>
                     <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms;?>">
                     
@@ -582,8 +661,9 @@ function vaildateBeforeOpenModal()
                     echo form_dropdown('PaymentTerms', $options1,set_value('PaymentTerms'),'id="PaymentTerms"' ,'class="form-control"');                                              ?>
                     
            </div>
-            
-             <div class="col-md-3" id="otheroptiondiv" style="display:none;">
+                    </div>
+   
+                <div class="col-md-4" id="otheroptiondiv" style="display:none;">
                       <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
 ;">*</span></label>
                        <div class="form-group">                        
@@ -595,83 +675,10 @@ function vaildateBeforeOpenModal()
                        </div>
                </div>
 
-
-
-              
-
-                <div class="col-md-3">
-                <label for="payablefrom">Import Options</label>
-                   
-                    
-                        
-                         <?php
-                                                     
-                                        // $options1 = array("0"=>'Select Import Option');       
-                                             
-                                           
-
-                      if(!empty($PoTypeOptions))
-                      {
-                       foreach ($PoTypeOptions as $payment):
-
-                        $options3[$payment->ConfigValue] =  $payment->ConfigValue;
-                         //$options6[$pay->PaymentID] =  $pay->PaymentTerms;
-
-                        endforeach;
-                      }
-
-                    echo form_dropdown('Importoption', $options3,set_value('Importoption'),'id="Importoption"' ,'class="form-control"');                                              ?>
-                    
-           </div>
-
-
-
-
-
-            <div class="col-md-1">
-                <label for="payablefrom">Insurance</label>
-                   
-                    
-                        
-                         <?php
-                                                     
-                                        $options1 = array("0"=>'NO',"1"=>'YES');       
-                                             
-                                           
-
-                      // if(!empty($PoTypeOptions))
-                      // {
-                      //  foreach ($PoTypeOptions as $payment):
-
-                      //   $options1[$payment->ConfigValue] =  $payment->ConfigValue;
-                      //    //$options6[$pay->PaymentID] =  $pay->PaymentTerms;
-
-                      //   endforeach;
-                      // }
-
-                    echo form_dropdown('Insurance', $options1,set_value('Insurance'),'id="Insurance"' ,'class="form-control"');                                              ?>
-                    
-           </div>
-
-
-
- <div class="col-md-2" id="insurancenum" style="display:none;">
-                      <label>Insurance Number<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5
-;">*</span></label>
-                       <div class="form-group">                        
-                           <?php
-                            
-                            $data = array('name' => 'insurancenumber','insurancenumber' => set_value('insurancenumber'),'id'=>'insurancenumber',  'class' => 'form-control' ,'required' => 'true');
-                           echo form_input($data);
-                           ?>  
-                       </div>
-               </div>
-
-
-
-
-             
-    </div>
+   
+  </div> 
+  </div>
+  </div>
     </div>     
     </div>
         
@@ -703,7 +710,7 @@ function vaildateBeforeOpenModal()
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Req No</label>
+                                                    <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0"=>'Req No');
@@ -758,7 +765,7 @@ function vaildateBeforeOpenModal()
                                             </div>
                                             <div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code</label>
+                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
@@ -794,7 +801,7 @@ function vaildateBeforeOpenModal()
                                                 </div>
                                                 <div class="col-md-6" style="padding:0px;">
                                                 <div class="col-md-3">
-                                                    <label>Quantity</label>
+                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange(),ExceedQuantityCheck()');
@@ -804,7 +811,7 @@ function vaildateBeforeOpenModal()
                                                     </div>
                                                 </div>
                                                 <div class="col-md-3">
-                                                  <!-- <P id=labelRate> -->  <label id=labelRate><?php echo "Rate in";?> </label><!-- </P> -->
+                                                  <!-- <P id=labelRate> -->  <label id=labelRate><?php echo "Rate in";?> <span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label><!-- </P> -->
                                                     <div class="form-group">
                                                         <?php
                                                        $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange(),validateExceedLimit()' );
@@ -884,7 +891,7 @@ function vaildateBeforeOpenModal()
                                                         <div class="col-md-12">
                                                             <div class="col-md-4" >
                                                                <!--  Basic Price: -->
-                                                    <label>Basic Price In ($INR)</label>
+                                                    <label>Basic Price In (<?php echo $INR?>)</label>
                                                             </div>
                                                             <div class="col-md-4" >
                                                                 <div class="form-group" style="display:none;">
@@ -1269,7 +1276,7 @@ function vaildateBeforeOpenModal()
                                                 <label id=labelTotalAmount>Total Amount</label>               
                                                             </div>
                                                            <div class="col-md-4"   >
-                                                                <div class="form-group" style="display:none;>
+                                                                <div class="form-group" style="display:none;">
                                                                     <?php 
                                             $data = array('name' => 'TotalExp','value' => set_value('TotalExp',0),'id'=>'TotalExp',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
                                                                     echo form_input($data);
@@ -1280,22 +1287,26 @@ function vaildateBeforeOpenModal()
                                                         </div>
 
 
+
+
                                                     </div>
                                                 </div>
-                                            </div>
-
-                                        </div>
-                                        <div class="modal-footer">
-
-                            <div class="col-md-12">
+                                                 <div class="col-md-12">
 <div class="col-md-12">
-<label>Import Description :</label>  
+<label style="text-align: left;">Import Description :</label>  
 <?php
 $data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
 echo form_textarea($data);
 ?>  
 </div>   
 </div>
+                                            </div>
+
+                                        </div>
+ 
+                                        <div class="modal-footer">
+
+                           
                                             <a class="btn btn-primary font AddImport"  ID="AddImport" > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
                                             <!--<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
 
@@ -1327,7 +1338,7 @@ echo form_textarea($data);
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Req No</label>
+                                                    <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div>
                                                         <?php
                                             
@@ -1371,7 +1382,7 @@ echo form_textarea($data);
                                             </div>
                                             <div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code</label>
+                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     
                                                         <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
                                                         <div>
@@ -1422,7 +1433,7 @@ echo form_textarea($data);
                                                 </div>
                                                 <div class="col-md-6" style="padding: 0px;">
                                                 <div class="col-md-3">
-                                                    <label>Quantity</label>
+                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
@@ -1432,7 +1443,7 @@ echo form_textarea($data);
                                                     </div>
                                                 </div>
                                                 <div class="col-md-3">
-                                                <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in";?> </label><!-- </P> -->
+                                                <!-- <P id=labelEditRate> -->  <label id=labelEditRate><?php echo "Rate in";?> <span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label><!-- </P> -->
                                                     <!-- <label>Rate </label> -->
                                                     <div class="form-group">
                                                         <?php
@@ -1957,8 +1968,8 @@ echo form_textarea($data);
                     <th>Description</th>
                     <th>Quantity</th>
                     <th>UOM</th>
-                    <th>Rate</th>
-                    <th>Basic Amount</th>
+                    <th>Rate<?php echo $INR?></th>
+                    <th>Basic Amount<?php echo $INR?></th>
                     <th>Received Qty</th>
                     <th>Rejected Qty</th>
                     <th>Pending Qty</th>