From d6dd4198ea15355d86861a8e1ece72255fb841d7 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 25 Apr 2011 12:49:30 +0530
Subject: [PATCH 01/37] [IMP] Payroll: to ease the use of the engine, we should
 use the code of rule directly as variable name instead of rules[<code of
 rule>] (we keep as it for heads[]). So it means that i should be able to use
 'gross' instead of rules['gross']

bzr revid: mra@mra-laptop-20110425071930-co05h4pyl0k73a4v
---
 addons/hr_payroll/hr_payroll.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 6757b57c417..8306d1f9fb9 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -482,11 +482,12 @@ class hr_payslip(osv.osv):
         #we keep a dict with the result because a value can be overwritten by another rule with the same code
         result_dict = {}
         blacklist = []
+        obj_rule = self.pool.get('hr.salary.rule')
         payslip = self.pool.get('hr.payslip').browse(cr, uid, payslip_id, context=context)
         worked_days = {}
         for input_line in payslip.input_line_ids:
             worked_days[input_line.code] = input_line
-        localdict = {'rules': {}, 'heads': {}, 'payslip': payslip, 'worked_days': worked_days}
+        localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children
@@ -497,17 +498,17 @@ class hr_payslip(osv.osv):
         for contract in self.pool.get('hr.contract').browse(cr, uid, contract_ids, context=context):
             employee = contract.employee_id
             localdict.update({'employee': employee, 'contract': contract})
-            for rule in self.pool.get('hr.salary.rule').browse(cr, uid, sorted_rule_ids, context=context):
+            for rule in obj_rule.browse(cr, uid, sorted_rule_ids, context=context):
                 key = rule.code + '-' + str(contract.id)
                 localdict['result'] = None
                 #check if the rule can be applied
-                if self.pool.get('hr.salary.rule').satisfy_condition(cr, uid, rule.id, localdict, context=context) and rule.id not in blacklist:
+                if obj_rule.satisfy_condition(cr, uid, rule.id, localdict, context=context) and rule.id not in blacklist:
                     #compute the amount of the rule
-                    amount = self.pool.get('hr.salary.rule').compute_rule(cr, uid, rule.id, localdict, context=context)
+                    amount = obj_rule.compute_rule(cr, uid, rule.id, localdict, context=context)
                     #check if there is already a rule computed with that code
-                    previous_amount = rule.code in localdict['rules'] and localdict['rules'][rule.code] or 0.0
+                    previous_amount = rule.code in localdict and localdict[rule.code] or 0.0
                     #set/overwrite the amount computed for this rule in the localdict
-                    localdict['rules'][rule.code] = amount
+                    localdict[rule.code] = amount
                     #sum the amount for its salary head
                     localdict = _sum_salary_head(localdict, rule.category_id, amount - previous_amount)
                     #create/overwrite the rule in the temporary results
@@ -679,7 +680,7 @@ class hr_salary_rule(osv.osv):
 # payslip: hr.payslip object
 # employee: hr.employee object
 # contract: hr.contract object
-# rules: dictionary containing the previsouly computed rules. Keys are the rule codes.
+# rules: rules code (previously computed)
 # heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
 
@@ -693,7 +694,7 @@ result = contract.wage * 0.10''',
 # payslip: hr.payslip object
 # employee: hr.employee object
 # contract: hr.contract object
-# rules: dictionary containing the previsouly computed rules. Keys are the rule codes.
+# rules: rules code (previously computed)
 # heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
 

From 51543fa458bfcdf8d702596aa44c90d78b0b8eb9 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 25 Apr 2011 12:55:10 +0530
Subject: [PATCH 02/37] [IMP] hr_payroll:added field 'quantity' on salary
 rules,modified computation engine and demo data

bzr revid: mtr@mtr-20110425072510-9f7tbuo9w3q3qq30
---
 addons/hr_payroll/hr_payroll.py       | 13 +++++++++++--
 addons/hr_payroll/hr_payroll_demo.xml | 10 ++++++++--
 addons/hr_payroll/hr_payroll_view.xml |  3 ++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 6757b57c417..b3434293342 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -500,6 +500,7 @@ class hr_payslip(osv.osv):
             for rule in self.pool.get('hr.salary.rule').browse(cr, uid, sorted_rule_ids, context=context):
                 key = rule.code + '-' + str(contract.id)
                 localdict['result'] = None
+                localdict.update({'quantity': rule.quantity or None})
                 #check if the rule can be applied
                 if self.pool.get('hr.salary.rule').satisfy_condition(cr, uid, rule.id, localdict, context=context) and rule.id not in blacklist:
                     #compute the amount of the rule
@@ -532,10 +533,12 @@ class hr_payslip(osv.osv):
                         'register_id': rule.register_id.id,
                         'total': amount,
                         'employee_id': contract.employee_id.id,
+                        'quantity': rule.quantity,
                     }
                 else:
                     #blacklist this rule and its children
                     blacklist += [id for id, seq in self.pool.get('hr.salary.rule')._recursive_search_of_rules(cr, uid, [rule], context=context)]
+
         result = [value for code, value in result_dict.items()]
         return result
 
@@ -640,6 +643,7 @@ class hr_salary_rule(osv.osv):
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
+        'quantity': fields.char('Quantity', size=256),
         'category_id':fields.many2one('hr.salary.head', 'Salary Head', required=True),
         'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),
         'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"),
@@ -711,6 +715,7 @@ result = rules['NET'] > heads['NET'] * 0.10''',
         'amount_select': 'fix',
         'amount_fix': 0.0,
         'amount_percentage': 0.0,
+        'quantity': 1,
      }
 
     def _recursive_search_of_rules(self, cr, uid, rule_ids, context=None):
@@ -733,10 +738,14 @@ result = rules['NET'] > heads['NET'] * 0.10''',
         """
         rule = self.browse(cr, uid, rule_id, context=context)
         if rule.amount_select == 'fix':
-            return rule.amount_fix
+            try:
+                return rule.amount_fix * eval(rule.quantity, localdict)
+            except:
+                raise osv.except_osv(_('Error'), _('Wrong quantity defined for salary rule %s (%s)')% (rule.name, rule.code))
         elif rule.amount_select == 'percentage':
             try:
-                return rule.amount_percentage * eval(rule.amount_percentage_base, localdict) / 100
+                amount = rule.amount_percentage * eval(rule.amount_percentage_base, localdict) / 100
+                return amount * eval(rule.quantity, localdict)
             except:
                 raise osv.except_osv(_('Error'), _('Wrong percentage base defined for salary rule %s (%s)')% (rule.name, rule.code))
         else:
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 24736cbb9c2..c90cde78b94 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -12,6 +12,7 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
+            <field name="quantity">1</field>
         </record>
 
         <record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
@@ -21,6 +22,7 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
+             <field name="quantity">1</field>
         </record>
 
         <record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
@@ -30,6 +32,7 @@
             <field name="code">PT</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Professional Tax</field>
+            <field name="quantity">1</field>
         </record>
 
         <record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
@@ -40,6 +43,7 @@
             <field name="code">PF</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Provident Fund</field>
+            <field name="quantity">1</field>
         </record>
 
         <record id="hr_salary_rule_ca_paolino" model="hr.salary.rule">
@@ -49,11 +53,13 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Conveyance Allowance For Paolino</field>
             <field name="sequence" eval="15"/>
+            <field name="quantity">1</field>
         </record>
 
         <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
-            <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = worked_days['WORK100']['number_of_days'] * 1</field>
+            <field name="amount_select">fix</field>
+            <field eval="1" name="amount_fix"/>
+            <field name="quantity">worked_days['WORK100']['number_of_days']</field>
             <field name="code">MA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Meal Voucher</field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e1efc9d7f0c..8aae0d37046 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -546,7 +546,8 @@
                                 <field name="condition_range_min" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
                                 <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
                                 <separator colspan="4" string="Computation"/>
-                                <field name="amount_select"/><newline/>
+                                <field name="amount_select"/>
+                                <field name="quantity" attrs="{'invisible':[('amount_select','=','code')]}"/><newline/>
                                 <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
                                 <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
 				<field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>

From 9f2709ccd0e9418594a6f3377fa9f0e0c93988bc Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 25 Apr 2011 15:11:42 +0530
Subject: [PATCH 03/37] [FIX] hr_payroll: payslip line color is blue when total
 is 0

bzr revid: ara@tinyerp.com-20110425094142-w0hjdx79bq84r920
---
 addons/hr_payroll/hr_payroll_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e1efc9d7f0c..8e491874944 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -135,7 +135,7 @@
             <field name="model">hr.payslip.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Salary Structure" editable="bottom">
+                <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
                     <field name="category_id"/>
                     <field name="employee_id" invisible="1"/>
                     <field name="sequence" groups="base.group_extended"/>
@@ -242,7 +242,7 @@
                     <notebook colspan="4">
                         <page string="Salary Computation" >
                             <field name="line_ids" colspan="4" nolabel="1">
-                                <tree string="Salary Structure" editable="bottom">
+                                <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
                                     <field name="name"/>
                                     <field name="code"/>
                                     <field name="category_id"/>

From 3c877bb4c78b01803c7a079b6bab81e8a6ae0bb8 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 25 Apr 2011 15:25:37 +0530
Subject: [PATCH 04/37] [IMP] hr_payroll:removed qty from demo,improved search
 engine,made qty mandatory and added tooltip

bzr revid: mtr@mtr-20110425095537-ewmhlikkh5i50jyg
---
 addons/hr_payroll/hr_payroll.py       | 5 ++---
 addons/hr_payroll/hr_payroll_demo.xml | 5 -----
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index b3434293342..57fbe2df201 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -500,7 +500,6 @@ class hr_payslip(osv.osv):
             for rule in self.pool.get('hr.salary.rule').browse(cr, uid, sorted_rule_ids, context=context):
                 key = rule.code + '-' + str(contract.id)
                 localdict['result'] = None
-                localdict.update({'quantity': rule.quantity or None})
                 #check if the rule can be applied
                 if self.pool.get('hr.salary.rule').satisfy_condition(cr, uid, rule.id, localdict, context=context) and rule.id not in blacklist:
                     #compute the amount of the rule
@@ -643,7 +642,7 @@ class hr_salary_rule(osv.osv):
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
-        'quantity': fields.char('Quantity', size=256),
+        'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ can have its quantity defined in expression like worked_days['WORK100']['number_of_days']."),
         'category_id':fields.many2one('hr.salary.head', 'Salary Head', required=True),
         'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),
         'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"),
@@ -715,7 +714,7 @@ result = rules['NET'] > heads['NET'] * 0.10''',
         'amount_select': 'fix',
         'amount_fix': 0.0,
         'amount_percentage': 0.0,
-        'quantity': 1,
+        'quantity': '1',
      }
 
     def _recursive_search_of_rules(self, cr, uid, rule_ids, context=None):
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index c90cde78b94..db903fbabfe 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -12,7 +12,6 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
-            <field name="quantity">1</field>
         </record>
 
         <record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
@@ -22,7 +21,6 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
-             <field name="quantity">1</field>
         </record>
 
         <record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
@@ -32,7 +30,6 @@
             <field name="code">PT</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Professional Tax</field>
-            <field name="quantity">1</field>
         </record>
 
         <record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
@@ -43,7 +40,6 @@
             <field name="code">PF</field>
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Provident Fund</field>
-            <field name="quantity">1</field>
         </record>
 
         <record id="hr_salary_rule_ca_paolino" model="hr.salary.rule">
@@ -53,7 +49,6 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Conveyance Allowance For Paolino</field>
             <field name="sequence" eval="15"/>
-            <field name="quantity">1</field>
         </record>
 
         <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8aae0d37046..6c0f615e3e7 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -547,7 +547,7 @@
                                 <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
                                 <separator colspan="4" string="Computation"/>
                                 <field name="amount_select"/>
-                                <field name="quantity" attrs="{'invisible':[('amount_select','=','code')]}"/><newline/>
+                                <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
                                 <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
                                 <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
 				<field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>

From 122d51a2d7b49a02804925b99704d9427e8f2f8a Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 25 Apr 2011 15:55:02 +0530
Subject: [PATCH 05/37] [IMP] hr_payroll:improved exception message string

bzr revid: mtr@mtr-20110425102502-6basvgqilrh664th
---
 addons/hr_payroll/hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 57fbe2df201..ecfc417c90e 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -746,7 +746,7 @@ result = rules['NET'] > heads['NET'] * 0.10''',
                 amount = rule.amount_percentage * eval(rule.amount_percentage_base, localdict) / 100
                 return amount * eval(rule.quantity, localdict)
             except:
-                raise osv.except_osv(_('Error'), _('Wrong percentage base defined for salary rule %s (%s)')% (rule.name, rule.code))
+                raise osv.except_osv(_('Error'), _('Wrong percentage base/quantity defined for salary rule %s (%s)')% (rule.name, rule.code))
         else:
             try:
                 eval(rule.amount_python_compute, localdict, mode='exec', nocopy=True)

From 11da3fc37b3bdedff6da103af525fcc3562ded95 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 25 Apr 2011 15:55:44 +0530
Subject: [PATCH 06/37] [FIX] hr_payroll: payslip line color is blue when total
 is 0

bzr revid: ara@tinyerp.com-20110425102544-ivqy6vu4fb14z68u
---
 addons/hr_payroll/hr_payroll_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8e491874944..2f542999b43 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -144,6 +144,7 @@
                     <field name="amount_select"/>
                     <field name="amount_fix"/>
                     <field name="amount_percentage"/>
+                    <field name="total" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -280,7 +281,7 @@
 <!-- TODO: put me back -->
 	                    <page string="Details By Salary Head">
                             <field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
-                                <tree string="Payslip Lines">
+                                <tree string="Payslip Lines" colors="blue:total == 0">
                                     <field name="category_id"/>
                                     <field name="name"/>
                                     <field name="code"/>

From eac6fb073cba5194dca4483e77897f1cd3a4fd25 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 25 Apr 2011 16:07:18 +0530
Subject: [PATCH 07/37] [IMP] hr_payroll:improved payslip line view,removed
 fields that are used to calculate the total

bzr revid: mtr@mtr-20110425103718-r80y25vatlik17z4
---
 addons/hr_payroll/hr_payroll_view.xml | 31 ++++++---------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e1efc9d7f0c..f3be5ffda11 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -250,30 +250,13 @@
                                     <field name="total"/>
                                 </tree>
                                 <form string="Payslip Line">
-                                    <group col="6" colspan="4">
-                                        <field name="name" colspan="4" select="1"/>
-                                        <field name="code" select="1"/>
-                                        <field name="appears_on_payslip"/>
-                                        <field name="salary_rule_id"/>
+                                    <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"/>
                                     </group>
-                                    <group col="2" colspan="2">
-                                        <separator colspan="4" string="Calculations"/>
-                                        <field name="category_id"/>
-                                        <field name="amount_select"/>
-                                        <field name="amount_fix" attrs="{'readonly':[('amount_select','&lt;&gt;','fix')]}"/>
-                                        <field name="amount_percentage" attrs="{'readonly':[('amount_select','=','percentage')]}"/>
-                                        <field name="sequence" groups="base.group_extended"/>
-                                    </group>
-                                    <group col="2" colspan="2">
-                                        <separator colspan="4" string="Company contribution"/>
-                                        <field name="company_contrib"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Description">
-                                            <separator colspan="4" string="Description"/>
-                                            <field name="note" colspan="4" nolabel="1"/>
-                                        </page>
-                                    </notebook>
                                 </form>
                             </field>
                         </page>
@@ -291,7 +274,7 @@
 
                        <page string="Worked Days">
                             <field name="input_line_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree editable="bottom">
+                                <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
                                     <field name="code"/>
                                     <field name="number_of_days" sum="Total Working Days"/>

From 30564f93e9fffe2dfaed90743229ed6ac142dbe7 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 25 Apr 2011 17:34:30 +0530
Subject: [PATCH 08/37] [IMP] hr_payroll:again improved exception message
 string

bzr revid: mtr@mtr-20110425120430-kacidzhufm6n25q7
---
 addons/hr_payroll/hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index ecfc417c90e..27de59c8f71 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -746,7 +746,7 @@ result = rules['NET'] > heads['NET'] * 0.10''',
                 amount = rule.amount_percentage * eval(rule.amount_percentage_base, localdict) / 100
                 return amount * eval(rule.quantity, localdict)
             except:
-                raise osv.except_osv(_('Error'), _('Wrong percentage base/quantity defined for salary rule %s (%s)')% (rule.name, rule.code))
+                raise osv.except_osv(_('Error'), _('Wrong percentage base or quantity defined for salary rule %s (%s)')% (rule.name, rule.code))
         else:
             try:
                 eval(rule.amount_python_compute, localdict, mode='exec', nocopy=True)

From ea9ab772d62392cff972773fc1bdf46e9d85138c Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 25 Apr 2011 18:00:44 +0530
Subject: [PATCH 09/37] [IMP] Add wizard to generate payslip by employee
 categories

bzr revid: psi@tinyerp.co.in-20110425123044-hxb20cq7iynw5ou7
---
 addons/hr_payroll/__openerp__.py              |  1 +
 addons/hr_payroll/hr_payroll.py               | 13 ++++-
 addons/hr_payroll/hr_payroll_view.xml         | 44 ++++++++++++--
 addons/hr_payroll/wizard/__init__.py          |  4 +-
 .../wizard/hr_payroll_payslips_by_category.py | 58 +++++++++++++++++++
 .../hr_payroll_payslips_by_category.xml       | 45 ++++++++++++++
 6 files changed, 156 insertions(+), 9 deletions(-)
 create mode 100644 addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
 create mode 100644 addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml

diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 87fe437a1db..822573db480 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -57,6 +57,7 @@ Generic Payroll system.
         'security/ir.model.access.csv',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
+        'wizard/hr_payroll_payslips_by_category.xml',
     ],
     'test': [
 #         'test/payslip.yml',
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 6757b57c417..55ec3d7995a 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -204,6 +204,15 @@ class one2many_mod2(fields.one2many):
             res[r[self._fields_id]].append( r['id'] )
         return res
 
+class hr_payslip_groups(osv.osv):
+
+    _name = 'hr.payslip.groups'
+    _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()
+
 class hr_payslip(osv.osv):
     '''
     Pay Slip
@@ -215,13 +224,14 @@ class hr_payslip(osv.osv):
     def _get_lines_salary_head(self, cr, uid, ids, field_names, arg=None, context=None):
         result = {}
         if not ids: return result
+        for id in ids:
+            result.setdefault(id, [])
         cr.execute('''SELECT pl.slip_id, pl.id FROM hr_payslip_line AS pl \
                     LEFT JOIN hr_salary_head AS sh on (pl.category_id = sh.id) \
                     WHERE pl.slip_id in %s \
                     GROUP BY pl.slip_id, sh.sequence, pl.sequence, pl.id ORDER BY sh.sequence, pl.sequence''',(tuple(ids),))
         res = cr.fetchall()
         for r in res:
-            result.setdefault(r[0], [])
             result[r[0]].append(r[1])
         return result
 
@@ -255,6 +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', 'Group', 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 e1efc9d7f0c..e319b209011 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -188,8 +188,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <group col="8" colspan="4">
-                    	<field name="name"/>
-                    	<field name="code"/>
+                        <field name="name"/>
+                        <field name="code"/>
                         <field name="slip_id"/>
                         <field name="amount_select"/>
                     </group>
@@ -211,7 +211,7 @@
             <field name="model">hr.payslip</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('confirm','hr_check','accont_check');black:state in ('new');gray:state in('cancel')" string="Payslip">
+                <tree colors="blue:state in ('confirm','hr_check','accont_check');black:state in ('new');gray:state in('cancel')" string="Payslips">
                     <field name="number"/>
                     <field name="employee_id"/>
                     <field name="name"/>
@@ -278,7 +278,7 @@
                             </field>
                         </page>
 <!-- TODO: put me back -->
-	                    <page string="Details By Salary Head">
+                       <page string="Details By Salary Head">
                             <field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
                                 <tree string="Payslip Lines">
                                     <field name="category_id"/>
@@ -549,14 +549,14 @@
                                 <field name="amount_select"/><newline/>
                                 <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
                                 <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
-				<field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
+                                <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
                                 <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
                                 <separator colspan="4" string="Company contribution"/>
                                 <field name="register_id"/>
                             </group>
                     </page>
                     <page string="Child Rules">
-		       <field name="parent_rule_id"/>
+                       <field name="parent_rule_id"/>
                        <separator colspan="4" string="Children definition"/>
                        <field colspan="4" name="child_ids" nolabel="1"/>
                     </page>
@@ -601,6 +601,38 @@
 
     <act_window domain="[('slip_id', '=', active_id)]" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
 
+    <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="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Payslip Groups">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <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="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Payslip by Category">
+                <group colspan="4">
+                    <field name="name"/>
+                </group>
+                <field name="slip_ids" colspan="4" nolabel="1"/>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_hr_payslip_category_tree" model="ir.actions.act_window">
+        <field name="name">Payslips by Category</field>
+        <field name="res_model">hr.payslip.groups</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="hr_payslip_category_tree"/>
+    </record>
+    <menuitem action="action_hr_payslip_category_tree" id="menu_hr_payslip_category" parent="menu_hr_root_payroll"/>
     </data>
 </openerp>
 
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
index 2cf78e17b1c..fc8083099a5 100644
--- a/addons/hr_payroll/wizard/__init__.py
+++ b/addons/hr_payroll/wizard/__init__.py
@@ -1,7 +1,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -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
 # 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_category.py
new file mode 100644
index 00000000000..9f8d9c010f9
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    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 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 Affero General Public License for more details.
+#
+#    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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import netsvc
+
+class hr_payroll_payslip_groups(osv.osv_memory):
+
+    _name ='hr.payroll.payslip.groups'
+    _columns = {
+            'employee_category': fields.many2one('hr.employee.category', 'Employee Category', required=True),
+    }
+
+    def compute_sheet(self, cr, uid, ids, context=None):
+        emp_pool = self.pool.get('hr.employee')
+        slip_pool = self.pool.get('hr.payslip')
+        wf_service = netsvc.LocalService("workflow")
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, context=context)[0]
+        cr.execute('SELECT DISTINCT emp_id FROM employee_category_rel WHERE category_id = %s', (data['employee_category'][0], ))
+        emp_ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+        for emp in emp_pool.browse(cr, uid, emp_ids, context=context):
+            old_slips = slip_pool.search(cr, uid, [('employee_id','=', emp.id)], context=context)
+            if old_slips:
+                slip_pool.write(cr, uid, old_slips, {'payslip_group_id': context.get('active_id', False)}, context=context)
+                for sid in old_slips:
+                    wf_service.trg_validate(uid, 'hr.payslip', sid, 'compute_sheet', cr)
+            else:
+                res = {
+                    'employee_id': emp.id,
+                    'payslip_group_id': context.get('active_id', False),
+                }
+                slip_id = slip_pool.create(cr, uid, res, context=context)
+                wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
+        return {'type': 'ir.actions.act_window_close'}
+
+hr_payroll_payslip_groups()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
new file mode 100644
index 00000000000..394a894c024
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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.payroll.payslip.groups</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee Category">
+                    <group colspan="4" >
+                        <separator string="Select Employee Category" colspan="4"/>
+                        <field name="employee_category"/>
+                    </group>
+                    <separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Generate Payslip" name="compute_sheet" type="object"/>
+                    </group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_hr_payslip_by_category" model="ir.actions.act_window">
+            <field name="name">Generate Payslips by Category</field>
+            <field name="res_model">hr.payroll.payslip.groups</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="target">new</field>
+        </record>
+
+        <record id="action_idea_post_vote_values" model="ir.values">
+            <field name="model_id" ref="model_hr_payslip_groups" />
+            <field name="object" eval="1" />
+            <field name="name">Generate Payslips by Category</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_payslip_by_category'))"/>
+            <field name="key">action</field>
+            <field name="model">hr.payslip.groups</field>
+        </record>
+
+    </data>
+</openerp>

From 98438b2376f923628ce0e8c4c6b3630b366cb6e2 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 25 Apr 2011 18:47:40 +0530
Subject: [PATCH 10/37] [IMP] hr_payroll:added company_id in payslip line view

bzr revid: mtr@mtr-20110425131740-422eih4okmi6rjqh
---
 addons/hr_payroll/hr_payroll_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f3be5ffda11..95a6a1f21c4 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -256,6 +256,7 @@
 	                                    <field name="category_id"/>
 	                                    <field name="sequence" groups="base.group_extended"/>
 	                                    <field name="total"/>
+	                                    <field name="company_id" groups="base.group_multi_company"/>
                                     </group>
                                 </form>
                             </field>

From e425496f88478713244eb321496e15467017f5d1 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Apr 2011 15:56:56 +0530
Subject: [PATCH 11/37] [IMP] improve the newly created wizard as per
 requirment suggested

bzr revid: psi@tinyerp.co.in-20110426102656-s2lfltvnkkvzz6ve
---
 addons/hr_payroll/hr_payroll.py               |  2 +-
 addons/hr_payroll/hr_payroll_view.xml         | 18 +++++++--
 .../wizard/hr_payroll_payslips_by_category.py | 40 ++++++++++---------
 .../hr_payroll_payslips_by_category.xml       | 15 ++++---
 4 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 55ec3d7995a..1beb676e467 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -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', 'Group', readonly=True, states={'draft': [('readonly', False)]}),
+        'payslip_group_id': fields.many2one('hr.payslip.groups', 'Payslip Group', 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 e319b209011..e84d00b0fea 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -601,12 +601,23 @@
 
     <act_window domain="[('slip_id', '=', active_id)]" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
 
+    <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="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Payslips Group">
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
     <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="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Payslip Groups">
+            <tree string="Payslips Group">
                 <field name="name"/>
             </tree>
         </field>
@@ -617,7 +628,7 @@
         <field name="model">hr.payslip.groups</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Payslip by Category">
+            <form string="Payslips Group">
                 <group colspan="4">
                     <field name="name"/>
                 </group>
@@ -627,10 +638,11 @@
     </record>
 
     <record id="action_hr_payslip_category_tree" model="ir.actions.act_window">
-        <field name="name">Payslips by Category</field>
+        <field name="name">Payslip Groups</field>
         <field name="res_model">hr.payslip.groups</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"/>
     </record>
     <menuitem action="action_hr_payslip_category_tree" id="menu_hr_payslip_category" parent="menu_hr_root_payroll"/>
     </data>
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
index 9f8d9c010f9..316e15cab4e 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
@@ -20,39 +20,43 @@
 ##############################################################################
 
 from osv import fields, osv
-import netsvc
+from tools.translate import _
 
-class hr_payroll_payslip_groups(osv.osv_memory):
+class hr_payslip_category(osv.osv_memory):
 
-    _name ='hr.payroll.payslip.groups'
+    _name ='hr.payslip.category'
     _columns = {
-            'employee_category': fields.many2one('hr.employee.category', 'Employee Category', required=True),
+            'category_id': fields.many2one('hr.employee.category', 'Employee Category', required=True),
     }
 
     def compute_sheet(self, cr, uid, ids, context=None):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
-        wf_service = netsvc.LocalService("workflow")
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
-        cr.execute('SELECT DISTINCT emp_id FROM employee_category_rel WHERE category_id = %s', (data['employee_category'][0], ))
-        emp_ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+        cr.execute('SELECT DISTINCT emp_id FROM employee_category_rel WHERE category_id = %s', (data['category_id'][0], ))
+        emp_ids = [x[0] for x in cr.fetchall()]
+        if not emp_ids:
+            raise osv.except_osv(_("Warning !"), _("No employee(s) found for '%s' category!") % (data['category_id'][1]))
+        slip_ids = []
         for emp in emp_pool.browse(cr, uid, emp_ids, context=context):
-            old_slips = slip_pool.search(cr, uid, [('employee_id','=', emp.id)], context=context)
+            old_slips = slip_pool.search(cr, uid, [('employee_id', '=', emp.id),('state', '=', 'draft')], context=context)
             if old_slips:
-                slip_pool.write(cr, uid, old_slips, {'payslip_group_id': context.get('active_id', False)}, context=context)
-                for sid in old_slips:
-                    wf_service.trg_validate(uid, 'hr.payslip', sid, 'compute_sheet', cr)
+                for id in context.get('active_ids'):
+                    slip_pool.write(cr, uid, old_slips, {'payslip_group_id': id}, context=context)
+                    slip_ids.extend(old_slips)
             else:
-                res = {
-                    'employee_id': emp.id,
-                    'payslip_group_id': context.get('active_id', False),
-                }
-                slip_id = slip_pool.create(cr, uid, res, context=context)
-                wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
+                for id in context.get('active_ids'):
+                    res = {
+                        'employee_id': emp.id,
+                        'payslip_group_id': id,
+                    }
+                    slip_id = slip_pool.create(cr, uid, res, context=context)
+                    slip_ids.append(slip_id)
+        slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-hr_payroll_payslip_groups()
+hr_payslip_category()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
index 394a894c024..7f558fd84c7 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
@@ -4,27 +4,27 @@
 
         <record id="view_hr_payslip_by_category" model="ir.ui.view">
             <field name="name">hr_payroll_payslip_category</field>
-            <field name="model">hr.payroll.payslip.groups</field>
+            <field name="model">hr.payslip.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Category">
                     <group colspan="4" >
-                        <separator string="Select Employee Category" colspan="4"/>
-                        <field name="employee_category"/>
+                        <separator string="This wizard will generate payslips based on employee(s) category" colspan="4"/>
+                        <field name="category_id"/>
                     </group>
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button  icon="terp-gtk-go-back-rtl" string="Generate Payslip" name="compute_sheet" type="object"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Generate" name="compute_sheet" type="object"/>
                     </group>
                </form>
             </field>
         </record>
 
         <record id="action_hr_payslip_by_category" model="ir.actions.act_window">
-            <field name="name">Generate Payslips by Category</field>
-            <field name="res_model">hr.payroll.payslip.groups</field>
+            <field name="name">Generate Payslips</field>
+            <field name="res_model">hr.payslip.category</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_hr_payslip_by_category"/>
@@ -34,10 +34,9 @@
         <record id="action_idea_post_vote_values" model="ir.values">
             <field name="model_id" ref="model_hr_payslip_groups" />
             <field name="object" eval="1" />
-            <field name="name">Generate Payslips by Category</field>
+            <field name="name">Generate Payslips</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_payslip_by_category'))"/>
-            <field name="key">action</field>
             <field name="model">hr.payslip.groups</field>
         </record>
 

From 588093d07031d8b2c2be3cfdebbe40f9f45eabfb Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Apr 2011 17:07:09 +0530
Subject: [PATCH 12/37] [IMP] payslip by category wizard

bzr revid: psi@tinyerp.co.in-20110426113709-znwz3vo0cf2wukjo
---
 .../wizard/hr_payroll_payslips_by_category.py | 23 +++++++------------
 .../hr_payroll_payslips_by_category.xml       |  4 +++-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
index 316e15cab4e..72e6c3b8830 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
@@ -25,13 +25,15 @@ from tools.translate import _
 class hr_payslip_category(osv.osv_memory):
 
     _name ='hr.payslip.category'
+    _description = 'Generate payslips for all employees within given category'
     _columns = {
-            'category_id': fields.many2one('hr.employee.category', 'Employee Category', required=True),
+        'category_id': fields.many2one('hr.employee.category', 'Employee Category', required=True),
     }
 
     def compute_sheet(self, cr, uid, ids, context=None):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
+        slip_ids = []
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
@@ -39,21 +41,12 @@ class hr_payslip_category(osv.osv_memory):
         emp_ids = [x[0] for x in cr.fetchall()]
         if not emp_ids:
             raise osv.except_osv(_("Warning !"), _("No employee(s) found for '%s' category!") % (data['category_id'][1]))
-        slip_ids = []
         for emp in emp_pool.browse(cr, uid, emp_ids, context=context):
-            old_slips = slip_pool.search(cr, uid, [('employee_id', '=', emp.id),('state', '=', 'draft')], context=context)
-            if old_slips:
-                for id in context.get('active_ids'):
-                    slip_pool.write(cr, uid, old_slips, {'payslip_group_id': id}, context=context)
-                    slip_ids.extend(old_slips)
-            else:
-                for id in context.get('active_ids'):
-                    res = {
-                        'employee_id': emp.id,
-                        'payslip_group_id': id,
-                    }
-                    slip_id = slip_pool.create(cr, uid, res, context=context)
-                    slip_ids.append(slip_id)
+            res = {
+                'employee_id': emp.id,
+                'payslip_group_id': context.get('active_id', False),
+            }
+            slip_ids.append(slip_pool.create(cr, uid, res, context=context))
         slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
index 7f558fd84c7..9e6346c0990 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Employee Category">
                     <group colspan="4" >
-                        <separator string="This wizard will generate payslips based on employee(s) category" 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" />
+                        <newline/>
                         <field name="category_id"/>
                     </group>
                     <separator string="" colspan="4" />

From 740aceecc3d067644cefc86651c2a66833e89bc7 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 26 Apr 2011 17:38:26 +0530
Subject: [PATCH 13/37] [IMP] add help on code field of hr.salary.rule

bzr revid: psi@tinyerp.co.in-20110426120826-3uid7tvyfwrj5fjt
---
 addons/hr_payroll/hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 6757b57c417..16189def579 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -638,7 +638,7 @@ class hr_salary_rule(osv.osv):
     _name = 'hr.salary.rule'
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=False),
-        'code':fields.char('Code', size=64, required=True),
+        'code':fields.char('Code', size=64, required=True, help="Code is case sensitive."),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
         'category_id':fields.many2one('hr.salary.head', 'Salary Head', required=True),
         'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),

From ac07145e5ac10eabd2fac907a06639539d1f422a Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 28 Apr 2011 12:01:40 +0530
Subject: [PATCH 14/37] [IMP] hr_payroll: added ir.rule for employee payslip
 and modified access rights

bzr revid: mtr@mtr-20110428063140-rxao7nev4xgzl9f2
---
 addons/hr_payroll/security/hr_security.xml     |  7 +++++++
 addons/hr_payroll/security/ir.model.access.csv | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index 339fb1961b9..3c2d84ea089 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -6,5 +6,12 @@
 <!--        <field name="name">Human Resources / Payroll</field>-->
 <!--    </record>-->
 
+    <record id="property_rule_employee_payslip" model="ir.rule">
+        <field name="name">Employee Payslip</field>
+        <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+    </record>
+
 </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 609fc99c034..d783db77455 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,10 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
-"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1
-"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,1,1,1
-"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
-"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
-"access_res_partner_payroll","res.partner.payroll","base.model_res_partner","base.group_hr_user",1,1,1,1
+"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,0,0,0
+"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,0,0,0
+"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,0,0,0
+"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,0,0,0
+"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,0,0,0
+"access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,0,0,0
 "access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
 "access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1

From 43327d9e9b3e3b22559b787e8de16c5ebe1d17fb Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 28 Apr 2011 14:05:38 +0530
Subject: [PATCH 15/37] [IMP] hr_payroll: 'HR / Officer' can now see the
 payslips of him and of employess for which he's the manager

bzr revid: mtr@mtr-20110428083538-v08g50zk6sx18t4j
---
 addons/hr_payroll/security/hr_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index 3c2d84ea089..d55f1c81cce 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -9,7 +9,7 @@
     <record id="property_rule_employee_payslip" model="ir.rule">
         <field name="name">Employee Payslip</field>
         <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
-        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="domain_force">['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
 

From 148b1d45a12789be61ea6e8a731defcaec0a1b7f Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 28 Apr 2011 14:23:11 +0530
Subject: [PATCH 16/37] [IMP] hr_payroll: revert back the changes of access
 rights,made for hr user

bzr revid: mtr@mtr-20110428085311-7017lofdf8jf7s3f
---
 addons/hr_payroll/security/ir.model.access.csv | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index d783db77455..ba816ea94f8 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,10 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,0,0,0
-"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,0,0,0
-"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,0,0,0
-"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,0,0,0
-"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,0,0,0
-"access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,0,0,0
+"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
+"access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1
+"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,1,1,1
+"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
+"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
+"access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,1,1,1
 "access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
 "access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1

From 19db9c692bce5a362c208ccd8115276b553e04e9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 28 Apr 2011 15:08:48 +0200
Subject: [PATCH 17/37] [IMP] hr_payroll: improved help tooltip

bzr revid: qdp-launchpad@openerp.com-20110428130848-cs584ryp8sesqmm7
---
 addons/hr_payroll/hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index a76daa4e0b0..132d8fc1104 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -643,7 +643,7 @@ class hr_salary_rule(osv.osv):
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
-        'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ can have its quantity defined in expression like worked_days['WORK100']['number_of_days']."),
+        'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days['WORK100']['number_of_days']."),
         'category_id':fields.many2one('hr.salary.head', 'Salary Head', required=True),
         'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),
         'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"),

From c44fef652682f9e33c96ad7eef91428a5a545218 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 28 Apr 2011 19:00:56 +0530
Subject: [PATCH 18/37] [IMP] improve the tooltip on code field of
 hr.salary.rule object

bzr revid: psi@tinyerp.co.in-20110428133056-cramofq63y4s9nhy
---
 addons/hr_payroll/hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 16189def579..11c08db580f 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -638,7 +638,7 @@ class hr_salary_rule(osv.osv):
     _name = 'hr.salary.rule'
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=False),
-        'code':fields.char('Code', size=64, required=True, help="Code is case sensitive."),
+        'code':fields.char('Code', size=64, required=True, help="The code of salary rules can be used as reference in computation of other rules. In that case, it is case sensitive."),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
         'category_id':fields.many2one('hr.salary.head', 'Salary Head', required=True),
         'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),

From 978b7567607a85157a408c8e21008b04ae834703 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 2 May 2011 17:48:22 +0530
Subject: [PATCH 19/37] [IMP] wizard will work for employees instead of
 employee categories

bzr revid: psi@tinyerp.co.in-20110502121822-2xw9r1yilxoovr2o
---
 addons/hr_payroll/hr_payroll.py               | 22 +++++++++-------
 addons/hr_payroll/hr_payroll_view.xml         | 12 ++++++---
 .../hr_payroll/security/ir.model.access.csv   |  1 +
 .../wizard/hr_payroll_payslips_by_category.py | 25 +++++++++++++------
 .../hr_payroll_payslips_by_category.xml       |  6 ++---
 5 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 1beb676e467..828d3d6d08e 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -413,7 +413,7 @@ class hr_payslip(osv.osv):
         for payslip in self.browse(cr, uid, ids, context=context):
             #delete old payslip lines
             old_slipline_ids = slip_line_pool.search(cr, uid, [('slip_id', '=', payslip.id)], context=context)
-            old_slipline_ids
+#            old_slipline_ids
             if old_slipline_ids:
                 slip_line_pool.unlink(cr, uid, old_slipline_ids, context=context)
             if payslip.contract_id:
@@ -565,27 +565,28 @@ class hr_payslip(osv.osv):
         #defaults
         res = {'value':{
                       'line_ids':[],
+                      'input_line_ids': [],
                       #'details_by_salary_head':[], TODO put me back
                       'name':'',
                       'contract_id': False,
                       'struct_id': False,
                       }
-                 }
+            }
         if not employee_id:
             return res
         ttyme = datetime.fromtimestamp(time.mktime(time.strptime(date_from, "%Y-%m-%d")))
         employee_id = empolyee_obj.browse(cr, uid, employee_id, context=context)
         res['value'].update({
-                           'name': _('Salary Slip of %s for %s') % (employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))),
-                           'company_id': employee_id.company_id.id
-                           })
+                    'name': _('Salary Slip of %s for %s') % (employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))),
+                    'company_id': employee_id.company_id.id
+        })
 
         if not context.get('contract', False):
             #fill with the first contract of the employee
             contract_ids = self.get_contract(cr, uid, employee_id, date_from, date_to, context=context)
             res['value'].update({
-                    'struct_id': contract_ids and contract_obj.read(cr, uid, contract_ids[0], ['struct_id'], context=context)['struct_id'][0] or False,
-                    'contract_id': contract_ids and contract_ids[0] or False,
+                        'struct_id': contract_ids and contract_obj.read(cr, uid, contract_ids[0], ['struct_id'], context=context)['struct_id'][0] or False,
+                        'contract_id': contract_ids and contract_ids[0] or False,
             })
         else:
             if contract_id:
@@ -593,7 +594,10 @@ class hr_payslip(osv.osv):
                 contract_ids = [contract_id]
                 #fill the structure with the one on the selected contract
                 contract_record = contract_obj.browse(cr, uid, contract_id, context=context)
-                res['value'].update({'struct_id': contract_record.struct_id.id, 'contract_id': contract_id})
+                res['value'].update({
+                            'struct_id': contract_record.struct_id.id,
+                            'contract_id': contract_id
+                })
             else:
                 #if we don't give the contract, then the input to fill should be for all current contracts of the employee
                 contract_ids = self.get_contract(cr, uid, employee_id, date_from, date_to, context=context)
@@ -604,7 +608,7 @@ class hr_payslip(osv.osv):
         input_line_ids = self.get_input_lines(cr, uid, contract_ids, date_from, date_to, context=context)
         res['value'].update({
                     'input_line_ids': input_line_ids,
-            })
+        })
         return res
 
     def onchange_contract_id(self, cr, uid, ids, date_from, date_to, employee_id=False, contract_id=False, context=None):
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e84d00b0fea..a4428094b2e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -306,6 +306,7 @@
                             <separator colspan="4" string="Other Information"/>
                             <group col="5" colspan="2">
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="payslip_group_id"/>
                                 <field name="paid" readonly="1"/>
                             </group>
                             <newline/>
@@ -629,16 +630,21 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Payslips Group">
-                <group colspan="4">
+                <group col="6" colspan="6">
                     <field name="name"/>
                 </group>
-                <field name="slip_ids" colspan="4" nolabel="1"/>
+                <notebook colspan="6">
+                    <page string="Payslips">
+                        <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" />
             </form>
         </field>
     </record>
 
     <record id="action_hr_payslip_category_tree" model="ir.actions.act_window">
-        <field name="name">Payslip Groups</field>
+        <field name="name">Payslip Run</field>
         <field name="res_model">hr.payslip.groups</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="hr_payslip_category_tree"/>
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 609fc99c034..622eebc5337 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -10,3 +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
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
index 72e6c3b8830..8246c577833 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
@@ -19,6 +19,10 @@
 #
 ##############################################################################
 
+import time
+from datetime import datetime
+from dateutil import relativedelta
+
 from osv import fields, osv
 from tools.translate import _
 
@@ -27,26 +31,33 @@ class hr_payslip_category(osv.osv_memory):
     _name ='hr.payslip.category'
     _description = 'Generate payslips for all employees within given category'
     _columns = {
-        'category_id': fields.many2one('hr.employee.category', 'Employee Category', required=True),
+        'employee_ids': fields.many2many('hr.employee', 'hr_employee_group_rel', 'struct_id', 'employee_id', 'Employees'),
     }
 
     def compute_sheet(self, cr, uid, ids, context=None):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
+        input_line_pool = self.pool.get('hr.payslip.input')
         slip_ids = []
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
-        cr.execute('SELECT DISTINCT emp_id FROM employee_category_rel WHERE category_id = %s', (data['category_id'][0], ))
-        emp_ids = [x[0] for x in cr.fetchall()]
-        if not emp_ids:
-            raise osv.except_osv(_("Warning !"), _("No employee(s) found for '%s' category!") % (data['category_id'][1]))
-        for emp in emp_pool.browse(cr, uid, emp_ids, context=context):
+        if not data['employee_ids']:
+            raise osv.except_osv(_("Warning !"), _("You must select employees to generate payslip"))
+        for emp in emp_pool.browse(cr, uid, data['employee_ids'], context=context):
+            slip_data = slip_pool.onchange_employee_id(cr, uid, [], time.strftime('%Y-%m-01'), str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10], emp.id, contract_id=False, context=context)
             res = {
                 'employee_id': emp.id,
+                'name': slip_data['value'].get('name', False),
+                'struct_id': slip_data['value'].get('struct_id', False),
+                'contract_id': slip_data['value'].get('contract_id', False),
                 'payslip_group_id': context.get('active_id', False),
             }
-            slip_ids.append(slip_pool.create(cr, uid, res, context=context))
+            slip_id = slip_pool.create(cr, uid, res, context=context)
+            for input in slip_data['value']['input_line_ids']:
+                input.update({'payslip_id': slip_id})
+                input_line_pool.create(cr, uid, input, context=context)
+            slip_ids.append(slip_id)
         slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
index 9e6346c0990..c4143cd1178 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
@@ -12,7 +12,7 @@
                         <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" />
                         <newline/>
-                        <field name="category_id"/>
+                        <field name="employee_ids" nolabel="1"/>
                     </group>
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">
@@ -33,14 +33,14 @@
             <field name="target">new</field>
         </record>
 
-        <record id="action_idea_post_vote_values" model="ir.values">
+<!--         <record id="action_idea_post_vote_values" model="ir.values">
             <field name="model_id" ref="model_hr_payslip_groups" />
             <field name="object" eval="1" />
             <field name="name">Generate Payslips</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_payslip_by_category'))"/>
             <field name="model">hr.payslip.groups</field>
-        </record>
+        </record> -->
 
     </data>
 </openerp>

From 0d8364a61be45097c33a6d9e9c0b03cbd322079b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 2 May 2011 18:13:13 +0530
Subject: [PATCH 20/37] [FIX] small fix in hr_payroll

bzr revid: psi@tinyerp.co.in-20110502124313-k0snr1nnx03026oo
---
 addons/hr_payroll/__openerp__.py                         | 2 +-
 .../wizard/hr_payroll_payslips_by_category.xml           | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 822573db480..67c36e3ece5 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -49,6 +49,7 @@ Generic Payroll system.
     ],
     'update_xml': [
         'security/hr_security.xml',
+        'wizard/hr_payroll_payslips_by_category.xml',
         'hr_payroll_view.xml',
         'hr_payroll_workflow.xml',
         'hr_payroll_sequence.xml',
@@ -57,7 +58,6 @@ Generic Payroll system.
         'security/ir.model.access.csv',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
-        'wizard/hr_payroll_payslips_by_category.xml',
     ],
     'test': [
 #         'test/payslip.yml',
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
index c4143cd1178..57d570126ab 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
@@ -33,14 +33,5 @@
             <field name="target">new</field>
         </record>
 
-<!--         <record id="action_idea_post_vote_values" model="ir.values">
-            <field name="model_id" ref="model_hr_payslip_groups" />
-            <field name="object" eval="1" />
-            <field name="name">Generate Payslips</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_payslip_by_category'))"/>
-            <field name="model">hr.payslip.groups</field>
-        </record> -->
-
     </data>
 </openerp>

From efdb84c905fb039c305dad8fb62a7097da204a30 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 3 May 2011 14:42:02 +0530
Subject: [PATCH 21/37] [IMP] Payroll: form and tree view of Salary heads

bzr revid: mra@mra-laptop-20110503091202-pmitrzjymkrr3otf
---
 addons/hr_payroll/hr_payroll_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index c4615ce0cc0..40a52a6c74e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -359,11 +359,12 @@
                         <field name="parent_id" select="1"/>
                         <field name="sequence" select="1"/>
                     </group>
-                    <separator colspan="4" string="Description"/>
+                    <separator colspan="4" string="Notes"/>
                         <field name="note" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>
+
         <record id="hr_salary_head_tree" model="ir.ui.view">
             <field name="name">hr.salary.head.tree</field>
             <field name="model">hr.salary.head</field>
@@ -371,9 +372,9 @@
             <field name="arch" type="xml">
                 <tree string="Salary Heads">
                     <field name="name"/>
-                    <field name="sequence"/>
                     <field name="code"/>
-                    <field name="parent_id"/>
+                    <field name="sequence"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>

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 22/37] [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>
 

From fe16882b43e90c38eddf86d3949dd10092f6daaf Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 3 May 2011 18:47:50 +0530
Subject: [PATCH 23/37] [IMP] small fixes

bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21
---
 addons/hr_payroll/hr_payroll.py                             | 4 ++--
 addons/hr_payroll/hr_payroll_view.xml                       | 6 +++---
 .../hr_payroll/wizard/hr_payroll_payslips_by_employees.py   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 579e937fcb1..d4b23b4a565 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -209,7 +209,7 @@ class hr_payslip_run(osv.osv):
     _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),
+        'slip_ids':fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True),
     }
 hr_payslip_run()
 
@@ -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.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
+        'payslip_run_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 efeec2a9d6d..92a350ae166 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -288,7 +288,7 @@
                             <separator colspan="4" string="Other Information"/>
                             <group col="5" colspan="2">
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="payslip_group_id"/>
+                                <field name="payslip_run_id"/>
                                 <field name="paid" readonly="1"/>
                             </group>
                             <newline/>
@@ -607,8 +607,8 @@
         </field>
     </record>
 
-    <record id="hr_payslip_category_form" model="ir.ui.view">
-        <field name="name">hr.payslip.category.form</field>
+    <record id="hr_payslip_run_form" model="ir.ui.view">
+        <field name="name">hr.payslip.run.form</field>
         <field name="model">hr.payslip.run</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index ff779951a61..31d2a77ee8a 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -51,7 +51,7 @@ class hr_payslip_employees(osv.osv_memory):
                 'name': slip_data['value'].get('name', False),
                 'struct_id': slip_data['value'].get('struct_id', False),
                 'contract_id': slip_data['value'].get('contract_id', False),
-                'payslip_group_id': context.get('active_id', False),
+                'payslip_run_id': context.get('active_id', False),
             }
             slip_id = slip_pool.create(cr, uid, res, context=context)
             for input in slip_data['value']['input_line_ids']:

From df2bac26861cf46ea73d7f2e2e5a4d1191e1b36c Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 4 May 2011 11:20:23 +0530
Subject: [PATCH 24/37] [IMP] remanes view ids

bzr revid: psi@tinyerp.co.in-20110504055023-rngf7l4vwf25ilj7
---
 addons/hr_payroll/hr_payroll_view.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 92a350ae166..45345297cbe 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -585,8 +585,8 @@
 
     <act_window domain="[('slip_id', '=', active_id)]" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
 
-    <record id="hr_payslip_category_filter" model="ir.ui.view">
-        <field name="name">hr.payslip.category.search</field>
+    <record id="hr_payslip_run_filter" model="ir.ui.view">
+        <field name="name">hr.payslip.run.search</field>
         <field name="model">hr.payslip.run</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
@@ -596,8 +596,8 @@
         </field>
     </record>
 
-    <record id="hr_payslip_category_tree" model="ir.ui.view">
-        <field name="name">hr.payslip.category.tree</field>
+    <record id="hr_payslip_run_tree" model="ir.ui.view">
+        <field name="name">hr.payslip.run.tree</field>
         <field name="model">hr.payslip.run</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
@@ -626,14 +626,15 @@
         </field>
     </record>
 
-    <record id="action_hr_payslip_category_tree" model="ir.actions.act_window">
+    <record id="action_hr_payslip_run_tree" model="ir.actions.act_window">
         <field name="name">Payslip Run</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"/>
+        <field name="view_id" ref="hr_payslip_run_tree"/>
+        <field name="search_view_id" ref="hr_payslip_run_filter"/>
     </record>
-    <menuitem action="action_hr_payslip_category_tree" id="menu_hr_payslip_category" parent="menu_hr_root_payroll"/>
+    <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_root_payroll"/>
+
     </data>
 </openerp>
 

From c5d6059ab2bbf39b8ab4ff79eb9c090f3cb513d7 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 4 May 2011 12:03:16 +0530
Subject: [PATCH 25/37] [FIX] rename the menu name

bzr revid: psi@tinyerp.co.in-20110504063316-26r7wu0ni4gtqhad
---
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 45345297cbe..8ff66113577 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -627,7 +627,7 @@
     </record>
 
     <record id="action_hr_payslip_run_tree" model="ir.actions.act_window">
-        <field name="name">Payslip Run</field>
+        <field name="name">Payslips Run</field>
         <field name="res_model">hr.payslip.run</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="hr_payslip_run_tree"/>

From a13984cf7baf0b02f97a1d539f1c7eca94b7f41e Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 4 May 2011 16:43:48 +0530
Subject: [PATCH 26/37] [IMP] remove sequence form salary head object

bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt
---
 addons/hr_payroll/hr_payroll.py       |  4 +---
 addons/hr_payroll/hr_payroll_view.xml | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 132d8fc1104..a8b12327995 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -177,14 +177,12 @@ class hr_salary_head(osv.osv):
         'parent_id':fields.many2one('hr.salary.head', 'Parent', help="Linking a salary head to its parent is used only for the reporting purpose."),
         'note': fields.text('Description'),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'sequence': fields.integer('Sequence', required=True, help='Display sequence order'),
     }
 
     _defaults = {
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
-        'sequence': 5
     }
 
 hr_salary_head()
@@ -218,7 +216,7 @@ class hr_payslip(osv.osv):
         cr.execute('''SELECT pl.slip_id, pl.id FROM hr_payslip_line AS pl \
                     LEFT JOIN hr_salary_head AS sh on (pl.category_id = sh.id) \
                     WHERE pl.slip_id in %s \
-                    GROUP BY pl.slip_id, sh.sequence, pl.sequence, pl.id ORDER BY sh.sequence, pl.sequence''',(tuple(ids),))
+                    GROUP BY pl.slip_id, pl.sequence, pl.id ORDER BY pl.sequence''',(tuple(ids),))
         res = cr.fetchall()
         for r in res:
             result.setdefault(r[0], [])
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 40a52a6c74e..53f4eb8c6fb 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -186,8 +186,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <group col="8" colspan="4">
-                    	<field name="name"/>
-                    	<field name="code"/>
+                        <field name="name"/>
+                        <field name="code"/>
                         <field name="slip_id"/>
                         <field name="amount_select"/>
                     </group>
@@ -249,18 +249,18 @@
                                 </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>
                         </page>
 <!-- TODO: put me back -->
-	                    <page string="Details By Salary Head">
+                       <page string="Details By Salary Head">
                             <field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
                                 <tree string="Payslip Lines" colors="blue:total == 0">
                                     <field name="category_id"/>
@@ -357,7 +357,6 @@
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
                         <field name="parent_id" select="1"/>
-                        <field name="sequence" select="1"/>
                     </group>
                     <separator colspan="4" string="Notes"/>
                         <field name="note" colspan="4" nolabel="1"/>
@@ -373,7 +372,6 @@
                 <tree string="Salary Heads">
                     <field name="name"/>
                     <field name="code"/>
-                    <field name="sequence"/>
                     <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
@@ -533,14 +531,14 @@
                                 <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
                                 <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
                                 <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
-				<field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
+                                <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
                                 <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
                                 <separator colspan="4" string="Company contribution"/>
                                 <field name="register_id"/>
                             </group>
                     </page>
                     <page string="Child Rules">
-		       <field name="parent_rule_id"/>
+                       <field name="parent_rule_id"/>
                        <separator colspan="4" string="Children definition"/>
                        <field colspan="4" name="child_ids" nolabel="1"/>
                     </page>

From 8666be5ebd2c9314b9c14e02c4d3f0348b86f012 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 9 May 2011 14:20:02 +0530
Subject: [PATCH 27/37] [IMP] rename object to worked_days and add one object
 hr.salary.input

bzr revid: psi@tinyerp.co.in-20110509085002-l0ygkq5al9yedmz6
---
 addons/hr_payroll/hr_payroll.py               | 85 +++++++++++++++++--
 addons/hr_payroll/hr_payroll_view.xml         | 41 ++++++---
 .../hr_payroll/security/ir.model.access.csv   |  3 +-
 3 files changed, 110 insertions(+), 19 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 132d8fc1104..c4dcec2f8bb 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -249,6 +249,7 @@ class hr_payslip(osv.osv):
 #        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Line',readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
+        'worked_days_line_ids': fields.one2many('hr.payslip.worked_days', 'payslip_id', 'Payslip Worked Days', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'note': fields.text('Description'),
@@ -415,7 +416,7 @@ class hr_payslip(osv.osv):
             self.write(cr, uid, [payslip.id], {'line_ids': lines}, context=context)
         return True
 
-    def get_input_lines(self, cr, uid, contract_ids, date_from, date_to, context=None):
+    def get_worked_day_lines(self, cr, uid, contract_ids, date_from, date_to, context=None):
         """
         @param contract_ids: list of contract id
         @return: returns a list of dict containing the input that should be applied for the given contract between date_from and date_to
@@ -472,6 +473,28 @@ class hr_payslip(osv.osv):
             res += [attendances] + leaves
         return res
 
+    def get_input_lines(self, cr, uid, contract_ids, date_from, date_to, context=None):
+        res = []
+        contract_obj = self.pool.get('hr.contract')
+        rule_obj = self.pool.get('hr.salary.rule')
+
+        structure_ids = contract_obj.get_all_structures(cr, uid, contract_ids, context=context)
+        rule_ids = self.pool.get('hr.payroll.structure').get_all_rules(cr, uid, structure_ids, context=context)
+        sorted_rule_ids = [id for id, sequence in sorted(rule_ids, key=lambda x:x[1])]
+
+        for contract in contract_obj.browse(cr, uid, contract_ids, context=context):
+            for rule in rule_obj.browse(cr, uid, sorted_rule_ids, context=context):
+                if rule.input_ids:
+                    for input in rule.input_ids:
+                        inputs = {
+                             'name': input.name,
+                             'sequence': 5,
+                             'code': input.code,
+                             'contract_id': contract.id,
+                        }
+                        res += [inputs]
+        return res
+
     def get_payslip_lines(self, cr, uid, contract_ids, payslip_id, context):
         def _sum_salary_head(localdict, head, amount):
             if head.parent_id:
@@ -485,9 +508,12 @@ class hr_payslip(osv.osv):
         obj_rule = self.pool.get('hr.salary.rule')
         payslip = self.pool.get('hr.payslip').browse(cr, uid, payslip_id, context=context)
         worked_days = {}
+        for worked_days_line in payslip.worked_days_line_ids:
+            worked_days[worked_days_line.code] = worked_days_line
+        input_lines = {}
         for input_line in payslip.input_line_ids:
-            worked_days[input_line.code] = input_line
-        localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days}
+            input_lines[input_line.code] = input_line
+        localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days, 'input_lines': input_lines}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children
@@ -545,15 +571,22 @@ class hr_payslip(osv.osv):
     def onchange_employee_id(self, cr, uid, ids, date_from, date_to, employee_id=False, contract_id=False, context=None):
         empolyee_obj = self.pool.get('hr.employee')
         contract_obj = self.pool.get('hr.contract')
+        worked_days_obj = self.pool.get('hr.payslip.worked_days')
         input_obj = self.pool.get('hr.payslip.input')
 
         if context is None:
             context = {}
+        #delete old worked days lines
+        old_worked_days_ids = ids and worked_days_obj.search(cr, uid, [('payslip_id', '=', ids[0])], context=context) or False
+        if old_worked_days_ids:
+            worked_days_obj.unlink(cr, uid, old_worked_days_ids, context=context)
+
         #delete old input lines
         old_input_ids = ids and input_obj.search(cr, uid, [('payslip_id', '=', ids[0])], context=context) or False
         if old_input_ids:
             input_obj.unlink(cr, uid, old_input_ids, context=context)
 
+
         #defaults
         res = {'value':{
                       'line_ids':[],
@@ -593,8 +626,10 @@ class hr_payslip(osv.osv):
                     return res
 
         #computation of the salary input
+        worked_days_line_ids = self.get_worked_day_lines(cr, uid, contract_ids, date_from, date_to, context=context)
         input_line_ids = self.get_input_lines(cr, uid, contract_ids, date_from, date_to, context=context)
         res['value'].update({
+                    'worked_days_line_ids': worked_days_line_ids,
                     'input_line_ids': input_line_ids,
             })
         return res
@@ -614,6 +649,28 @@ class hr_payslip(osv.osv):
 
 hr_payslip()
 
+class hr_payslip_worked_days(osv.osv):
+    '''
+    Payslip Worked Days
+    '''
+
+    _name = 'hr.payslip.worked_days'
+    _description = 'Payslip Worked Days'
+    _columns = {
+        'name': fields.char('Description', size=256, required=True),
+        'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
+        'sequence': fields.integer('Sequence', required=True,),
+        'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
+        'number_of_days': fields.float('Number of Days'),
+        'number_of_hours': fields.float('Number of Hours'),
+        'contract_id': fields.many2one('hr.contract', 'Contract', required=True, help="The contract for which applied this input"),
+    }
+    _order = 'payslip_id, sequence'
+    _defaults = {
+        'sequence': 10,
+    }
+hr_payslip_worked_days()
+
 class hr_payslip_input(osv.osv):
     '''
     Payslip Input
@@ -626,13 +683,13 @@ class hr_payslip_input(osv.osv):
         'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
         'sequence': fields.integer('Sequence', required=True,),
         'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
-        'number_of_days': fields.float('Number of Days'),
-        'number_of_hours': fields.float('Number of Hours'),
+        'quantity': fields.float('Quantity'),
         'contract_id': fields.many2one('hr.contract', 'Contract', required=True, help="The contract for which applied this input"),
     }
-    _order = 'payslip_id,sequence'
+    _order = 'payslip_id, sequence'
     _defaults = {
         'sequence': 10,
+        'quantity': 0.0,
     }
 hr_payslip_input()
 
@@ -674,6 +731,7 @@ class hr_salary_rule(osv.osv):
             help="Contribution register based on company",
             required=False
         ),
+        'input_ids': fields.one2many('hr.rule.input', 'input_id', 'Inputs'),
         'note':fields.text('Description'),
      }
     _defaults = {
@@ -780,6 +838,21 @@ result = rules['NET'] > heads['NET'] * 0.10''',
 
 hr_salary_rule()
 
+class hr_rule_input(osv.osv):
+    '''
+    Salary Rule Input
+    '''
+
+    _name = 'hr.rule.input'
+    _description = 'Salary Rule Input'
+    _columns = {
+        'name': fields.char('Description', size=256, required=True),
+        'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
+        'input_id': fields.many2one('hr.salary.rule', 'Salary Rule Input', required=True)
+    }
+
+hr_rule_input()
+
 class hr_payslip_line(osv.osv):
     '''
     Payslip Line
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 40a52a6c74e..1b0c8f82e32 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -186,8 +186,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <group col="8" colspan="4">
-                    	<field name="name"/>
-                    	<field name="code"/>
+                        <field name="name"/>
+                        <field name="code"/>
                         <field name="slip_id"/>
                         <field name="amount_select"/>
                     </group>
@@ -249,18 +249,18 @@
                                 </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>
                         </page>
 <!-- TODO: put me back -->
-	                    <page string="Details By Salary Head">
+                        <page string="Details By Salary Head">
                             <field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
                                 <tree string="Payslip Lines" colors="blue:total == 0">
                                     <field name="category_id"/>
@@ -272,7 +272,7 @@
                        </page>
 
                        <page string="Worked Days">
-                            <field name="input_line_ids" colspan="4" nolabel="1" mode="tree">
+                            <field name="worked_days_line_ids" colspan="4" nolabel="1" mode="tree">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
                                     <field name="code"/>
@@ -282,6 +282,15 @@
                                     <field name="sequence" invisible="True"/>
                                 </tree>
                             </field>
+                            <field name="input_line_ids" colspan="4" nolabel="1" mode="tree">
+                                <tree string="Input Data" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="code"/>
+                                    <field name="quantity"/>
+                                    <field name="contract_id" groups="base.group_extended"/>
+                                    <field name="sequence" invisible="True"/>
+                                </tree>
+                            </field>
                        </page>
 
                        <page string="Other Information">
@@ -533,17 +542,25 @@
                                 <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
                                 <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
                                 <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
-				<field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
+                                <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
                                 <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
                                 <separator colspan="4" string="Company contribution"/>
                                 <field name="register_id"/>
                             </group>
                     </page>
                     <page string="Child Rules">
-		       <field name="parent_rule_id"/>
+                       <field name="parent_rule_id"/>
                        <separator colspan="4" string="Children definition"/>
                        <field colspan="4" name="child_ids" nolabel="1"/>
                     </page>
+                       <page string="Inputs">
+                            <field name="input_ids" colspan="4" nolabel="1" mode="tree">
+                                <tree string="Input Data" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="code"/>
+                                </tree>
+                            </field>
+                       </page>
                     <page string="Description">
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 609fc99c034..a5b2ee24201 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -8,5 +8,6 @@
 "access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
 "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_payslip_worked_days ","hr.payslip.worked_days","model_hr_payslip_worked_days","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_input","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1

From c600603f3acd8e650522d9a32644961815d405c2 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 10 May 2011 16:49:31 +0530
Subject: [PATCH 28/37] [ADD] improve code and add demo rule for sales

bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp
---
 addons/hr_payroll/hr_payroll.py               |  15 +-
 addons/hr_payroll/hr_payroll_demo.xml         |  24 ++
 addons/hr_payroll/hr_payroll_view.xml         | 207 +++++++++++-------
 .../hr_payroll/security/ir.model.access.csv   |   1 +
 4 files changed, 156 insertions(+), 91 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index c4dcec2f8bb..2c8f957aa03 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -473,7 +473,7 @@ class hr_payslip(osv.osv):
             res += [attendances] + leaves
         return res
 
-    def get_input_lines(self, cr, uid, contract_ids, date_from, date_to, context=None):
+    def get_inputs(self, cr, uid, contract_ids, date_from, date_to, context=None):
         res = []
         contract_obj = self.pool.get('hr.contract')
         rule_obj = self.pool.get('hr.salary.rule')
@@ -488,7 +488,6 @@ class hr_payslip(osv.osv):
                     for input in rule.input_ids:
                         inputs = {
                              'name': input.name,
-                             'sequence': 5,
                              'code': input.code,
                              'contract_id': contract.id,
                         }
@@ -510,10 +509,10 @@ class hr_payslip(osv.osv):
         worked_days = {}
         for worked_days_line in payslip.worked_days_line_ids:
             worked_days[worked_days_line.code] = worked_days_line
-        input_lines = {}
+        inputs = {}
         for input_line in payslip.input_line_ids:
-            input_lines[input_line.code] = input_line
-        localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days, 'input_lines': input_lines}
+            inputs[input_line.code] = input_line
+        localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days, 'inputs': inputs}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children
@@ -627,7 +626,7 @@ class hr_payslip(osv.osv):
 
         #computation of the salary input
         worked_days_line_ids = self.get_worked_day_lines(cr, uid, contract_ids, date_from, date_to, context=context)
-        input_line_ids = self.get_input_lines(cr, uid, contract_ids, date_from, date_to, context=context)
+        input_line_ids = self.get_inputs(cr, uid, contract_ids, date_from, date_to, context=context)
         res['value'].update({
                     'worked_days_line_ids': worked_days_line_ids,
                     'input_line_ids': input_line_ids,
@@ -683,7 +682,7 @@ class hr_payslip_input(osv.osv):
         'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
         'sequence': fields.integer('Sequence', required=True,),
         'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
-        'quantity': fields.float('Quantity'),
+        'quantity': fields.float('Quantity', help="It is used in computation. For e.g. A rule for sales having 1% commission of basic salary for per product can defined in expression like result = inputs['S-ASUS']['qunatity']*contract.wage*0.01."),
         'contract_id': fields.many2one('hr.contract', 'Contract', required=True, help="The contract for which applied this input"),
     }
     _order = 'payslip_id, sequence'
@@ -744,6 +743,7 @@ class hr_salary_rule(osv.osv):
 # rules: rules code (previously computed)
 # heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
+# inputs: dictionary containing the computed inputs. Keys are the inputs codes.
 
 # Note: returned value have to be set in the variable 'result'
 
@@ -758,6 +758,7 @@ result = contract.wage * 0.10''',
 # rules: rules code (previously computed)
 # heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
+# inputs: dictionary containing the computed inputs. Keys are the inputs codes.
 
 # Note: returned value have to be set in the variable 'result'
 
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index db903fbabfe..5a6ccc2c995 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -60,6 +60,30 @@
             <field name="name">Meal Voucher</field>
             <field name="sequence" eval="16"/>
          </record>
+
+        <record id="hr_salary_rule_sales_commission" model="hr.salary.rule">
+            <field name="amount_select">code</field>
+            <field name="code">SALE</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="name">Get 1% of sales</field>
+            <field name="sequence" eval="17"/>
+            <field name="amount_python_compute">result = (inputs['S-ASUS']['quantity'] + inputs['S-CHINA']['quantity']) * contract.wage * 0.01</field>
+         </record>
+
+        <!-- Rule Inputs -->
+
+        <record id="hr_rule_input_sale_a" model="hr.rule.input">
+            <field name="code">S-ASUS</field>
+            <field name="name">Sale to ASUStek</field>
+            <field name="input_id" ref="hr_salary_rule_sales_commission"/>
+        </record>
+
+        <record id="hr_rule_input_sale_b" model="hr.rule.input">
+            <field name="code">S-CHINA</field>
+            <field name="name">Sale to China Export</field>
+            <field name="input_id" ref="hr_salary_rule_sales_commission"/>
+        </record>
+
         <!-- Salary Structure -->
 
          <record id="structure_001" model="hr.payroll.structure">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1b0c8f82e32..7f40b7e7312 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -272,7 +272,7 @@
                        </page>
 
                        <page string="Worked Days">
-                            <field name="worked_days_line_ids" colspan="4" nolabel="1" mode="tree">
+                            <field name="worked_days_line_ids" colspan="4" nolabel="1">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
                                     <field name="code"/>
@@ -281,8 +281,19 @@
                                     <field name="contract_id" groups="base.group_extended"/>
                                     <field name="sequence" invisible="True"/>
                                 </tree>
+                                <form string="Worked Day">
+                                    <group>
+                                        <field name="name" select="1"/>
+                                        <field name="code" select="1"/>
+                                        <field name="payslip_id"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="number_of_days"/>
+                                        <field name="number_of_hours"/>
+                                        <field name="contract_id" groups="base.group_extended"/>
+                                    </group>
+                                </form>
                             </field>
-                            <field name="input_line_ids" colspan="4" nolabel="1" mode="tree">
+                            <field name="input_line_ids" colspan="4" nolabel="1">
                                 <tree string="Input Data" editable="bottom">
                                     <field name="name"/>
                                     <field name="code"/>
@@ -290,6 +301,16 @@
                                     <field name="contract_id" groups="base.group_extended"/>
                                     <field name="sequence" invisible="True"/>
                                 </tree>
+                                <form string="Payslip Line">
+                                    <group>
+                                        <field name="name" select="1"/>
+                                        <field name="code" select="1"/>
+                                        <field name="payslip_id"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="quantity"/>
+                                        <field name="contract_id" groups="base.group_extended"/>
+                                    </group>
+                                </form>
                             </field>
                        </page>
 
@@ -499,7 +520,7 @@
 
     <!-- Salary Rules -->
 
-    <record id="hr_salary_rule_tree" model="ir.ui.view">
+        <record id="hr_salary_rule_tree" model="ir.ui.view">
             <field name="name">hr.salary.rule.tree</field>
             <field name="model">hr.salary.rule</field>
             <field name="type">tree</field>
@@ -513,94 +534,112 @@
                 </tree>
             </field>
         </record>
-    <record id="hr_salary_rule_form" model="ir.ui.view">
-        <field name="name">hr.salary.rule.form</field>
+        <record id="hr_salary_rule_form" model="ir.ui.view">
+            <field name="name">hr.salary.rule.form</field>
+            <field name="model">hr.salary.rule</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Salary Rules">
+                    <group col="6" colspan="6">
+                       <field name="name"/>
+                       <field name="code" select="1"/>
+                       <field name="category_id"/>
+                       <field name="sequence" />
+                       <field name="active"/>
+                       <field name="appears_on_payslip" attrs="{'readonly':[('company_contribution','=', True)]}" />
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <notebook colspan="6">
+                        <page string="General">
+                                <group col="4" colspan="6">
+                                    <separator colspan="4" string="Conditions"/>
+                                    <field name="condition_select"/><newline/>
+                                    <field name="condition_python" attrs="{'invisible':[('condition_select','&lt;&gt;','python')], 'required': [('condition_select','=','python')]}" colspan="4"/> <newline/>
+                                    <field name="condition_range" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
+                                    <field name="condition_range_min" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
+                                    <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
+                                    <separator colspan="4" string="Computation"/>
+                                    <field name="amount_select"/>
+                                    <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
+                                    <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
+                                    <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
+                                    <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
+                                    <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
+                                    <separator colspan="4" string="Company contribution"/>
+                                    <field name="register_id"/>
+                                </group>
+                        </page>
+                        <page string="Child Rules">
+                           <field name="parent_rule_id"/>
+                           <separator colspan="4" string="Children definition"/>
+                           <field colspan="4" name="child_ids" nolabel="1"/>
+                        </page>
+                           <page string="Inputs">
+                                <field name="input_ids" colspan="4" nolabel="1" mode="tree, form">
+                                    <tree string="Input Data" editable="bottom">
+                                        <field name="name"/>
+                                        <field name="code"/>
+                                    </tree>
+                                </field>
+                           </page>
+                        <page string="Description">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_hr_rule_filter" model="ir.ui.view">
+        <field name="name">hr.salary.rule.select</field>
         <field name="model">hr.salary.rule</field>
-        <field name="type">form</field>
+        <field name="type">search</field>
         <field name="arch" type="xml">
-            <form string="Salary Rules">
-                <group col="6" colspan="6">
-                   <field name="name"/>
-                   <field name="code" select="1"/>
-                   <field name="category_id"/>
-                   <field name="sequence" />
-                   <field name="active"/>
-                   <field name="appears_on_payslip" attrs="{'readonly':[('company_contribution','=', True)]}" />
-                   <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
-                <notebook colspan="6">
-                    <page string="General">
-                            <group col="4" colspan="6">
-                                <separator colspan="4" string="Conditions"/>
-                                <field name="condition_select"/><newline/>
-                                <field name="condition_python" attrs="{'invisible':[('condition_select','&lt;&gt;','python')], 'required': [('condition_select','=','python')]}" colspan="4"/> <newline/>
-                                <field name="condition_range" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
-                                <field name="condition_range_min" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
-                                <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
-                                <separator colspan="4" string="Computation"/>
-                                <field name="amount_select"/>
-                                <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
-                                <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
-                                <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
-                                <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
-                                <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
-                                <separator colspan="4" string="Company contribution"/>
-                                <field name="register_id"/>
-                            </group>
-                    </page>
-                    <page string="Child Rules">
-                       <field name="parent_rule_id"/>
-                       <separator colspan="4" string="Children definition"/>
-                       <field colspan="4" name="child_ids" nolabel="1"/>
-                    </page>
-                       <page string="Inputs">
-                            <field name="input_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree string="Input Data" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="code"/>
-                                </tree>
-                            </field>
-                       </page>
-                    <page string="Description">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
-            </form>
+            <search string="Search Salary Rule">
+            <group col="8" colspan="4">
+                <field name="name"/>
+                <field name="code" select="1"/>
+                <field name="category_id"/>
+                <field name="condition_range_min"/>
+            </group>
+            <newline/>
+            <group col="8" colspan="4" expand="0" string="Group By...">
+                <filter string="Head" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
+            </group>
+            </search>
         </field>
-    </record>
+        </record>
 
-    <record id="view_hr_rule_filter" model="ir.ui.view">
-    <field name="name">hr.salary.rule.select</field>
-    <field name="model">hr.salary.rule</field>
-    <field name="type">search</field>
-    <field name="arch" type="xml">
-        <search string="Search Salary Rule">
-        <group col="8" colspan="4">
-            <field name="name"/>
-            <field name="code" select="1"/>
-            <field name="category_id"/>
-            <field name="condition_range_min"/>
-        </group>
-        <newline/>
-        <group col="8" colspan="4" expand="0" string="Group By...">
-            <filter string="Head" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
-        </group>
-        </search>
-    </field>
-    </record>
+        <record id="action_salary_rule_form" model="ir.actions.act_window">
+            <field name="name">Salary Rules</field>
+            <field name="res_model">hr.salary.rule</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="hr_salary_rule_tree"/>
+            <field name="domain">[('parent_rule_id','=',False)]</field>
+            <field name="search_view_id" ref="view_hr_rule_filter"/>
+        </record>
 
-    <record id="action_salary_rule_form" model="ir.actions.act_window">
-        <field name="name">Salary Rules</field>
-        <field name="res_model">hr.salary.rule</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="hr_salary_rule_tree"/>
-        <field name="domain">[('parent_rule_id','=',False)]</field>
-        <field name="search_view_id" ref="view_hr_rule_filter"/>
-    </record>
+        <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
 
-    <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
+        <act_window domain="[('slip_id', '=', active_id)]" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
 
-    <act_window domain="[('slip_id', '=', active_id)]" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
+        <record id="hr_contribution_register_form" model="ir.ui.view">
+            <field name="name">hr.contribution.register.form</field>
+            <field name="model">hr.contribution.register</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contribution">
+                    <field name="name" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    <notebook colspan="4">
+                         <page string="Description">
+                            <separator colspan="4" string="Description"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index a5b2ee24201..7f54f1dd50b 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -11,3 +11,4 @@
 "access_hr_payslip_worked_days ","hr.payslip.worked_days","model_hr_payslip_worked_days","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_input","hr.payslip.input","model_hr_payslip_input","base.group_hr_manager",1,1,1,1
+"access_hr_rule_input","hr.rule.input","model_hr_rule_input","base.group_hr_manager",1,1,1,1

From 84739f218e893b52e13f5024fd80ac12aa49062d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 10 May 2011 17:24:11 +0530
Subject: [PATCH 29/37] [IMP] hr_payroll: renamed salary head into salary
 category

bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug
---
 addons/hr_payroll/hr_payroll.py               | 38 +++++++++----------
 addons/hr_payroll/hr_payroll_data.xml         | 16 ++++----
 addons/hr_payroll/hr_payroll_view.xml         | 36 +++++++++---------
 .../hr_payroll/security/ir.model.access.csv   |  2 +-
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 132d8fc1104..e4597aa0c8d 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -164,17 +164,17 @@ class contrib_register(osv.osv):
 
 contrib_register()
 
-class hr_salary_head(osv.osv):
+class hr_salary_category(osv.osv):
     """
-    HR Salary Head
+    HR Salary Category
     """
 
-    _name = 'hr.salary.head'
-    _description = 'Salary Head'
+    _name = 'hr.salary.category'
+    _description = 'Salary Category'
     _columns = {
         'name':fields.char('Name', size=64, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True, readonly=False),
-        'parent_id':fields.many2one('hr.salary.head', 'Parent', help="Linking a salary head to its parent is used only for the reporting purpose."),
+        'parent_id':fields.many2one('hr.salary.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."),
         'note': fields.text('Description'),
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'sequence': fields.integer('Sequence', required=True, help='Display sequence order'),
@@ -187,7 +187,7 @@ class hr_salary_head(osv.osv):
         'sequence': 5
     }
 
-hr_salary_head()
+hr_salary_category()
 
 class one2many_mod2(fields.one2many):
 
@@ -212,11 +212,11 @@ class hr_payslip(osv.osv):
     _name = 'hr.payslip'
     _description = 'Pay Slip'
 
-    def _get_lines_salary_head(self, cr, uid, ids, field_names, arg=None, context=None):
+    def _get_lines_salary_category(self, cr, uid, ids, field_names, arg=None, context=None):
         result = {}
         if not ids: return result
         cr.execute('''SELECT pl.slip_id, pl.id FROM hr_payslip_line AS pl \
-                    LEFT JOIN hr_salary_head AS sh on (pl.category_id = sh.id) \
+                    LEFT JOIN hr_salary_category AS sh on (pl.category_id = sh.id) \
                     WHERE pl.slip_id in %s \
                     GROUP BY pl.slip_id, sh.sequence, pl.sequence, pl.id ORDER BY sh.sequence, pl.sequence''',(tuple(ids),))
         res = cr.fetchall()
@@ -253,7 +253,7 @@ class hr_payslip(osv.osv):
         'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'note': fields.text('Description'),
         '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'),
+        'details_by_salary_category': fields.function(_get_lines_salary_category, 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"),
     }
     _defaults = {
@@ -473,10 +473,10 @@ class hr_payslip(osv.osv):
         return res
 
     def get_payslip_lines(self, cr, uid, contract_ids, payslip_id, context):
-        def _sum_salary_head(localdict, head, amount):
-            if head.parent_id:
-                localdict = _sum_salary_head(localdict, head.parent_id, amount)
-            localdict['heads'][head.code] = head.code in localdict['heads'] and localdict['heads'][head.code] + amount or amount
+        def _sum_salary_category(localdict, category, amount):
+            if category.parent_id:
+                localdict = _sum_salary_category(localdict, category.parent_id, amount)
+            localdict['categories'][category.code] = category.code in localdict['categories'] and localdict['categories'][category.code] + amount or amount
             return localdict
 
         #we keep a dict with the result because a value can be overwritten by another rule with the same code
@@ -487,7 +487,7 @@ class hr_payslip(osv.osv):
         worked_days = {}
         for input_line in payslip.input_line_ids:
             worked_days[input_line.code] = input_line
-        localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days}
+        localdict = {'categories': {}, 'payslip': payslip, 'worked_days': worked_days}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children
@@ -510,7 +510,7 @@ class hr_payslip(osv.osv):
                     #set/overwrite the amount computed for this rule in the localdict
                     localdict[rule.code] = amount
                     #sum the amount for its salary head
-                    localdict = _sum_salary_head(localdict, rule.category_id, amount - previous_amount)
+                    localdict = _sum_salary_category(localdict, rule.category_id, amount - previous_amount)
                     #create/overwrite the rule in the temporary results
                     result_dict[key] = {
                         'salary_rule_id': rule.id,
@@ -644,7 +644,7 @@ class hr_salary_rule(osv.osv):
         'code':fields.char('Code', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
         'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days['WORK100']['number_of_days']."),
-        'category_id':fields.many2one('hr.salary.head', 'Salary Head', required=True),
+        'category_id':fields.many2one('hr.salary.category', 'Category', required=True),
         'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),
         'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"),
         'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True),
@@ -684,7 +684,7 @@ class hr_salary_rule(osv.osv):
 # employee: hr.employee object
 # contract: hr.contract object
 # rules: rules code (previously computed)
-# heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
+# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
 
 # Note: returned value have to be set in the variable 'result'
@@ -698,12 +698,12 @@ result = contract.wage * 0.10''',
 # employee: hr.employee object
 # contract: hr.contract object
 # rules: rules code (previously computed)
-# heads: dictionary containing the computed heads (sum of amount of all rules belonging to that head). Keys are the head codes.
+# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
 
 # Note: returned value have to be set in the variable 'result'
 
-result = rules['NET'] > heads['NET'] * 0.10''',
+result = rules['NET'] > categories['NET'] * 0.10''',
         'condition_range': 'contract.wage',
         'sequence': 5,
         'appears_on_payslip': True,
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index 21273bfa725..49253ca90b4 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -2,32 +2,32 @@
 <openerp>
     <data noupdate="1">
     
-        <record id="BASIC" model="hr.salary.head">
+        <record id="BASIC" model="hr.salary.category">
             <field name="name">Basic</field>
             <field name="code">BASIC</field>
         </record>
     
-        <record id="ALW" model="hr.salary.head">
+        <record id="ALW" model="hr.salary.category">
             <field name="name">Allowance</field>
             <field name="code">ALW</field>
         </record>
         
-        <record id="DED" model="hr.salary.head">
+        <record id="DED" model="hr.salary.category">
             <field name="name">Deduction</field>
             <field name="code">DED</field>
         </record>
         
-        <record id="GROSS" model="hr.salary.head">
+        <record id="GROSS" model="hr.salary.category">
             <field name="name">Gross</field>
             <field name="code">GROSS</field>
         </record>
         
-        <record id="NET" model="hr.salary.head">
+        <record id="NET" model="hr.salary.category">
             <field name="name">Net</field>
             <field name="code">NET</field>
         </record>
         
-        <record id="COMP" model="hr.salary.head">
+        <record id="COMP" model="hr.salary.category">
             <field name="name">Company Contribution</field>
             <field name="code">COMP</field>
         </record>
@@ -177,7 +177,7 @@
             <field name="category_id" ref="hr_payroll.GROSS"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0)</field>
+            <field name="amount_python_compute">result = categories['BASIC'] + ('ALW' in categories and categories['ALW'] or 0.0)</field>
         </record>
 
         <record id="hr_rule_net" model="hr.salary.rule">
@@ -187,7 +187,7 @@
             <field name="category_id" ref="hr_payroll.NET"/>
             <field name="condition_select">none</field>
             <field name="amount_select">code</field>
-            <field name="amount_python_compute">result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0) + ('DED' in heads and heads['DED'] or 0.0)</field>
+            <field name="amount_python_compute">result = categories['BASIC'] + ('ALW' in categories and categories['ALW'] or 0.0) + ('DED' in categories and categories['DED'] or 0.0)</field>
         </record>
 
 
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 40a52a6c74e..1f39afc2462 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -260,8 +260,8 @@
                             </field>
                         </page>
 <!-- TODO: put me back -->
-	                    <page string="Details By Salary Head">
-                            <field name="details_by_salary_head" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
+	                    <page string="Details By Salary Category">
+                            <field name="details_by_salary_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
                                 <tree string="Payslip Lines" colors="blue:total == 0">
                                     <field name="category_id"/>
                                     <field name="name"/>
@@ -347,9 +347,9 @@
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
 
         <!-- Payment Heads -->
-        <record id="hr_salary_head_form" model="ir.ui.view">
-            <field name="name">hr.salary.head.form</field>
-            <field name="model">hr.salary.head</field>
+        <record id="hr_salary_category_form" model="ir.ui.view">
+            <field name="name">hr.salary.category.form</field>
+            <field name="model">hr.salary.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Heads">
@@ -365,9 +365,9 @@
             </field>
         </record>
 
-        <record id="hr_salary_head_tree" model="ir.ui.view">
-            <field name="name">hr.salary.head.tree</field>
-            <field name="model">hr.salary.head</field>
+        <record id="hr_salary_category_tree" model="ir.ui.view">
+            <field name="name">hr.salary.category.tree</field>
+            <field name="model">hr.salary.category</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Salary Heads">
@@ -379,9 +379,9 @@
             </field>
         </record>
 
-        <record id="view_hr_salary_head_filter" model="ir.ui.view">
-            <field name="name">hr.salary.head.select</field>
-            <field name="model">hr.salary.head</field>
+        <record id="view_hr_salary_category_filter" model="ir.ui.view">
+            <field name="name">hr.salary.category.select</field>
+            <field name="model">hr.salary.category</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Heads">
@@ -391,16 +391,16 @@
             </field>
         </record>
 
-        <record id="action_hr_salary_head" model="ir.actions.act_window">
-            <field name="name">Salary Heads</field>
-            <field name="res_model">hr.salary.head</field>
+        <record id="action_hr_salary_category" model="ir.actions.act_window">
+            <field name="name">Salary Categories</field>
+            <field name="res_model">hr.salary.category</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="hr_salary_head_tree"/>
-           <field name="search_view_id" ref="view_hr_salary_head_filter"/>
+            <field name="view_id" ref="hr_salary_category_tree"/>
+           <field name="search_view_id" ref="view_hr_salary_category_filter"/>
         </record>
         <menuitem
-            id="menu_hr_salary_head"
-            action="action_hr_salary_head"
+            id="menu_hr_salary_category"
+            action="action_hr_salary_category"
             parent="payroll_configure"
             sequence="11"
         />
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 609fc99c034..9fe2fd67498 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
 "access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1
-"access_hr_salary_head","hr.salary.head","model_hr_salary_head","base.group_hr_user",1,1,1,1
+"access_hr_salary_category","hr.salary.category","model_hr_salary_category","base.group_hr_user",1,1,1,1
 "access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
 "access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
 "access_res_partner_payroll","res.partner.payroll","base.model_res_partner","base.group_hr_user",1,1,1,1

From 7e28aed3a08f44e58fcf83005f5a29d7c616e2fd Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 10 May 2011 18:41:10 +0530
Subject: [PATCH 30/37] [FIX] Payroll: Payslip lines readonly with all states
 of payslips

bzr revid: mra@mra-laptop-20110510131110-gd32dkedh7m3gv2i
---
 addons/hr_payroll/hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 132d8fc1104..6894f32ad5c 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -247,7 +247,7 @@ class hr_payslip(osv.osv):
             \n* If the salary is paid then state is set to \'Paid Salary\'.\
             \n* The \'Reject\' state is used when user cancel payslip.'),
 #        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Line',readonly=True, states={'draft':[('readonly',False)]}),
+        'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Line',readonly=True),
         'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),

From 3eb0031cae88eba3f2443f8f42198cbd8c2b47fc Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 10 May 2011 19:02:27 +0530
Subject: [PATCH 31/37] [IMP] improve searh view of hr.employee add filter on
 categories

bzr revid: psi@tinyerp.co.in-20110510133227-fzbbptd2tje5suf8
---
 addons/hr/hr.py       |  6 +++---
 addons/hr/hr_view.xml | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a2c4ee3805b..13db46ccc22 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -142,8 +142,8 @@ class hr_employee(osv.osv):
         'work_email': fields.char('Work E-mail', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
-        'parent_id': fields.many2one('hr.employee', 'Manager'), 
-        'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Category'),
+        'parent_id': fields.many2one('hr.employee', 'Manager'),
+        'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Categories'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
@@ -231,7 +231,7 @@ class res_users(osv.osv):
         except:
             # Tolerate a missing shortcut. See product/product.py for similar code.
             logging.getLogger('orm').debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
-            
+
         return user_id
 
 res_users()
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 9f50ed5852d..7fda9314592 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -110,6 +110,7 @@
                     <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
                     </field>
                     <field name="job_id" widget="selection"/>
+                    <field name="category_ids" select="1" groups="base.group_extended"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
@@ -157,12 +158,12 @@
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
-	    <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
-	        <field name="name">Employees</field>
-	        <field name="resource">ir.ui.menu</field>
-	        <field name="user_id" ref="base.user_root"/>
-	        <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
-	    </record>
+        <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
+            <field name="name">Employees</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
+        </record>
 
         <!--
         =======================
@@ -280,7 +281,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" 
+        <menuitem action="open_view_categ_tree"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">

From 7ae069998e9f72e400de7d3874f8853cf3976355 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 11 May 2011 12:48:54 +0530
Subject: [PATCH 32/37] [IMP] hr_payroll: renamed hr.salary.category into
 hr.salary.rule.category

bzr revid: mtr@mtr-20110511071854-ctdf3czpedhe5t6l
---
 addons/hr_payroll/hr_payroll.py               | 30 ++++++++--------
 addons/hr_payroll/hr_payroll_data.xml         | 12 +++----
 addons/hr_payroll/hr_payroll_view.xml         | 36 +++++++++----------
 .../hr_payroll/security/ir.model.access.csv   |  2 +-
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 658df8c69c5..1f29bc1e0a7 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -164,17 +164,17 @@ class contrib_register(osv.osv):
 
 contrib_register()
 
-class hr_salary_category(osv.osv):
+class hr_salary_rule_category(osv.osv):
     """
-    HR Salary Category
+    HR Salary Rule Category
     """
 
-    _name = 'hr.salary.category'
-    _description = 'Salary Category'
+    _name = 'hr.salary.rule.category'
+    _description = 'Salary Rule Category'
     _columns = {
         'name':fields.char('Name', size=64, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True, readonly=False),
-        'parent_id':fields.many2one('hr.salary.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."),
+        'parent_id':fields.many2one('hr.salary.rule.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."),
         'note': fields.text('Description'),
         'company_id':fields.many2one('res.company', 'Company', required=False),
     }
@@ -185,7 +185,7 @@ class hr_salary_category(osv.osv):
                     context=context).company_id.id,
     }
 
-hr_salary_category()
+hr_salary_rule_category()
 
 class one2many_mod2(fields.one2many):
 
@@ -210,11 +210,11 @@ class hr_payslip(osv.osv):
     _name = 'hr.payslip'
     _description = 'Pay Slip'
 
-    def _get_lines_salary_category(self, cr, uid, ids, field_names, arg=None, context=None):
+    def _get_lines_salary_rule_category(self, cr, uid, ids, field_names, arg=None, context=None):
         result = {}
         if not ids: return result
         cr.execute('''SELECT pl.slip_id, pl.id FROM hr_payslip_line AS pl \
-                    LEFT JOIN hr_salary_category AS sh on (pl.category_id = sh.id) \
+                    LEFT JOIN hr_salary_rule_category AS sh on (pl.category_id = sh.id) \
                     WHERE pl.slip_id in %s \
                     GROUP BY pl.slip_id, pl.sequence, pl.id ORDER BY pl.sequence''',(tuple(ids),))
         res = cr.fetchall()
@@ -251,7 +251,7 @@ class hr_payslip(osv.osv):
         'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'note': fields.text('Description'),
         'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'details_by_salary_category': fields.function(_get_lines_salary_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'),
+        'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'),
         'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
     }
     _defaults = {
@@ -471,9 +471,9 @@ class hr_payslip(osv.osv):
         return res
 
     def get_payslip_lines(self, cr, uid, contract_ids, payslip_id, context):
-        def _sum_salary_category(localdict, category, amount):
+        def _sum_salary_rule_category(localdict, category, amount):
             if category.parent_id:
-                localdict = _sum_salary_category(localdict, category.parent_id, amount)
+                localdict = _sum_salary_rule_category(localdict, category.parent_id, amount)
             localdict['categories'][category.code] = category.code in localdict['categories'] and localdict['categories'][category.code] + amount or amount
             return localdict
 
@@ -508,7 +508,7 @@ class hr_payslip(osv.osv):
                     #set/overwrite the amount computed for this rule in the localdict
                     localdict[rule.code] = amount
                     #sum the amount for its salary category
-                    localdict = _sum_salary_category(localdict, rule.category_id, amount - previous_amount)
+                    localdict = _sum_salary_rule_category(localdict, rule.category_id, amount - previous_amount)
                     #create/overwrite the rule in the temporary results
                     result_dict[key] = {
                         'salary_rule_id': rule.id,
@@ -641,7 +641,7 @@ class hr_salary_rule(osv.osv):
         'code':fields.char('Code', size=64, required=True, help="The code of salary rules can be used as reference in computation of other rules. In that case, it is case sensitive."),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
         'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days['WORK100']['number_of_days']."),
-        'category_id':fields.many2one('hr.salary.category', 'Category', required=True),
+        'category_id':fields.many2one('hr.salary.rule.category', 'Category', required=True),
         'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."),
         'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"),
         'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True),
@@ -681,7 +681,7 @@ class hr_salary_rule(osv.osv):
 # employee: hr.employee object
 # contract: hr.contract object
 # rules: rules code (previously computed)
-# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes.
+# categories: dictionary containing the computed salary rule categories (sum of amount of all rules belonging to that category). Keys are the category codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
 
 # Note: returned value have to be set in the variable 'result'
@@ -695,7 +695,7 @@ result = contract.wage * 0.10''',
 # employee: hr.employee object
 # contract: hr.contract object
 # rules: rules code (previously computed)
-# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes.
+# categories: dictionary containing the computed salary rule categories (sum of amount of all rules belonging to that category). Keys are the category codes.
 # worked_days: dictionary containing the computed worked days. Keys are the worked days codes.
 
 # Note: returned value have to be set in the variable 'result'
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index cee14f2ccbb..c7ba6e62062 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -2,32 +2,32 @@
 <openerp>
     <data noupdate="1">
     
-        <record id="BASIC" model="hr.salary.category">
+        <record id="BASIC" model="hr.salary.rule.category">
             <field name="name">Basic</field>
             <field name="code">BASIC</field>
         </record>
     
-        <record id="ALW" model="hr.salary.category">
+        <record id="ALW" model="hr.salary.rule.category">
             <field name="name">Allowance</field>
             <field name="code">ALW</field>
         </record>
         
-        <record id="DED" model="hr.salary.category">
+        <record id="DED" model="hr.salary.rule.category">
             <field name="name">Deduction</field>
             <field name="code">DED</field>
         </record>
         
-        <record id="GROSS" model="hr.salary.category">
+        <record id="GROSS" model="hr.salary.rule.category">
             <field name="name">Gross</field>
             <field name="code">GROSS</field>
         </record>
         
-        <record id="NET" model="hr.salary.category">
+        <record id="NET" model="hr.salary.rule.category">
             <field name="name">Net</field>
             <field name="code">NET</field>
         </record>
         
-        <record id="COMP" model="hr.salary.category">
+        <record id="COMP" model="hr.salary.rule.category">
             <field name="name">Company Contribution</field>
             <field name="code">COMP</field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f7015a97791..87a2b263640 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -260,8 +260,8 @@
                             </field>
                         </page>
 <!-- TODO: put me back -->
-	                    <page string="Details By Salary Category">
-                            <field name="details_by_salary_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
+	                    <page string="Details By Salary Rule Category">
+                            <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
                                 <tree string="Payslip Lines" colors="blue:total == 0">
                                     <field name="category_id"/>
                                     <field name="name"/>
@@ -347,9 +347,9 @@
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
 
         <!-- Salary Category-->
-        <record id="hr_salary_category_form" model="ir.ui.view">
-            <field name="name">hr.salary.category.form</field>
-            <field name="model">hr.salary.category</field>
+        <record id="hr_salary_rule_category_form" model="ir.ui.view">
+            <field name="name">hr.salary.rule.category.form</field>
+            <field name="model">hr.salary.rule.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Categories">
@@ -364,9 +364,9 @@
             </field>
         </record>
 
-        <record id="hr_salary_category_tree" model="ir.ui.view">
-            <field name="name">hr.salary.category.tree</field>
-            <field name="model">hr.salary.category</field>
+        <record id="hr_salary_rule_category_tree" model="ir.ui.view">
+            <field name="name">hr.salary.rule.category.tree</field>
+            <field name="model">hr.salary.rule.category</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Salary Rule Categories">
@@ -377,9 +377,9 @@
             </field>
         </record>
 
-        <record id="view_hr_salary_category_filter" model="ir.ui.view">
-            <field name="name">hr.salary.category.select</field>
-            <field name="model">hr.salary.category</field>
+        <record id="view_hr_salary_rule_category_filter" model="ir.ui.view">
+            <field name="name">hr.salary.rule.category.select</field>
+            <field name="model">hr.salary.rule.category</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
@@ -389,16 +389,16 @@
             </field>
         </record>
 
-        <record id="action_hr_salary_category" model="ir.actions.act_window">
-            <field name="name">Salary Categories</field>
-            <field name="res_model">hr.salary.category</field>
+        <record id="action_hr_salary_rule_category" model="ir.actions.act_window">
+            <field name="name">Salary Rule Categories</field>
+            <field name="res_model">hr.salary.rule.category</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="hr_salary_category_tree"/>
-           <field name="search_view_id" ref="view_hr_salary_category_filter"/>
+            <field name="view_id" ref="hr_salary_rule_category_tree"/>
+           <field name="search_view_id" ref="view_hr_salary_rule_category_filter"/>
         </record>
         <menuitem
-            id="menu_hr_salary_category"
-            action="action_hr_salary_category"
+            id="menu_hr_salary_rule_category"
+            action="action_hr_salary_rule_category"
             parent="payroll_configure"
             sequence="11"
         />
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index d91f380cf0e..f1a3a0f4ae4 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
 "access_hr_contribution_register","hr.contribution.register","model_hr_contribution_register","base.group_hr_user",1,1,1,1
-"access_hr_salary_category","hr.salary.category","model_hr_salary_category","base.group_hr_user",1,1,1,1
+"access_hr_salary_rule_category","hr.salary.rule.category","model_hr_salary_rule_category","base.group_hr_user",1,1,1,1
 "access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
 "access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
 "access_hr_payslip_input_user","hr.payslip.input.user","model_hr_payslip_input","base.group_hr_user",1,1,1,1

From d7055116642fbc9000fa7c7a144bf792b9bced5c Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 11 May 2011 14:40:09 +0530
Subject: [PATCH 33/37] [IMP] Improve code and add state on hr.payslip.run
 object

bzr revid: psi@tinyerp.co.in-20110511091009-iyu5bloo5ewg5re9
---
 addons/hr_payroll/hr_payroll.py               | 24 +++++++++++++++----
 addons/hr_payroll/hr_payroll_view.xml         |  9 +++++--
 .../hr_payroll_payslips_by_employees.py       |  7 ++----
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index d4b23b4a565..e6bd76923c9 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -208,9 +208,23 @@ class hr_payslip_run(osv.osv):
 
     _name = 'hr.payslip.run'
     _columns = {
-        'name':fields.char('Name', size=256, required=True),
-        'slip_ids':fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True),
+        'name': fields.char('Name', size=256, readonly=True, states={'draft': [('readonly', False)]}),
+        'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('close', 'Close'),
+        ], 'State', select=True, readonly=True)
     }
+    _defaults = {
+        'state': 'draft',
+    }
+
+    def draft_payslip_run(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+
+    def close_payslip_run(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'close'}, context=context)
+
 hr_payslip_run()
 
 class hr_payslip(osv.osv):
@@ -236,7 +250,7 @@ class hr_payslip(osv.osv):
         return result
 
     _columns = {
-        'struct_id': fields.many2one('hr.payroll.structure', 'Structure', help='Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn\'t mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period'),
+        'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True, states={'draft': [('readonly', False)]}, help='Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn\'t mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period'),
         'name': fields.char('Description', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'number': fields.char('Reference', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -257,11 +271,11 @@ class hr_payslip(osv.osv):
             \n* If the salary is paid then state is set to \'Paid Salary\'.\
             \n* The \'Reject\' state is used when user cancel payslip.'),
 #        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Line',readonly=True, states={'draft':[('readonly',False)]}),
+        'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Line', readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'note': fields.text('Description'),
+        'note': fields.text('Description', readonly=True, states={'draft':[('readonly',False)]}),
         '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"),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8ff66113577..8082418b963 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -288,7 +288,7 @@
                             <separator colspan="4" string="Other Information"/>
                             <group col="5" colspan="2">
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="payslip_run_id"/>
+                                <field name="payslip_run_id" domain="[('state','=','draft')]"/>
                                 <field name="paid" readonly="1"/>
                             </group>
                             <newline/>
@@ -621,7 +621,12 @@
                         <field name="slip_ids" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
-                <button name="%(action_hr_payslip_by_employees)d" type="action" icon="terp-stock_effects-object-colorize" string="Generate Payslips" />
+                <group col="6" colspan="6">
+                    <field name="state"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
+                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
+                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index 31d2a77ee8a..8413bb81f61 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -52,12 +52,9 @@ class hr_payslip_employees(osv.osv_memory):
                 'struct_id': slip_data['value'].get('struct_id', False),
                 'contract_id': slip_data['value'].get('contract_id', False),
                 'payslip_run_id': context.get('active_id', False),
+                'input_line_ids': [(0, 0, x) for x in slip_data['value'].get('input_line_ids', False)]
             }
-            slip_id = slip_pool.create(cr, uid, res, context=context)
-            for input in slip_data['value']['input_line_ids']:
-                input.update({'payslip_id': slip_id})
-                input_line_pool.create(cr, uid, input, context=context)
-            slip_ids.append(slip_id)
+            slip_ids.append(slip_pool.create(cr, uid, res, context=context))
         slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 

From dad5da0b60eac07686c09d46357d9b1f5f347d18 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 11 May 2011 19:05:22 +0530
Subject: [PATCH 34/37] [FIX] small fix

bzr revid: psi@tinyerp.co.in-20110511133522-8e51br6tsnzs4dao
---
 addons/hr_payroll/hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index b3962cef824..b15cb8ff03a 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -510,7 +510,7 @@ class hr_payslip(osv.osv):
         inputs = {}
         for input_line in payslip.input_line_ids:
             inputs[input_line.code] = input_line
-        localdict = {'heads': {}, 'payslip': payslip, 'worked_days': worked_days, 'inputs': inputs}
+        localdict = {'categories': {}, 'payslip': payslip, 'worked_days': worked_days, 'inputs': inputs}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children

From 3df45b0659a3bf65bff52926f995e78c6a11841a Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 12 May 2011 10:37:03 +0530
Subject: [PATCH 35/37] [FIX] small fix in onchange_employee(when onchage is
 called with no employee, worked days lines will also update)

bzr revid: psi@tinyerp.co.in-20110512050703-lvf1d3ra76i4walx
---
 addons/hr_payroll/hr_payroll.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index ed6961ae998..c3e153b9a82 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -613,6 +613,7 @@ class hr_payslip(osv.osv):
         res = {'value':{
                       'line_ids':[],
                       'input_line_ids': [],
+                      'worked_days_line_ids': [],
                       #'details_by_salary_head':[], TODO put me back
                       'name':'',
                       'contract_id': False,

From badc8caef52ccf5911c3423420ffbb524e8f647c Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 12 May 2011 12:32:53 +0530
Subject: [PATCH 36/37] [IMP] small improvment in wizard

bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0
---
 addons/hr_payroll/hr_payroll.py                               | 4 ++--
 addons/hr_payroll/hr_payroll_view.xml                         | 2 +-
 addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py  | 3 +--
 addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index c3e153b9a82..5bec8164e32 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -206,8 +206,8 @@ class hr_payslip_run(osv.osv):
 
     _name = 'hr.payslip.run'
     _columns = {
-        'name': fields.char('Name', size=256, readonly=True, states={'draft': [('readonly', False)]}),
-        'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True),
+        'name': fields.char('Name', size=64, readonly=True, states={'draft': [('readonly', False)]}),
+        'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('close', 'Close'),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 27fa0d15bc2..4d422d708de 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -660,7 +660,7 @@
                 <group col="6" colspan="6">
                     <field name="state"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
+                    <button name="close_payslip_run" type="object" icon="gtk-jump-to" string="Close" states="draft"/>
                     <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
                 </group>
             </form>
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index 0f0c42095d2..55375095025 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -37,13 +37,12 @@ class hr_payslip_employees(osv.osv_memory):
     def compute_sheet(self, cr, uid, ids, context=None):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
-        input_line_pool = self.pool.get('hr.payslip.input')
         slip_ids = []
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         if not data['employee_ids']:
-            raise osv.except_osv(_("Warning !"), _("You must select employees to generate payslip"))
+            raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip"))
         for emp in emp_pool.browse(cr, uid, data['employee_ids'], context=context):
             slip_data = slip_pool.onchange_employee_id(cr, uid, [], time.strftime('%Y-%m-01'), str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10], emp.id, contract_id=False, context=context)
             res = {
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index 28d83700948..c8bd142dbf9 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.payslip.employees</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employees">
+                <form string="Payslips by Employees">
                     <group colspan="4" >
                         <separator string="Payslips by Employees" colspan="4"/>
                         <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s)" />
@@ -18,7 +18,7 @@
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button  icon="terp-gtk-go-back-rtl" string="Generate" name="compute_sheet" type="object"/>
+                        <button  icon="gtk-execute" string="Generate" name="compute_sheet" type="object"/>
                     </group>
                </form>
             </field>

From 2058cd5859746bf575006e55d8979c8b316204ad Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 12 May 2011 12:51:31 +0530
Subject: [PATCH 37/37] [IMP] small change in warning

bzr revid: psi@tinyerp.co.in-20110512072131-bkyu91oejlje6k1e
---
 addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index 55375095025..ebb9bed26c1 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -42,7 +42,7 @@ class hr_payslip_employees(osv.osv_memory):
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         if not data['employee_ids']:
-            raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip"))
+            raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip(s)"))
         for emp in emp_pool.browse(cr, uid, data['employee_ids'], context=context):
             slip_data = slip_pool.onchange_employee_id(cr, uid, [], time.strftime('%Y-%m-01'), str(datetime.now() + relativedelta.relativedelta(months=+1, day=1, days=-1))[:10], emp.id, contract_id=False, context=context)
             res = {