diff --git a/application/logs/log-2017-09-19.php b/application/logs/log-2017-09-19.php
old mode 100644
new mode 100755
diff --git a/application/logs/log-2017-09-20.php b/application/logs/log-2017-09-20.php
new file mode 100644
index 00000000..26d5efc0
--- /dev/null
+++ b/application/logs/log-2017-09-20.php
@@ -0,0 +1,163 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-09-20 08:50:39 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/20sept/siddharth_application2/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:52 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:52 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:50:52 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:55 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:55 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:50:55 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 430
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 437
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 444
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Undefined variable: r /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:57 --> Severity: Notice  --> Trying to get property of non-object /opt/lampp/htdocs/20sept/siddharth_application2/application/views/servicepopdf.php 451
+ERROR - 2017-09-20 08:50:57 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:50:57 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:53:09 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:53:09 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:54:59 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:54:59 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:56:29 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:56:29 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:56:31 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:56:31 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:02 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:02 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:04 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:04 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:06 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:06 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:47 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:47 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:53 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:57:53 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:04 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:04 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:06 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:06 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:06 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:07 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$DiscountType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 449
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$PackagingType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 450
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:07 --> Severity: Notice  --> Undefined property: stdClass::$FreightType /opt/lampp/htdocs/20sept/siddharth_application2/application/views/revenuepopdf.php 493
+ERROR - 2017-09-20 08:58:08 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:08 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:48 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:48 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:49 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:49 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:50 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:50 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:51 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:51 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:52 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:52 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:54 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 08:58:54 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:01:35 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:01:35 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:01:37 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:01:37 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:01:53 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:01:53 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:02:16 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:02:16 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:02:20 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:02:20 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:02:42 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:02:42 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:03:01 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:03:01 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:11:24 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:11:24 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:11:30 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
+ERROR - 2017-09-20 09:11:30 --> Severity: Warning  --> DOMXPath::query(): Invalid expression /opt/lampp/htdocs/20sept/siddharth_application2/application/third_party/dompdf/include/stylesheet.cls.php 697
diff --git a/application/third_party/dompdf/lib/fonts/log.htm b/application/third_party/dompdf/lib/fonts/log.htm
index 3b281c5f..4e904465 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'>10,240 KB</span>    <span style='color: #090'>595.5811 ms</span><br />
\ No newline at end of file
+<span style='color: #900'>2,048 KB</span>    <span style='color: #090'>445.5121 ms</span><br />
\ No newline at end of file
diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php
index db1f9203..d5fadc3e 100755
--- a/application/views/capitalpopdf.php
+++ b/application/views/capitalpopdf.php
@@ -56,7 +56,11 @@
                $CompanyStateCode=$CO->StateCode;
 		  }
         }	
-  
+  foreach ($GetPoFormat[0] as $For)
+         {
+          $PONO = $For;
+            
+          }
         
 		if(!empty($POItem))
 		{
@@ -65,7 +69,7 @@
            {
 
            	 $ReqNo=$PO->ReqNo;
-		     $PONO = $PO->PONO;
+		     
 			 $postatus= $PO->Status;
 			
 		     $SuplierName = $PO->SupplierName;
@@ -446,12 +450,43 @@
                                     $TotalFreight='-';
 
                                      ?>
-                                <td><?php echo $st->TotalDiscount;?></td><!--data should be come-->
-				<td><?php echo $st->CGST;?></td><!--data should be come-->
-				<td><?php echo $st->SGST;?></td><!--data should be come-->
-				<td><?php echo $st->IGST;?></td><!--data should be come-->
-				<td><?php echo $st->TotalOtherAllowance;?></td><!--data should be come-->
-                                <td><?php echo '-';?></td><!--data should be come-->
+                                     <?php if($st->TotalDiscount>0 && $st->TotalDiscount!='') { ?>
+
+				<td> <?php echo $st->TotalDiscount; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+                                <!-- <td><?php echo $st->TotalDiscount;?></td> -->
+                                 <?php if($st->CGST>0 && $st->CGST!='') { ?>
+
+				<td> <?php echo $st->CGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<!-- <td><?php echo $st->CGST;?></td> -->
+				<?php if($st->SGST>0 && $st->SGST!='') { ?>
+
+				<td> <?php echo $st->SGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+				<!-- <td><?php echo $st->SGST;?></td> -->
+				<?php if($st->IGST>0 && $st->IGST!='') { ?>
+
+				<td> <?php echo $st->IGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+				<!-- <td><?php echo $st->IGST;?></td> -->
+				<?php if($st->TotalOtherAllowance>0 && $st->TotalOtherAllowance!='') { ?>
+
+				<td> <?php echo $st->TotalOtherAllowance; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+				<!-- <td><?php echo $st->TotalOtherAllowance;?></td> -->
+                                <td><?php echo '-';?></td>
                                     <?php } else if($CapitalRange==0) {
                                      $TotalCgst='-';
                                     $TotalSgst='-';
@@ -460,12 +495,18 @@
                                     $TotalOtherAllowance='-';
                                     $TotalFreight=$TotalFreight+$st->TotalFreight;
                                             ?>
-                                     <td><?php echo '-';?></td><!--data should be come-->
-				<td><?php echo '-';?></td><!--data should be come-->
-				<td><?php echo '-';?></td><!--data should be come-->
-				<td><?php echo '-';?></td><!--data should be come-->
-				<td><?php echo '-';?></td><!--data should be come-->
-                                    <td><?php echo $st->TotalFreight;?></td><!--data should be come-->
+                                     <td><?php echo '-';?></td>
+				<td><?php echo '-';?></td>
+				<td><?php echo '-';?></td>
+				<td><?php echo '-';?></td>
+				<td><?php echo '-';?></td>
+				<?php if($st->TotalFreight>0 && $st->TotalFreight!='') { ?>
+
+				<td> <?php echo $st->TotalFreight; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+                                   <!--  <td><?php echo $st->TotalFreight;?></td> -->
                                     <?php } ?>
                                     
 				
@@ -510,26 +551,74 @@
 		<td style="text-align: center;"><strong>Total Tax Amount&nbsp; <?php if($currencyName!='INR'){ ?> <?php echo "$currencyName"."("."$currencyCode".")"; }  else  {?><span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span> <?php } ?></strong></td>
 		<td style="text-align: center;"><strong>Order Value&nbsp; <?php if($currencyName!='INR'){ ?> <?php echo "$currencyName"."("."$currencyCode".")"; }  else  {?><span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span> <?php } ?></strong></td>
 		</tr>
-		<tr style="text-align: right;">
-                <td><?php echo number_format(($TotalOrderValue),2); ?></td> 
+		<tr>
+
+              <?php if($TotalOrderValue>0 && $TotalOrderValue!='') { ?>
+                <td style="text-align: right;"><?php echo number_format($TotalOrderValue,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+               <!--  <td><?php echo number_format(($TotalOrderValue),2); ?></td>  -->
 		
 		
                 <?php if($CapitalRange==1){ ?> 
-                <td><?php echo number_format(($TotalCgst1),2); ?></td> 
-                <td><?php echo number_format(($TotalSgst),2); ?></td> 
-		   <td><?php echo number_format(($TotalIgst),2); ?></td> 
-                <td><?php echo number_format(($TotalOtherAllowance),2); ?></td> 
-                <td><?php echo number_format(($TotalCgst+$TotalSgst+$TotalIgst),2); ?></td> 
-             
-                <?php } else {?>
+
+
+                <?php if($TotalCgst1>0 && $TotalCgst1!='') { ?>
+                <td style="text-align: right;"><?php echo number_format($TotalCgst1,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+                <!-- <td><?php echo number_format(($TotalCgst1),2); ?></td>  -->
+
+                 <?php if($TotalSgst>0 && $TotalSgst!='') { ?>
+                <td style="text-align: right;"><?php echo number_format($TotalSgst,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+				 <!-- <td><?php echo number_format(($TotalSgst),2); ?></td> -->
+
+				   <?php if($TotalIgst>0 && $TotalIgst!='') { ?>
+                <td style="text-align: right;"><?php echo number_format($TotalIgst,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+				<!-- <td><?php echo number_format(($TotalIgst),2); ?></td> -->
+
+				 <?php if($TotalOtherAllowance>0 && $TotalOtherAllowance!='') { ?>
+                <td style="text-align: right;"><?php echo number_format($TotalOtherAllowance,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+				 <!-- <td><?php echo number_format(($TotalOtherAllowance),2); ?></td>  -->
+				  <?php if($TotalCgst+$TotalSgst+$TotalIgst>0 && $TotalCgst+$TotalSgst+$TotalIgst!='') { ?>
+                <td style="text-align: right;"><?php echo number_format($TotalCgst+$TotalSgst+$TotalIgst,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+				 <!-- <td><?php echo number_format(($TotalCgst+$TotalSgst+$TotalIgst),2); ?></td>  -->
+
+
+              <?php } else {?>
                <td><?php echo '-'; ?></td> 
                   <td><?php echo '-' ?></td>
-		   <td><?php echo '-'; ?></td><!--data should be come-->
-                 <td><?php echo number_format(($TotalFreight),2); ?></td><!--data should be come-->
-                <td><?php echo '-'; ?></td><!--data should be come-->
+		   <td><?php echo '-'; ?></td> 
+                 <td><?php echo number_format(($TotalFreight),2); ?></td> 
+                <td><?php echo '-'; ?></td> 
                  <?php } ?>
+
+
+
+<?php if($TotalOrderValue>0 && $TotalOrderValue!='') { ?>
+                <td style="text-align: right;"><?php echo number_format($TotalOrderValue,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
                 
-		<td><?php echo number_format(($TotalOrderValue),2); ?></td><!--data should be come-->
+		<!-- <td><?php echo number_format(($TotalOrderValue),2); ?></td>  -->
 		
 		
 		
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 7c7a2c62..666400ae 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -296,7 +296,7 @@ function vaildateBeforeOpenModal()
 																	?>
 							</div>
 							<div class="col-md-12" id="currencyOpt" style="padding:0px;">
-											<label>Currency Type</label> 
+											<label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label> 
 							<div class="form-group">                     
 
 
@@ -327,7 +327,7 @@ 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');     
@@ -406,7 +406,7 @@ function vaildateBeforeOpenModal()
 							<div class="col-md-4" style="padding:0px;">
 									<div class="col-md-12" style="padding-left: 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/>
 										 <div style="display:inline-flex;">
                                                  <div id="dispatchinternational">
 											 
@@ -425,7 +425,7 @@ function vaildateBeforeOpenModal()
 									</div>
 
 											<div class="col-md-12" id="Schedulediv" style="padding-top: 3%;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>
 
 															<?php
 															$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@@ -434,7 +434,7 @@ function vaildateBeforeOpenModal()
 
 											</div>
 										<div class="col-md-12" id="Deliverydtdiv" style="display:none;padding-top: 3%;padding-left: 0px;">  <br/>
-                            <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');
@@ -446,7 +446,7 @@ function vaildateBeforeOpenModal()
                              
         </div>
 		      <div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;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>
                         <div class="form-group">
                                     <?php
                              $data = array('name' => 'Deliverydate','value' => set_value('Deliverydate',$CurrentDate),'id'=>'Deliverydate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
@@ -475,7 +475,7 @@ function vaildateBeforeOpenModal()
 											</div>
 							</div>
 							<div class="col-md-4" id="hideExchangeRate">
-							  <label id="CurrencySymbol">Exchange Rate</label>
+							  <label id="CurrencySymbol">Exchange Rate</label><span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span>
 											<div class="form-group">
 													<?php
 													$data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
@@ -495,7 +495,7 @@ function vaildateBeforeOpenModal()
 							</div> -->
 
 							 <div class="col-md-4" id="PlaceOforigindiv" style="padding-left: 0px;">
-                <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;');
@@ -751,7 +751,7 @@ function vaildateBeforeOpenModal()
 												<div class="col-md-12" style="padding: 0px;">
 														<div class="col-md-5" style="padding:0px;">
 																<div class="col-md-6">
-																		<label>Req No</label>
+																		<label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 																		<div>
 
 									<?php
@@ -794,7 +794,7 @@ function vaildateBeforeOpenModal()
 				    </div>
 					</div>
 					<div class="col-md-6">
-				    <label>Avail Bud Amount<?php echo "($INR)"?></label>
+				    <label>Avail Bud Amount <?php echo "($INR)"?></label>
 					<div class="form-group">
 				    <?php
 					$data = array('name' => 'CapitalbudAmt','value' => set_value('CapitalbudAmt'),'id'=>'CapitalbudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -817,7 +817,7 @@ function vaildateBeforeOpenModal()
                         <div class="col-md-12" style="padding:0px;">
                         <div class="col-md-12" style="padding: 0px;">
                         <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');
@@ -846,7 +846,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' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);');
@@ -855,7 +855,7 @@ function vaildateBeforeOpenModal()
                                 </div>
                             </div>
                             <div class="col-md-3" style="padding-right: 0px;">
-                               <label id="RateIn">Rate(In INR /UOM)</label>
+                               <label id="RateIn">Rate( In INR /UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
                                   <div class="form-group">
                                     <?php
                                       $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);' );
@@ -869,7 +869,7 @@ function vaildateBeforeOpenModal()
 							echo form_input($data); ?>
 						</div>
                                                     <div class="col-md-3">
-                                                        <label id="TotalAmount">Basic value in <?php echo "($INR)"?></label>
+                                                        <label id="TotalAmount">Basic value  <?php echo "($INR)"?></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'CPTotalAmount','value' => set_value('CPTotalAmount'),'id'=>'CPTotalAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
@@ -1014,7 +1014,7 @@ function vaildateBeforeOpenModal()
 				</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 "($INR)"?></label>			 
 					</div>	
 		<div class="col-md-3">
 							 <div class="form-group">
@@ -1369,7 +1369,7 @@ function vaildateBeforeOpenModal()
                                                             <div class="col-md-12">
 
                                                                 <div class="col-md-4">
-                                                Custom Duty Expenses<?php echo "($INR)"?>
+                                                Custom Duty Expenses <?php echo "($INR)"?>
                                                                 </div>
                                                                 <div class="col-md-4">
                                                                     <div class="form-group">
@@ -1383,7 +1383,7 @@ function vaildateBeforeOpenModal()
                                                             </div>
                                                             <div class="col-md-12">
                                                                 <div class="col-md-4">
-                                                    RMC Including Customers<?php echo "($INR)"?>
+                                                    RMC Including Customers <?php echo "($INR)"?>
                                                                 </div>
                                                                 <div class="col-md-4">
                                                                     <div class="form-group">
@@ -1450,7 +1450,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
@@ -1511,7 +1511,7 @@ function vaildateBeforeOpenModal()
                     <div class="col-md-12">
                     <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');
@@ -1539,7 +1539,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' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);');
@@ -1548,7 +1548,7 @@ function vaildateBeforeOpenModal()
                                                         </div>
                                                     </div>
                                                     <div class="col-md-3" style="padding-right: 0px;">
-                                                        <label id="EditRateIn">Rate(in INR/UOM)</label>
+                                                        <label id="EditRateIn">Rate (In INR/UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);' );
@@ -1562,7 +1562,7 @@ function vaildateBeforeOpenModal()
 							                             echo form_input($data); ?>
 					                                   	</div>
                                                     <div class="col-md-3">
-                                                        <label id="EditTotalAmount">Basic value in INR</label>
+                                                        <label id="EditTotalAmount">Basic value <?php echo "($INR)"?></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'EditCPTotalAmount','value' => set_value('EditCPTotalAmount'),'id'=>'EditCPTotalAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
@@ -1706,7 +1706,7 @@ function vaildateBeforeOpenModal()
 				</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 "($INR)"?></label>			 
 					</div>	
 		<div class="col-md-3">
 							 <div class="form-group">
@@ -1725,7 +1725,7 @@ function vaildateBeforeOpenModal()
                             <div class="col-md-6" style="padding:0px;">
                                 <div class="col-md-12">
                                   <div class="col-md-4" >
-                                    Basic Price In <?php echo "($INR)"?>
+                                    Basic Price <?php echo "($INR)"?>
                                   </div>
                                 <div class="col-md-4" style="display:none;">
                                   <div class="form-group">
@@ -1746,7 +1746,7 @@ function vaildateBeforeOpenModal()
                                 </div>
                                <div class="col-md-12">
                                 <div class="col-md-4">
-                                 Landing charge<?php echo "($INR)"?>
+                                 Landing charge <?php echo "($INR)"?>
                                 </div>
                                 <div class="col-md-4">
                                 <div class="form-group">
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index 20e23a15..62188226 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -418,7 +418,7 @@ $("#PaymentMethod").select2();
                                                             ?>
                     </div>
                     <div class="col-md-12" id="currencyTypeDiv" style="display:none;padding:0px;">
-                                    <label>Currency Type</label> 
+                                    <label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label> 
                     <div class="form-group">                     
 
 
@@ -453,7 +453,7 @@ $("#PaymentMethod").select2();
             <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
                                                        
@@ -519,9 +519,9 @@ $("#PaymentMethod").select2();
                            
                     </div>
                     <div class="col-md-4" style="padding:0px;">
-                            <div class="col-md-12" 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/>
                                <div style="display:inline-flex;">
                                     <div id="dispatchinternational" style="display:none;">
                                        <?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>('2' == $DeliverOption) ? TRUE : FALSE)); ?>&nbsp;&nbsp;&nbsp;&nbsp; 
@@ -537,8 +537,8 @@ $("#PaymentMethod").select2();
 								</div>                                
                             </div>
 
-                                    <div class="col-md-12" id="Schedulediv" style="display:none;padding-top: 3%;padding-left: 0px;">  <br/>
-                                                    <label >Schedule  BY</label>
+                                    <div class="col-md-12" id="Schedulediv" style="display:none;padding-top: 3%;">  <br/>
+                                                    <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');
@@ -547,7 +547,7 @@ $("#PaymentMethod").select2();
 
                                     </div>
 									<div class="col-md-12" id="deliverydateby" style="display:none;padding-top: 3%;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>
 												<div class="form-group">
 															<?php
 													 $data = array('name' => 'Deliverydate','value' => set_value('Deliverydate',$CurrentDate),'id'=>'Deliverydate',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
@@ -556,7 +556,7 @@ $("#PaymentMethod").select2();
 												</div>
 									</div>
                                    <div class="col-md-12" id="Deliverydtdiv" style="padding-top: 3%;"> <br/>
-										 <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');
@@ -586,7 +586,7 @@ $("#PaymentMethod").select2();
 							
 							
 							<div class="col-md-3" id="ExchangeRateDiv" style="display:none;">
-                                    <label id="CurrencySymbol">Exchange Rate </label> 
+                                    <label id="CurrencySymbol">Exchange Rate </label><span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span> 
                                     <div class="form-group">
                                             <?php
                                             $data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt',$exchangeRate),'id'=>'ExchangeRt',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);');
@@ -598,7 +598,8 @@ $("#PaymentMethod").select2();
 								
 
                             <div class="col-md-3" id="PlaceOforigindiv">
-                <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;');
@@ -607,6 +608,7 @@ $("#PaymentMethod").select2();
                                 echo form_input($data);
                             ?>   
                         </div>
+
             </div>						
 							
 							
@@ -666,7 +668,7 @@ $("#PaymentMethod").select2();
   </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">
@@ -772,7 +774,7 @@ $("#PaymentMethod").select2();
 	<div class="col-md-9" style="padding:0px;">
 	 
 	<div class="col-md-4" id="insuranceTxtDiv"  style="display:block;">
-                     <label>Insurance Details<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+                     <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' => 'insuranceNo','value' => set_value('insuranceNo',$InsuranceNo),'id'=>'insuranceNo',  'class' => 'form-control' ,'required' => 'true');
@@ -817,7 +819,7 @@ $("#PaymentMethod").select2();
 
 
             </div>
-			<div class="col-md-4" id="otheroptiondiv" style="display:none; padding-left: 0px;">
+			<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
@@ -1074,7 +1076,7 @@ $("#PaymentMethod").select2();
                                              <div class="col-md-12">
                                 <div class="col-md-5" style="padding:0px;">
                                 <div class="col-md-6" style="padding:0px">
-                                <label>Req No</label>
+                                <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
                                 <div>
                          
                                  <?php
@@ -1126,7 +1128,7 @@ $("#PaymentMethod").select2();
                 </div>
                 </div>
                 </div>
-             <div class="col-md-2" id="ExchangeRateModalDiv" style="display:none;">
+             <div class="col-md-2" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
               <label> Exchange Rate</label> 
                     <div class="form-group">
                     <?php
@@ -1140,7 +1142,7 @@ $("#PaymentMethod").select2();
             <div class="col-md-12" style="padding:0px">
                 <div class="col-md-12" style="padding:0px">
                 <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');
@@ -1169,7 +1171,7 @@ $("#PaymentMethod").select2();
                 </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' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);');
@@ -1178,7 +1180,7 @@ $("#PaymentMethod").select2();
 						</div>
 					</div>
 					<div class="col-md-3" style="padding-right: 0px;padding-left: 0px;">
-						<label id="RateIn">Rate(In INR /UOM)</label>
+						<label id="RateIn">Rate(In INR /UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
 						<div class="form-group">
 							<?php
 							$data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();calculateFreight(3);' );
@@ -1192,7 +1194,7 @@ $("#PaymentMethod").select2();
              echo form_input($data); ?>
                 </div>
 					<div class="col-md-3">
-						<label id="TotalAmount">Basic value in INR</label>
+						<label id="TotalAmount">Basic value <?php echo "($INR)"?></label>
 						<div class="form-group">
 							<?php
 							$data = array('name' => 'CPTotalAmount','value' => set_value('CPTotalAmount'),'id'=>'CPTotalAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
@@ -1240,7 +1242,7 @@ $("#PaymentMethod").select2();
                                                             </div>
                                                         </div>
                                                         <div class="col-md-2" style="padding:0px">
-                                                            <label>Discounted Amt In INR</label>
+                                                            <label>Discounted Amt <?php echo "($INR)"?></label>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount',0.00),'id'=>'txtAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -1335,7 +1337,7 @@ $("#PaymentMethod").select2();
 				</div>
 				<div class="col-md-12" id="ADDCAPdiv1" style="padding:0px">
 				<div class="col-md-5 col-md-offset-4" align="right">
-							<label>Other Allowances In INR</label>			 
+							<label>Other Allowances <?php echo "($INR)"?></label>			 
 					</div>	
 		<div class="col-md-3">
 							 <div class="form-group">
@@ -1649,7 +1651,7 @@ $("#PaymentMethod").select2();
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <span>Freight Amt In INR</span>
+                                                            <span>Freight Amt <?php echo "($INR)"?></span>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -1776,7 +1778,7 @@ $("#PaymentMethod").select2();
 							<div class="col-md-12" style="padding: 0px;">
 							<div class="col-md-5" style="padding:0px;">
 						   <div class="col-md-6">
-						   <label>Req No</label>
+						   <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
 							<div>
 
                              <?php
@@ -1839,10 +1841,10 @@ $("#PaymentMethod").select2();
          </div>
         </div>
         </div>
-         <div class="col-md-12">
-        <div class="col-md-12">
+         <div class="col-md-12" style="padding: 0px;">
+        <div class="col-md-12" style="padding: 0px;">
         <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');
@@ -1870,7 +1872,7 @@ $("#PaymentMethod").select2();
 				</div>
 				 <div class="col-md-6">
 				<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' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4)');
@@ -1878,8 +1880,8 @@ $("#PaymentMethod").select2();
 						?>
 					</div>
 				</div>
-				<div class="col-md-3">
-					<label id="EditRateIn">Rate(in INR/UOM)</label>
+				<div class="col-md-3" style="padding-right: 0px;">
+					<label id="EditRateIn">Rate(in INR/UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
 					<div class="form-group">
 						<?php
 						$data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();calculateFreight(4);' );
@@ -1892,8 +1894,8 @@ $("#PaymentMethod").select2();
               $data = array('name' => 'EditPer','value' => set_value('EditPer'),'id'=>'EditPer',  'class' => 'form-control');
              echo form_input($data); ?>
                 </div>
-				<div class="col-md-3">
-					<label id="EditTotalAmount">Basic value in INR</label>
+				<div class="col-md-3" style="padding-right: 0px;">
+					<label id="EditTotalAmount">Basic value <?php echo "($INR)"?></label>
 					<div class="form-group">
 						<?php
 						$data = array('name' => 'EditCPTotalAmount','value' => set_value('EditCPTotalAmount'),'id'=>'EditCPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
@@ -1941,7 +1943,7 @@ $("#PaymentMethod").select2();
 																		</div> 
 											</div>
 											 <div class="col-md-2" style="padding:0px;">
-															  <label>Discounted Amt In INR  </label>
+															  <label>Discounted Amt <?php echo "($INR)"?>  </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;');
@@ -2036,7 +2038,7 @@ $("#PaymentMethod").select2();
 				</div>
 				<div class="col-md-12" id="EDITCAPdiv3">
 				 <div class="col-md-5 col-md-offset-4" align="right">
-							<label>Other Allowances In INR</label>			 
+							<label>Other Allowances <?php echo "($INR)"?></label>			 
 					</div>
 
 		<div class="col-md-3">
@@ -2350,7 +2352,7 @@ $("#PaymentMethod").select2();
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <span>Freight Amt In INR</span>
+                                                            <span>Freight Amt <?php echo "($INR)"?></span>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -2477,7 +2479,7 @@ $("#PaymentMethod").select2();
 																				  <div class="col-md-12" style="padding: 0px;">
 																	
 																				<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													
@@ -2515,7 +2517,7 @@ $("#PaymentMethod").select2();
 		 
 		
 		</div>
-		<div class="col-md-2" id="ExchangeRateModalViewDiv" style="display:none;">
+		<div class="col-md-2" id="ExchangeRateModalViewDiv" style="display:none;padding-right: 0px;">
 		<label> Exchange Rate</label> 
 		<div class="form-group">
 		<?php
@@ -2538,7 +2540,7 @@ $("#PaymentMethod").select2();
         <div class="col-md-12" style="padding: 0px;">
         <div class="col-md-12" style="padding: 0px;">
         <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
        
@@ -2569,7 +2571,7 @@ $("#PaymentMethod").select2();
 					</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' => 'ViewCPQuantity','value' => set_value('ViewCPQuantity'),'id'=>'ViewCPQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();','readonly' => 'true');
@@ -2578,7 +2580,7 @@ $("#PaymentMethod").select2();
 						</div>
 					</div>
 					<div class="col-md-3" style="padding-right: 0px;">
-						<label id="ViewRateIn">Rate(in INR/UOM)</label>
+						<label id="ViewRateIn">Rate(in INR/UOM)</label><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span>
 						<div class="form-group">
 							<?php
 							$data = array('name' => 'ViewCPRate','value' => set_value('ViewCPRate'),'id'=>'ViewCPRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();','readonly' => 'true' );
@@ -2592,7 +2594,7 @@ $("#PaymentMethod").select2();
            echo form_input($data); ?>
               </div>
 					<div class="col-md-3">
-						<label id="EditTotalAmount">Basic value in INR</label>
+						<label id="EditTotalAmount">Basic value <?php echo "($INR)"?></label>
 						<div class="form-group">
 							<?php
 							$data = array('name' => 'ViewCPTotalAmount','value' => set_value('ViewCPTotalAmount'),'id'=>'ViewCPTotalAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
@@ -2629,7 +2631,7 @@ $("#PaymentMethod").select2();
 																		</div> 
 											</div>
 											 <div class="col-md-2" style="padding:0px;">
-															  <label>Discounted Amt In INR  </label>
+															  <label>Discounted Amt <?php echo "($INR)"?>  </label>
 															  <div class="form-group">
 																					<?php
 																			 $data = array('name' => 'txtViewAfterDiscount','value' => set_value('txtViewAfterDiscount'),'id'=>'txtViewAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
@@ -2724,7 +2726,7 @@ $("#PaymentMethod").select2();
 				</div>
 				<div class="col-md-12" id="VIEWCAPdiv3" style="padding: 0px;">
 				 <div class="col-md-5 col-md-offset-4" align="right">
-							<label>Other Allowances In INR</label>			 
+							<label>Other Allowances <?php echo "($INR)"?></label>			 
 					</div>	
 		<div class="col-md-3">
 							 <div class="form-group">
@@ -3037,7 +3039,7 @@ $("#PaymentMethod").select2();
                                                         </div>
                             
                                                         <div class="col-md-3" style="padding-left: 0px;">
-                                                            <span>Freight Amt In INR</span>
+                                                            <span>Freight Amt <?php echo "($INR)"?></span>
                                                             <div class="form-group">
                                                                 <?php
                                                                 $data = array('name' => 'txtViewAfterFreight','value' => set_value('txtViewAfterFreight'),'id'=>'txtViewAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
@@ -3165,7 +3167,7 @@ $("#PaymentMethod").select2();
 				 
 		</div>
                                             <div class="col-md-3">
-									 <label>CGST In INR</label> 
+									 <label>CGST <?php echo "($INR)"?></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);				
@@ -3174,14 +3176,14 @@ $("#PaymentMethod").select2();
 							 
 							  
 								<div class="col-md-3">
-									 <label>SGST In INR</label> 
+									 <label>SGST <?php echo "($INR)"?></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-3">
-									<label>IGST In INR</label> 
+									<label>IGST <?php echo "($INR)"?></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);
@@ -3189,7 +3191,7 @@ $("#PaymentMethod").select2();
 								</div>
 							 
 					<div class="col-md-3">
-							<label >Other Allowances  In INR </label>							
+							<label >Other Allowances  <?php echo "($INR)"?> </label>							
 								<?php
 								 $data = array('name' => 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances',number_format($OtherAmt, 2, '.', '')),'id'=>'TotalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
 								echo form_input($data);
diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php
index f271f513..4fdea4a8 100755
--- a/application/views/revenuepopdf.php
+++ b/application/views/revenuepopdf.php
@@ -50,11 +50,16 @@
 		
 	}
         }	
+        foreach ($GetPoFormat[0] as $For)
+         {
+          $PONO = $For;
+            
+          }
 		if(!empty($POItem))
 		{
     foreach ($POItem as $PO)
     {
-		 $PONO = $PO->PONO;
+		 
 		  $postatus= $PO->Status;
 		 $SuplierName = $PO->SupplierName;
 		$SuplierAddress = $PO->Address;
@@ -443,12 +448,48 @@ $OrderValue =  (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
 				<td style="text-align: left;"><?php echo $r->Itemcode ; ?></td>
 				<!--<td><?php if($r->DiscountType == 'PERCENTAGE'){$type="%";}else if($r->DiscountType == 'LUMP SUM'){$type="LS";}else if($r->DiscountType == 'NIL'){$type='';} echo $r->DiscountValue . $type;?></td>-->
 				<!--<td><?php if($r->PackagingType == 'PERCENTAGE'){$type="%";}else if($r->PackagingType == 'LUMP SUM'){$type="LS";}else if($r->PackagingType == 'NIL'){$type='';} echo $r->PackagingValue . $type;?></td>-->
-				<td><?php echo $r->DiscountValue;?></td>
-				<td><?php echo $r->PackagingValue;?></td>
-				<td><?php echo $r->CGST;?></td>
-				<td><?php echo $r->SGST;?></td>
-				<td><?php echo $r->IGST;?></td>
-				<td><?php echo $r->FreightValue;?></td>
+				
+
+				<?php if($r->DiscountValue>0 && $r->DiscountValue!='') { ?>
+
+				<td> <?php echo $r->DiscountValue; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+				<?php if($r->PackagingValue>0 && $r->PackagingValue!='') { ?>
+
+				<td> <?php echo $r->PackagingValue; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<?php if($r->CGST>0 && $r->CGST!='') { ?>
+
+				<td> <?php echo $r->CGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<?php if($r->SGST>0 && $r->SGST!='') { ?>
+
+				<td> <?php echo $r->SGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+				<?php if($r->IGST>0 && $r->IGST!='') { ?>
+
+				<td> <?php echo $r->IGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+				<?php if($r->FreightValue>0 && $r->FreightValue!='') { ?>
+
+				<td> <?php echo $r->FreightValue; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+				
+				
 				<!-- <td><?php if($r->FreightType == 'PER TRIP'){$type="TRIP"; echo $r->FreightValue ."*" . $r->NoOfTrip . $type;}else{ if($r->FreightType == 'LUMP SUM'){$type="LS";}else if($r->FreightType == 'NIL'){$type='';}else if($r->FreightType == 'PER UOM'){$type='UOM';}else if($r->FreightType == 'PERCENTAGE'){$type='%';} echo $r->FreightValue . $type;}?></td>-->
 			   </tr><?php }
 			}?>
@@ -472,13 +513,56 @@ $OrderValue =  (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
 		<td style="text-align: center;"><strong>Order Value&nbsp; <span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span></strong></td>
 		</tr>
 		<tr>
-		<td style="text-align: right;"><?php echo number_format($SubTotalAmount,2);?></td>
-		<td style="text-align: right;"><?php echo number_format($AfterCGST,2);?></td>
-		<td style="text-align: right;"><?php echo number_format($AfterSGST,2);?></td>
-		<td style="text-align: right;"><?php echo number_format($AfterIGST,2);?></td>
-		<td style="text-align: center;"><?php echo number_format($others,2);?></td>
-		<td style="text-align: right;"><?php echo number_format($totaltaxonly,2);?></td>
-		<td style="text-align: right;"><?php echo number_format($OrderValue,2);?></td>
+		<?php if($SubTotalAmount>0 && $SubTotalAmount!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($SubTotalAmount,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<?php if($AfterCGST>0 && $AfterCGST!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($AfterCGST,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<?php if($AfterSGST>0 && $AfterSGST!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($AfterSGST,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		 
+ 
+		        <?php if($AfterIGST>0 && $AfterIGST!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($AfterIGST,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<?php if($others>0 && $others!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($others,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<?php if($totaltaxonly>0 && $totaltaxonly!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($totaltaxonly,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+
+				<?php if($OrderValue>0 && $OrderValue!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($OrderValue,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+ 
 		</tr>
 		<tr>
 		<td colspan="7">
@@ -509,4 +593,3 @@ $OrderValue =  (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
 
 		 
 
- 
\ No newline at end of file
diff --git a/application/views/servicepopdf.php b/application/views/servicepopdf.php
index 40510e96..9725aad4 100755
--- a/application/views/servicepopdf.php
+++ b/application/views/servicepopdf.php
@@ -73,7 +73,11 @@
 
                     }
 
+            foreach ($GetPoFormat[0] as $For)
+         {
+          $PONO = $For;
             
+          }
 
 	
 		if(!empty($POItem))
@@ -82,7 +86,7 @@
     foreach ($POItem as $PO)
     {
 
-		 $PONO = $PO->PONO;
+		  
 		 $postatus= $PO->Status;
 		 $SuplierName = $PO->SupplierName;
 		$SuplierAddress = $PO->Address;
@@ -420,12 +424,37 @@
 						{
 						
 							foreach($serviceTaxList as $st)
-							{ ?><tr>
+							{ ?><tr style="text-align: center;">
+
 							<td style="text-align: center;"><?php echo $st->Itemcode?></td>
-							<td style="text-align: center;"><?php echo $st->CGST?></td>
-							<td style="text-align: center;"><?php echo $st->SGST?></td>
-							<td style="text-align: center;"><?php echo $st->IGST?></td>
-							<td style="text-align: center;"><?php echo $st->otherallowance?></td>
+							<?php if($st->CGST>0 && $st->CGST!='') { ?>
+
+				<td> <?php echo $st->CGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+							<!-- <td style="text-align: center;"><?php echo $st->CGST?></td> -->
+							<?php if($st->SGST>0 && $st->SGST!='') { ?>
+
+				<td> <?php echo $st->SGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+							<!-- <td style="text-align: center;"><?php echo $st->SGST?></td> -->
+							<?php if($st->IGST>0 && $st->IGST!='') { ?>
+
+				<td> <?php echo $st->IGST; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+							<!-- <td style="text-align: center;"><?php echo $st->IGST?></td> -->
+								<?php if($st->otherallowance>0 && $st->otherallowance!='') { ?>
+
+				<td> <?php echo $st->otherallowance; ?> </td>
+				<?php } else { ?>
+				<td> <?php echo '-'; ?> </td>
+				<?php } ?>
+							<!-- <td style="text-align: center;"><?php echo $st->otherallowance?></td> -->
 								
 								</tr>
 								<?php 
@@ -454,13 +483,55 @@
 		<td style="text-align: center;"><strong>Order value&nbsp; <span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span></strong></td>
 		</tr>
 		<tr style="text-align: right;">
-		<td><?php echo number_format(($BasicAmount),2 )?>&nbsp;</td>
-		<td><?php echo number_format(($AfterCGST),2 )?>&nbsp;</td> 
-		<td><?php echo number_format(($AfterSGST),2)?>&nbsp;</td> 
-		<td><?php echo number_format(($AfterIGST),2)?>&nbsp;</td>
-		<td><?php echo number_format(($otherallowances),2)?>&nbsp;</td>
-		<td><?php echo number_format(($AfterCGST+$AfterSGST+$AfterIGST),2)?>&nbsp;</td>
-		<td style="text-align: right;"><?php echo number_format(($BasicAmount+$AfterCGST+$AfterSGST+$AfterIGST+$otherallowances),2)?>&nbsp;</td>
+		<?php if($BasicAmount>0 && $BasicAmount!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($BasicAmount,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		<!-- <td><?php echo number_format(($BasicAmount),2 )?>&nbsp;</td> -->
+		<?php if($AfterCGST>0 && $AfterCGST!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($AfterCGST,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		<!-- <td><?php echo number_format(($AfterCGST),2 )?>&nbsp;</td> --> 
+		<?php if($AfterSGST>0 && $AfterSGST!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($AfterSGST,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		<!-- <td><?php echo number_format(($AfterSGST),2)?>&nbsp;</td>  -->
+		<?php if($AfterIGST>0 && $AfterIGST!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($AfterIGST,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		<!-- <td><?php echo number_format(($AfterIGST),2)?>&nbsp;</td> -->
+		<?php if($otherallowances>0 && $otherallowances!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($otherallowances,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		<!-- <td><?php echo number_format(($otherallowances),2)?>&nbsp;</td> -->
+		<?php if($AfterCGST+$AfterSGST+$AfterIGST>0 && $AfterCGST+$AfterSGST+$AfterIGST!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($AfterCGST+$AfterSGST+$AfterIGST,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		<!-- <td><?php echo number_format(($AfterCGST+$AfterSGST+$AfterIGST),2)?>&nbsp;</td> -->
+		<?php if($BasicAmount+$AfterCGST+$AfterSGST+$AfterIGST+$otherallowances>0 && $BasicAmount+$AfterCGST+$AfterSGST+$AfterIGST+$otherallowances!='') { ?>
+
+				<td style="text-align: right;"><?php echo number_format($BasicAmount+$AfterCGST+$AfterSGST+$AfterIGST+$otherallowances,2);?></td>
+				<?php } else { ?>
+				<td style="text-align: center;"> <?php echo '-'; ?> </td>
+				<?php } ?>
+		<!-- <td style="text-align: right;"><?php echo number_format(($BasicAmount+$AfterCGST+$AfterSGST+$AfterIGST+$otherallowances),2)?>&nbsp;</td> -->
 		</tr>
 		<tr>
 		<td colspan="7">