diff --git a/public/Forwarder/warehousenote.html b/public/Forwarder/warehousenote.html
index 57dfee5..23a062d 100644
--- a/public/Forwarder/warehousenote.html
+++ b/public/Forwarder/warehousenote.html
@@ -38,11 +38,20 @@ License: You must have a valid license purchased only from themeforest(the above
         <link href="../assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
         <link href="../assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
         <!-- END PAGE LEVEL PLUGINS -->
+        <link href="../assets/global/plugins/bootstrap-wysihtml5/bootstrap-wysihtml5.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/bootstrap-wysihtml5/bootstrap-wysihtml5.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/bootstrap-editable/inputs-ext/address/address.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
         <!-- BEGIN THEME GLOBAL STYLES -->
         <link href="../assets/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" />
         <link href="../assets/global/css/plugins.min.css" rel="stylesheet" type="text/css" />
         <!-- END THEME GLOBAL STYLES -->
-        <!-- BEGIN THEME LAYOUT STYLES -->
+        <!-- BEGIN THEME LAYOUT STYLES --><link href="../assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
+        <link href="../assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
         <link href="../assets/layouts/layout/css/layout.min.css" rel="stylesheet" type="text/css" />
         <link href="../assets/layouts/layout/css/themes/darkblue.min.css" rel="stylesheet" type="text/css" id="style_color" />
         <link href="../assets/layouts/layout/css/custom.min.css" rel="stylesheet" type="text/css" />
@@ -369,7 +378,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                             <i class="fa fa-cogs"></i><strong>Departure Warehouse Receive Note</strong> </div>
                                         <div class="actions">
                                             <div class="btn-group" style="display:none">
-                                                <a id="qweqwe" class="btn white btn-outline btn-circle" href="#form_delivery" data-toggle="modal" > Departure Warehouse Receive Note
+                                                <a id="qweqwe" class="btn white btn-outline btn-circle" href="#modal_demo_1" data-toggle="modal" > Departure Warehouse Receive Note
                                                 </a>
                                             </div>
                                             <div class="btn-group">
@@ -424,7 +433,7 @@ License: You must have a valid license purchased only from themeforest(the above
                             </div>                          
                         </div>
                         <!-- END CONTENT -->
-                                <div class="modal fade modal-scroll bs-modal-lg in" id="form_delivery" tabindex="-1" role="basic" aria-hidden="true">
+                                <div id="modal_demo_1" class="modal fade modal-scroll bs-modal-lg in" role="dialog" aria-hidden="true">
                             <div class="modal-dialog modal-lg">
                                 <div class="modal-content">
                                     <div class="modal-header" style="background-color: #3598dc">
@@ -527,28 +536,28 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                     <div class="form-group">
                                                                         <label class="control-label col-md-3">Order No</label>
                                                                         <div class="col-md-9">
-                                                                             <select id="single" class="form-control select2">
-                                                        <optgroup label="Order No">
-                                                            <option>Please choose your order</option>
-                                                            <option value="000">00012</option>
-                                                            <option value="001">00114</option>
-                                                            <option value="002">00216</option>
-                                                            <option value="004">00418</option>
-                                                            <option value="006">00624</option>
-                                                            <option value="183">18332</option>
-                                                            <option value="187">18742</option>
-                                                            <option value="197">19745</option>
-                                                            <option value="256">25654</option>
-                                                            <option value="287">28782</option>
-                                                            <option value="348">34829</option>
-                                                            <option value="368">36894</option>
-                                                            <option value="380">38090</option>
-                                                            <option value="426">42679</option>
-                                                            <option value="448">44895</option>
-                                                            <option value="468">46894</option>
-                                                            <option value="489">48939</option>
-                                                            <option value="578">57839</option>
-                                                        </optgroup>                                                     
+                                                                             <select class="form-control select2">
+																				<optgroup label="Order No">
+																					<option>Please choose your order</option>
+																					<option value="000">00012</option>
+																					<option value="001">00114</option>
+																					<option value="002">00216</option>
+																					<option value="004">00418</option>
+																					<option value="006">00624</option>
+																					<option value="183">18332</option>
+																					<option value="187">18742</option>
+																					<option value="197">19745</option>
+																					<option value="256">25654</option>
+																					<option value="287">28782</option>
+																					<option value="348">34829</option>
+																					<option value="368">36894</option>
+																					<option value="380">38090</option>
+																					<option value="426">42679</option>
+																					<option value="448">44895</option>
+																					<option value="468">46894</option>
+																					<option value="489">48939</option>
+																					<option value="578">57839</option>
+																				</optgroup>                                                     
                                                     
                                                                     </div>
                                                                 </div>
@@ -601,9 +610,9 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td>4</td>
                                                         <td>40x40x40</td>
                                                         <td>10kg</td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">4</span></td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">40x40x40</span></td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">9.8kg</span></td>
+                                                        <td><a href="javascript:;" id="totalctn" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                        <td><a href="javascript:;" id="measurement" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                        <td><a href="javascript:;" id="weight" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
                                                         <td>
                                                             <div>
                                                                 <span class="fileinput-new"></span>
@@ -617,9 +626,9 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td>4</td>
                                                         <td>40x40x40</td>
                                                         <td>10kg</td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">4</span></td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">40x40x40</span></td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">9.8kg</span></td>
+                                                        <td><a href="javascript:;" id="totalctn2" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                        <td><a href="javascript:;" id="measurement2" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                        <td><a href="javascript:;" id="weight2" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
                                                         <td>
                                                             <div>
                                                                 <span class="fileinput-new"></span>
@@ -633,9 +642,9 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         <td>4</td>
                                                         <td>40x40x40</td>
                                                         <td>10kg</td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">4</span></td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">40x40x40</span></td>
-                                                        <td data-jstree='{ "type" : "file" }' onclick="show_content();" ><span class="editInPlace">9.8kg</span></td>
+                                                        <td><a href="javascript:;" id="totalctn3" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                        <td><a href="javascript:;" id="measurement3" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                        <td><a href="javascript:;" id="weight3" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
                                                         <td>
                                                             <div>
                                                                 <span class="fileinput-new"></span>
@@ -1346,7 +1355,21 @@ License: You must have a valid license purchased only from themeforest(the above
         <!-- END PAGE LEVEL PLUGINS --> 
         <!-- BEGIN THEME GLOBAL SCRIPTS -->
         <script src="../assets/global/scripts/app.min.js" type="text/javascript"></script>
-
+		<script src="../assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
+        <script src="../assets/pages/scripts/components-select2.min.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-wysihtml5/wysihtml5-0.3.0.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-wysihtml5/bootstrap-wysihtml5.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/moment.min.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/jquery.mockjax.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-editable/inputs-ext/address/address.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-editable/inputs-ext/wysihtml5/wysihtml5.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js" type="text/javascript"></script>
+        <script src="../assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
+		
+        <script src="../assets/pages/scripts/form-editable.js" type="text/javascript"></script>
         <!-- END THEME GLOBAL SCRIPTS -->
         <!-- END PAGE LEVEL SCRIPTS -->
         <!-- BEGIN THEME LAYOUT SCRIPTS -->
@@ -1356,31 +1379,7 @@ License: You must have a valid license purchased only from themeforest(the above
         <script src="../assets/layouts/global/scripts/quick-nav.min.js" type="text/javascript"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.7/js/materialize.min.js"></script>
         <!-- END THEME LAYOUT SCRIPTS -->        
-        <script type="text/javascript">
-            function show_content(){
-                        //alert('hoooo');
-                document.getElementById("without_content").style.display = "none";
-                document.getElementById("with_content").style.display = "";
-                var elements = getElementsByClassName('editInPlace', '*', document);
-               for (var i = 0; i < elements.length; i++) {
-                   elements[i].ondblclick = function() {
-                       this.setAttribute('oldText', this.innerHTML); // not actually required. I use this just in case you want to cancel and set the original text back.
-                       var textBox = document.createElement('INPUT');
-                       textBox.setAttribute('type', 'text');
-                       textBox.value = this.innerHTML;
-                       textBox.onblur = function() {
-                           var newValue = this.value;
-                           this.parentNode.innerHTML = newValue;
-                           //alert("Your new value: \n\n" + newValue);
-                       }
-           
-                       this.innerHTML = '';
-           
-                       this.appendChild(textBox);
-                   }
-               }(i);
-            }
-                    
+        <script type="text/javascript">  
                     
                window.onload = function() {
                    var elements = getElementsByClassName('editInPlace', '*', document);
diff --git a/public/assets/pages/scripts/form-editable.js b/public/assets/pages/scripts/form-editable.js
index 02071aa..e0180cd 100644
--- a/public/assets/pages/scripts/form-editable.js
+++ b/public/assets/pages/scripts/form-editable.js
@@ -107,6 +107,69 @@ var FormEditable = function() {
         $.fn.editable.defaults.url = '/post';
 
         //editables element samples 
+        $('#totalctn').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'totalctn',
+            title: 'Enter Total Ctn'
+        });
+        $('#weight').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'weight',
+            title: 'Enter Weight'
+        });
+        $('#measurement').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'measurement',
+            title: 'Enter measurement'
+        });
+        $('#totalctn2').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'totalctn',
+            title: 'Enter Total Ctn'
+        });
+        $('#weight2').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'weight',
+            title: 'Enter Weight'
+        });
+        $('#measurement2').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'measurement',
+            title: 'Enter measurement'
+        });
+        $('#totalctn3').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'totalctn',
+            title: 'Enter Total Ctn'
+        });
+        $('#weight3').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'weight',
+            title: 'Enter Weight'
+        });
+        $('#measurement3').editable({
+            url: '/post',
+            type: 'text',
+            pk: 1,
+            name: 'measurement',
+            title: 'Enter measurement'
+        });
         $('#username').editable({
             url: '/post',
             type: 'text',