odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]report modified. 

bzr revid: kbh@tinyerp.com-20120618055642-1p2uztplg15ceu03
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-06-18 11:26:42 +05:30
parent c740e3fdf8
commit 07081e4b73
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
View File

@ -15,7 +15,7 @@
id="payroll_advice"
model="hr.payroll.advice"
name="payroll.advice"
rml="l10n_in_hr_payroll/report/payment_advice.rml"
rml="l10n_in_hr_payroll/report/report_payroll_advice.rml"
string="Print Advice" />
</data>

8
addons/l10n_in_hr_payroll/report/report_payroll_advice.py
View File

@ -31,7 +31,6 @@ 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,
@ -61,17 +60,18 @@ class payroll_advice_report(report_sxw.rml_parse):
def get_detail(self, line_ids):
result =[]
res = {}
self.total_bysal = 0.00
for l in line_ids:
res = {}
res.update({
'name': l.employee_id.name,
'acc_no': l.name,
'bysal': l.bysal,
})
self.total_bysal += l.bysal
result.append(res)
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)
report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

48
addons/l10n_in_hr_payroll/report/payment_advice.rml → addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
View File

@ -66,15 +66,15 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="6.0" leading="8" 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" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" alignment="JUSTIFY"/>
<paraStyle name="P9" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica" fontSize="6.0" leading="8" 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="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"/>
@ -137,15 +137,13 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="P6">
<font face="Helvetica" size="10.0">Payment advice</font>
</para>
<para style="P10">Payment Advice </para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P10">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
<para style="P6">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
</td>
</tr>
<tr>
@ -185,7 +183,7 @@
<blockTable colWidths="539.0" style="Table2">
<tr>
<td>
<para style="P7">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="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>
</td>
</tr>
</blockTable>
@ -199,7 +197,7 @@
<para style="terp_default_8_space">
<font color="white"> </font>
</para>
<blockTable colWidths="61.0,154.0,149.0,175.0" style="Table4">
<blockTable colWidths="61.0,189.0,165.0,124.0" style="Table4">
<tr>
<td>
<para style="P1">SI. No.</para>
@ -208,36 +206,36 @@
<para style="P1">Name of the Employe</para>
</td>
<td>
<para style="P2">Bank Account No.</para>
<para style="P3">Bank Account No.</para>
</td>
<td>
<para style="P2">By Salary</para>
<para style="P3">By Salary</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
<blockTable colWidths="61.0,154.0,149.0,175.0" style="Table5">
<blockTable colWidths="61.0,189.0,165.0,124.0" style="Table5">
<tr>
<td>
<para style="P8" leftIndent="15" bulletIndent="0">
<bullet><seq id="L1"/>.</bullet>
<para style="P9" leftIndent="15" bulletIndent="0">
<bullet><seq id="L1"/></bullet>
<font color="white"> </font>
</para>
</td>
<td>
<para style="P5">[[ line['name'] ]]</para>
<para style="P7">[[ line['name'] ]]</para>
</td>
<td>
<para style="P4">[[ line['acc_no'] ]]</para>
<para style="P5">[[ line['acc_no'] ]]</para>
</td>
<td>
<para style="P5">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
<para style="P7">[[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
</tr>
</blockTable>
</section>
<blockTable colWidths="62.0,154.0,149.0,174.0" style="Table6">
<blockTable colWidths="62.0,189.0,165.0,124.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_Details">
@ -245,16 +243,16 @@
</para>
</td>
<td>
<para style="P9">
<para style="P2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
<para style="P3"/>
<para style="P4"/>
</td>
<td>
<para style="P3"><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>
<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>
</tr>
</blockTable>