From 6b8ca34ca4c891ad2e9cd6a8b8a55cceb00b34ca Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 30 Jun 2010 18:24:12 +0530
Subject: [PATCH] [IMP] hr_payroll: convert the wizard of
 hr_payroll_year_salary into osv_memory

bzr revid: sbh@tinyerp.com-20100630125412-7gqx7s7x5wxegcc2
---
 addons/hr_payroll/__openerp__.py              |  1 +
 .../hr_payroll/report/report_year_salary.py   |  2 +-
 addons/hr_payroll/wizard/__init__.py          |  2 +-
 .../wizard/hr_payroll_create_analytic.xml     |  2 +-
 .../wizard/hr_payroll_employees_detail.xml    |  4 +-
 ...ar_salary.py => hr_payroll_year_salary.py} |  0
 .../wizard/hr_payroll_year_salary.xml         | 44 +++++++++++++++++++
 7 files changed, 50 insertions(+), 5 deletions(-)
 rename addons/hr_payroll/wizard/{wizard_year_salary.py => hr_payroll_year_salary.py} (100%)
 create mode 100644 addons/hr_payroll/wizard/hr_payroll_year_salary.xml

diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 07ba77306f0..f8693fb9587 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -52,6 +52,7 @@
         'hr_payroll_data.xml',
         '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/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index 1866ef795b6..66cf05db601 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -64,7 +64,7 @@ class year_salary_report(rml_parse.rml_parse):
         periods = []
         tol_mnths=['Total',0,0,0,0,0,0,0,0,0,0,0,0]     
         emp = pooler.get_pool(self.cr.dbname).get('hr.employee')     
-        emp_ids = form['employee_ids'][0][2]
+        emp_ids = form['employee_ids']
         empll  = emp.browse(self.cr,self.uid, emp_ids)
         fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear_id'])
         period_ids_l = fiscalyear_obj.period_ids
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
index 0918085e334..3f80055c621 100755
--- a/addons/hr_payroll/wizard/__init__.py
+++ b/addons/hr_payroll/wizard/__init__.py
@@ -1,3 +1,3 @@
 import hr_payroll_employees_detail
-import wizard_employees_detail
 import hr_payroll_create_analytic
+import hr_payroll_year_salary
diff --git a/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml b/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml
index 88a3746e272..927ae3e408c 100644
--- a/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml
@@ -27,7 +27,7 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+       <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
        <!-- <menuitem  id="menu_wizard_payroll_analysis" 
             action="action_view_hr_payroll_create" 
             parent="payroll_configure" 
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
index aed2e1f377b..ca43d8dfe7e 100644
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
@@ -14,7 +14,7 @@
 			    	<newline/>
 					<button icon='gtk-cancel' special="cancel" 
 	        			string="Close" />
-	 						<button name="print_report" string="Print Report"
+	 				<button name="print_report" string="Print Report"
 	        			 type="object" icon="gtk-print" />
 	        		</group>		 				    	 
                 </form>
@@ -29,7 +29,7 @@
             <field name="target">new</field>
         </record>
 	
-	<menuitem id="action_hr_payroll_employees_detail1" 
+	<menuitem id="action_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/wizard_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
similarity index 100%
rename from addons/hr_payroll/wizard/wizard_year_salary.py
rename to addons/hr_payroll/wizard/hr_payroll_year_salary.py
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.xml b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
new file mode 100644
index 00000000000..b533fac738c
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        		
+		<record id="view_hr_payroll_employees_detail" model="ir.ui.view">
+            <field name="name">Salary Register</field>
+            <field name="model">hr.payroll.year.salary</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			   <form string="Year Salary">
+			   <group col="4" colspan="4"  width="600">
+			    <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"/>
+			    <newline/>
+				<button icon='gtk-cancel' special="cancel" 
+	        			string="Close" />
+				<button name="print_report" string="Print Report"
+	        			 type="object" icon="gtk-print" />
+				</group>	        			 
+			</form>
+            </field>
+        </record>
+        <record id="action_hr_payroll_employees_detail" 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>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+	
+        <menuitem  id="menu_wizard_print_year_salary1"
+            icon="STOCK_PRINT"
+            action="action_hr_payroll_employees_detail"  
+            parent="menu_hr_payroll_reporting" 
+            name="Salary Register"
+           />
+
+</data>
+</openerp>