digvijay singh has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-dsi into
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-dsi/+merge/113911
Hello,
I have done all the required changes in rml and sxw.have add one field in the
py file with the default value as c.
Thanks,
Digvijay singh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-dsi/+merge/113911
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-dsi into
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll.py'
--- l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-07-04 05:17:41 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-07-09 07:05:25 +0000
@@ -222,8 +222,13 @@
'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 @@
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:
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-07-04 05:17:41 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-07-09 07:05:25 +0000
@@ -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>
=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.py'
--- l10n_in_hr_payroll/report/report_payroll_advice.py 2012-06-26 05:22:22 +0000
+++ l10n_in_hr_payroll/report/report_payroll_advice.py 2012-07-09 07:05:25 +0000
@@ -70,6 +70,7 @@
'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 @@
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:
=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.rml'
--- l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-06-18 05:56:42 +0000
+++ l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-07-09 07:05:25 +0000
@@ -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,51 +294,51 @@
<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>
+ <para style="terp_default_9">Yours Sincerely</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_9">For [[ company.name ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_9">Authorized Signature</para>
</td>
<td>
<para style="terp_tblheader_Details">
=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.sxw'
Binary files l10n_in_hr_payroll/report/report_payroll_advice.sxw 2012-06-18 05:56:42 +0000 and l10n_in_hr_payroll/report/report_payroll_advice.sxw 2012-07-09 07:05:25 +0000 differ
_______________________________________________
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
