From 46cf36457483bc106c8d52d27ce5629e2bd204f8 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 3 May 2011 18:08:07 +0530
Subject: [PATCH] [IMP] rename the class and changed the view accourdingly

bzr revid: psi@tinyerp.co.in-20110503123807-ptgnp6gejy045fai
---
 addons/hr_payroll/__openerp__.py              |  2 +-
 addons/hr_payroll/hr_payroll.py               |  8 +++---
 addons/hr_payroll/hr_payroll_view.xml         | 26 +++++++++----------
 .../hr_payroll/security/ir.model.access.csv   |  2 +-
 addons/hr_payroll/wizard/__init__.py          |  2 +-
 ...py => hr_payroll_payslips_by_employees.py} | 12 ++++-----
 ...l => hr_payroll_payslips_by_employees.xml} | 18 ++++++-------
 7 files changed, 35 insertions(+), 35 deletions(-)
 rename addons/hr_payroll/wizard/{hr_payroll_payslips_by_category.py => hr_payroll_payslips_by_employees.py} (92%)
 rename addons/hr_payroll/wizard/{hr_payroll_payslips_by_category.xml => hr_payroll_payslips_by_employees.xml} (62%)

diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 67c36e3ece5..44c0fb93506 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -49,7 +49,7 @@ Generic Payroll system.
     ],
     'update_xml': [
         'security/hr_security.xml',
-        'wizard/hr_payroll_payslips_by_category.xml',
+        'wizard/hr_payroll_payslips_by_employees.xml',
         'hr_payroll_view.xml',
         'hr_payroll_workflow.xml',
         'hr_payroll_sequence.xml',
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index c631b9ba009..579e937fcb1 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -204,14 +204,14 @@ class one2many_mod2(fields.one2many):
             res[r[self._fields_id]].append( r['id'] )
         return res
 
-class hr_payslip_groups(osv.osv):
+class hr_payslip_run(osv.osv):
 
-    _name = 'hr.payslip.groups'
+    _name = 'hr.payslip.run'
     _columns = {
         'name':fields.char('Name', size=256, required=True),
         'slip_ids':fields.one2many('hr.payslip', 'payslip_group_id', 'Payslips', required=False, readonly=True),
     }
-hr_payslip_groups()
+hr_payslip_run()
 
 class hr_payslip(osv.osv):
     '''
@@ -265,7 +265,7 @@ class hr_payslip(osv.osv):
         'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'details_by_salary_head': fields.function(_get_lines_salary_head, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'),
         'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
-        'payslip_group_id': fields.many2one('hr.payslip.groups', 'Payslip Group', readonly=True, states={'draft': [('readonly', False)]}),
+        'payslip_group_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
     }
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-01'),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 25c416174a1..efeec2a9d6d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -249,12 +249,12 @@
                                 </tree>
                                 <form string="Payslip Line">
                                     <group>
-	                                    <field name="name" select="1"/>
-	                                    <field name="code" select="1"/>
-	                                    <field name="category_id"/>
-	                                    <field name="sequence" groups="base.group_extended"/>
-	                                    <field name="total"/>
-	                                    <field name="salary_rule_id" groups="base.group_extended"/>
+                                        <field name="name" select="1"/>
+                                        <field name="code" select="1"/>
+                                        <field name="category_id"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="total"/>
+                                        <field name="salary_rule_id" groups="base.group_extended"/>
                                     </group>
                                 </form>
                             </field>
@@ -587,7 +587,7 @@
 
     <record id="hr_payslip_category_filter" model="ir.ui.view">
         <field name="name">hr.payslip.category.search</field>
-        <field name="model">hr.payslip.groups</field>
+        <field name="model">hr.payslip.run</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Payslips Group">
@@ -598,10 +598,10 @@
 
     <record id="hr_payslip_category_tree" model="ir.ui.view">
         <field name="name">hr.payslip.category.tree</field>
-        <field name="model">hr.payslip.groups</field>
+        <field name="model">hr.payslip.run</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Payslips Group">
+            <tree string="Payslips Run">
                 <field name="name"/>
             </tree>
         </field>
@@ -609,10 +609,10 @@
 
     <record id="hr_payslip_category_form" model="ir.ui.view">
         <field name="name">hr.payslip.category.form</field>
-        <field name="model">hr.payslip.groups</field>
+        <field name="model">hr.payslip.run</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Payslips Group">
+            <form string="Payslips Run">
                 <group col="6" colspan="6">
                     <field name="name"/>
                 </group>
@@ -621,14 +621,14 @@
                         <field name="slip_ids" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
-                <button name="%(action_hr_payslip_by_category)d" type="action" icon="terp-stock_effects-object-colorize" string="Generate Payslips" />
+                <button name="%(action_hr_payslip_by_employees)d" type="action" icon="terp-stock_effects-object-colorize" string="Generate Payslips" />
             </form>
         </field>
     </record>
 
     <record id="action_hr_payslip_category_tree" model="ir.actions.act_window">
         <field name="name">Payslip Run</field>
-        <field name="res_model">hr.payslip.groups</field>
+        <field name="res_model">hr.payslip.run</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="hr_payslip_category_tree"/>
         <field name="search_view_id" ref="hr_payslip_category_filter"/>
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 622eebc5337..d3f794089c2 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -10,4 +10,4 @@
 "access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_input ","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1
 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_groups","hr.payslip.groups","model_hr_payslip_groups","base.group_hr_manager",1,1,1,1
+"access_hr_payslip_run","hr.payslip.run","model_hr_payslip_run","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
index fc8083099a5..e0882d2d6da 100644
--- a/addons/hr_payroll/wizard/__init__.py
+++ b/addons/hr_payroll/wizard/__init__.py
@@ -24,5 +24,5 @@
 import hr_payroll_employees_detail
 #import hr_payroll_create_analytic
 import hr_payroll_year_salary
-import hr_payroll_payslips_by_category
+import hr_payroll_payslips_by_employees
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
similarity index 92%
rename from addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
rename to addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index 8246c577833..ff779951a61 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -26,12 +26,12 @@ from dateutil import relativedelta
 from osv import fields, osv
 from tools.translate import _
 
-class hr_payslip_category(osv.osv_memory):
+class hr_payslip_employees(osv.osv_memory):
 
-    _name ='hr.payslip.category'
-    _description = 'Generate payslips for all employees within given category'
+    _name ='hr.payslip.employees'
+    _description = 'Generate payslips for all selected employees'
     _columns = {
-        'employee_ids': fields.many2many('hr.employee', 'hr_employee_group_rel', 'struct_id', 'employee_id', 'Employees'),
+        'employee_ids': fields.many2many('hr.employee', 'hr_employee_group_rel', 'payslip_id', 'employee_id', 'Employees'),
     }
 
     def compute_sheet(self, cr, uid, ids, context=None):
@@ -61,6 +61,6 @@ class hr_payslip_category(osv.osv_memory):
         slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-hr_payslip_category()
+hr_payslip_employees()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
similarity index 62%
rename from addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
rename to addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index 57d570126ab..28d83700948 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -2,15 +2,15 @@
 <openerp>
     <data>
 
-        <record id="view_hr_payslip_by_category" model="ir.ui.view">
-            <field name="name">hr_payroll_payslip_category</field>
-            <field name="model">hr.payslip.category</field>
+        <record id="view_hr_payslip_by_employees" model="ir.ui.view">
+            <field name="name">hr_payroll_payslip_employees</field>
+            <field name="model">hr.payslip.employees</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Category">
+                <form string="Employees">
                     <group colspan="4" >
-                        <separator string="Payslips by employee category" colspan="4"/>
-                        <label colspan="4" nolabel="1" string="This wizard will generate payslips for all employee(s), who belogs to selected category" />
+                        <separator string="Payslips by Employees" colspan="4"/>
+                        <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s)" />
                         <newline/>
                         <field name="employee_ids" nolabel="1"/>
                     </group>
@@ -24,12 +24,12 @@
             </field>
         </record>
 
-        <record id="action_hr_payslip_by_category" model="ir.actions.act_window">
+        <record id="action_hr_payslip_by_employees" model="ir.actions.act_window">
             <field name="name">Generate Payslips</field>
-            <field name="res_model">hr.payslip.category</field>
+            <field name="res_model">hr.payslip.employees</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_hr_payslip_by_category"/>
+            <field name="view_id" ref="view_hr_payslip_by_employees"/>
             <field name="target">new</field>
         </record>