From 71003a5aa06cf7d4ac2c2d8936330b22070876e3 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:08:45 +0530
Subject: [PATCH 1/7] [ADD]sequence file added for payroll advice.

bzr revid: kbh@tinyerp.com-20120613063845-1qiuuasfim19f94r
---
 addons/l10n_in_hr_payroll/__openerp__.py          |  1 +
 .../l10n_in_hr_payroll_sequence.xml               | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml

diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 07f83d2605a..b1825850256 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -49,6 +49,7 @@ Indian Payroll Rules.
          'l10n_in_hr_payroll_data.xml',
          'data/hr.salary.rule.csv',
          'l10n_in_hr_payroll_report.xml',
+         'l10n_in_hr_payroll_sequence.xml'
      ],
     'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
     'installable': True
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
new file mode 100644
index 00000000000..140d0676c4f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="seq_type_payment_advice" model="ir.sequence.type">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+        </record>
+        <record id="seq_payment_advice" model="ir.sequence">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+            <field name="prefix">PAY/%(month)s/%(year)s/</field>
+            <field name="padding">3</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

From 8ca629034c5b28dc27b09b4e62d2b860d55fe6af Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:21:37 +0530
Subject: [PATCH 2/7] [ADD]sequence number created in mentho,access rights
 added for payroll advice.

bzr revid: kbh@tinyerp.com-20120613065137-78ye6taovw0yffdw
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 4 +++-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 2 +-
 addons/l10n_in_hr_payroll/security/hr.salary.rule.csv | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b16cfb871d7..59d45c0b119 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -129,6 +129,7 @@ class payroll_advice(osv.osv):
         payslip_pool = self.pool.get('hr.payslip')
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
         payslip_line_pool = self.pool.get('hr.payslip.line')
+        sequence_pool = self.pool.get('ir.sequence')
 
         for advice in self.browse(cr, uid, ids, context=context):
             old_line_ids = advice_line_pool.search(cr, uid, [('advice_id','=',advice.id)], context=context)
@@ -152,7 +153,8 @@ class payroll_advice(osv.osv):
                             'bysal': line.total
                             }
                     advice_line_pool.create(cr, uid, advice_line, context=context)
-        return True
+        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
+        self.write(cr, uid, ids, {'number':number}, context=context)
 
     def confirm_sheet(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 351908455c0..35e56d9225e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -10,7 +10,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
+                 <xpath expr="//field[@name='struct_id']" position="after">
                  <group col="2" colspan="2" name="right_column">
                     <separator colspan="2" string="Allowance"/>
                         <field name="food_coupon_amount"/>
diff --git a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
index 0015ef665b0..e1e23bf3985 100644
--- a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
@@ -1,2 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_manager",1,1,1,1
+"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_manager",1,1,1,1

From 1514f85e3395a3ecf3432caae52f3c8599f94bff Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:23:22 +0530
Subject: [PATCH 3/7] [IMP]button removed from tree view and state name
 changed.

bzr revid: kbh@tinyerp.com-20120613065322-k538s2sb7nekx5q4
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 4 ++--
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 59d45c0b119..6e85c65bb2f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -106,8 +106,8 @@ class payroll_advice(osv.osv):
         'note': fields.text('Description'),
         'date': fields.date('Date', states={'draft': [('readonly', False)]},),
         'state':fields.selection([
-            ('draft','Draft Sheet'),
-            ('confirm','Confirm Sheet'),
+            ('draft','Draft'),
+            ('confirm','Confirm'),
             ('cancel','Cancelled'),
         ],'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 35e56d9225e..65af024a83b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -61,10 +61,6 @@
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="bank_id" select="1"/>
                     <field name="state"/>
-                    <button name="compute_advice" string="Compute Advice" icon="terp-document-new" states="draft" type="object"/>
-                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
-                        <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
-                        <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
                 </tree>
             </field>
         </record>

From bd053e72bbbb048ae9f86e42dc55b0bd386f1dcb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:28:07 +0530
Subject: [PATCH 4/7] [IMP]date and line_ids are readonly true when advice is
 confirm,tooltip on date field and default test on note filed.

bzr revid: kbh@tinyerp.com-20120613065807-e5ldjk8pfy4u46tr
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 6e85c65bb2f..b79868f5060 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -104,14 +104,14 @@ class payroll_advice(osv.osv):
     _columns = {
         'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
         'note': fields.text('Description'),
-        'date': fields.date('Date', states={'draft': [('readonly', False)]},),
+        'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Date is used to search Payslips."),
         'state':fields.selection([
             ('draft','Draft'),
             ('confirm','Confirm'),
             ('cancel','Cancelled'),
         ],'State', select=True, readonly=True),
         'number':fields.char('Number', size=16, readonly=True),
-        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}),
+        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Chaque Nos', size=256),
         'company_id':fields.many2one('res.company', 'Company',required=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank Address from whcih the salary is going to be paid"),
@@ -123,6 +123,8 @@ class payroll_advice(osv.osv):
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
+        'note': "Bank Payment advice contain the payment amount, payment date, company name, bank and other information of the payment."
+
     }
 
     def compute_advice(self, cr, uid, ids, context=None):

From 13ce1a7d1a96ac2e164bd2aab5ee772ce816f329 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 12:29:30 +0530
Subject: [PATCH 5/7] [IMP]added error message if no lines.

bzr revid: kbh@tinyerp.com-20120613065930-6wyjkh4yb1tt7y7p
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b79868f5060..95ebf909044 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -159,7 +159,11 @@ class payroll_advice(osv.osv):
         self.write(cr, uid, ids, {'number':number}, context=context)
 
     def confirm_sheet(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+        for advice in self.browse(cr, uid, ids, context=context):
+            if not advice.line_ids:
+                raise osv.except_osv(_('No Payment Advice Lines !'), _('Please create some advice lines.'))
+            else:
+                return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)

From f7ccfee64d7b62b7921db64620267935dafc5eab Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 13 Jun 2012 17:56:05 +0530
Subject: [PATCH 6/7] [FIX]error message imporved and remove unnecessary access
 right.

bzr revid: kbh@tinyerp.com-20120613122605-ge147o1mps20wpdv
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 7 +++----
 addons/l10n_in_hr_payroll/security/hr.salary.rule.csv | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 95ebf909044..20a26aff72e 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -123,7 +123,7 @@ class payroll_advice(osv.osv):
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
-        'note': "Bank Payment advice contain the payment amount, payment date, company name, bank and other information of the payment."
+        'note': "Please make the payroll transfer from above account number to the below mentioned account numbers towards employee salaries:"
 
     }
 
@@ -161,9 +161,8 @@ class payroll_advice(osv.osv):
     def confirm_sheet(self, cr, uid, ids, context=None):
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
-                raise osv.except_osv(_('No Payment Advice Lines !'), _('Please create some advice lines.'))
-            else:
-                return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+                raise osv.except_osv(_('No Payment Advice Lines !'), _('You can not confirm Payment advice without advice lines.'))
+        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
index e1e23bf3985..11860aa17e2 100644
--- a/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
+++ b/addons/l10n_in_hr_payroll/security/hr.salary.rule.csv
@@ -1,4 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1
 "access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_manager",1,1,1,1
 "access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_manager",1,1,1,1

From bfc3f9774a8802057c9edc84edbe0dcca7a62d88 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 14 Jun 2012 18:15:33 +0530
Subject: [PATCH 7/7] [IMP]sequence set on confirm button,company field
 readonly on confirm,field name set as letter detail.

bzr revid: kbh@tinyerp.com-20120614124533-h1jdw9692uj8ptk5
---
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py       | 11 ++++++-----
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 20a26aff72e..d2893c25bd8 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -113,7 +113,7 @@ class payroll_advice(osv.osv):
         'number':fields.char('Number', size=16, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
         'chaque_nos':fields.char('Chaque Nos', size=256),
-        'company_id':fields.many2one('res.company', 'Company',required=True, states={'draft': [('readonly', False)]}),
+        'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank Address from whcih the salary is going to be paid"),
     }
     
@@ -131,7 +131,6 @@ class payroll_advice(osv.osv):
         payslip_pool = self.pool.get('hr.payslip')
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
         payslip_line_pool = self.pool.get('hr.payslip.line')
-        sequence_pool = self.pool.get('ir.sequence')
 
         for advice in self.browse(cr, uid, ids, context=context):
             old_line_ids = advice_line_pool.search(cr, uid, [('advice_id','=',advice.id)], context=context)
@@ -155,14 +154,16 @@ class payroll_advice(osv.osv):
                             'bysal': line.total
                             }
                     advice_line_pool.create(cr, uid, advice_line, context=context)
-        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
-        self.write(cr, uid, ids, {'number':number}, context=context)
+        return True
 
     def confirm_sheet(self, cr, uid, ids, context=None):
+        sequence_pool = self.pool.get('ir.sequence')
+
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
                 raise osv.except_osv(_('No Payment Advice Lines !'), _('You can not confirm Payment advice without advice lines.'))
-        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+        number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
+        return self.write(cr, uid, ids, {'number':number,'state':'confirm'}, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'draft'}, context=context)
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 65af024a83b..5c239eeb295 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -101,7 +101,7 @@
                               <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
                               <field name="chaque_nos"/>
                             </group>
-                            <separator colspan="4" string="Information"/>
+                            <separator colspan="4" string="Letter Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>