diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 9a5ff2187e2..1d83902d36e 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -39,7 +39,8 @@
         'hr',
         'hr_contract', 
         'hr_holidays',
-        'hr_expense'
+        'hr_expense',
+        'account'
     ],
     'init_xml': [
     ],
@@ -52,6 +53,7 @@
         'hr_payroll_wizard.xml'
     ],
     'demo_xml': [
+        'hr_payroll_demo.xml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index ee24bc3cd21..c8687df870e 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1153,27 +1153,6 @@ class hr_payslip_line(osv.osv):
     _name = 'hr.payslip.line'
     _description = 'Payslip Line'
     
-#    def _calculate(self, cr, uid, ids, field_names, arg, context):
-#        res = {}
-#        obj = {}
-#        for line in self.browse(cr, uid, ids, context):
-#            obj['basic'] = line.slip_id.basic
-#            amount = 0.0
-#            
-#            if line.amount_type == 'per' and line.base:
-#                print 'XXXXXXXXXXXXXXXX : ', obj
-#                amount = line.amount * eval(line.base, obj)
-#            elif line.amount_type in ('fix', 'func'):
-#                amount = line.amount
-
-#            cd = line.category_id.code.lower()
-#            obj[cd] = amount
-#            print 'XXXXXXXXXXXXXXXXXX : ', cd
-#            
-#            res[line.id] = amount
-#        print 'XXXXXXXXXXXX : ', obj
-#        return res
-
     def onchange_category(self, cr, uid, ids, category_id):
         seq = 0
         res = {
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index 80a66722efc..0a6e0f1afbb 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="HRA" model="hr.allounce.deduction.categoty">
+        <!-- Wages Type-->
+        <record model="hr.contract.wage.type" id="wage_basic">
+            <field name="name">Monthly Basic Wage</field>
+            <field name="period_id" ref="hr_contract.hr_contract_wage_type_period_monthly"/>
+            <field name="type">basic</field>
+            <field name="factor_type">1.80</field>
+        </record>
+        
+        <!-- Payroll Heads -->
+        <record id="hra" model="hr.allounce.deduction.categoty">
             <field name="code">HRA</field>
             <field name="type">allowance</field>
             <field name="name">House Rant Allowance</field>
@@ -108,5 +117,6 @@
             <field name="type">allowance</field>
             <field name="name">Other Taxable Allowance</field>
         </record>
+        
     </data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
new file mode 100644
index 00000000000..97651f9f14b
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Payroll Structure -->
+        <record id="structure_001" model="hr.payroll.structure">
+            <field name="code">ME</field>
+            <field name="name">Marketing Executive</field>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+        <record id="hr_payslip_line_houserantallowance1" model="hr.payslip.line">
+            <field name="amount_type">per</field>
+            <field name="account_id" ref="account.a_expense"/>
+            <field eval="5" name="sequence"/>
+            <field eval="0.4" name="amount"/>
+            <field name="code">HRA</field>
+            <field name="category_id" ref="hr_payroll.hra"/>
+            <field name="type">allowance</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">House Rant Allowance</field>
+        </record>
+        <record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
+            <field name="amount_type">fix</field>
+            <field name="account_id" ref="account.a_expense"/>
+            <field eval="10" name="sequence"/>
+            <field eval="800.0" name="amount"/>
+            <field name="code">CA</field>
+            <field name="category_id" ref="hr_payroll.CA"/>
+            <field name="type">allowance</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">Convance Allowance</field>
+        </record>
+        <record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
+            <field name="amount_type">fix</field>
+            <field name="account_id" ref="account.a_pay"/>
+            <field eval="15" name="sequence"/>
+            <field eval="200.0" name="amount"/>
+            <field name="code">PT</field>
+            <field name="category_id" ref="hr_payroll.PT"/>
+            <field name="type">deduction</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">Professional Tax</field>
+        </record>
+        <record id="hr_payslip_line_providentfund1" model="hr.payslip.line">
+            <field name="amount_type">per</field>
+            <field name="account_id" ref="account.a_pay"/>
+            <field eval="20" name="sequence"/>
+            <field eval="0.125" name="amount"/>
+            <field name="code">PF</field>
+            <field name="category_id" ref="hr_payroll.PF"/>
+            <field name="type">deduction</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">Provident Fund</field>
+        </record>
+        
+        <!-- Employee -->
+        <record id="hr_employee_bonamy0" model="hr.employee">
+            <field eval="0" name="manager"/>
+            <field eval="1.0" name="time_efficiency"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="1" name="active"/>
+            <field name="name">Bonamy</field>
+            <field name="resource_type">user</field>
+        </record>
+        
+        <!-- Employee Contract -->
+        <record id="hr_contract_firstcontract1" model="hr.contract">
+            <field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
+            <field name="name">First Contract</field>
+            <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+            <field name="struct_id" ref="hr_payroll.structure_001"/>
+            <field name="employee_id" ref="hr_employee_bonamy0"/>
+            <field name="notes">This is a First Contract</field>
+            <field eval="4000.0" name="wage"/>
+            <field eval="5" name="working_days_per_week"/>
+        </record>
+        
+        <!-- Payslip -->
+        <record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
+            <field name="number">SLIP/001</field>
+            <field name="journal_id" ref="account.expenses_journal"/>
+            <field name="deg_id" ref="hr_payroll.structure_001"/>
+            <field name="employee_id" ref="hr_employee_bonamy0"/>
+            <field name="contract_id" ref="hr_contract_firstcontract1"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-5'"/>
+            <field name="bank_journal_id" ref="account.bank_journal"/>
+            <field name="name">Salary Slip of Bonamy for June-2010</field>
+        </record>
+        
+    </data>
+</openerp>