Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openerp-india/payroll-india-trunk-report-payroll-advice-kbh
into lp:~openerp-dev/openerp-india/payroll-india-trunk.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-india/payroll-india-trunk-report-payroll-advice-kbh/+merge/110005
Hello,
===l10n_in_hr_payroll===
- I have added sxw, rml and py files for payment advice report.
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openerp-india/payroll-india-trunk-report-payroll-advice-kbh/+merge/110005
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-india/payroll-india-trunk-report-payroll-advice-kbh
into lp:~openerp-dev/openerp-india/payroll-india-trunk.
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml 2012-05-15 08:41:29 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml 2012-06-13 09:15:49 +0000
@@ -1,14 +1,39 @@
-<?xml version="1.0"?>
-<openerp>
- <data>
-
- <report
- auto="False"
- id="payslip_details_report"
- model="hr.payslip"
- name="paylip.details.in"
- rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
- string="PaySlip Details" />
-
- </data>
-</openerp>
+<<<<<<< TREE
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <report
+ auto="False"
+ id="payslip_details_report"
+ model="hr.payslip"
+ name="paylip.details.in"
+ rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
+ string="PaySlip Details" />
+
+ </data>
+</openerp>
+=======
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <report
+ auto="False"
+ id="payslip_details_report"
+ model="hr.payslip"
+ name="paylip.details.in"
+ rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
+ string="PaySlip Details" />
+
+ <report
+ auto="False"
+ id="payroll_advice"
+ model="hr.payroll.advice"
+ name="payroll.advice"
+ rml="l10n_in_hr_payroll/report/payment_advice.rml"
+ string="Bank Payment Advice" />
+
+ </data>
+</openerp>
+>>>>>>> MERGE-SOURCE
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-06-12 05:57:10 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-06-13 09:15:49 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
@@ -156,3 +157,163 @@
</data>
</openerp>
+=======
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <record id="hr_contract_form_in_inherit" model="ir.ui.view">
+ <field name="name">hr.contract.form.in.inherit</field>
+ <field name="model">hr.contract</field>
+ <field name="type">form</field>
+ <field name="priority">20</field>
+ <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <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"/>
+ <field name="house_rent_income"/>
+ <field name="saving_bank_account"/>
+ <field name="other_income"/>
+ <field name="short_term_gain"/>
+ <field name="long_term_gain"/>
+ <field name="driver_salay"/>
+ </group>
+ <group col="2" colspan="2" name="left_column">
+ <separator colspan="2" string="Deduction"/>
+ <field name="tds"/>
+ <field name="professional_tax"/>
+ <field name="voluntary_provident_fund"/>
+ <field name="company_transport"/>
+ <field name="leave_avail_dedution"/>
+ <field name="medical_insurance"/>
+ </group>
+ </xpath>
+ </data>
+ </field>
+ </record>
+ <record id="hr_employee_form_inherit" model="ir.ui.view">
+ <field name="name">hr.employee.form.inherit</field>
+ <field name="model">hr.employee</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="hr.view_employee_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <xpath expr="//field[@name='job_id']" position="after">
+ <field name="join_date"/>
+ <field name="number_of_year"/>
+ </xpath>
+ </data>
+ </field>
+ </record>
+
+ <record id="view_hr_bank_advice_tree" model="ir.ui.view">
+ <field name="name">hr.payroll.advice.tree</field>
+ <field name="model">hr.payroll.advice</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Bank Advice">
+ <field name="date" select="1"/>
+ <field name="number" select="1"/>
+ <field name="name" select="1"/>
+ <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>
+ <record id="view_hr_bank_advice_form" model="ir.ui.view">
+ <field name="name">hr.payroll.advice.form</field>
+ <field name="model">hr.payroll.advice</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Bank Advice" version="7.0">
+ <header>
+ <button name="confirm_sheet" string="Confirm Sheet" states="draft" type="object"/>
+ <button name="compute_advice" string="Compute Advice" states="draft" type="object"/>
+ <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>
+ <div class="oe_clear"/>
+ </header>
+ <group col="6" colspan="4">
+ <field name="name" colspan="4" select="1"/>
+ <field name="number" select="1"/>
+ <field name="bank_id" select="1"/>
+ <field name="date" select="1"/>
+ </group>
+ <notebook colspan="4">
+ <page string="Paymeny Lines">
+ <field name="line_ids" colspan="4" nolabel="1">
+ <tree string="Payment Lines" editable="bottom">
+ <field name="employee_id" on_change="onchange_employee_id(parent.date, employee_id)"/>
+ <field name="name"/>
+ <field name="bysal"/>
+ </tree>
+ </field>
+ </page>
+ <page string="Other Information">
+ <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"/>
+ </group>
+ <separator colspan="4" string="Information"/>
+ <field name="note" colspan="4" nolabel="1"/>
+ </page>
+ </notebook>
+ </form>
+ </field>
+ </record>
+
+ <record id="view_hr_payroll_advice_filter" model="ir.ui.view">
+ <field name="name">hr.payroll.advice.select</field>
+ <field name="model">hr.payroll.advice</field>
+ <field name="type">search</field>
+ <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"/>
+ <separator orientation="vertical"/>
+ <field name="date"/>
+ <field name="number"/>
+ <field name="name"/>
+ <field name="bank_id"/>
+ </group>
+ <newline/>
+ <group expand="0" string="Group By...">
+ <filter string="Bank" name="bank_id" icon="terp-folder-orange" context="{'group_by':'bank_id'}"/>
+ <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'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
+ <field name="name">Payment Advice</field>
+ <field name="res_model">hr.payroll.advice</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="view_hr_bank_advice_tree"/>
+ <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
+ </record>
+ <menuitem
+ action="action_view_hr_bank_advice_tree"
+ id="hr_menu_payment_advice"
+ parent="hr_payroll.menu_hr_root_payroll"
+ />
+
+ </data>
+</openerp>
+>>>>>>> MERGE-SOURCE
=== modified file 'l10n_in_hr_payroll/report/__init__.py'
--- l10n_in_hr_payroll/report/__init__.py 2012-05-15 08:41:29 +0000
+++ l10n_in_hr_payroll/report/__init__.py 2012-06-13 09:15:49 +0000
@@ -1,27 +1,58 @@
-#!/usr/bin/env python
-#-*- coding:utf-8 -*-
-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# d$
-#
-# 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 report_payslip_details
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+<<<<<<< TREE
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# d$
+#
+# 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 report_payslip_details
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+=======
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# d$
+#
+# 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 report_payslip_details
+import report_payroll_advice
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+>>>>>>> MERGE-SOURCE
=== added file 'l10n_in_hr_payroll/report/payment_advice.rml'
--- l10n_in_hr_payroll/report/payment_advice.rml 1970-01-01 00:00:00 +0000
+++ l10n_in_hr_payroll/report/payment_advice.rml 2012-06-13 09:15:49 +0000
@@ -0,0 +1,338 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+ <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+ <pageTemplate id="first">
+ <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+ </pageTemplate>
+ </template>
+ <stylesheet>
+ <blockTableStyle id="Standard_Outline">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table1">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table2">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table3">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table4">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+ <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"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table5">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <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"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+ <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"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <initialize>
+ <paraStyle name="all" alignment="justify"/>
+ </initialize>
+ <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P3" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+ <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" alignment="JUSTIFY"/>
+ <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"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="Table Contents" fontName="Helvetica"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+ <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_0.30cmspace" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_8_space" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
+ <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Header" fontName="Helvetica"/>
+ <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+ <paraStyle name="Signature" fontName="Helvetica"/>
+ <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Salutation" fontName="Helvetica"/>
+ <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
+ </stylesheet>
+ <story>
+ <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+ <blockTable colWidths="269.0,269.0" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9">The Manager</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9">[[ o.bank_id.name ]] Bank</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_1">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">Dear Sir/Madam,</para>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="539.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_tblheader_General_Centre">Payment Advice: [[ o.name ]] for period [[ get_month(o.date)['mname'] ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="539.0" style="Table3">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ o.note ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_8_space">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="61.0,151.0,151.0,175.0" style="Table4">
+ <tr>
+ <td>
+ <para style="P2">SI. No.</para>
+ </td>
+ <td>
+ <para style="P2">Name of the Employe</para>
+ </td>
+ <td>
+ <para style="P4">By Salary</para>
+ </td>
+ <td>
+ <para style="P3">Bank Account No.</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+ <blockTable colWidths="62.0,152.0,151.0,172.0,2.0" style="Table5">
+ <tr>
+ <td>
+ <para style="P6" leftIndent="15" bulletIndent="0">
+ <bullet><seq id="L1"/>.</bullet>
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">[[ line['name'] ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+ </td>
+ <td>
+ <para style="P1">[[ line['acc_no'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <blockTable colWidths="62.0,152.0,99.0,92.0,135.0" style="Table6">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P2">Total: </para>
+ </td>
+ <td>
+ <para style="P4">[[ 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>
+ <td>
+ <para style="P4">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_0.30cmspace">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="269.0,269.0" style="Table7">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Yours Sincerely</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">For [[ company.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Authorized Signature</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para>
+ <seqReset id="L1"/>
+ </para>
+ </story>
+</document>
=== added file 'l10n_in_hr_payroll/report/payment_advice.sxw'
Binary files l10n_in_hr_payroll/report/payment_advice.sxw 1970-01-01 00:00:00 +0000 and l10n_in_hr_payroll/report/payment_advice.sxw 2012-06-13 09:15:49 +0000 differ
=== added file 'l10n_in_hr_payroll/report/report_payroll_advice.py'
--- l10n_in_hr_payroll/report/report_payroll_advice.py 1970-01-01 00:00:00 +0000
+++ l10n_in_hr_payroll/report/report_payroll_advice.py 2012-06-13 09:15:49 +0000
@@ -0,0 +1,70 @@
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# d$
+#
+# 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 time
+from datetime import datetime
+from report import report_sxw
+from tools import amount_to_text_en
+
+class payroll_advice_report(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(payroll_advice_report, self).__init__(cr, uid, name, context)
+
+ self.total_bysal = 0.00
+ self.localcontext.update({
+ 'time': time,
+ 'get_month': self.get_month,
+ 'convert': self.convert,
+ 'get_detail': self.get_detail,
+ 'get_bysal_total': self.get_bysal_total,
+ })
+ def get_month(self,input_date):
+ res = {
+ 'mname': ''
+ }
+ date = datetime.strptime(input_date, '%Y-%m-%d')
+ res['mname']= date.strftime('%B')+'-'+date.strftime('%Y')
+ return res
+
+ def convert(self,amount, cur):
+ amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
+ return amt_en
+
+ def get_bysal_total(self):
+ return self.total_bysal
+
+ def get_detail(self,line_ids):
+ result =[]
+ if line_ids:
+ for l in line_ids:
+ res = {}
+ res['name'] = l.employee_id.name
+ res['acc_no'] = l.name
+ res['bysal'] = l.bysal
+ self.total_bysal += l.bysal
+ result.append(res)
+ return result
+
+report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/payment_advice.rml', parser=payroll_advice_report)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
_______________________________________________
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