Meera Trambadia (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-payment-advice-analysis-report-india-mtr
into lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
Requested reviews:
Mustufa Rangwala (Open ERP) (mra-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payment-advice-analysis-report-india-mtr/+merge/115495
l10n_in_hr_payroll:-added Reporting(Analysis) for Payment Advices.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payment-advice-analysis-report-india-mtr/+merge/115495
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
=== modified file 'l10n_in_hr_payroll/__openerp__.py'
--- l10n_in_hr_payroll/__openerp__.py 2012-07-03 13:00:49 +0000
+++ l10n_in_hr_payroll/__openerp__.py 2012-07-18 08:54:24 +0000
@@ -49,7 +49,8 @@
'data/hr.salary.rule.csv',
'security/ir.model.access.csv',
'l10n_in_hr_payroll_report.xml',
- 'l10n_in_hr_payroll_sequence.xml'
+ 'l10n_in_hr_payroll_sequence.xml',
+ 'report/payment_advice_report_view.xml',
],
'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
'installable': True
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-07-18 05:24:54 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-07-18 08:54:24 +0000
@@ -150,8 +150,8 @@
<field name="arch" type="xml">
<search string="Search Payment advice">
<group>
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advice"/>
- <filter icon="terp-camera_test" string="Done" domain="[('state','=','confirm')]" help="Done Advice"/>
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advices"/>
+ <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirm Advices"/>
<separator orientation="vertical"/>
<field name="date"/>
<field name="number"/>
@@ -160,11 +160,11 @@
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="Bank" name="bank_id" icon="terp-folder-orange" context="{'group_by':'bank_id'}"/>
+ <filter string="Bank" name="bank_id" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Status" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical" />
- <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
- <separator orientation="vertical"/>
- <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ <filter string="Company" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
</group>
</search>
</field>
=== modified file 'l10n_in_hr_payroll/report/__init__.py'
--- l10n_in_hr_payroll/report/__init__.py 2012-06-13 07:26:39 +0000
+++ l10n_in_hr_payroll/report/__init__.py 2012-07-18 08:54:24 +0000
@@ -24,5 +24,6 @@
import report_payslip_details
import report_payroll_advice
+import payment_advice_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'l10n_in_hr_payroll/report/payment_advice_report.py'
--- l10n_in_hr_payroll/report/payment_advice_report.py 1970-01-01 00:00:00 +0000
+++ l10n_in_hr_payroll/report/payment_advice_report.py 2012-07-18 08:54:24 +0000
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields, osv
+
+class payment_advice_report(osv.osv):
+ _name = "payment.advice.report"
+ _description = "Payment Advice Analysis"
+ _auto = False
+ _rec_name = ''
+ _columns = {
+ 'name':fields.char('Name', size=32, readonly=True),
+ 'date': fields.date('Date', readonly=True,),
+ 'year': fields.char('Year', size=4, readonly=True),
+ 'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
+ ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
+ ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
+ 'state':fields.selection([
+ ('draft', 'Draft'),
+ ('confirm', 'Confirmed'),
+ ('cancel', 'Cancelled'),
+ ], 'State', select=True, readonly=True),
+ 'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
+ 'nbr': fields.integer('# of Lines', readonly=True),
+ '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, 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')
+ cr.execute("""
+ create or replace view payment_advice_report as (
+ select
+ min(l.id) as id,
+ sum(l.bysal) as bysal,
+ p.name,
+ p.state,
+ p.date,
+ p.number,
+ p.company_id,
+ p.bank_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
+ 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,p.neft,
+ l.employee_id,l.advice_id,l.bysal,l.ifsc_code
+ )
+ """)
+payment_advice_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'l10n_in_hr_payroll/report/payment_advice_report_view.xml'
--- l10n_in_hr_payroll/report/payment_advice_report_view.xml 1970-01-01 00:00:00 +0000
+++ l10n_in_hr_payroll/report/payment_advice_report_view.xml 2012-07-18 08:54:24 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+ <record id="view_payment_advice_tree" model="ir.ui.view">
+ <field eval="1" name="priority"/>
+ <field name="name">payment.advice.report.tree</field>
+ <field name="model">payment.advice.report</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state == 'cancel' " string="Advices Analysis">
+ <field name="nbr" sum="# of Lines"/>
+ <field name="name" invisible="1"/>
+ <field name="employee_id" invisible="1"/>
+ <field name="date" invisible="1"/>
+ <field name="bank_id" invisible="1"/>
+ <field name="state" invisible="1"/>
+ <field name="number" invisible="1"/>
+ <field name="bysal" sum="Total Salary"/>
+ <field name="year" invisible="1"/>
+ <field name="day" invisible="1"/>
+ <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>
+
+
+ <record id="view_payment_advice_search" model="ir.ui.view">
+ <field name="name">payment.advice.report.search</field>
+ <field name="model">payment.advice.report</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Advices Analysis">
+ <group>
+ <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"/>
+ <field name="cheque_nos"/>
+ </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/>
+ <group expand="1" string="Group By...">
+ <filter string="Employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
+ <filter string="Bank" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Date of Payment Advices"/>
+ <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payment Advices"/>
+ <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payment Advices"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <record id="action_payment_advice_report_all" model="ir.actions.act_window">
+ <field name="name">Advices Analysis</field>
+ <field name="res_model">payment.advice.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="view_payment_advice_tree"/>
+ <field name="context">{'search_default_confirm':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="help">This report performs analysis on your payment advices</field>
+ </record>
+
+ <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
+
+</data>
+</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
