diff --git a/addons/hr_contract/__init__.py b/addons/hr_contract/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
old mode 100644
new mode 100755
index d47b3b687cb..29678612e34
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -42,6 +42,7 @@
         'hr_contract_view.xml'
     ],
     'demo_xml': [],
+    'test': ['test/test_hr_contract.yml'],
     'installable': True,
     'active': False,
     'certificate': '0046298028637',
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
old mode 100644
new mode 100755
index 9951a9e3982..66e1fba946a
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -142,13 +142,12 @@
                    <group col='15' colspan='4'>
                    		<field name="name"/>
                       	<field name="employee_id"/>
-                      	<field name="department_id"/>
                        	<field name="date_start"/>
                        	<field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Contract Type" icon="terp-project" domain="[]" context="{'group_by':'type_id'}"/>
                     </group>
                </search>
             </field>
@@ -203,6 +202,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="working_hours"/>
+                    <field name="type_id"/>
                     <field name="wage_type_id"/>
                     <field name="wage"/>
                 </tree>
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
old mode 100644
new mode 100755
diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml
new file mode 100644
index 00000000000..87c44722e2c
--- /dev/null
+++ b/addons/hr_contract/test/test_hr_contract.yml
@@ -0,0 +1,46 @@
+- |
+  In order to test hr_contract module in OpenERP,   
+  I will create contract for "Mark Johnson" employee.
+  
+- |
+  First I create Employee "Mark Johnson" 
+-
+  !record {model: hr.employee, id: hr_employee_employee0}:
+    address_home_id: base.res_partner_address_1
+    company_id: base.main_company
+    gender: male
+    name: Mark Johnson
+    user_id: base.user_root
+    
+- |
+  Given that I have Contract wage period "monthly" and 
+  specify "hours in period" is "176.00"
+- 
+  !record {model: hr.contract.wage.type.period, id: hr_contract_wage_type_period_monthly0}:
+    factor_days: 178.0
+    name: monthly
+- |
+  Given that I have Contract wage type "Monthly Gross Wage". 
+  select wage period "monthly" and type "Gross". with hour cost "1.9" 
+- 
+  !record {model: hr.contract.wage.type, id: hr_contract_wage_type_monthlygrosswage0}:
+    factor_type: 1.9
+    name: Monthly Gross Wage
+    period_id: 'hr_contract_wage_type_period_monthly0'
+    type: gross
+       
+- |
+  Now I start by create contract for "Mark Johnson".
+  Select wage type "Monthly Gross Wage" and Wage period "monthly" 
+  which I have given.
+- 
+  !record {model: hr.contract, id: hr_contract_contract0}:
+    advantages_gross: 0.0
+    employee_id: 'hr_employee_employee0'
+    advantages_net: 0.0
+    date_end: '2011-05-18'
+    date_start: '2010-05-18'
+    name: contract1
+    wage: 1.0
+    wage_type_id: hr_contract_wage_type_monthlygrosswage0
+    working_hours: resource.timesheet_group1