diff --git a/application/logs/log-2017-07-28.php b/application/logs/log-2017-07-28.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-07-31.php b/application/logs/log-2017-07-31.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-08-01.php b/application/logs/log-2017-08-01.php old mode 100644 new mode 100755 diff --git a/application/third_party/dompdf/lib/fonts/Times-BoldItalic.afm.php b/application/third_party/dompdf/lib/fonts/Times-BoldItalic.afm.php old mode 100644 new mode 100755 diff --git a/application/third_party/dompdf/lib/fonts/Times-Italic.afm.php b/application/third_party/dompdf/lib/fonts/Times-Italic.afm.php old mode 100644 new mode 100755 diff --git a/application/views/MaterialIssueList.php b/application/views/MaterialIssueList.php index 88526263..4a26d806 100755 --- a/application/views/MaterialIssueList.php +++ b/application/views/MaterialIssueList.php @@ -1,52 +1,29 @@ - - - -
- - -
- -
-

SIA - Material Distribution List

+
+
+
+
+

Siddharth Industries - Material Distribution List

+
'form-label-left Approve ','name' => 'Approve','id' => 'Approve'); - - echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?> -
-
-
- - - - -
-
- - - -
- - - - - - -
-
- - -
- - - - - + $attributes = array('class' => 'form-label-left Approve ','name' => 'Approve','id' => 'Approve'); + + echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?> +
+
+
+
+
+
+
Purchase Order NumberRequisition NumberRequested ByRequested Department
+
+
+
+ + + + + @@ -57,18 +34,18 @@ - - - - - + + + + + ?> @@ -85,27 +62,22 @@ - - - - ReqStatus != REQ_DELIVERED) { ?> + ReqStatus != REQ_DELIVERED) { ?> @@ -115,45 +87,37 @@ - - - - -
Purchase Order NumberRequisition NumberRequested ByRequested Department Requested Date Material Code Material NameAccepted Quantity Remarks Action
PONO ?> ReqNo ?>OrderedQuantity ?> AcceptedQty; ?> - - - + StatusCode != $record->ReqStatus) { ?> - + if(!empty($status)) + { + foreach ($status as $rl) + { + if($rl->StatusCode != $record->ReqStatus) { ?> + + } + } + ?>
- - - -
-
-
- -
-
+ } + } + ?> + + +
+
+
+ + + + //alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY')); + }); + + }); + $(function () { + + + $('#Requisition').DataTable({ + "paging": true, + "lengthChange": true, + "searching": true, + "ordering": true, + "info": true, + "autoWidth": true + + }); + }); + diff --git a/application/views/assetListing.php b/application/views/assetListing.php index f64655ff..fe9baef4 100755 --- a/application/views/assetListing.php +++ b/application/views/assetListing.php @@ -1,13 +1,12 @@
- -
-

-
Siddharth industries - Asset Details
- -

-
+
+
+
+

Siddharth Industries - Asset Details

+
+
@@ -68,6 +67,8 @@
+
+
diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php old mode 100644 new mode 100755 diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php old mode 100644 new mode 100755 diff --git a/application/views/costListing.php b/application/views/costListing.php index bcef2be0..f6ea97b5 100755 --- a/application/views/costListing.php +++ b/application/views/costListing.php @@ -1,12 +1,12 @@
- -
-

-
Siddharth Industries - Cost Details
-

-
+
+
+
+

Siddharth Industries - Cost Details

+
+
@@ -65,6 +65,8 @@
+
+
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php old mode 100644 new mode 100755 diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php old mode 100644 new mode 100755 diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php old mode 100644 new mode 100755 diff --git a/application/views/employeeListing.php b/application/views/employeeListing.php index 0862efd5..89432325 100755 --- a/application/views/employeeListing.php +++ b/application/views/employeeListing.php @@ -1,13 +1,12 @@
- -
-

-
Siddharth Industries - Employee Details
- -

-
+
+
+
+

Siddharth Industries - Employee Details

+
+
@@ -56,7 +55,10 @@
+
+
+
diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php old mode 100644 new mode 100755 diff --git a/application/views/supplierListing.php b/application/views/supplierListing.php index 7846efff..80010d68 100755 --- a/application/views/supplierListing.php +++ b/application/views/supplierListing.php @@ -1,13 +1,12 @@
- -
-

-
Siddharth Industries -Supplier Details
- -

-
+
+
+
+

Siddharth Industries - Supplier Details

+
+
@@ -19,7 +18,7 @@
- +
@@ -67,6 +66,8 @@ + + diff --git a/application/views/users.php b/application/views/users.php index 79d14faa..023bb204 100755 --- a/application/views/users.php +++ b/application/views/users.php @@ -1,14 +1,13 @@
- -
-

-
Siddharth Industries - User Management
- -

-
+
+
+
+

Siddharth Industries - User Management

+
+
@@ -61,6 +60,8 @@
+
+
Supplier ID