diff --git a/app/assets/javascripts/app/view/master/HomeList.js b/app/assets/javascripts/app/view/master/HomeList.js
diff --git a/app/assets/javascripts/app/view/master/HomeType.js b/app/assets/javascripts/app/view/master/HomeType.js
diff --git a/app/assets/javascripts/app/view/master/cashbankadjustment/ConfirmForm.js b/app/assets/javascripts/app/view/master/cashbankadjustment/ConfirmForm.js
diff --git a/app/assets/javascripts/app/view/master/cashbankadjustment/Form.js b/app/assets/javascripts/app/view/master/cashbankadjustment/Form.js
diff --git a/app/assets/javascripts/app/view/master/cashbankadjustment/List.js b/app/assets/javascripts/app/view/master/cashbankadjustment/List.js
diff --git a/app/assets/javascripts/app/view/master/cashbankadjustment/UnconfirmForm.js b/app/assets/javascripts/app/view/master/cashbankadjustment/UnconfirmForm.js
diff --git a/app/assets/javascripts/app/view/master/cashbankmutation/ConfirmForm.js b/app/assets/javascripts/app/view/master/cashbankmutation/ConfirmForm.js
diff --git a/app/assets/javascripts/app/view/master/cashbankmutation/Form.js b/app/assets/javascripts/app/view/master/cashbankmutation/Form.js
diff --git a/app/assets/javascripts/app/view/master/cashbankmutation/List.js b/app/assets/javascripts/app/view/master/cashbankmutation/List.js
diff --git a/app/assets/javascripts/app/view/master/cashbankmutation/UnconfirmForm.js b/app/assets/javascripts/app/view/master/cashbankmutation/UnconfirmForm.js
diff --git a/app/assets/javascripts/app/view/master/employee/Form.js b/app/assets/javascripts/app/view/master/employee/Form.js
@@ -4,109 +4,111 @@ Ext.define('AM.view.master.employee.Form', {
 
   title : 'Add / Edit Employee',
   layout: 'fit',
-	width	: 960, 
+	width	: 500,
   autoShow: true,  // does it need to be called?
 	modal : true, 
-	height : 500,
 // win.show() 
 // if autoShow == true.. on instantiation, will automatically be called 
 
-	employeeInfo : function(){
-				var entityInfo = {
-					xtype : 'fieldset',
-					title : "Info Pegawai",
-					flex : 1 , 
-					border : true, 
-					labelWidth: 60,
-					defaultType : 'field',
-					width : '90%',
-					defaults : {
-						anchor : '-10'
-					},
-					items : [
-						{
-							xtype: 'hidden',
-							fieldLabel: 'id',
-							name: 'id' 
-						},
-						{
-							xtype: 'textfield',
-							fieldLabel : 'Name Pegawai',
-							name : 'name'
-						},
-						{
-							xtype: 'textfield',
-							fieldLabel : 'Contact No',
-							name : 'contact_no' 
-						},
-						{
-							xtype: 'textfield',
-							fieldLabel : 'Email',
-							name : 'email' 
-						},
-						{
-							xtype: 'textarea',
-							fieldLabel : 'Alamat',
-							name : 'address' 
-						}, 
-						{
-							xtype: 'textarea',
-							fieldLabel : 'Deskripsi',
-							name : 'description' 
-						}, 
-
+  initComponent: function() {
 
-					]
-				};
+		var remoteJsonStore = Ext.create(Ext.data.JsonStore, {
+			storeId : 'role_search',
+			fields	: [
+	 				{
+						name : 'role_name',
+						mapping : "name"
+					},
+					{
+						name : 'role_id',
+						mapping : 'id'
+					}
+			],
+			proxy  	: {
+				type : 'ajax',
+				url : 'api/search_role',
+				reader : {
+					type : 'json',
+					root : 'records', 
+					totalProperty  : 'total'
+				}
+			},
+			autoLoad : false 
+		});
+
+    this.items = [{
+      xtype: 'form',
+			msgTarget	: 'side',
+			border: false,
+      bodyPadding: 10,
+			fieldDefaults: {
+          labelWidth: 165,
+					anchor: '100%'
+      },
+      items: [
+				{
+	        xtype: 'hidden',
+	        name : 'id',
+	        fieldLabel: 'id'
+	      },{
+	        xtype: 'textfield',
+	        name : 'name',
+	        fieldLabel: ' Name'
+	      },{
+					xtype: 'textfield',
+					name : 'id_number',
+					fieldLabel: 'Nomor ID'
+				},
+				{
+					xtype: 'textarea',
+					name : 'address',
+					fieldLabel: 'Alamat'
+				},
 
+				{
+					xtype: 'numberfield',
+					name : 'rt',
+					fieldLabel: 'RT'
+				},
 
+				{
+					xtype: 'numberfield',
+					name : 'rw',
+					fieldLabel: 'RW'
+				},
 
-
+				{
+					xtype: 'textfield',
+					name : 'village',
+					fieldLabel: 'Kelurahan'
+				},
 
-				var container = {
-					xtype : 'container',
-					layoutConfig: {
-						align :'stretch'
-					},
-					flex: 1, 
-					width : 500,
-					layout : 'vbox',
-					items : [
-						entityInfo 
-					]
-				};
 
-				return container; 
-	},
-
-
-
-  initComponent: function() {
-
-
-
-		var me = this; 
-
-	    this.items = [{
-	      xtype: 'form',
-				msgTarget	: 'side',
-				border: false,
-	      bodyPadding: 10,
-				fieldDefaults: {
-	          labelWidth: 100,
-						anchor: '100%'
-	      },
-				height : 350,
-				overflowY : 'auto', 
-				layout : 'hbox', 
-				// height : 400,
-				items : [
-					me.employeeInfo(), 
-				]
-	    }];
-
-
-
+				{
+					xtype: 'textfield',
+					name : 'id_card_number',
+					fieldLabel: 'KTP'
+				},
+
+
+
+				{
+					xtype: 'datefield',
+					name : 'birthday_date',
+					fieldLabel: 'Ulang Tahun',
+					format: 'Y-m-d',
+				},
+
+
+
+
+				{
+					fieldLabel : 'Data Lengkap?',
+					name : 'is_data_complete',
+					xtype : 'checkbox'
+				},
+			]
+    }];
 
     this.buttons = [{
       text: 'Save',
@@ -120,15 +122,21 @@ Ext.define('AM.view.master.employee.Form', {
     this.callParent(arguments);
   },
 
-	setSelectedContactGroup: function( contact_group_id ){
-
-	},
-
 	setComboBoxData : function( record){
-		var me = this; 
-		me.setLoading(true);
-
-		// me.setSelectedContactGroup( record.get("contact_group_id")  ) ;
+		// console.log("Inside the Form.. edit.. setComboBox data");
+		// var role_id = record.get("role_id");
+		// var comboBox = this.down('form').getForm().findField('role_id'); 
+		// var me = this; 
+		// var store = comboBox.store; 
+		// store.load({
+		// 	params: {
+		// 		selected_id : role_id 
+		// 	},
+		// 	callback : function(records, options, success){
+		// 		me.setLoading(false);
+		// 		comboBox.setValue( role_id );
+		// 	}
+		// });
 	}
 });
 
diff --git a/app/assets/javascripts/app/view/master/employee/List.js b/app/assets/javascripts/app/view/master/employee/List.js
@@ -24,18 +24,18 @@ Ext.define('AM.view.master.employee.List' ,{
 		];
 
 		this.addObjectButton = new Ext.Button({
-			text: 'Add ',
+			text: 'Add',
 			action: 'addObject'
 		});
 
 		this.editObjectButton = new Ext.Button({
-			text: 'Edit ',
+			text: 'Edit',
 			action: 'editObject',
 			disabled: true
 		});
 
 		this.deleteObjectButton = new Ext.Button({
-			text: 'Delete ',
+			text: 'Delete',
 			action: 'deleteObject',
 			disabled: true
 		});
@@ -47,15 +47,42 @@ Ext.define('AM.view.master.employee.List' ,{
 			emptyText : "Search",
 			checkChangeBuffer: 300
 		});
+
+		this.markAsDeceasedObjectButton = new Ext.Button({
+			text: 'Deceased',
+			action: 'markasdeceasedObject',
+			disabled: true
+		});
+
+		this.unmarkAsDeceasedObjectButton = new Ext.Button({
+			text: 'Cancel Deceased',
+			action: 'unmarkasdeceasedObject',
+			disabled: true,
+			hidden :true 
+		});
+
+		this.markAsRunAwayObjectButton = new Ext.Button({
+			text: 'Run Away',
+			action: 'markasrunawayObject',
+			disabled: true
+		});
 
 
 
-		this.tbar = [this.addObjectButton, this.editObjectButton, this.deleteObjectButton, this.searchField ];
+		this.tbar = [this.addObjectButton, this.editObjectButton, this.deleteObjectButton ,
+		 				'-',
+						this.searchField,
+						'->',
+						this.markAsDeceasedObjectButton,
+						this.unmarkAsDeceasedObjectButton,
+						this.markAsRunAwayObjectButton
+
+		];
 		this.bbar = Ext.create("Ext.PagingToolbar", {
 			store	: this.store, 
 			displayInfo: true,
-			displayMsg: 'Displaying  {0} - {1} of {2}',
-			emptyMsg: "N/Ay" 
+			displayMsg: 'Displaying topics {0} - {1} of {2}',
+			emptyMsg: "No topics to display" 
 		});
 
 		this.callParent(arguments);
@@ -70,10 +97,43 @@ Ext.define('AM.view.master.employee.List' ,{
 	enableRecordButtons: function() {
 		this.editObjectButton.enable();
 		this.deleteObjectButton.enable();
+
+
+		this.markAsRunAwayObjectButton.enable();
+
+		this.unmarkAsDeceasedObjectButton.enable();
+		this.markAsDeceasedObjectButton.enable();
+
+
+
+		selectedObject = this.getSelectedObject();
+
+		if( selectedObject && selectedObject.get("is_deceased") == true ){
+			this.unmarkAsDeceasedObjectButton.show();
+			this.markAsDeceasedObjectButton.hide();
+		}else{
+			this.unmarkAsDeceasedObjectButton.hide();
+			this.markAsDeceasedObjectButton.show();
+		}
+
+
 	},
 
 	disableRecordButtons: function() {
 		this.editObjectButton.disable();
 		this.deleteObjectButton.disable();
+		this.markAsDeceasedObjectButton.disable();
+		this.unmarkAsDeceasedObjectButton.disable();
+		this.markAsRunAwayObjectButton.disable();
+
+		selectedObject = this.getSelectedObject();
+
+		if( selectedObject && selectedObject.get("is_deceased") == true ){
+			this.unmarkAsDeceasedObjectButton.show();
+			this.markAsDeceasedObjectButton.hide();
+		}else{
+			this.unmarkAsDeceasedObjectButton.hide();
+			this.markAsDeceasedObjectButton.show();
+		}
 	}
 });
diff --git a/app/assets/javascripts/app/view/operation/CashBankAdjustment.js b/app/assets/javascripts/app/view/operation/CashBankAdjustment.js
diff --git a/app/assets/javascripts/app/view/operation/CashBankMutation.js b/app/assets/javascripts/app/view/operation/CashBankMutation.js
diff --git a/app/assets/javascripts/app/view/operation/DeliveryOrder.js b/app/assets/javascripts/app/view/operation/DeliveryOrder.js
diff --git a/app/assets/javascripts/app/view/operation/Invoice.js b/app/assets/javascripts/app/view/operation/Invoice.js
diff --git a/app/assets/javascripts/app/view/operation/PaymentRequest.js b/app/assets/javascripts/app/view/operation/PaymentRequest.js
diff --git a/app/assets/javascripts/app/view/operation/PaymentVoucher.js b/app/assets/javascripts/app/view/operation/PaymentVoucher.js
diff --git a/app/assets/javascripts/app/view/operation/ReceiptVoucher.js b/app/assets/javascripts/app/view/operation/ReceiptVoucher.js
diff --git a/app/assets/javascripts/app/view/operation/SalesInvoice.js b/app/assets/javascripts/app/view/operation/SalesInvoice.js
diff --git a/app/assets/javascripts/app/view/operation/SalesOrder.js b/app/assets/javascripts/app/view/operation/SalesOrder.js
@@ -20,7 +20,7 @@ Ext.define('AM.view.operation.SalesOrder', {
 			},
 			{
 				xtype :'salesorderdetaillist',
-				// html : "This is gonna be the detail",
+				// html : "This is gonna be the price_rule",
 				flex : 1
 			} 
 		],

diff --git a/app/assets/javascripts/app/view/operation/StockAdjustment.js b/app/assets/javascripts/app/view/operation/StockAdjustment.js
diff --git a/app/assets/javascripts/app/view/operation/WarehouseMutation.js b/app/assets/javascripts/app/view/operation/WarehouseMutation.js
diff --git a/app/assets/javascripts/app/view/operation/cashbankadjustment/Form.js b/app/assets/javascripts/app/view/operation/cashbankadjustment/Form.js
diff --git a/app/assets/javascripts/app/view/operation/cashbankadjustment/List.js b/app/assets/javascripts/app/view/operation/cashbankadjustment/List.js
diff --git a/app/assets/javascripts/app/view/operation/cashbankadjustment/UnconfirmForm.js b/app/assets/javascripts/app/view/operation/cashbankadjustment/UnconfirmForm.js
diff --git a/app/assets/javascripts/app/view/operation/cashbankmutation/ConfirmForm.js b/app/assets/javascripts/app/view/operation/cashbankmutation/ConfirmForm.js
diff --git a/app/assets/javascripts/app/view/operation/cashbankmutation/Form.js b/app/assets/javascripts/app/view/operation/cashbankmutation/Form.js
diff --git a/app/assets/javascripts/app/view/operation/cashbankmutation/List.js b/app/assets/javascripts/app/view/operation/cashbankmutation/List.js
diff --git a/app/assets/javascripts/app/view/operation/deliveryorder/Form.js b/app/assets/javascripts/app/view/operation/deliveryorder/Form.js
diff --git a/app/assets/javascripts/app/view/operation/deliveryorder/List.js b/app/assets/javascripts/app/view/operation/deliveryorder/List.js
diff --git a/app/assets/javascripts/app/view/operation/deliveryorderdetail/Form.js b/app/assets/javascripts/app/view/operation/deliveryorderdetail/Form.js
diff --git a/app/assets/javascripts/app/view/operation/deliveryorderdetail/List.js b/app/assets/javascripts/app/view/operation/deliveryorderdetail/List.js
diff --git a/app/assets/javascripts/app/view/operation/invoice/List.js b/app/assets/javascripts/app/view/operation/invoice/List.js
diff --git a/app/assets/javascripts/app/view/operation/paymentrequest/ConfirmForm.js b/app/assets/javascripts/app/view/operation/paymentrequest/ConfirmForm.js