diff --git a/application/views/Report_Material_Master_ItemWise.php b/application/views/Report_Material_Master_ItemWise.php index 8ab91d91..8ae2efd5 100755 --- a/application/views/Report_Material_Master_ItemWise.php +++ b/application/views/Report_Material_Master_ItemWise.php @@ -28,6 +28,8 @@ if(!empty($mmi)) +
+
@@ -88,6 +90,8 @@ if(!empty($mmi))
+
+ diff --git a/application/views/Report_Material_Master_ReceiptValue.php b/application/views/Report_Material_Master_ReceiptValue.php index a309b751..3d4571ae 100755 --- a/application/views/Report_Material_Master_ReceiptValue.php +++ b/application/views/Report_Material_Master_ReceiptValue.php @@ -32,6 +32,8 @@ if(!empty($mmr)) +
+
@@ -191,6 +193,8 @@ if(!empty($mmr))
+
+ diff --git a/application/views/Report_Material_Master_SupplierWise.php b/application/views/Report_Material_Master_SupplierWise.php index a2b95ae4..bf96bd5e 100755 --- a/application/views/Report_Material_Master_SupplierWise.php +++ b/application/views/Report_Material_Master_SupplierWise.php @@ -28,6 +28,8 @@ if(!empty($mms)) +
+
@@ -91,6 +93,9 @@ if(!empty($mms))
+
+
+ diff --git a/application/views/Report_POreleased.php b/application/views/Report_POreleased.php index 87999f02..cd059e59 100755 --- a/application/views/Report_POreleased.php +++ b/application/views/Report_POreleased.php @@ -32,6 +32,9 @@ if(!empty($rel_po)) +
+
+
@@ -165,7 +168,7 @@ if(!empty($rel_po))
-

+

@@ -236,6 +239,8 @@ if(!empty($rel_po))
+
+ diff --git a/application/views/Report_consolidate.php b/application/views/Report_consolidate.php index 0fd9c6e5..c308c77c 100755 --- a/application/views/Report_consolidate.php +++ b/application/views/Report_consolidate.php @@ -50,6 +50,8 @@ table.dataTable thead > tr > td.sorting { +
+
@@ -676,7 +678,10 @@ table.dataTable thead > tr > td.sorting {
-
+
+ + + diff --git a/application/views/Report_consolidate_inward.php b/application/views/Report_consolidate_inward.php index 07efcc95..30b94636 100755 --- a/application/views/Report_consolidate_inward.php +++ b/application/views/Report_consolidate_inward.php @@ -49,6 +49,8 @@ table.dataTable thead > tr > td.sorting { } +
+
@@ -675,7 +677,10 @@ table.dataTable thead > tr > td.sorting {
-
+
+ + + diff --git a/application/views/Report_consolidate_m.php b/application/views/Report_consolidate_m.php index d293acf2..67d893f4 100755 --- a/application/views/Report_consolidate_m.php +++ b/application/views/Report_consolidate_m.php @@ -32,6 +32,8 @@ if(!empty($mms)) +
+
@@ -146,7 +148,10 @@ if(!empty($mms))
-
+
+ + + diff --git a/application/views/Report_consolidate_month_inward.php b/application/views/Report_consolidate_month_inward.php index 7d759181..4ea994f0 100755 --- a/application/views/Report_consolidate_month_inward.php +++ b/application/views/Report_consolidate_month_inward.php @@ -32,6 +32,8 @@ if(!empty($mms)) +
+
@@ -146,8 +148,11 @@ if(!empty($mms))
-
+
+ + + diff --git a/application/views/Report_consolidate_raw.php b/application/views/Report_consolidate_raw.php index 9ffc47a3..9572a18b 100755 --- a/application/views/Report_consolidate_raw.php +++ b/application/views/Report_consolidate_raw.php @@ -49,6 +49,8 @@ table.dataTable thead > tr > td.sorting { +
+
@@ -680,7 +682,10 @@ table.dataTable thead > tr > td.sorting {
-
+
+ + + diff --git a/application/views/Report_consolidate_year_inward.php b/application/views/Report_consolidate_year_inward.php index 3728282f..ab1ecdf4 100755 --- a/application/views/Report_consolidate_year_inward.php +++ b/application/views/Report_consolidate_year_inward.php @@ -32,6 +32,8 @@ if(!empty($mms)) +
+
@@ -148,7 +150,11 @@ if(!empty($mms))
-
+
+ + + + diff --git a/application/views/Report_costcenter.php b/application/views/Report_costcenter.php index 0141977c..d31bc715 100755 --- a/application/views/Report_costcenter.php +++ b/application/views/Report_costcenter.php @@ -41,6 +41,8 @@ if(!empty($ccrpt)) } +
+
@@ -137,6 +139,9 @@ if(!empty($ccrpt))
+
+
+ diff --git a/application/views/Report_cumulative.php b/application/views/Report_cumulative.php index 0129e735..98acc2c5 100755 --- a/application/views/Report_cumulative.php +++ b/application/views/Report_cumulative.php @@ -32,6 +32,8 @@ if(!empty($mms)) +
+
@@ -223,7 +225,10 @@ if(!empty($mms))
-
+
+ + + diff --git a/application/views/Report_cumulative_inward.php b/application/views/Report_cumulative_inward.php index f7209240..9e440a28 100755 --- a/application/views/Report_cumulative_inward.php +++ b/application/views/Report_cumulative_inward.php @@ -32,6 +32,8 @@ if(!empty($mms)) +
+
@@ -222,7 +224,10 @@ if(!empty($mms))
-
+
+ + + diff --git a/application/views/Report_cumulative_raw.php b/application/views/Report_cumulative_raw.php index 8eac52ab..cc6cb6eb 100755 --- a/application/views/Report_cumulative_raw.php +++ b/application/views/Report_cumulative_raw.php @@ -32,6 +32,8 @@ if(!empty($mms)) +
+
@@ -230,7 +232,10 @@ if(!empty($mms))
-
+
+ + + diff --git a/application/views/Report_openorder.php b/application/views/Report_openorder.php index 986c6bd6..4f268654 100755 --- a/application/views/Report_openorder.php +++ b/application/views/Report_openorder.php @@ -32,6 +32,8 @@ if(!empty($open_po)) +
+
@@ -165,7 +167,7 @@ if(!empty($open_po))
-

+

@@ -236,6 +238,8 @@ if(!empty($open_po))
+
+ diff --git a/application/views/Report_pending_purchase.php b/application/views/Report_pending_purchase.php index 3395a15c..cc433b88 100755 --- a/application/views/Report_pending_purchase.php +++ b/application/views/Report_pending_purchase.php @@ -41,6 +41,8 @@ if(!empty($mms)) +
+
@@ -378,8 +380,11 @@ if(!empty($mms))
-
+
+ + + diff --git a/application/views/Report_purchase.php b/application/views/Report_purchase.php index e090fb99..25a43ce0 100755 --- a/application/views/Report_purchase.php +++ b/application/views/Report_purchase.php @@ -54,6 +54,8 @@ table.dataTable thead > tr > td.sorting { +
+
@@ -478,7 +480,10 @@ table.dataTable thead > tr > td.sorting {
-
+
+ + + diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php index 2f7bb334..8ec2b80b 100755 --- a/application/views/Report_purchase_inward.php +++ b/application/views/Report_purchase_inward.php @@ -56,6 +56,8 @@ table.dataTable thead > tr > td.sorting { +
+
@@ -484,6 +486,8 @@ table.dataTable thead > tr > td.sorting {
+
+
diff --git a/application/views/Report_supplier.php b/application/views/Report_supplier.php index a35f32bc..6846401e 100755 --- a/application/views/Report_supplier.php +++ b/application/views/Report_supplier.php @@ -41,6 +41,8 @@ if(!empty($mms)) +
+
@@ -288,6 +290,8 @@ if(!empty($mms))
+
+ diff --git a/application/views/Report_supplier_inward.php b/application/views/Report_supplier_inward.php index b2f96597..716556bd 100755 --- a/application/views/Report_supplier_inward.php +++ b/application/views/Report_supplier_inward.php @@ -41,6 +41,8 @@ if(!empty($mms)) +
+
@@ -285,8 +287,11 @@ if(!empty($mms))
-
+
+ +
+ diff --git a/application/views/Report_totalorders.php b/application/views/Report_totalorders.php index 95dc5f08..863e2f7d 100755 --- a/application/views/Report_totalorders.php +++ b/application/views/Report_totalorders.php @@ -32,7 +32,8 @@ if(!empty($Total)) - +
+
@@ -143,7 +144,10 @@ if(!empty($Total))
-
+
+ + + diff --git a/application/views/Report_year_wise.php b/application/views/Report_year_wise.php index ec5cdfe6..31d8271b 100755 --- a/application/views/Report_year_wise.php +++ b/application/views/Report_year_wise.php @@ -32,6 +32,8 @@ if(!empty($mms)) +
+
@@ -179,6 +181,8 @@ if(!empty($mms))
+
+ diff --git a/application/views/deliver_perform.php b/application/views/deliver_perform.php index 75795ad5..b6dc2c88 100644 --- a/application/views/deliver_perform.php +++ b/application/views/deliver_perform.php @@ -33,6 +33,8 @@ } +
+
@@ -242,7 +244,10 @@
-
+
+ + + diff --git a/application/views/editInprocessReport.php b/application/views/editInprocessReport.php index 3279cab0..fcbf1ce7 100755 --- a/application/views/editInprocessReport.php +++ b/application/views/editInprocessReport.php @@ -197,7 +197,7 @@ th{ -

 

+
@@ -388,7 +388,7 @@ th{ -
 
+
@@ -423,9 +423,9 @@ th{
-
 
+
-
 
+
diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 9c48483f..a7496b43 100755 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -115,6 +115,14 @@ $(function() { font-size:14px !important; } + .sidebar { + height: 600px; + overflow: auto; +} +::-webkit-scrollbar { +display: none; +} + @@ -131,131 +139,149 @@ $(function() { - - - - -
- - - - +
-
  • - Complaint -
    • + + - - - - - - - - - - - -
  • - - User Image - - - -
    • - - -
    - - - \ No newline at end of file diff --git a/application/views/report_emp.php b/application/views/report_emp.php index c33d5541..4ce73e4d 100755 --- a/application/views/report_emp.php +++ b/application/views/report_emp.php @@ -33,6 +33,8 @@ } +
    +
    @@ -200,7 +202,9 @@
    -
    +
    + +
    diff --git a/application/views/report_pendingreqst.php b/application/views/report_pendingreqst.php index 9561ea92..cf579294 100755 --- a/application/views/report_pendingreqst.php +++ b/application/views/report_pendingreqst.php @@ -31,6 +31,8 @@ if(!empty($pending_list)) } +
    +
    @@ -165,7 +167,7 @@ if(!empty($pending_list))
    -

    +

    @@ -220,8 +222,11 @@ if(!empty($pending_list))
    -
    +
    + + + diff --git a/application/views/reportcashbook.php b/application/views/reportcashbook.php index ba2c9681..b53df446 100755 --- a/application/views/reportcashbook.php +++ b/application/views/reportcashbook.php @@ -98,7 +98,9 @@ if(!empty($todayincome)) - + +
    +
    @@ -167,7 +169,9 @@ if(!empty($todayincome)) + +
    @@ -284,7 +288,7 @@ if(!empty($todayincome))     -   + @@ -298,6 +302,8 @@ if(!empty($todayincome))
    + +
    @@ -318,6 +324,7 @@ if(!empty($todayincome)) "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", +// "bSort": false, buttons: [ { diff --git a/application/views/reportslink.php b/application/views/reportslink.php index 09bacd90..84c8b1f7 100755 --- a/application/views/reportslink.php +++ b/application/views/reportslink.php @@ -61,7 +61,7 @@

      Cashbook

    -

    Cashbook Reports

     + Cashbook Reports