diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index f8693fb9587..da1a4a0bed6 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -53,7 +53,7 @@
         'wizard/hr_payroll_create_analytic.xml',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
-        'hr_payroll_wizard.xml'
+   
     ],
     'demo_xml': [
     ],
diff --git a/addons/hr_payroll/wizard/hr_payroll_create_analytic.py b/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
index bd368080565..380a812603f 100644
--- a/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
+++ b/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
@@ -24,7 +24,7 @@ import time
 from osv import fields, osv
 from tools.translate import _
 
-class hr_payroll_create_analytic(osv.osv):
+class hr_payroll_create_analytic(osv.osv_memory):
    _name = "hr.payroll.create.analytic"
    _columns = {
         'company_id': fields.many2one('res.company', 'Company'),
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
index c780ce03e8c..8ec5a6aa766 100755
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
@@ -24,8 +24,8 @@ import time
 from osv import fields, osv
 from tools.translate import _
 
-class hr_payroll_employees_detail(osv.osv):
-   _name = "hr.payroll.employees.detail"
+class hr_payroll_employees_detail(osv.osv_memory):
+   _name ='hr.payroll.employees.detail'
    _columns = {
         'employee_ids': fields.many2many('hr.employee', 'payroll_emp_rel','payroll_id','emp_id', 'Employees',required=True),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)        
@@ -55,7 +55,6 @@ class hr_payroll_employees_detail(osv.osv):
         res = self.read(cr, uid, ids, ['employee_ids', 'fiscalyear_id'], context)
         res = res and res[0] or {}
         datas['form'] = res
-        datas['form']['fiscalyear_id']=res['fiscalyear_id'][0]
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'employees.salary',
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
index ca43d8dfe7e..7d6312e7691 100644
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Year Salary">
-                   <group col="4" colspan="4"  width="500">
+                <group height="260" width="460">
 			    	<field name="fiscalyear_id"/>
 			    	<newline/>
-			    	<field name="employee_ids" colspan="2"/>
+			    	<field name="employee_ids" />
 			    	<newline/>
 					<button icon='gtk-cancel' special="cancel" 
 	        			string="Close" />
 	 				<button name="print_report" string="Print Report"
 	        			 type="object" icon="gtk-print" />
-	        		</group>		 				    	 
+					</group>	        			 
                 </form>
             </field>
         </record>
@@ -29,7 +29,7 @@
             <field name="target">new</field>
         </record>
 	
-	<menuitem id="action_hr_payroll_employees_detail" 
+	<menuitem id="menu_hr_payroll_employees_detail" 
             icon="STOCK_PRINT"
             action="action_hr_payroll_employees_detail" 
             parent="menu_hr_payroll_reporting" 
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
index efab1695ba1..4a5f212e56c 100755
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
@@ -1,69 +1,69 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import wizard
-import datetime
-import pooler
 import time
-import netsvc
 
-form='''<?xml version="1.0"?>
-<form string="Year Salary">
-    <field name="fiscalyear_id" select="1" colspan="2"/>
-    <newline/>
-    <field name="employee_ids" colspan="2"/>
-    <newline/>
-    <separator string="Salary Deposit Date Option?" colspan="2"/>
-    <newline/>
-    <field name="salary_on"/>
-</form>'''
-fields = {    
-    'fiscalyear_id':{'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True },
-    'employee_ids':{'string':'Employees', 'type':'many2many','relation':'hr.employee','required':True},
-    'salary_on':{
-        'string':"Salary On",
-        'type':'selection',
-        'selection':[('current_month','Current Month Date'),('next_month','Next Month Date')],
-        'default': lambda *a:'current_month'
-    },
-       }
+from osv import fields, osv
+from tools.translate import _
 
-class wizard_print(wizard.interface):
-    def _get_defaults(self, cr, uid, data, context={}):
-        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-        data['form']['fiscalyear_id'] = fiscalyear_obj.find(cr, uid)
-        return data['form']
+class hr_payroll_year_salary(osv.osv_memory):
+   _name = "hr.payroll.year.salary"
+   _columns = {
+        'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel','payroll_year_id','emp_id', 'Employees',required=True),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)  ,
+        'salary_on': fields.selection([('current_month','Current Month Date'),('next_month','Next Month Date')],'Salary On'),   
+       } 
 
-    states={
-        'init':{
-            'actions':[_get_defaults],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report':{
-            'actions':[],
-            'result':{'type':'print', 'report':'year.salary', 'state':'end'}
-        }
+   def _get_defaults(self, cr, uid, ids, context={}):
+        fiscal_ids=self.pool.get('account.fiscalyear').search(cr,uid,[])
+        if fiscal_ids:
+            return fiscal_ids[0]
+        return False
+   
+   _defaults = {
+        'fiscalyear_id':_get_defaults,
+        'salary_on': lambda *a:'current_month'
     }
-wizard_print('wizard.year.salary')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+   def print_report(self, cr, uid, ids, context={}):
+        """
+         To get the date and print the report
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return : return report
+        """
 
+        datas = {'ids': context.get('active_ids', [])}
+        
+        res = self.read(cr, uid, ids, ['employee_ids', 'fiscalyear_id','salary_on'], context)
+        res = res and res[0] or {}
+        datas['form'] = res
+#        datas['form']['fiscalyear_id']=res['fiscalyear_id'][0]
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'year.salary',
+            'datas': datas,
+            'nodestroy':True,
+       }
+   
+hr_payroll_year_salary()
\ No newline at end of file
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.xml b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
index b533fac738c..092fe0303cb 100644
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>        		
-		<record id="view_hr_payroll_employees_detail" model="ir.ui.view">
+		<record id="view_hr_payroll_year_salary" model="ir.ui.view">
             <field name="name">Salary Register</field>
             <field name="model">hr.payroll.year.salary</field>
             <field name="type">form</field>
@@ -24,7 +24,7 @@
 			</form>
             </field>
         </record>
-        <record id="action_hr_payroll_employees_detail" model="ir.actions.act_window">
+        <record id="action_hr_payroll_year_salary" model="ir.actions.act_window">
             <field name="name">Salary Register</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.payroll.year.salary</field>
@@ -33,9 +33,9 @@
             <field name="target">new</field>
         </record>
 	
-        <menuitem  id="menu_wizard_print_year_salary1"
+        <menuitem  id="menu_wizard_print_year_salary"
             icon="STOCK_PRINT"
-            action="action_hr_payroll_employees_detail"  
+            action="action_hr_payroll_year_salary"  
             parent="menu_hr_payroll_reporting" 
             name="Salary Register"
            />