From 0bff771edab196b67c87ae450d520e57957c8492 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 16 May 2011 16:02:31 +0530
Subject: [PATCH 01/13] [IMP] hr_payroll_account: removed fields from
 contribution.register and salary.rule

bzr revid: mtr@mtr-20110516103231-vzmxbdy11zyhs52y
---
 .../hr_payroll_account/hr_payroll_account.py  | 64 ++++++++-----------
 .../hr_payroll_account_view.xml               |  2 -
 2 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index a58aed22730..63cac3f8684 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -33,7 +33,6 @@ class contrib_register(osv.osv):
     _description = 'Contribution Register'
 
     _columns = {
-        'account_id': fields.many2one('account.account', 'Account'),
         'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
     }
 contrib_register()
@@ -109,40 +108,34 @@ class hr_payslip(osv.osv):
                 'narration': name
             }
             for line in slip.line_ids:
-                if line.salary_rule_id.accounting_select != 'none':
-                    amt = slip.credit_note and -line.total or line.total
-                    partner_id = False
-                    name = line.name
-                    debit_account_id = line.salary_rule_id.account_debit.id
-                    credit_account_id = line.salary_rule_id.account_credit.id
-                    if line.salary_rule_id.accounting_select == 'third_party':
-                        if line.salary_rule_id.register_id:
-                            credit_account_id = line.salary_rule_id.register_id.account_id.id
-                        else:
-                            partner_id = slip.employee_id.partner_id.id
-                    debit_line = (0,0,{
-                        'name': line.name,
-                        'account_id': debit_account_id,
-                        'debit': amt > 0.0 and amt or 0.0,
-                        'credit': amt < 0.0 and -amt or 0.0,
-                        'date': timenow,
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id,
-                    })
-                    credit_line = (0,0,{
-                        'date': timenow,
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id,
-                        'name': name,
-                        'partner_id': partner_id,
-                        'account_id': credit_account_id,
-                        'debit': amt < 0.0 and -amt or 0.0,
-                        'credit': amt > 0.0 and amt or 0.0,
-                    })
-                    if debit_account_id:
-                        line_ids.append(debit_line)
-                    if credit_account_id:
-                        line_ids.append(credit_line)
+                amt = slip.credit_note and -line.total or line.total
+                partner_id = False
+                name = line.name
+                debit_account_id = line.salary_rule_id.account_debit.id
+                credit_account_id = line.salary_rule_id.account_credit.id
+                debit_line = (0,0,{
+                    'name': line.name,
+                    'account_id': debit_account_id,
+                    'debit': amt > 0.0 and amt or 0.0,
+                    'credit': amt < 0.0 and -amt or 0.0,
+                    'date': timenow,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
+                })
+                credit_line = (0,0,{
+                    'date': timenow,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
+                    'name': name,
+                    'partner_id': partner_id,
+                    'account_id': credit_account_id,
+                    'debit': amt < 0.0 and -amt or 0.0,
+                    'credit': amt > 0.0 and amt or 0.0,
+                })
+                if debit_account_id:
+                    line_ids.append(debit_line)
+                if credit_account_id:
+                    line_ids.append(credit_line)
             move.update({'line_id': line_ids})
             move_id = move_pool.create(cr, uid, move, context=context)
             self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)
@@ -381,7 +374,6 @@ hr_payslip()
 class hr_salary_rule(osv.osv):
     _inherit = 'hr.salary.rule'
     _columns = {
-        'accounting_select':fields.selection([('none', 'No Accounting Entries'), ('third_party', 'To Employee or contribution Register'), ('yes','Regular Entries')], 'Accounting Entries Option'),
         'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
         'account_tax_id':fields.many2one('account.tax.code', 'Tax Code'),
         'account_debit': fields.many2one('account.account', 'Debit Account'),
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 4b36508138d..9b9895c31a7 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -26,7 +26,6 @@
             <field name="arch" type="xml">
              <xpath expr="/form/notebook" position="before">
                 <newline/>
-                <field name="account_id" />
                 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
              </xpath>
             </field>
@@ -41,7 +40,6 @@
             <field name="arch" type="xml">
               <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
                     <page string="Accounting">
-	                    <field name="accounting_select" />
 	                    <field name="account_debit" />
 	                    <field name="account_credit"/>
 	                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>

From 2aeb9b6ef444f20305ea0335020b7ea9d8d84b19 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 26 May 2011 18:40:45 +0530
Subject: [PATCH 02/13] [IMP] hr_payroll_account: improved code to create
 accounting entries in order to balance the moves

bzr revid: mtr@mtr-20110526131045-st6zsk868ul0zs3q
---
 .../hr_payroll_account/hr_payroll_account.py  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 63cac3f8684..b210365c6eb 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -90,7 +90,8 @@ class hr_payslip(osv.osv):
 
         for slip in self.browse(cr, uid, ids, context=context):
             line_ids = []
-
+            debit_sum = 0.0
+            credit_sum = 0.0
             if not slip.period_id:
                 search_periods = period_pool.search(cr, uid, [('date_start','<=',slip.date_from),('date_stop','>=',slip.date_to)], context=context)
                 if not search_periods:
@@ -122,6 +123,7 @@ class hr_payslip(osv.osv):
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
                 })
+                debit_sum += debit_line[2]['debit']
                 credit_line = (0,0,{
                     'date': timenow,
                     'journal_id': slip.journal_id.id,
@@ -132,10 +134,37 @@ class hr_payslip(osv.osv):
                     'debit': amt < 0.0 and -amt or 0.0,
                     'credit': amt > 0.0 and amt or 0.0,
                 })
+                credit_sum += debit_line[2]['credit']
                 if debit_account_id:
                     line_ids.append(debit_line)
                 if credit_account_id:
                     line_ids.append(credit_line)
+            
+            if debit_sum > credit_sum:
+                bal_credit_line = (0,0,{
+                    'date': timenow,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
+                    'name': 'Balancing Entry',
+                    'partner_id': partner_id,
+                    'account_id': slip.journal_id.default_credit_account_id.id,
+                    'debit': 0.0,
+                    'credit': debit_sum - credit_sum,
+                })
+                line_ids.append(bal_credit_line)
+            else:
+                bal_debit_line = (0,0,{
+                    'date': timenow,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
+                    'name': 'Balancing Entry',
+                    'partner_id': partner_id,
+                    'account_id': slip.journal_id.default_debit_account_id.id,
+                    'debit': 0.0,
+                    'credit': credit_sum - debit_sum,
+                })
+                line_ids.append(bal_debit_line)
+                
             move.update({'line_id': line_ids})
             move_id = move_pool.create(cr, uid, move, context=context)
             self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)

From 4f28c87d46705faa8f2e3953fbc9d70b806d7dbe Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 27 May 2011 10:46:11 +0530
Subject: [PATCH 03/13] [IMP] hr_payroll_account: changed variable name and
 string for adjustment moves

bzr revid: mtr@mtr-20110527051611-plh7e43c6n9brx5x
---
 addons/hr_payroll_account/hr_payroll_account.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index b210365c6eb..cf43cb01679 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -141,29 +141,29 @@ class hr_payslip(osv.osv):
                     line_ids.append(credit_line)
             
             if debit_sum > credit_sum:
-                bal_credit_line = (0,0,{
+                adjust_credit = (0,0,{
                     'date': timenow,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
-                    'name': 'Balancing Entry',
+                    'name': 'Adjustment Entry',
                     'partner_id': partner_id,
                     'account_id': slip.journal_id.default_credit_account_id.id,
                     'debit': 0.0,
                     'credit': debit_sum - credit_sum,
                 })
-                line_ids.append(bal_credit_line)
+                line_ids.append(adjust_credit)
             else:
-                bal_debit_line = (0,0,{
+                adjust_debit = (0,0,{
                     'date': timenow,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
-                    'name': 'Balancing Entry',
+                    'name': 'Adjustment Entry',
                     'partner_id': partner_id,
                     'account_id': slip.journal_id.default_debit_account_id.id,
                     'debit': 0.0,
                     'credit': credit_sum - debit_sum,
                 })
-                line_ids.append(bal_debit_line)
+                line_ids.append(adjust_debit)
                 
             move.update({'line_id': line_ids})
             move_id = move_pool.create(cr, uid, move, context=context)

From d65bc5d7ca7d0b51071f4f0b7e74ae1905597087 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 27 May 2011 10:59:21 +0530
Subject: [PATCH 04/13] [IMP] hr_payroll_account: minor change in Adjustment
 entry for debit

bzr revid: mtr@mtr-20110527052921-w6dnm07rpn3nzx3b
---
 addons/hr_payroll_account/hr_payroll_account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index cf43cb01679..23c6a2bea49 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -160,8 +160,8 @@ class hr_payslip(osv.osv):
                     'name': 'Adjustment Entry',
                     'partner_id': partner_id,
                     'account_id': slip.journal_id.default_debit_account_id.id,
-                    'debit': 0.0,
-                    'credit': credit_sum - debit_sum,
+                    'debit': credit_sum - debit_sum,
+                    'credit': 0.0
                 })
                 line_ids.append(adjust_debit)
                 

From bc343fe2515cfb1ab55655e2aa243e53c2f54890 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 30 May 2011 12:06:45 +0200
Subject: [PATCH 05/13] [FIX] hr_payroll_account: misc fixes

bzr revid: qdp-launchpad@openerp.com-20110530100645-f9auedgpta62zp77
---
 addons/hr_payroll_account/hr_payroll_account.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 23c6a2bea49..2b70ae698b4 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -123,7 +123,6 @@ class hr_payslip(osv.osv):
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
                 })
-                debit_sum += debit_line[2]['debit']
                 credit_line = (0,0,{
                     'date': timenow,
                     'journal_id': slip.journal_id.id,
@@ -134,30 +133,31 @@ class hr_payslip(osv.osv):
                     'debit': amt < 0.0 and -amt or 0.0,
                     'credit': amt > 0.0 and amt or 0.0,
                 })
-                credit_sum += debit_line[2]['credit']
                 if debit_account_id:
                     line_ids.append(debit_line)
+                    debit_sum += debit_line[2]['debit']
                 if credit_account_id:
                     line_ids.append(credit_line)
+                    credit_sum += credit_line[2]['credit']
             
             if debit_sum > credit_sum:
                 adjust_credit = (0,0,{
                     'date': timenow,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
-                    'name': 'Adjustment Entry',
+                    'name': _('Adjustment Entry'),
                     'partner_id': partner_id,
                     'account_id': slip.journal_id.default_credit_account_id.id,
                     'debit': 0.0,
                     'credit': debit_sum - credit_sum,
                 })
                 line_ids.append(adjust_credit)
-            else:
+            elif debit_sum < credit_sum:
                 adjust_debit = (0,0,{
                     'date': timenow,
                     'journal_id': slip.journal_id.id,
                     'period_id': period_id,
-                    'name': 'Adjustment Entry',
+                    'name': _('Adjustment Entry'),
                     'partner_id': partner_id,
                     'account_id': slip.journal_id.default_debit_account_id.id,
                     'debit': credit_sum - debit_sum,

From 3eaa5428eefe4bcec4844a80017a4d3cc724152f Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 31 May 2011 12:32:28 +0530
Subject: [PATCH 06/13] [IMP] hr_payroll_account: remove analaytic_account_id
 field and post the move only if the boolean 'skip draft state for new entry'
 is set on the selected journal of payslip

bzr revid: psi@tinyerp.co.in-20110531070228-vp7doq20e6cbgjro
---
 .../hr_payroll_account/hr_payroll_account.py  | 58 ++++++++-----------
 .../hr_payroll_account_view.xml               | 31 +++-------
 2 files changed, 33 insertions(+), 56 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 2b70ae698b4..476196759b2 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -27,16 +27,6 @@ from osv import fields, osv
 from tools import config
 from tools.translate import _
 
-
-class contrib_register(osv.osv):
-    _inherit = 'hr.contribution.register'
-    _description = 'Contribution Register'
-
-    _columns = {
-        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
-    }
-contrib_register()
-
 #class account_move_line(osv.osv):
 #
 #    _inherit = 'account.move.line'
@@ -83,8 +73,6 @@ class hr_payslip(osv.osv):
 #TODO: to correct
     def process_sheet(self, cr, uid, ids, context=None):
         move_pool = self.pool.get('account.move')
-        movel_pool = self.pool.get('account.move.line')
-        invoice_pool = self.pool.get('account.invoice')
         period_pool = self.pool.get('account.period')
         timenow = time.strftime('%Y-%m-%d')
 
@@ -102,34 +90,34 @@ class hr_payslip(osv.osv):
 
             name = _('Payslip of %s') % (slip.employee_id.name)
             move = {
+                'narration': name,
+                'date': timenow,
+                'ref': slip.number,
                 'journal_id': slip.journal_id.id,
                 'period_id': period_id,
-                'date': timenow,
-                'ref':slip.number,
-                'narration': name
             }
             for line in slip.line_ids:
                 amt = slip.credit_note and -line.total or line.total
                 partner_id = False
-                name = line.name
                 debit_account_id = line.salary_rule_id.account_debit.id
                 credit_account_id = line.salary_rule_id.account_credit.id
-                debit_line = (0,0,{
+                debit_line = (0, 0, {
                     'name': line.name,
+                    'date': timenow,
+                    'partner_id': partner_id,
                     'account_id': debit_account_id,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
                     'debit': amt > 0.0 and amt or 0.0,
                     'credit': amt < 0.0 and -amt or 0.0,
-                    'date': timenow,
-                    'journal_id': slip.journal_id.id,
-                    'period_id': period_id,
                 })
-                credit_line = (0,0,{
+                credit_line = (0, 0, {
+                    'name': line.name,
                     'date': timenow,
-                    'journal_id': slip.journal_id.id,
-                    'period_id': period_id,
-                    'name': name,
                     'partner_id': partner_id,
                     'account_id': credit_account_id,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
                     'debit': amt < 0.0 and -amt or 0.0,
                     'credit': amt > 0.0 and amt or 0.0,
                 })
@@ -139,35 +127,37 @@ class hr_payslip(osv.osv):
                 if credit_account_id:
                     line_ids.append(credit_line)
                     credit_sum += credit_line[2]['credit']
-            
+
             if debit_sum > credit_sum:
-                adjust_credit = (0,0,{
-                    'date': timenow,
-                    'journal_id': slip.journal_id.id,
-                    'period_id': period_id,
+                adjust_credit = (0, 0, {
                     'name': _('Adjustment Entry'),
+                    'date': timenow,
                     'partner_id': partner_id,
                     'account_id': slip.journal_id.default_credit_account_id.id,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
                     'debit': 0.0,
                     'credit': debit_sum - credit_sum,
                 })
                 line_ids.append(adjust_credit)
             elif debit_sum < credit_sum:
-                adjust_debit = (0,0,{
-                    'date': timenow,
-                    'journal_id': slip.journal_id.id,
-                    'period_id': period_id,
+                adjust_debit = (0, 0, {
                     'name': _('Adjustment Entry'),
+                    'date': timenow,
                     'partner_id': partner_id,
                     'account_id': slip.journal_id.default_debit_account_id.id,
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
                     'debit': credit_sum - debit_sum,
                     'credit': 0.0
                 })
                 line_ids.append(adjust_debit)
-                
+
             move.update({'line_id': line_ids})
             move_id = move_pool.create(cr, uid, move, context=context)
             self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)
+            if slip.journal_id.entry_posted:
+                move_pool.post(cr, uid, [move_id], context=context)
         return super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)
 
 #TODO: to clean: the verofying doesn't do anything in the accounting..
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 9b9895c31a7..825fac9cab4 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -18,19 +18,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="hr_contibution_register_inherit_form">
-            <field name="name">hr.contribution.register.inherit.form</field>
-            <field name="model">hr.contribution.register</field>
-            <field name="inherit_id" ref="hr_payroll.hr_contribution_register_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <xpath expr="/form/notebook" position="before">
-                <newline/>
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-             </xpath>
-            </field>
-        </record>
-
     <!-- Adding Account fields to the Salary Rules -->
 
         <record id="hr_salary_rule_form_inherit" model="ir.ui.view">
@@ -40,10 +27,10 @@
             <field name="arch" type="xml">
               <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
                     <page string="Accounting">
-	                    <field name="account_debit" />
-	                    <field name="account_credit"/>
-	                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-	                    <field name="account_tax_id"/>
+                        <field name="account_debit" />
+                        <field name="account_credit"/>
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="account_tax_id"/>
                     </page>
                 </xpath>
             </field>
@@ -57,11 +44,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/notebook/page/group/field[@name='advantages']" position="after">
-	               <separator colspan="4" string="Accounting"/>
-	                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-	                <field name="journal_id"/>
-	            </xpath>
+                <xpath expr="/form/notebook/page/group/field[@name='advantages']" position="after">
+                   <separator colspan="4" string="Accounting"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="journal_id"/>
+                </xpath>
             </field>
         </record>
 

From 6f5c7b8227ffd385ce8e0e34dfbeb88a3748d3d8 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 14:18:55 +0530
Subject: [PATCH 07/13] [IMP] hr_payroll: Added demo data for contribution
 register and updated the demo data

bzr revid: psi@tinyerp.co.in-20110629084855-ah2889z5oucv6ssg
---
 addons/hr_payroll/hr_payroll_demo.xml | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 6408cb78094..a7c0e170b6e 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -2,43 +2,57 @@
 <openerp>
     <data>
 
+        <!-- Contribution Register -->
+
+        <record id="hr_contribution_register_allowance" model="hr.contribution.register">
+            <field name="name">Contribution Register for Allowances</field>
+        </record>
+
+        <record id="hr_contribution_register_deduction" model="hr.contribution.register">
+            <field name="name">Contribution Register for Deductions</field>
+        </record>
+
         <!-- Salary Rules -->
 
-        <record id="hr_payslip_line_houserantallowance1" model="hr.salary.rule">
+        <record id="hr_salary_rule_houserentallowance1" model="hr.salary.rule">
             <field name="amount_select">percentage</field>
             <field eval="40.0" name="amount_percentage"/>
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">HRA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_contribution_register_allowance"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
         </record>
 
-        <record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
+        <record id="hr_salary_rule_convanceallowance1" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="800.0" name="amount_fix"/>
             <field name="code">CA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="register_id" ref="hr_contribution_register_allowance"/>
             <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
         </record>
 
-        <record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
+        <record id="hr_salary_rule_professionaltax1" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="150" name="sequence"/>
             <field eval="-200.0" name="amount_fix"/>
             <field name="code">PT</field>
             <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="register_id" ref="hr_contribution_register_deduction"/>
             <field name="name">Professional Tax</field>
         </record>
 
-        <record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
+        <record id="hr_salary_rule_providentfund1" model="hr.salary.rule">
             <field name="amount_select">percentage</field>
             <field eval="120" name="sequence"/>
             <field eval="-12.5" name="amount_percentage"/>
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">PF</field>
             <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="register_id" ref="hr_contribution_register_deduction"/>
             <field name="name">Provident Fund</field>
         </record>
 
@@ -89,7 +103,7 @@
          <record id="structure_001" model="hr.payroll.structure">
             <field name="code">ME</field>
             <field name="name">Marketing Executive</field>
-            <field eval="[(6, 0, [ref('hr_payslip_line_houserantallowance1'), ref('hr_payslip_line_convanceallowance1'),ref('hr_payslip_line_professionaltax1'),ref('hr_payslip_line_providentfund1')])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_houserentallowance1'), ref('hr_salary_rule_convanceallowance1'),ref('hr_salary_rule_professionaltax1'),ref('hr_salary_rule_providentfund1')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_base"/>
         </record>

From 48c01fbf51cc865f2de1806f958726b3badfefb5 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 14:33:53 +0530
Subject: [PATCH 08/13] [IMP] hr_payroll: make credit note readonly while state
 is not draft and remove unsused attrs from appers_on_payslip field

bzr revid: psi@tinyerp.co.in-20110629090353-xodv3bnvnjwdeyjw
---
 addons/hr_payroll/hr_payroll.py       | 2 +-
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 5ba5dbac216..14b66c328d5 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -278,7 +278,7 @@ class hr_payslip(osv.osv):
         '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_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"),
+        'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}),
         'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
     }
     _defaults = {
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f8b74ba01ee..c260a46f503 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -551,7 +551,7 @@
                        <field name="category_id"/>
                        <field name="sequence" />
                        <field name="active"/>
-                       <field name="appears_on_payslip" attrs="{'readonly':[('company_contribution','=', True)]}" />
+                       <field name="appears_on_payslip"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="6">

From 82b0249a9d05c67342a276dbc94314dc10a33c3d Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 14:50:32 +0530
Subject: [PATCH 09/13] [IMP] hr_payroll: Improve the contribution register
 report so it will now show the lines of confirmed payslips only

bzr revid: psi@tinyerp.co.in-20110629092032-2uq3i90evylxy8zu
---
 addons/hr_payroll/report/report_contribution_register.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index bd9e00d3832..e32e93532b5 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -54,6 +54,7 @@ class contribution_register_report(report_sxw.rml_parse):
                         "LEFT JOIN hr_payslip AS hp on (pl.slip_id = hp.id) "\
                         "WHERE (hp.date_from >= %s) AND (hp.date_to <= %s) "\
                         "AND pl.register_id = %s "\
+                        "AND hp.state = 'done' "\
                         "ORDER BY pl.slip_id, pl.sequence",
                         (self.date_from, self.date_to, obj.id))
         payslip_lines = [x[0] for x in self.cr.fetchall()]

From 167b5b068639f830aa304e95b0892007dfe1c0a1 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 15:58:01 +0530
Subject: [PATCH 10/13] [IMP] hr_payroll: Improvement in demo data

bzr revid: psi@tinyerp.co.in-20110629102801-wx3i2rcpy5ols9pg
---
 addons/hr_payroll/hr_payroll_demo.xml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index a7c0e170b6e..bcbecd63ffd 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -4,12 +4,20 @@
 
         <!-- Contribution Register -->
 
-        <record id="hr_contribution_register_allowance" model="hr.contribution.register">
-            <field name="name">Contribution Register for Allowances</field>
+        <record id="hr_houserent_register" model="hr.contribution.register">
+            <field name="name">House Rent Allowance Register</field>
         </record>
 
-        <record id="hr_contribution_register_deduction" model="hr.contribution.register">
-            <field name="name">Contribution Register for Deductions</field>
+        <record id="hr_provident_fund_register" model="hr.contribution.register">
+            <field name="name">Provident Fund Register</field>
+        </record>
+
+        <record id="hr_professional_tax_register" model="hr.contribution.register">
+            <field name="name">Professional Tax Register</field>
+        </record>
+
+        <record id="hr_meal_voucher_register" model="hr.contribution.register">
+            <field name="name">Meal Voucher Register</field>
         </record>
 
         <!-- Salary Rules -->
@@ -20,7 +28,7 @@
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">HRA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_contribution_register_allowance"/>
+            <field name="register_id" ref="hr_houserent_register"/>
             <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
         </record>
@@ -30,7 +38,6 @@
             <field eval="800.0" name="amount_fix"/>
             <field name="code">CA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
-            <field name="register_id" ref="hr_contribution_register_allowance"/>
             <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
         </record>
@@ -41,7 +48,7 @@
             <field eval="-200.0" name="amount_fix"/>
             <field name="code">PT</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="register_id" ref="hr_contribution_register_deduction"/>
+            <field name="register_id" ref="hr_professional_tax_register"/>
             <field name="name">Professional Tax</field>
         </record>
 
@@ -52,7 +59,7 @@
             <field name="amount_percentage_base">contract.wage</field>
             <field name="code">PF</field>
             <field name="category_id" ref="hr_payroll.DED"/>
-            <field name="register_id" ref="hr_contribution_register_deduction"/>
+            <field name="register_id" ref="hr_provident_fund_register"/>
             <field name="name">Provident Fund</field>
         </record>
 
@@ -71,6 +78,7 @@
             <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="register_id" ref="hr_meal_voucher_register"/>
             <field name="name">Meal Voucher</field>
             <field name="sequence" eval="16"/>
          </record>
@@ -117,6 +125,7 @@
         </record>
 
         <!-- Employee -->
+
         <record id="hr_employee_bonamy0" model="hr.employee">
             <field eval="0" name="manager"/>
             <field eval="1.0" name="time_efficiency"/>
@@ -127,6 +136,7 @@
         </record>
 
         <!-- Employee Contract -->
+
         <record id="hr_contract_firstcontract1" model="hr.contract">
             <field name="name">Marketing Executive Contract</field>
             <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>

From 4c37aafc45119db0e26033d98e42b3ff9a02943f Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 16:01:10 +0530
Subject: [PATCH 11/13] [IMP] hr_payroll: remove abs from contribution report

bzr revid: psi@tinyerp.co.in-20110629103110-kjqz620ybuwxxswb
---
 addons/hr_payroll/report/report_contribution_register.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml
index fedacc8786e..efe2955b22d 100644
--- a/addons/hr_payroll/report/report_contribution_register.rml
+++ b/addons/hr_payroll/report/report_contribution_register.rml
@@ -222,7 +222,7 @@
           <para style="P15">Total:</para>
         </td>
         <td>
-          <para style="P11">[[ formatLang(abs(sum_total())) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+          <para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
         </td>
       </tr>
     </blockTable>

From 606ebf878136a7628e9ca395da8bdefe1e6f9c1b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 16:41:22 +0530
Subject: [PATCH 12/13] [IMP] hr_payroll: Added button for contribution
 register in group by search for payslip search view

bzr revid: psi@tinyerp.co.in-20110629111122-13e8l8fwyorjmjqc
---
 addons/hr_payroll/hr_payroll_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f8b74ba01ee..1a47b1859e7 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -144,6 +144,8 @@
                     <field name="quantity" string="Quantity/Rate"/>
                     <field name="amount"/>
                     <field name="total"/>
+                    <field name="amount_select" invisible="1"/>
+                    <field name="register_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -196,6 +198,7 @@
                     <newline/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
                         <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
+                        <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/>
                         <separator orientation="vertical"/>

From fff45e7a1734ed69ca87d21159ce98ce8fc5c345 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 17:57:27 +0530
Subject: [PATCH 13/13] [IMP] hr_payroll: added a button relate on the payslip
 to get all the payslip lines applied grouped by contribution register

bzr revid: psi@tinyerp.co.in-20110629122727-1hfynocjx7kxjefd
---
 addons/hr_payroll/hr_payroll_view.xml | 121 +++++++++++++-------------
 1 file changed, 60 insertions(+), 61 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1a47b1859e7..5e051afce6c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -208,7 +208,6 @@
             </field>
         </record>
 
-
         <record id="view_hr_payslip_tree" model="ir.ui.view">
             <field name="name">hr.payslip.tree</field>
             <field name="model">hr.payslip</field>
@@ -526,7 +525,7 @@
             id="act_hr_employee_payslip_list"
             groups="base.group_hr_manager"/>
 
-    <!-- Salary Rules -->
+        <!-- Salary Rules -->
 
         <record id="hr_salary_rule_tree" model="ir.ui.view">
             <field name="name">hr.salary.rule.tree</field>
@@ -629,69 +628,69 @@
 
         <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)]" context="{'search_default_register_id': 1}" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
 
-    <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">
-            <search string="Search Payslips Group">
-                <field name="name"/>
-                <field name="date_start"/>
-                <field name="date_end"/>
-            </search>
-        </field>
-    </record>
-
-    <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">
-            <tree string="Payslips Run">
-                <field name="name"/>
-                <field name="date_start"/>
-                <field name="date_end"/>
-            </tree>
-        </field>
-    </record>
-
-    <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">
-            <form string="Payslips Run">
-                <group col="6" colspan="4">
-                    <field name="name" colspan="4"/>
-                    <field name="credit_note"/>
+        <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">
+                <search string="Search Payslips Group">
+                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Payslips">
-                        <field name="slip_ids" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
-                <group col="6" colspan="4">
-                    <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="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>
-        </field>
-    </record>
+                </search>
+            </field>
+        </record>
 
-    <record id="action_hr_payslip_run_tree" model="ir.actions.act_window">
-        <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"/>
-        <field name="search_view_id" ref="hr_payslip_run_filter"/>
-    </record>
-    <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_root_payroll"/>
+        <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">
+                <tree string="Payslips Run">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                </tree>
+            </field>
+        </record>
+
+        <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">
+                <form string="Payslips Run">
+                    <group col="6" colspan="4">
+                        <field name="name" colspan="4"/>
+                        <field name="credit_note"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payslips">
+                            <field name="slip_ids" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="6" colspan="4">
+                        <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="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>
+            </field>
+        </record>
+
+        <record id="action_hr_payslip_run_tree" model="ir.actions.act_window">
+            <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"/>
+            <field name="search_view_id" ref="hr_payslip_run_filter"/>
+        </record>
+        <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_root_payroll"/>
 
     </data>
 </openerp>