Merge lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-payslip_details-rsi into lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in
- trunk-qwebreport-l10n_in-payslip_details-rsi
- Merge into trunk-qwebreport-l10n_in
Proposed by
Rakesh Sindhav(OpenERP)
| Status: | Merged |
|---|---|
| Merged at revision: | 9359 |
| Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-payslip_details-rsi |
| Merge into: | lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in |
| Diff against target: |
535 lines (+105/-377) 5 files modified
l10n_in_hr_payroll/__openerp__.py (+1/-0) l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml (+4/-4) l10n_in_hr_payroll/report/report_payslip_details.py (+6/-1) l10n_in_hr_payroll/report/report_payslip_details.rml (+0/-372) l10n_in_hr_payroll/views/report_payslipdetails.xml (+94/-0) |
| To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-payslip_details-rsi |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP R&D Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Hello sir,
Here is the proposal for merging QWEB report of Pay Slip Details of l10n_in_hr_payroll module. This report is in the RML format so now i convert it into the QWEB report.
Thanks & Regard,
rsi
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'l10n_in_hr_payroll/__openerp__.py' | |||
| 2 | --- l10n_in_hr_payroll/__openerp__.py 2014-04-22 12:09:15 +0000 | |||
| 3 | +++ l10n_in_hr_payroll/__openerp__.py 2014-04-24 10:02:33 +0000 | |||
| 4 | @@ -49,6 +49,7 @@ | |||
| 5 | 49 | 'security/ir.model.access.csv', | 49 | 'security/ir.model.access.csv', |
| 6 | 50 | 'l10n_in_hr_payroll_report.xml', | 50 | 'l10n_in_hr_payroll_report.xml', |
| 7 | 51 | 'l10n_in_hr_payroll_sequence.xml', | 51 | 'l10n_in_hr_payroll_sequence.xml', |
| 8 | 52 | 'views/report_payslipdetails.xml', | ||
| 9 | 52 | 'views/report_hrsalarybymonth.xml', | 53 | 'views/report_hrsalarybymonth.xml', |
| 10 | 53 | 'wizard/hr_salary_employee_bymonth_view.xml', | 54 | 'wizard/hr_salary_employee_bymonth_view.xml', |
| 11 | 54 | 'wizard/hr_yearly_salary_detail_view.xml', | 55 | 'wizard/hr_yearly_salary_detail_view.xml', |
| 12 | 55 | 56 | ||
| 13 | === modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml' | |||
| 14 | --- l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml 2014-04-22 12:09:15 +0000 | |||
| 15 | +++ l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml 2014-04-24 10:02:33 +0000 | |||
| 16 | @@ -3,12 +3,12 @@ | |||
| 17 | 3 | <data> | 3 | <data> |
| 18 | 4 | 4 | ||
| 19 | 5 | <report | 5 | <report |
| 20 | 6 | auto="False" | ||
| 21 | 7 | id="payslip_details_report" | 6 | id="payslip_details_report" |
| 22 | 8 | model="hr.payslip" | 7 | model="hr.payslip" |
| 26 | 9 | name="paylip.details.in" | 8 | string="PaySlip Details" |
| 27 | 10 | rml="l10n_in_hr_payroll/report/report_payslip_details.rml" | 9 | report_type="qweb-pdf" |
| 28 | 11 | string="PaySlip Details" /> | 10 | name="l10n_in_hr_payroll.report_payslipdetails" |
| 29 | 11 | file="l10n_in_hr_payroll.report_payslipdetails" /> | ||
| 30 | 12 | 12 | ||
| 31 | 13 | <report | 13 | <report |
| 32 | 14 | auto="False" | 14 | auto="False" |
| 33 | 15 | 15 | ||
| 34 | === modified file 'l10n_in_hr_payroll/report/report_payslip_details.py' | |||
| 35 | --- l10n_in_hr_payroll/report/report_payslip_details.py 2013-10-27 12:31:04 +0000 | |||
| 36 | +++ l10n_in_hr_payroll/report/report_payslip_details.py 2014-04-24 10:02:33 +0000 | |||
| 37 | @@ -20,6 +20,7 @@ | |||
| 38 | 20 | ############################################################################## | 20 | ############################################################################## |
| 39 | 21 | 21 | ||
| 40 | 22 | from openerp.report import report_sxw | 22 | from openerp.report import report_sxw |
| 41 | 23 | from openerp.osv import osv | ||
| 42 | 23 | from openerp.addons.hr_payroll import report | 24 | from openerp.addons.hr_payroll import report |
| 43 | 24 | 25 | ||
| 44 | 25 | class payslip_details_report_in(report.report_payslip_details.payslip_details_report): | 26 | class payslip_details_report_in(report.report_payslip_details.payslip_details_report): |
| 45 | @@ -30,6 +31,10 @@ | |||
| 46 | 30 | 'get_details_by_rule_category': self.get_details_by_rule_category, | 31 | 'get_details_by_rule_category': self.get_details_by_rule_category, |
| 47 | 31 | }) | 32 | }) |
| 48 | 32 | 33 | ||
| 50 | 33 | report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in) | 34 | class wrapped_report_payslipdetailsin(osv.AbstractModel): |
| 51 | 35 | _name = 'report.l10n_in_hr_payroll.report_payslipdetails' | ||
| 52 | 36 | _inherit = 'report.abstract_report' | ||
| 53 | 37 | _template = 'l10n_in_hr_payroll.report_payslipdetails' | ||
| 54 | 38 | _wrapped_report_class = payslip_details_report_in | ||
| 55 | 34 | 39 | ||
| 56 | 35 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | 40 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
| 57 | 36 | 41 | ||
| 58 | === removed file 'l10n_in_hr_payroll/report/report_payslip_details.rml' | |||
| 59 | --- l10n_in_hr_payroll/report/report_payslip_details.rml 2012-10-02 14:45:47 +0000 | |||
| 60 | +++ l10n_in_hr_payroll/report/report_payslip_details.rml 1970-01-01 00:00:00 +0000 | |||
| 61 | @@ -1,372 +0,0 @@ | |||
| 62 | 1 | <?xml version="1.0"?> | ||
| 63 | 2 | <document filename="test.pdf"> | ||
| 64 | 3 | <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> | ||
| 65 | 4 | <pageTemplate id="first"> | ||
| 66 | 5 | <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/> | ||
| 67 | 6 | </pageTemplate> | ||
| 68 | 7 | </template> | ||
| 69 | 8 | <stylesheet> | ||
| 70 | 9 | <blockTableStyle id="Standard_Outline"> | ||
| 71 | 10 | <blockAlignment value="LEFT"/> | ||
| 72 | 11 | <blockValign value="TOP"/> | ||
| 73 | 12 | </blockTableStyle> | ||
| 74 | 13 | <blockTableStyle id="Table1"> | ||
| 75 | 14 | <blockAlignment value="LEFT"/> | ||
| 76 | 15 | <blockValign value="TOP"/> | ||
| 77 | 16 | </blockTableStyle> | ||
| 78 | 17 | <blockTableStyle id="Table2"> | ||
| 79 | 18 | <blockAlignment value="LEFT"/> | ||
| 80 | 19 | <blockValign value="TOP"/> | ||
| 81 | 20 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/> | ||
| 82 | 21 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> | ||
| 83 | 22 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> | ||
| 84 | 23 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> | ||
| 85 | 24 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> | ||
| 86 | 25 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> | ||
| 87 | 26 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/> | ||
| 88 | 27 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/> | ||
| 89 | 28 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> | ||
| 90 | 29 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 91 | 30 | <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 92 | 31 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/> | ||
| 93 | 32 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> | ||
| 94 | 33 | </blockTableStyle> | ||
| 95 | 34 | <blockTableStyle id="Table3"> | ||
| 96 | 35 | <blockAlignment value="LEFT"/> | ||
| 97 | 36 | <blockValign value="TOP"/> | ||
| 98 | 37 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/> | ||
| 99 | 38 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> | ||
| 100 | 39 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> | ||
| 101 | 40 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> | ||
| 102 | 41 | <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/> | ||
| 103 | 42 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> | ||
| 104 | 43 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> | ||
| 105 | 44 | </blockTableStyle> | ||
| 106 | 45 | <blockTableStyle id="Table4"> | ||
| 107 | 46 | <blockAlignment value="LEFT"/> | ||
| 108 | 47 | <blockValign value="TOP"/> | ||
| 109 | 48 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/> | ||
| 110 | 49 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> | ||
| 111 | 50 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> | ||
| 112 | 51 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> | ||
| 113 | 52 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> | ||
| 114 | 53 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> | ||
| 115 | 54 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/> | ||
| 116 | 55 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/> | ||
| 117 | 56 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> | ||
| 118 | 57 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 119 | 58 | <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 120 | 59 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/> | ||
| 121 | 60 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> | ||
| 122 | 61 | </blockTableStyle> | ||
| 123 | 62 | <blockTableStyle id="Table5"> | ||
| 124 | 63 | <blockAlignment value="LEFT"/> | ||
| 125 | 64 | <blockValign value="TOP"/> | ||
| 126 | 65 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/> | ||
| 127 | 66 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> | ||
| 128 | 67 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> | ||
| 129 | 68 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> | ||
| 130 | 69 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> | ||
| 131 | 70 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> | ||
| 132 | 71 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/> | ||
| 133 | 72 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/> | ||
| 134 | 73 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> | ||
| 135 | 74 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 136 | 75 | <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 137 | 76 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/> | ||
| 138 | 77 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> | ||
| 139 | 78 | </blockTableStyle> | ||
| 140 | 79 | <blockTableStyle id="Table6"> | ||
| 141 | 80 | <blockAlignment value="LEFT"/> | ||
| 142 | 81 | <blockValign value="TOP"/> | ||
| 143 | 82 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/> | ||
| 144 | 83 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> | ||
| 145 | 84 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> | ||
| 146 | 85 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> | ||
| 147 | 86 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> | ||
| 148 | 87 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> | ||
| 149 | 88 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/> | ||
| 150 | 89 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/> | ||
| 151 | 90 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> | ||
| 152 | 91 | <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 153 | 92 | <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/> | ||
| 154 | 93 | <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/> | ||
| 155 | 94 | <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> | ||
| 156 | 95 | </blockTableStyle> | ||
| 157 | 96 | <blockTableStyle id="Table10"> | ||
| 158 | 97 | <blockAlignment value="LEFT"/> | ||
| 159 | 98 | <blockValign value="TOP"/> | ||
| 160 | 99 | </blockTableStyle> | ||
| 161 | 100 | <blockTableStyle id="Table11"> | ||
| 162 | 101 | <blockAlignment value="LEFT"/> | ||
| 163 | 102 | <blockValign value="TOP"/> | ||
| 164 | 103 | <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> | ||
| 165 | 104 | <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> | ||
| 166 | 105 | <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> | ||
| 167 | 106 | <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> | ||
| 168 | 107 | </blockTableStyle> | ||
| 169 | 108 | <blockTableStyle id="Table12"> | ||
| 170 | 109 | <blockAlignment value="LEFT"/> | ||
| 171 | 110 | <blockValign value="TOP"/> | ||
| 172 | 111 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> | ||
| 173 | 112 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> | ||
| 174 | 113 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> | ||
| 175 | 114 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> | ||
| 176 | 115 | </blockTableStyle> | ||
| 177 | 116 | <blockTableStyle id="Table8"> | ||
| 178 | 117 | <blockAlignment value="LEFT"/> | ||
| 179 | 118 | <blockValign value="TOP"/> | ||
| 180 | 119 | </blockTableStyle> | ||
| 181 | 120 | <blockTableStyle id="Table7"> | ||
| 182 | 121 | <blockAlignment value="LEFT"/> | ||
| 183 | 122 | <blockValign value="TOP"/> | ||
| 184 | 123 | <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> | ||
| 185 | 124 | <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> | ||
| 186 | 125 | <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> | ||
| 187 | 126 | <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> | ||
| 188 | 127 | <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> | ||
| 189 | 128 | <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> | ||
| 190 | 129 | </blockTableStyle> | ||
| 191 | 130 | <blockTableStyle id="Table16"> | ||
| 192 | 131 | <blockAlignment value="LEFT"/> | ||
| 193 | 132 | <blockValign value="TOP"/> | ||
| 194 | 133 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> | ||
| 195 | 134 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> | ||
| 196 | 135 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> | ||
| 197 | 136 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> | ||
| 198 | 137 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> | ||
| 199 | 138 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> | ||
| 200 | 139 | </blockTableStyle> | ||
| 201 | 140 | <blockTableStyle id="Table13"> | ||
| 202 | 141 | <blockAlignment value="LEFT"/> | ||
| 203 | 142 | <blockValign value="TOP"/> | ||
| 204 | 143 | </blockTableStyle> | ||
| 205 | 144 | <initialize> | ||
| 206 | 145 | <paraStyle name="all" alignment="justify"/> | ||
| 207 | 146 | </initialize> | ||
| 208 | 147 | <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3"/> | ||
| 209 | 148 | <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3"/> | ||
| 210 | 149 | <paraStyle name="P3" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 211 | 150 | <paraStyle name="P4" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 212 | 151 | <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 213 | 152 | <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 214 | 153 | <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 215 | 154 | <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 216 | 155 | <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 217 | 156 | <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 218 | 157 | <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 219 | 158 | <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 220 | 159 | <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/> | ||
| 221 | 160 | <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/> | ||
| 222 | 161 | <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/> | ||
| 223 | 162 | <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 224 | 163 | <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 225 | 164 | <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 226 | 165 | <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/> | ||
| 227 | 166 | <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3"/> | ||
| 228 | 167 | <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 229 | 168 | <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/> | ||
| 230 | 169 | <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/> | ||
| 231 | 170 | <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 232 | 171 | <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 233 | 172 | <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 234 | 173 | <paraStyle name="Standard" fontName="Helvetica"/> | ||
| 235 | 174 | <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> | ||
| 236 | 175 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 237 | 176 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | ||
| 238 | 177 | <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 239 | 178 | <paraStyle name="Index" fontName="Helvetica"/> | ||
| 240 | 179 | <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 241 | 180 | <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 242 | 181 | <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 243 | 182 | <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 244 | 183 | <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 245 | 184 | <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 246 | 185 | <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 247 | 186 | <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 248 | 187 | <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 249 | 188 | <paraStyle name="terp_default_10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 250 | 189 | <paraStyle name="Table Contents" fontName="Helvetica"/> | ||
| 251 | 190 | <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 252 | 191 | <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 253 | 192 | <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> | ||
| 254 | 193 | <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/> | ||
| 255 | 194 | <paraStyle name="payslip_adj" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
| 256 | 195 | <images/> | ||
| 257 | 196 | </stylesheet> | ||
| 258 | 197 | <story> | ||
| 259 | 198 | <para style="P3">[[repeatIn(objects,'o')]]</para> | ||
| 260 | 199 | <blockTable colWidths="539.0" style="Table1"> | ||
| 261 | 200 | <tr> | ||
| 262 | 201 | <td> | ||
| 263 | 202 | <para style="P8">Pay Slip Details</para> | ||
| 264 | 203 | </td> | ||
| 265 | 204 | </tr> | ||
| 266 | 205 | </blockTable> | ||
| 267 | 206 | <para style="terp_header_Centre"> | ||
| 268 | 207 | <font face="Helvetica" size="6.0">[[o.credit_note==False and removeParentNode('para')]]</font> | ||
| 269 | 208 | <font face="Helvetica-Bold" size="14.0">Credit</font> | ||
| 270 | 209 | <font face="Helvetica" size="14.0"/> | ||
| 271 | 210 | <font face="Helvetica-Bold" size="14.0">Note</font> | ||
| 272 | 211 | </para> | ||
| 273 | 212 | <para style="P9">([[o.name or removeParentNode('para')]])</para> | ||
| 274 | 213 | <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2"> | ||
| 275 | 214 | <tr> | ||
| 276 | 215 | <td> | ||
| 277 | 216 | <para style="P16">Name</para> | ||
| 278 | 217 | </td> | ||
| 279 | 218 | <td> | ||
| 280 | 219 | <para style="P16">[[o.employee_id.name]]</para> | ||
| 281 | 220 | </td> | ||
| 282 | 221 | <td> | ||
| 283 | 222 | <para style="P16">Designation </para> | ||
| 284 | 223 | </td> | ||
| 285 | 224 | <td> | ||
| 286 | 225 | <para style="P5">[[ o.employee_id.job_id.name or '' ]]</para> | ||
| 287 | 226 | </td> | ||
| 288 | 227 | </tr> | ||
| 289 | 228 | </blockTable> | ||
| 290 | 229 | <blockTable colWidths="63.0,476.0" style="Table3"> | ||
| 291 | 230 | <tr> | ||
| 292 | 231 | <td> | ||
| 293 | 232 | <para style="terp_default_Bold_8"> | ||
| 294 | 233 | <font face="Helvetica">Address </font> | ||
| 295 | 234 | </para> | ||
| 296 | 235 | </td> | ||
| 297 | 236 | <td> | ||
| 298 | 237 | <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para> | ||
| 299 | 238 | </td> | ||
| 300 | 239 | </tr> | ||
| 301 | 240 | </blockTable> | ||
| 302 | 241 | <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4"> | ||
| 303 | 242 | <tr> | ||
| 304 | 243 | <td> | ||
| 305 | 244 | <para style="P16">Email</para> | ||
| 306 | 245 | </td> | ||
| 307 | 246 | <td> | ||
| 308 | 247 | <para style="P5">[[ o.employee_id.work_email or '' ]]</para> | ||
| 309 | 248 | </td> | ||
| 310 | 249 | <td> | ||
| 311 | 250 | <para style="terp_default_Bold_8"> | ||
| 312 | 251 | <font face="Helvetica">Identification No</font> | ||
| 313 | 252 | </para> | ||
| 314 | 253 | </td> | ||
| 315 | 254 | <td> | ||
| 316 | 255 | <para style="P5">[[ o.employee_id.identification_id or '' ]]</para> | ||
| 317 | 256 | </td> | ||
| 318 | 257 | </tr> | ||
| 319 | 258 | </blockTable> | ||
| 320 | 259 | <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5"> | ||
| 321 | 260 | <tr> | ||
| 322 | 261 | <td> | ||
| 323 | 262 | <para style="P16">Reference</para> | ||
| 324 | 263 | </td> | ||
| 325 | 264 | <td> | ||
| 326 | 265 | <para style="P5">[[ o.number or '' ]]</para> | ||
| 327 | 266 | </td> | ||
| 328 | 267 | <td> | ||
| 329 | 268 | <para style="P16">Bank Account</para> | ||
| 330 | 269 | </td> | ||
| 331 | 270 | <td> | ||
| 332 | 271 | <para style="P5">[[ o.employee_id.otherid or '' ]]</para> | ||
| 333 | 272 | </td> | ||
| 334 | 273 | </tr> | ||
| 335 | 274 | </blockTable> | ||
| 336 | 275 | <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6"> | ||
| 337 | 276 | <tr> | ||
| 338 | 277 | <td> | ||
| 339 | 278 | <para style="P16">Date From</para> | ||
| 340 | 279 | </td> | ||
| 341 | 280 | <td> | ||
| 342 | 281 | <para style="P5">[[ o.date_from or '']]</para> | ||
| 343 | 282 | </td> | ||
| 344 | 283 | <td> | ||
| 345 | 284 | <para style="terp_default_Bold_8"> | ||
| 346 | 285 | <font face="Helvetica" size="8.0">Date To</font> | ||
| 347 | 286 | </para> | ||
| 348 | 287 | </td> | ||
| 349 | 288 | <td> | ||
| 350 | 289 | <para style="P5">[[ o.date_to or '' ]]</para> | ||
| 351 | 290 | </td> | ||
| 352 | 291 | </tr> | ||
| 353 | 292 | </blockTable> | ||
| 354 | 293 | <para style="P7"/> | ||
| 355 | 294 | <para style="P11"> | ||
| 356 | 295 | <font color="white"> </font> | ||
| 357 | 296 | </para> | ||
| 358 | 297 | <para style="P5"> | ||
| 359 | 298 | <font color="white"> </font> | ||
| 360 | 299 | </para> | ||
| 361 | 300 | <blockTable colWidths="539.0" style="Table10"> | ||
| 362 | 301 | <tr> | ||
| 363 | 302 | <td> | ||
| 364 | 303 | <para style="P10">Details by Salary Rule Category: </para> | ||
| 365 | 304 | </td> | ||
| 366 | 305 | </tr> | ||
| 367 | 306 | </blockTable> | ||
| 368 | 307 | <blockTable colWidths="54.0,388.0,97.0" style="Table11"> | ||
| 369 | 308 | <tr> | ||
| 370 | 309 | <td> | ||
| 371 | 310 | <para style="P15">Code</para> | ||
| 372 | 311 | </td> | ||
| 373 | 312 | <td> | ||
| 374 | 313 | <para style="P15">Salary Rule Category</para> | ||
| 375 | 314 | </td> | ||
| 376 | 315 | <td> | ||
| 377 | 316 | <para style="P14">Total</para> | ||
| 378 | 317 | </td> | ||
| 379 | 318 | </tr> | ||
| 380 | 319 | </blockTable> | ||
| 381 | 320 | <para style="P1"> | ||
| 382 | 321 | <font color="white"> </font> | ||
| 383 | 322 | </para> | ||
| 384 | 323 | <section> | ||
| 385 | 324 | <para style="P16">[[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]]</para> | ||
| 386 | 325 | <blockTable colWidths="54.0,388.0,97.0" style="Table12"> | ||
| 387 | 326 | <tr> | ||
| 388 | 327 | <td> | ||
| 389 | 328 | <para style="P16"> | ||
| 390 | 329 | <font face="Helvetica">[[ h['code'] ]]</font> | ||
| 391 | 330 | <font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font> | ||
| 392 | 331 | </para> | ||
| 393 | 332 | </td> | ||
| 394 | 333 | <td> | ||
| 395 | 334 | <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para> | ||
| 396 | 335 | </td> | ||
| 397 | 336 | <td> | ||
| 398 | 337 | <para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para> | ||
| 399 | 338 | </td> | ||
| 400 | 339 | </tr> | ||
| 401 | 340 | </blockTable> | ||
| 402 | 341 | </section> | ||
| 403 | 342 | <para style="P7"> | ||
| 404 | 343 | <font color="white"> </font> | ||
| 405 | 344 | </para> | ||
| 406 | 345 | |||
| 407 | 346 | <blockTable colWidths="269.0,269.0" style="Table13"> | ||
| 408 | 347 | <tr> | ||
| 409 | 348 | <td> | ||
| 410 | 349 | <para style="P5"> | ||
| 411 | 350 | <font color="white"> </font> | ||
| 412 | 351 | </para> | ||
| 413 | 352 | </td> | ||
| 414 | 353 | <td> | ||
| 415 | 354 | <para style="P12"> | ||
| 416 | 355 | <font color="white"> </font> | ||
| 417 | 356 | </para> | ||
| 418 | 357 | <para style="P12"> | ||
| 419 | 358 | <font color="white"> </font> | ||
| 420 | 359 | </para> | ||
| 421 | 360 | <para style="P12"> | ||
| 422 | 361 | <font color="white"> </font> | ||
| 423 | 362 | </para> | ||
| 424 | 363 | <para style="P12">Authorized Signature </para> | ||
| 425 | 364 | </td> | ||
| 426 | 365 | </tr> | ||
| 427 | 366 | </blockTable> | ||
| 428 | 367 | <para style="P4"> | ||
| 429 | 368 | <font color="white"> </font> | ||
| 430 | 369 | </para> | ||
| 431 | 370 | </story> | ||
| 432 | 371 | </document> | ||
| 433 | 372 | |||
| 434 | 373 | 0 | ||
| 435 | === removed file 'l10n_in_hr_payroll/report/report_payslip_details.sxw' | |||
| 436 | 374 | Binary files l10n_in_hr_payroll/report/report_payslip_details.sxw 2012-10-02 14:45:47 +0000 and l10n_in_hr_payroll/report/report_payslip_details.sxw 1970-01-01 00:00:00 +0000 differ | 1 | Binary files l10n_in_hr_payroll/report/report_payslip_details.sxw 2012-10-02 14:45:47 +0000 and l10n_in_hr_payroll/report/report_payslip_details.sxw 1970-01-01 00:00:00 +0000 differ |
| 437 | === added file 'l10n_in_hr_payroll/views/report_payslipdetails.xml' | |||
| 438 | --- l10n_in_hr_payroll/views/report_payslipdetails.xml 1970-01-01 00:00:00 +0000 | |||
| 439 | +++ l10n_in_hr_payroll/views/report_payslipdetails.xml 2014-04-24 10:02:33 +0000 | |||
| 440 | @@ -0,0 +1,94 @@ | |||
| 441 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 442 | 2 | <openerp> | ||
| 443 | 3 | <data> | ||
| 444 | 4 | <template id="report_payslipdetails"> | ||
| 445 | 5 | <t t-call="report.html_container"> | ||
| 446 | 6 | <t t-call="report.external_layout"> | ||
| 447 | 7 | <t t-foreach="docs" t-as="o"> | ||
| 448 | 8 | <div class="page"> | ||
| 449 | 9 | <h2>Pay Slip Details</h2> | ||
| 450 | 10 | <p t-field="o.name"/> | ||
| 451 | 11 | |||
| 452 | 12 | <table class="table table-condensed table-bordered"> | ||
| 453 | 13 | <tr> | ||
| 454 | 14 | <td><strong>Name</strong></td> | ||
| 455 | 15 | <td><span t-field="o.employee_id"/></td> | ||
| 456 | 16 | <td><strong>Designation</strong></td> | ||
| 457 | 17 | <td><span t-field="o.employee_id.job_id"/></td> | ||
| 458 | 18 | </tr> | ||
| 459 | 19 | <tr> | ||
| 460 | 20 | <td><strong>Address</strong></td> | ||
| 461 | 21 | <td colspan="3"> | ||
| 462 | 22 | <div t-field="o.employee_id.address_home_id" | ||
| 463 | 23 | t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/> | ||
| 464 | 24 | </td> | ||
| 465 | 25 | </tr> | ||
| 466 | 26 | <tr> | ||
| 467 | 27 | <td><strong>Email</strong></td> | ||
| 468 | 28 | <td><span t-field="o.employee_id.work_email"/></td> | ||
| 469 | 29 | <td><strong>Identification No</strong></td> | ||
| 470 | 30 | <td><span t-field="o.employee_id.job_id"/></td> | ||
| 471 | 31 | </tr> | ||
| 472 | 32 | <tr> | ||
| 473 | 33 | <td><strong>Reference</strong></td> | ||
| 474 | 34 | <td><span t-field="o.number"/></td> | ||
| 475 | 35 | <td><strong>Bank Account</strong></td> | ||
| 476 | 36 | <td><span t-field="o.employee_id.otherid"/></td> | ||
| 477 | 37 | </tr> | ||
| 478 | 38 | <tr> | ||
| 479 | 39 | <td><strong>Date From</strong></td> | ||
| 480 | 40 | <td><span t-field="o.date_from"/></td> | ||
| 481 | 41 | <td><strong>Date To</strong></td> | ||
| 482 | 42 | <td><span t-field="o.date_to"/></td> | ||
| 483 | 43 | </tr> | ||
| 484 | 44 | </table> | ||
| 485 | 45 | |||
| 486 | 46 | <h3>Details by Salary Rule Category</h3> | ||
| 487 | 47 | <table class="table table-condensed mb32"> | ||
| 488 | 48 | <thead> | ||
| 489 | 49 | <tr> | ||
| 490 | 50 | <th>Code</th> | ||
| 491 | 51 | <th>Salary Rule Category</th> | ||
| 492 | 52 | <th>Total</th> | ||
| 493 | 53 | </tr> | ||
| 494 | 54 | </thead> | ||
| 495 | 55 | <tbody> | ||
| 496 | 56 | <t t-foreach="get_details_by_rule_category(o.details_by_salary_rule_category)" t-as="h"> | ||
| 497 | 57 | <t t-if="h['level']==0"> | ||
| 498 | 58 | <tr> | ||
| 499 | 59 | <td> | ||
| 500 | 60 | <strong><span t-esc="h['code']"/></strong> | ||
| 501 | 61 | </td> | ||
| 502 | 62 | <td> | ||
| 503 | 63 | <strong><span t-esc="h['rule_category']"/></strong> | ||
| 504 | 64 | </td> | ||
| 505 | 65 | <td> | ||
| 506 | 66 | <strong><span t-esc="formatLang(h['total'], currency_obj=o.company_id.currency_id)"/></strong> | ||
| 507 | 67 | </td> | ||
| 508 | 68 | </tr> | ||
| 509 | 69 | </t> | ||
| 510 | 70 | <t t-if="h['level']!=0"> | ||
| 511 | 71 | <tr> | ||
| 512 | 72 | <td> | ||
| 513 | 73 | <span t-esc="h['code']"/> | ||
| 514 | 74 | </td> | ||
| 515 | 75 | <td> | ||
| 516 | 76 | <span t-esc="'..'*h['level']"/><span t-esc="h['rule_category']"/> | ||
| 517 | 77 | </td> | ||
| 518 | 78 | <td> | ||
| 519 | 79 | <span t-esc="formatLang(h['total'], currency_obj=o.company_id.currency_id)"/> | ||
| 520 | 80 | </td> | ||
| 521 | 81 | </tr> | ||
| 522 | 82 | </t> | ||
| 523 | 83 | </t> | ||
| 524 | 84 | </tbody> | ||
| 525 | 85 | </table> | ||
| 526 | 86 | |||
| 527 | 87 | <p class="text-right"><strong>Authorized signature</strong></p> | ||
| 528 | 88 | </div> | ||
| 529 | 89 | </t> | ||
| 530 | 90 | </t> | ||
| 531 | 91 | </t> | ||
| 532 | 92 | </template> | ||
| 533 | 93 | </data> | ||
| 534 | 94 | </openerp> | ||
| 535 | 0 | \ No newline at end of file | 95 | \ No newline at end of file |
