From a5bfe8212a99d42d5edcd2e8fec59b24e714e14e Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Mon, 9 Jul 2012 11:59:05 +0530
Subject: [PATCH 1/4] [IMP]l10n_in_hr_payroll: add the required field and done
 some improvement in py,sxw and rml

bzr revid: dsi@tinyerp.com-20120709062905-l0c8rk4q7e3bp3mb
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  7 +-
 .../l10n_in_hr_payroll_view.xml               |  2 +-
 .../report/report_payroll_advice.py           |  3 +-
 .../report/report_payroll_advice.rml          | 64 ++++++++++++++-----
 4 files changed, 57 insertions(+), 19 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 7465453df3c..19275c36161 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -222,8 +222,13 @@ class payroll_advice_line(osv.osv):
         'name': fields.char('Bank Account No.', size=32, required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
+        'debit_credit': fields.char('c/d', size=8, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
+    _defaults = {
+        'debit_credit': 'c',
+    }    
+    
 
 payroll_advice_line()
 
@@ -252,4 +257,4 @@ class res_company(osv.osv):
 
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 124c4f1553f..5906b49b38c 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
@@ -74,7 +74,6 @@
                         <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
                         <button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
                         <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
-                        <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
                         <div class="oe_right">
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
                         </div>
@@ -96,6 +95,7 @@
                                         <field name="employee_id"/>
                                         <field name="name"/>
                                         <field name="bysal"/>
+                                        <field name="debit_credit"/>
                                     </tree>
                                 </field>
                             </page>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 86bdfe01998..052f3109e05 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -70,6 +70,7 @@ class payroll_advice_report(report_sxw.rml_parse):
                     'name': l.employee_id.name,
                     'acc_no': l.name,
                     'bysal': l.bysal,
+                    'debit_credit': l.debit_credit,
                     })
             self.total_bysal += l.bysal
             result.append(res) 
@@ -77,4 +78,4 @@ class payroll_advice_report(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report, header="external")
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 55014e3b1ee..5bdd9868d4b 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -33,6 +33,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -45,6 +47,8 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -57,6 +61,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -75,6 +81,10 @@
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P9" fontName="Helvetica" alignment="JUSTIFY"/>
     <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -131,23 +141,24 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
-    <blockTable colWidths="269.0,269.0" style="Table1">
+    <blockTable colWidths="234.0,305.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-          <para style="P10">Payment Advice </para>
+          <para style="P14">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P10"/>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P6">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
       <tr>
         <td>
+          <para style="terp_default_Bold_9">To,</para>
           <para style="terp_default_Bold_9">The Manager</para>
         </td>
         <td>
@@ -183,7 +194,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="P8"><u>Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</u></para>
+          <para style="P8">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -197,7 +208,7 @@
     <para style="terp_default_8_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="61.0,189.0,165.0,124.0" style="Table4">
+    <blockTable colWidths="50.0,153.0,134.0,101.0,101.0,0.0" style="Table4">
       <tr>
         <td>
           <para style="P1">SI. No.</para>
@@ -211,15 +222,23 @@
         <td>
           <para style="P3">By Salary</para>
         </td>
+        <td>
+          <para style="P3">c/d</para>
+        </td>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="61.0,189.0,165.0,124.0" style="Table5">
+      <blockTable colWidths="50.0,153.0,134.0,101.0,101.0" style="Table5">
         <tr>
           <td>
             <para style="P9" leftIndent="15" bulletIndent="0">
-              <bullet><seq id="L1"/></bullet>
+              <bullet><seq id="L1"/>.</bullet>
               <font color="white"> </font>
             </para>
           </td>
@@ -232,10 +251,18 @@
           <td>
             <para style="P7">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
+           <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+          <td>
+            <para style="P7">
+              <font color="white"> </font>
+            </para>
+          </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="62.0,189.0,165.0,124.0" style="Table6">
+    <blockTable colWidths="50.0,153.0,135.0,101.0,101.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">
@@ -254,6 +281,11 @@
         <td>
           <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
         </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
       </tr>
     </blockTable>
     <para style="terp_default_0.30cmspace">
@@ -262,7 +294,7 @@
     <blockTable colWidths="269.0,269.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Yours Sincerely</para>
+          <para style="terp_default_9">Yours Sincerely</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">
@@ -272,7 +304,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">For [[ company.name ]]</para>
+          <para style="terp_default_9">For [[ company.name ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">
@@ -282,7 +314,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
@@ -294,7 +326,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
@@ -306,7 +338,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Authorized Signature</para>
+          <para style="terp_default_9">Authorized Signature</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">

From 221013aab171f77269f9ac9c26b8a49d8e9dfc2d Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Tue, 10 Jul 2012 11:18:11 +0530
Subject: [PATCH 2/4] [IMP]l10n_in_hr_payroll: gives bank account number of
 concerned person

bzr revid: dsi@tinyerp.com-20120710054811-j3xqxakm5jsod9ng
---
 addons/hr_payroll/hr_payroll_view.xml            |  2 +-
 addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 16 ++++++++++++----
 .../l10n_in_hr_payroll_view.xml                  |  2 +-
 .../report/report_payroll_advice.py              |  1 -
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f52c420df8a..736324e47b1 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,7 +18,7 @@
                     <page string="Miscellaneous" groups="base.group_hr_user">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                            <field name="bank_account_id"/>
                             <field name="place_of_birth"/>
                             <field name="children"/>
                             <!-- <field name="basic" invisible="0"/> -->
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 19275c36161..2cb0765ec3f 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -105,7 +105,7 @@ class payroll_advice(osv.osv):
     '''
     Bank Advice
     '''
-
+        
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice'
     _columns = {
@@ -208,13 +208,21 @@ class payroll_advice(osv.osv):
         return {
             'value':res
         }
-
+        
 payroll_advice()
 
 class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines
-    '''
+    '''    
+    def get_account_number(self, cr, uid, ids, employee_id=False, context=None):
+        res = {}
+        if employee_id:
+            hr_obj = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
+            acc_number = hr_obj.bank_account_id.acc_number
+            res.update({'name': acc_number})
+        return {'value': res}  
+    
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
@@ -226,7 +234,7 @@ class payroll_advice_line(osv.osv):
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
     _defaults = {
-        'debit_credit': 'c',
+        'debit_credit': 'C',
     }    
     
 
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 5906b49b38c..58a5192c2e7 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
@@ -92,7 +92,7 @@
                             <page string="Payment Lines">
                                 <field name="line_ids" colspan="4" nolabel="1">
                                     <tree string="Payment Lines" editable="bottom">
-                                        <field name="employee_id"/>
+                                        <field name="employee_id" on_change="get_account_number(employee_id)"/>
                                         <field name="name"/>
                                         <field name="bysal"/>
                                         <field name="debit_credit"/>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 052f3109e05..0c0e31c7f54 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -70,7 +70,6 @@ class payroll_advice_report(report_sxw.rml_parse):
                     'name': l.employee_id.name,
                     'acc_no': l.name,
                     'bysal': l.bysal,
-                    'debit_credit': l.debit_credit,
                     })
             self.total_bysal += l.bysal
             result.append(res) 

From b3285b426f8bafba70f8e9f53bbd668565560ba7 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Fri, 13 Jul 2012 12:08:31 +0530
Subject: [PATCH 3/4] [IMP]l10n_in_hr_payroll: gives IFSC code with bank
 account number of conc^Cned person

bzr revid: dsi@tinyerp.com-20120713063831-djo31ykbr3jve49h
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  |  15 ++-
 .../l10n_in_hr_payroll_view.xml               |   4 +-
 .../report/report_payroll_advice.py           |   4 +-
 .../report/report_payroll_advice.rml          | 103 +++++++++++++-----
 4 files changed, 89 insertions(+), 37 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 2cb0765ec3f..4b957e5f488 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -120,6 +120,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('Cheque Numbers', size=256),
+        'neft':fields.boolean('NEFT', size=16, help="NEFT should be checked if you want IFSC code"),
         '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 from which the salary is going to be paid"),
     }
@@ -215,22 +216,26 @@ class payroll_advice_line(osv.osv):
     '''
     Bank Advice Lines
     '''    
-    def get_account_number(self, cr, uid, ids, employee_id=False, context=None):
+    def onchange_employee_id(self, cr, uid, ids, employee_id=False, context=None):
         res = {}
-        if employee_id:
+        if not (employee_id):
+            res = ''
+        else :  
             hr_obj = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
             acc_number = hr_obj.bank_account_id.acc_number
-            res.update({'name': acc_number})
+            ifsc_code_number = hr_obj.bank_account_id.bank_bic
+            res.update({'name': acc_number ,'ifsc_code': ifsc_code_number})
         return {'value': res}  
-    
+        
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
         'name': fields.char('Bank Account No.', size=32, required=True),
+        'ifsc_code': fields.char('IFSC', size=16, help="check neft if you want IFSC code"),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
-        'debit_credit': fields.char('c/d', size=8, required=False),
+        'debit_credit': fields.char('C/D', size=8, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
     }
     _defaults = {
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 58a5192c2e7..8f9ee9d5a2a 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
@@ -92,8 +92,9 @@
                             <page string="Payment Lines">
                                 <field name="line_ids" colspan="4" nolabel="1">
                                     <tree string="Payment Lines" editable="bottom">
-                                        <field name="employee_id" on_change="get_account_number(employee_id)"/>
+                                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                                         <field name="name"/>
+                                        <field name="ifsc_code"/>
                                         <field name="bysal"/>
                                         <field name="debit_credit"/>
                                     </tree>
@@ -103,6 +104,7 @@
                                 <group colspan="4" col="6">
                                 <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
                                 <field name="chaque_nos"/>
+                                <field name="neft"/>
                                 </group>
                                 <separator colspan="4" string="Letter Details"/>
                                 <field name="note" colspan="4" nolabel="1"/>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index 0c0e31c7f54..d4eeaf3d218 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -60,7 +60,7 @@ class payroll_advice_report(report_sxw.rml_parse):
 
     def get_bysal_total(self):
         return self.total_bysal
-
+        
     def get_detail(self, line_ids):
         result = []
         self.total_bysal = 0.00
@@ -69,7 +69,9 @@ class payroll_advice_report(report_sxw.rml_parse):
             res.update({
                     'name': l.employee_id.name,
                     'acc_no': l.name,
+                    'ifsc_code': l.ifsc_code,
                     'bysal': l.bysal,
+                    'debit_credit': l.debit_credit,
                     })
             self.total_bysal += l.bysal
             result.append(res) 
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 5bdd9868d4b..0101c179f79 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -35,6 +35,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -49,6 +51,8 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -77,14 +81,13 @@
     <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica" alignment="JUSTIFY"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -144,8 +147,8 @@
     <blockTable colWidths="234.0,305.0" style="Table1">
       <tr>
         <td>
-          <para style="P14">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
-          <para style="P10"/>
+          <para style="P7">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P9"/>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
@@ -158,7 +161,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_Bold_9">To,</para>
+          <para style="terp_default_Bold_9">To, </para>
           <para style="terp_default_Bold_9">The Manager</para>
         </td>
         <td>
@@ -194,7 +197,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="P8">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
+          <para style="P10">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -208,7 +211,7 @@
     <para style="terp_default_8_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="50.0,153.0,134.0,101.0,101.0,0.0" style="Table4">
+    <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="P1">SI. No.</para>
@@ -223,46 +226,86 @@
           <para style="P3">By Salary</para>
         </td>
         <td>
-          <para style="P3">c/d</para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
+          <para style="P3">C/D</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
-      <blockTable colWidths="50.0,153.0,134.0,101.0,101.0" style="Table5">
+      <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
         <tr>
           <td>
-            <para style="P9" leftIndent="15" bulletIndent="0">
+            <para style="P11" leftIndent="15" bulletIndent="0">
               <bullet><seq id="L1"/>.</bullet>
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P7">[[ line['name'] ]]</para>
+            <para style="P8">[[ line['name'] ]]</para>
           </td>
           <td>
             <para style="P5">[[ line['acc_no'] ]]</para>
           </td>
           <td>
-            <para style="P7">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
-          </td>
-           <td>
-            <para style="P5">[[ line['debit_credit'] ]]</para>
+            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
           </td>
           <td>
-            <para style="P7">
-              <font color="white"> </font>
-            </para>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="50.0,153.0,135.0,101.0,101.0" style="Table6">
+        <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="P1">SI. No.</para>
+        </td>
+        <td>
+          <para style="P1">Name of the Employe</para>
+        </td>
+        <td>
+          <para style="P3">Bank Account No.</para>
+        </td>
+        <td>
+          <para style="P3">IFSC Code </para>
+        </td>
+        <td>
+          <para style="P3">By Salary</para>
+        </td>
+        <td>
+          <para style="P3">C/D</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+      <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="P11" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/>.</bullet>
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P8">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['ifsc_code'] ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="58.0,251.0,67.0,94.0,70.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">

From 037b2d30b62c934e0e25669bcf151751c367fed8 Mon Sep 17 00:00:00 2001
From: Digvijay Singh <dsi@tinyerp.com>
Date: Fri, 13 Jul 2012 16:22:18 +0530
Subject: [PATCH 4/4] [IMP]l10n_in_hr_payroll: gives IFSC code with bank
 account number of conc^Cned person

bzr revid: dsi@tinyerp.com-20120713105218-qp1v3w874ahzvpla
---
 .../l10n_in_hr_payroll/l10n_in_hr_payroll.py  | 23 ++++++++-----------
 .../l10n_in_hr_payroll_view.xml               |  1 +
 2 files changed, 11 insertions(+), 13 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 4b957e5f488..107b56b30db 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -104,8 +104,7 @@ hr_employee()
 class payroll_advice(osv.osv):
     '''
     Bank Advice
-    '''
-        
+    '''        
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice'
     _columns = {
@@ -120,7 +119,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('Cheque Numbers', size=256),
-        'neft':fields.boolean('NEFT', size=16, help="NEFT should be checked if you want IFSC code"),
+        'neft': fields.boolean('NEFT Transaction', help="Check NEFT For Online Transfer"),
         '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 from which the salary is going to be paid"),
     }
@@ -208,8 +207,7 @@ class payroll_advice(osv.osv):
                 res.update({'bank': company.partner_id.bank_ids[0].bank.name})
         return {
             'value':res
-        }
-        
+        }     
 payroll_advice()
 
 class payroll_advice_line(osv.osv):
@@ -218,13 +216,12 @@ class payroll_advice_line(osv.osv):
     '''    
     def onchange_employee_id(self, cr, uid, ids, employee_id=False, context=None):
         res = {}
-        if not (employee_id):
-            res = ''
-        else :  
-            hr_obj = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
-            acc_number = hr_obj.bank_account_id.acc_number
-            ifsc_code_number = hr_obj.bank_account_id.bank_bic
-            res.update({'name': acc_number ,'ifsc_code': ifsc_code_number})
+        if not employee_id:
+            res ['value'] = {}
+        hr_obj = self.pool.get('hr.employee').browse(cr, uid, [employee_id], context=context)[0]
+        acc_number = hr_obj.bank_account_id.acc_number
+        ifsc_code_number = hr_obj.bank_account_id.bank_bic
+        res.update({'name': acc_number ,'ifsc_code': ifsc_code_number})
         return {'value': res}  
         
     _name = 'hr.payroll.advice.line'
@@ -232,7 +229,7 @@ class payroll_advice_line(osv.osv):
     _columns = {
         'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
         'name': fields.char('Bank Account No.', size=32, required=True),
-        'ifsc_code': fields.char('IFSC', size=16, help="check neft if you want IFSC code"),
+        'ifsc_code': fields.char('IFSC Code', size=16),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
         'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
         'debit_credit': fields.char('C/D', size=8, required=False),
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 8f9ee9d5a2a..8f5beb33495 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
@@ -74,6 +74,7 @@
                         <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
                         <button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
                         <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
+                        <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
                         <div class="oe_right">
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
                         </div>