[IMP] l10n_in_hr_payroll: added fields and modified query for NEFT and IFSC code

bzr revid: mtr@tinyerp.com-20120718054226-m8m2ubrcmho6p1ui

diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
index f952dc4..90feb4a 100644 (file)
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -45,9 +45,10 @@ class payment_advice_report(osv.osv):
         'number':fields.char('Number', size=16, readonly=True),
         'bysal': fields.float('By Salary', readonly=True),
         'bank_id':fields.many2one('res.bank', 'Bank', readonly=True),
-        'company_id':fields.many2one('res.company', 'Company', readonly=True,),
-        'cheque_nos':fields.char('Cheque Numbers', size=256),
-
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'cheque_nos':fields.char('Cheque Numbers', size=256, readonly=True),
+        'neft': fields.boolean('NEFT Transaction', readonly=True),
+        'ifsc_code': fields.char('IFSC Code', size=32, readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'payment_advice_report')
@@ -62,18 +63,20 @@ class payment_advice_report(osv.osv):
                     p.number,
                     p.company_id,
                     p.bank_id,
-                    l.employee_id,
                     p.chaque_nos as cheque_nos,
+                    p.neft,
+                    l.employee_id,
+                    l.ifsc_code,
                     to_char(p.date, 'YYYY') as year,
                     to_char(p.date, 'MM') as month,
                     to_char(p.date, 'YYYY-MM-DD') as day,
                     1 as nbr
                 from
-                    hr_payroll_advice as p, hr_payroll_advice_line as l
-                where
-                    (p.id=l.advice_id)
+                    hr_payroll_advice as p
+                    left join hr_payroll_advice_line as l on (p.id=l.advice_id)
                 group by
-                    p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,l.employee_id,l.advice_id,l.bysal
+                    p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,p.neft,
+                    l.employee_id,l.advice_id,l.bysal,l.ifsc_code
             )
         """)
 payment_advice_report()

diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index f3069f8..806cb1a 100644 (file)
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -22,6 +22,8 @@
                 <field name="month" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="cheque_nos" invisible="1"/>
+                <field name="neft" invisible="1"/>
+                <field name="ifsc_code" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -37,7 +39,10 @@
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payment Advices which are in draft state"/>
                     <filter icon="terp-check" string="Confirm" name="confirm" domain="[('state','=','confirm')]" help="Payment Advices which are confirmed"/>
                     <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test" string="NEFT" domain="[('neft','=',True)]"/>
+                    <separator orientation="vertical"/>
                     <field name="date"/>
+                    <separator orientation="vertical"/>
                     <field name="number"/>
                     <field name="name"/>
                     <field name="employee_id"/>
@@ -45,7 +50,9 @@
                 </group>
                 <newline/>
                  <group expand="0" string="Extended Filters...">
+                    <field name="ifsc_code"/>
                     <field name="bank_id" widget="selection"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>