1
=== modified file 'l10n_in_hr_payroll/__openerp__.py'
2
--- l10n_in_hr_payroll/__openerp__.py	2012-08-21 13:20:23 +0000
3
+++ l10n_in_hr_payroll/__openerp__.py	2012-08-24 13:15:26 +0000
4
@@ -28,7 +28,7 @@
5
28
    'version': '1.0',
28
    'version': '1.0',
6
29
    'description': """
29
    'description': """
7
30
Indian Payroll Salary Rules.
30
Indian Payroll Salary Rules.
9
31
=======================
31
============================
10
32
32
11
33
    -Configuration of hr_payroll for India localization
33
    -Configuration of hr_payroll for India localization
12
34
    -All main contributions rules for India payslip.
34
    -All main contributions rules for India payslip.
13
@@ -53,6 +53,7 @@
14
53
         'wizard/hr_salary_employee_bymonth_view.xml',
53
         'wizard/hr_salary_employee_bymonth_view.xml',
15
54
         'wizard/hr_yearly_salary_detail_view.xml',
54
         'wizard/hr_yearly_salary_detail_view.xml',
16
55
         'report/payment_advice_report_view.xml',
55
         'report/payment_advice_report_view.xml',
17
56
         'report/payslip_report_view.xml',
18
56
57
19
57
     ],
58
     ],
20
58
    'test': [
59
    'test': [
21
59
60
22
=== modified file 'l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml'
23
--- l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml	2012-08-21 13:20:23 +0000
24
+++ l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml	2012-08-24 13:15:26 +0000
25
@@ -19,6 +19,41 @@
26
19
            <field name="name">Register for Food Coupen</field>
19
            <field name="name">Register for Food Coupen</field>
27
20
        </record>
20
        </record>
28
21
21
29
22
        <record id="hr_tds_register" model="hr.contribution.register">
30
23
            <field name="name">Register for TDS</field>
31
24
        </record>
32
25
33
26
        <record id="hr_nps_contribution_register" model="hr.contribution.register">
34
27
            <field name="name">Register for NPS Contribution</field>
35
28
        </record>
36
29
37
30
        <record id="hr_vpf_contribution_register" model="hr.contribution.register">
38
31
            <field name="name">Register for Voluntarily Provident Fund</field>
39
32
        </record>
40
33
41
34
        <record id="hr_company_transport_register" model="hr.contribution.register">
42
35
            <field name="name">Register for Company Provided Transport Deduction</field>
43
36
        </record>
44
37
45
38
        <record id="hr_labour_Welfare_fund_register" model="hr.contribution.register">
46
39
            <field name="name">Register for State Labour Welfare Fund Deduction</field>
47
40
        </record>
48
41
49
42
        <record id="hr_group_term_insurance_register" model="hr.contribution.register">
50
43
            <field name="name">Register for Company Provided Group Term Insurance Deduction</field>
51
44
        </record>
52
45
53
46
        <record id="hr_leave_availed_register" model="hr.contribution.register">
54
47
            <field name="name">Register for Leave Availed Deduction</field>
55
48
        </record>
56
49
57
50
        <record id="hr_medical_insurance_register" model="hr.contribution.register">
58
51
            <field name="name">Register for Company Provided Medical Insurance Deduction</field>
59
52
        </record>
60
53
61
54
        <record id="hr_other_deduction_register" model="hr.contribution.register">
62
55
            <field name="name">Register for Other Deduction from Employer</field>
63
56
        </record>
64
22
        <!-- Hr Salary Rules for allowance-->
57
        <!-- Hr Salary Rules for allowance-->
65
23
58
66
24
        <record id="hr_salary_rule_da" model="hr.salary.rule">
59
        <record id="hr_salary_rule_da" model="hr.salary.rule">
67
@@ -34,7 +69,7 @@
68
34
        <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
69
        <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
69
35
            <field name="code">HRAMN</field>
70
            <field name="code">HRAMN</field>
70
36
            <field name="amount_select">code</field>
71
            <field name="amount_select">code</field>
72
37
            <field name="amount_python_compute">result=payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.50) or (contract.wage * 0.50) if (contract.city_type=='metro') else payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.40) or (contract.wage * 0.40) if (contract.city_type=='non-metro') else 0.00</field>
72
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100) or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100)</field>
73
38
            <field name="category_id" ref="hr_payroll.ALW"/>
73
            <field name="category_id" ref="hr_payroll.ALW"/>
74
39
            <field name="name">House Rent Allowance for metro and nonmetro city</field>
74
            <field name="name">House Rent Allowance for metro and nonmetro city</field>
75
40
            <field name="register_id" ref="hr_houserent_allowance_register"/>
75
            <field name="register_id" ref="hr_houserent_allowance_register"/>
76
@@ -54,8 +89,10 @@
77
54
            <field name="code">SA</field>
89
            <field name="code">SA</field>
78
55
            <field name="name">Grade/Special/Management/Supplementary Allowance</field>
90
            <field name="name">Grade/Special/Management/Supplementary Allowance</field>
79
56
            <field name="category_id" ref="hr_payroll.ALW"/>
91
            <field name="category_id" ref="hr_payroll.ALW"/>
82
57
            <field name="amount_select">fix</field>
92
            <field name="condition_select">python</field>
83
58
            <field eval="0.0" name="amount_fix"/>
93
            <field name="condition_python">result = bool(contract.supplementary_allowance)</field>
84
94
            <field name="amount_select">code</field>
85
95
            <field name="amount_python_compute">result = contract.supplementary_allowance</field>
86
59
            <field name="sequence" eval="20"/>
96
            <field name="sequence" eval="20"/>
87
60
            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
97
            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
88
61
        </record>
98
        </record>
89
@@ -116,7 +153,8 @@
90
116
            <field name="code">ARRE</field>
153
            <field name="code">ARRE</field>
91
117
            <field name="name">Arrears</field>
154
            <field name="name">Arrears</field>
92
118
            <field name="category_id" ref="hr_payroll.ALW"/>
155
            <field name="category_id" ref="hr_payroll.ALW"/>
94
119
            <field name="amount_select">fix</field>
156
            <field name="amount_select">code</field>
95
157
            <field name="amount_python_compute">result = inputs.ARS.amount</field>
96
120
            <field eval="0.0" name="amount_fix"/>
158
            <field eval="0.0" name="amount_fix"/>
97
121
            <field name="sequence" eval="28"/>
159
            <field name="sequence" eval="28"/>
98
122
            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1).
160
            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1).
99
@@ -124,25 +162,13 @@
100
124
Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
162
Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
101
125
        </record>
163
        </record>
102
126
164
103
127
        <record id="hr_salary_rule_gratuity" model="hr.salary.rule">
104
128
            <field name="code">GRA</field>
105
129
            <field name="name">Gratuity</field>
106
130
            <field name="category_id" ref="hr_payroll.ALW"/>
107
131
            <field name="condition_select">none</field>
108
132
            <field name="amount_select">code</field>
109
133
             <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and ((contract.wage + DA) * 15 * employee.number_of_year / worked_days.WORK100.number_of_days) or (contract.wage * 15 * employee.number_of_year / worked_days.WORK100.number_of_days)</field>
110
134
            <field name="sequence" eval="57"/>
111
135
            <field name="note">Covered under the Payment of Gratuity Act, 1971:
112
136
(Last drawn monthly basic salary + dearness allowance)/26 x 15 days x
113
137
number of years of service (date of joining – date of retirement/leaving job)</field>
114
138
        </record>
115
139
116
140
        <record id="hr_salary_rule_lta" model="hr.salary.rule">
165
        <record id="hr_salary_rule_lta" model="hr.salary.rule">
117
141
            <field name="code">LTA</field>
166
            <field name="code">LTA</field>
118
142
            <field name="name">Leave Travel Allowance</field>
167
            <field name="name">Leave Travel Allowance</field>
119
143
            <field name="category_id" ref="hr_payroll.ALW"/>
168
            <field name="category_id" ref="hr_payroll.ALW"/>
122
144
            <field name="amount_select">fix</field>
169
            <field name="amount_select">percentage</field>
123
145
            <field name="amount_fix">1666</field>
170
            <field name="amount_percentage_base">contract.wage</field>
124
171
            <field name="amount_percentage" eval="8.33"/>
125
146
            <field name="sequence" eval="29"/>
172
            <field name="sequence" eval="29"/>
126
147
            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.</field>
173
            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.</field>
127
148
        </record>
174
        </record>
128
@@ -152,8 +178,8 @@
129
152
            <field name="name">Leave Encashment</field>
178
            <field name="name">Leave Encashment</field>
130
153
            <field name="category_id" ref="hr_payroll.ALW"/>
179
            <field name="category_id" ref="hr_payroll.ALW"/>
131
154
            <field name="condition_select">none</field>
180
            <field name="condition_select">none</field>
134
155
            <field name="amount_select">fix</field>
181
            <field name="amount_select">code</field>
135
156
            <field name="amount_fix">0.0</field>
182
            <field name="amount_python_compute">result = inputs.LE.amount</field>
136
157
            <field name="sequence" eval="30"/>
183
            <field name="sequence" eval="30"/>
137
158
            <field name="note">Payment by way of leave encashment received by Central and State Govt.employees at the time of retirement in respect of the period of earned leave at credit is fully exempt. In case of other employees, the exemption is to be limited to minimum of all below:
184
            <field name="note">Payment by way of leave encashment received by Central and State Govt.employees at the time of retirement in respect of the period of earned leave at credit is fully exempt. In case of other employees, the exemption is to be limited to minimum of all below:
138
159
    1.The actual amount received
185
    1.The actual amount received
139
@@ -162,29 +188,40 @@
140
162
    4.Rs. 3 Lakh</field>
188
    4.Rs. 3 Lakh</field>
141
163
        </record>
189
        </record>
142
164
190
144
165
        <record id="hr_salary_rule_bonus" model="hr.salary.rule">
191
        <record id="hr_salary_rule_performance" model="hr.salary.rule">
145
166
            <field name="code">PI</field>
192
            <field name="code">PI</field>
147
167
            <field name="name">Performance Incentive/Bonus</field>
193
            <field name="name">Performance Incentive</field>
148
168
            <field name="category_id" ref="hr_payroll.ALW"/>
194
            <field name="category_id" ref="hr_payroll.ALW"/>
151
169
            <field name="amount_select">fix</field>
195
            <field name="amount_select">code</field>
152
170
            <field eval="0.0" name="amount_fix"/>
196
            <field name="amount_python_compute">result = inputs.PERF.amount</field>
153
171
            <field name="sequence" eval="31"/>
197
            <field name="sequence" eval="31"/>
154
172
            <field name="note">This would be fully taxable based on incentive.</field>
198
            <field name="note">This would be fully taxable based on incentive.</field>
155
173
        </record>
199
        </record>
156
174
200
157
201
        <record id="hr_salary_rule_bonus" model="hr.salary.rule">
158
202
            <field name="code">BONUS</field>
159
203
            <field name="name">Bonus</field>
160
204
            <field name="category_id" ref="hr_payroll.ALW"/>
161
205
            <field name="amount_select">code</field>
162
206
            <field name="amount_python_compute">result = inputs.BNS.amount</field>
163
207
            <field name="sequence" eval="41"/>
164
208
            <field name="note">This would be fully taxable based on Bonus.</field>
165
209
        </record>
166
210
167
211
168
175
        <record id="hr_salary_rule_medical" model="hr.salary.rule">
212
        <record id="hr_salary_rule_medical" model="hr.salary.rule">
169
176
            <field name="code">MEDA</field>
213
            <field name="code">MEDA</field>
170
177
            <field name="name">Medical Reimbursement</field>
214
            <field name="name">Medical Reimbursement</field>
171
178
            <field name="category_id" ref="hr_payroll.ALW"/>
215
            <field name="category_id" ref="hr_payroll.ALW"/>
172
179
            <field name="amount_select">fix</field>
216
            <field name="amount_select">fix</field>
174
180
            <field eval="1200.0" name="amount_fix"/>
217
            <field eval="1250.0" name="amount_fix"/>
175
181
            <field name="sequence" eval="32"/>
218
            <field name="sequence" eval="32"/>
176
182
            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
219
            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
177
183
        </record>
220
        </record>
178
184
221
179
185
         <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
222
         <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
180
186
            <field name="amount_select">fix</field>
223
            <field name="amount_select">fix</field>
182
187
            <field eval="20" name="amount_fix"/>
224
            <field eval="50" name="amount_fix"/>
183
188
            <field name="quantity">worked_days.WORK100.number_of_days</field>
225
            <field name="quantity">worked_days.WORK100.number_of_days</field>
184
189
            <field name="code">FC</field>
226
            <field name="code">FC</field>
185
190
            <field name="category_id" ref="hr_payroll.ALW"/>
227
            <field name="category_id" ref="hr_payroll.ALW"/>
186
@@ -197,28 +234,38 @@
187
197
            <field name="code">PERJ</field>
234
            <field name="code">PERJ</field>
188
198
            <field name="name">Periodical Journals</field>
235
            <field name="name">Periodical Journals</field>
189
199
            <field name="category_id" ref="hr_payroll.ALW"/>
236
            <field name="category_id" ref="hr_payroll.ALW"/>
192
200
            <field name="amount_select">fix</field>
237
            <field name="amount_select">code</field>
193
201
            <field eval="0.0" name="amount_fix"/>
238
            <field name="amount_python_compute">result = inputs.PJ.amount</field>
194
202
            <field name="sequence" eval="34"/>
239
            <field name="sequence" eval="34"/>
195
203
            <field name="note">Some employers may provide component for buying magazines, journals and books as a part of knowledge enhancement for business growth.This part would become non taxable on providing original bills.</field>
240
            <field name="note">Some employers may provide component for buying magazines, journals and books as a part of knowledge enhancement for business growth.This part would become non taxable on providing original bills.</field>
196
204
        </record>
241
        </record>
197
205
242
201
206
        <record id="hr_salary_rule_uniform" model="hr.salary.rule">
243
        <record id="hr_salary_rule_uniform_senior" model="hr.salary.rule">
202
207
            <field name="code">UNIF</field>
244
            <field name="code">UNIFS</field>
203
208
            <field name="name">Uniform/Dress Allowance</field>
245
            <field name="name">Uniform/Dress Allowance for Senior Executive</field>
204
209
            <field name="category_id" ref="hr_payroll.ALW"/>
246
            <field name="category_id" ref="hr_payroll.ALW"/>
205
210
            <field name="amount_select">fix</field>
247
            <field name="amount_select">fix</field>
207
211
            <field eval="0.0" name="amount_fix"/>
248
            <field eval="1000" name="amount_fix"/>
208
212
            <field name="sequence" eval="35"/>
249
            <field name="sequence" eval="35"/>
209
213
            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
250
            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
210
214
        </record>
251
        </record>
211
215
252
212
253
        <record id="hr_salary_rule_uniform_junior" model="hr.salary.rule">
213
254
            <field name="code">UNIFJ</field>
214
255
            <field name="name">Uniform/Dress Allowance for Junior Executive</field>
215
256
            <field name="category_id" ref="hr_payroll.ALW"/>
216
257
            <field name="amount_select">fix</field>
217
258
            <field eval="600" name="amount_fix"/>
218
259
            <field name="sequence" eval="42"/>
219
260
            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
220
261
        </record>
221
262
222
216
        <record id="hr_salary_rule_telephone" model="hr.salary.rule">
263
        <record id="hr_salary_rule_telephone" model="hr.salary.rule">
223
217
            <field name="code">TELR</field>
264
            <field name="code">TELR</field>
224
218
            <field name="name">Telephone Reimbursement</field>
265
            <field name="name">Telephone Reimbursement</field>
225
219
            <field name="category_id" ref="hr_payroll.ALW"/>
266
            <field name="category_id" ref="hr_payroll.ALW"/>
228
220
            <field name="amount_select">fix</field>
267
            <field name="amount_select">code</field>
229
221
            <field name="amount_fix">1500</field>
268
            <field name="amount_python_compute">result = inputs.TR.amount</field>
230
222
            <field name="sequence" eval="36"/>
269
            <field name="sequence" eval="36"/>
231
223
            <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
270
            <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
232
224
            </field>
271
            </field>
233
@@ -237,8 +284,8 @@
234
237
            <field name="code">CAR</field>
284
            <field name="code">CAR</field>
235
238
            <field name="name">Car Expenses Reimbursement</field>
285
            <field name="name">Car Expenses Reimbursement</field>
236
239
            <field name="category_id" ref="hr_payroll.ALW"/>
286
            <field name="category_id" ref="hr_payroll.ALW"/>
239
240
            <field name="amount_select">fix</field>
287
            <field name="amount_select">code</field>
240
241
            <field name="amount_fix">1800</field>
288
            <field name="amount_python_compute">result = inputs.CEI.amount</field>
241
242
            <field name="sequence" eval="38"/>
289
            <field name="sequence" eval="38"/>
242
243
            <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.</field>
290
            <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.</field>
243
244
        </record>
291
        </record>
244
@@ -247,8 +294,8 @@
245
247
            <field name="code">INT</field>
294
            <field name="code">INT</field>
246
248
            <field name="name">Internet Expense</field>
295
            <field name="name">Internet Expense</field>
247
249
            <field name="category_id" ref="hr_payroll.ALW"/>
296
            <field name="category_id" ref="hr_payroll.ALW"/>
250
250
            <field name="amount_select">fix</field>
297
            <field name="amount_select">code</field>
251
251
            <field eval="0.0" name="amount_fix"/>
298
            <field name="amount_python_compute">result = inputs.IE.amount</field>
252
252
            <field name="sequence" eval="39"/>
299
            <field name="sequence" eval="39"/>
253
253
            <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
300
            <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
254
254
        </record>
301
        </record>
255
@@ -276,6 +323,7 @@
256
276
            <field name="condition_python">result = bool(contract.tds)</field>
323
            <field name="condition_python">result = bool(contract.tds)</field>
257
277
            <field name="amount_select">code</field>
324
            <field name="amount_select">code</field>
258
278
            <field name="amount_python_compute">result = -(contract.tds)</field>
325
            <field name="amount_python_compute">result = -(contract.tds)</field>
259
326
            <field name="register_id" ref="hr_tds_register"/>
260
279
            <field name="sequence" eval="140"/>
327
            <field name="sequence" eval="140"/>
261
280
            <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.</field>
328
            <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.</field>
262
281
        </record>
329
        </record>
263
@@ -297,7 +345,7 @@
264
297
            <field name="name">Employee's PF Contribution</field>
345
            <field name="name">Employee's PF Contribution</field>
265
298
            <field name="category_id" ref="hr_payroll.DED"/>
346
            <field name="category_id" ref="hr_payroll.DED"/>
266
299
            <field name="amount_select">code</field>
347
            <field name="amount_select">code</field>
268
300
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 8.33 / 100) or - (contract.wage * 8.33 / 100)</field>
348
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) or - (contract.wage * 0.12)</field>
269
301
            <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
349
            <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
270
302
            <field name="register_id" ref="hr_register_provident_fund"/>
350
            <field name="register_id" ref="hr_register_provident_fund"/>
271
303
            <field name="sequence" eval="150"/>
351
            <field name="sequence" eval="150"/>
272
@@ -310,6 +358,7 @@
273
310
            <field name="amount_select">code</field>
358
            <field name="amount_select">code</field>
274
311
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
359
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
275
312
            <field name="sequence" eval="155"/>
360
            <field name="sequence" eval="155"/>
276
361
            <field name="register_id" ref="hr_nps_contribution_register"/>
277
313
            <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
362
            <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
278
314
        </record>
363
        </record>
279
315
364
280
@@ -322,6 +371,7 @@
281
322
            <field name="amount_select">code</field>
371
            <field name="amount_select">code</field>
282
323
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * contract.voluntary_provident_fund / 100) or - (contract.wage * contract.voluntary_provident_fund / 100)</field>
372
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * contract.voluntary_provident_fund / 100) or - (contract.wage * contract.voluntary_provident_fund / 100)</field>
283
324
            <field name="sequence" eval="160"/>
373
            <field name="sequence" eval="160"/>
284
374
            <field name="register_id" ref="hr_vpf_contribution_register"/>
285
325
            <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
375
            <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
286
326
        </record>
376
        </record>
287
327
377
288
@@ -331,27 +381,42 @@
289
331
            <field name="category_id" ref="hr_payroll.DED"/>
381
            <field name="category_id" ref="hr_payroll.DED"/>
290
332
            <field name="condition_select">none</field>
382
            <field name="condition_select">none</field>
291
333
            <field name="amount_select">fix</field>
383
            <field name="amount_select">fix</field>
293
334
            <field eval="0.0" name="amount_fix"/>
384
            <field eval="-1500.0" name="amount_fix"/>
294
385
            <field name="register_id" ref="hr_company_transport_register"/>
295
335
            <field name="sequence" eval="165"/>
386
            <field name="sequence" eval="165"/>
296
387
            <field name="note">Company provided transport amount is based on company.</field>
297
336
        </record>
388
        </record>
298
337
389
299
338
         <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
390
         <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
300
339
            <field name="amount_select">fix</field>
391
            <field name="amount_select">fix</field>
302
340
            <field eval="-20" name="amount_fix"/>
392
            <field eval="-50" name="amount_fix"/>
303
341
            <field name="quantity">worked_days.WORK100.number_of_days</field>
393
            <field name="quantity">worked_days.WORK100.number_of_days</field>
304
342
            <field name="code">FD</field>
394
            <field name="code">FD</field>
305
343
            <field name="category_id" ref="hr_payroll.DED"/>
395
            <field name="category_id" ref="hr_payroll.DED"/>
306
344
            <field name="name">Deduction Towards Food Coupons</field>
396
            <field name="name">Deduction Towards Food Coupons</field>
307
397
            <field name="register_id" ref="hr_food_coupen_register"/>
308
345
            <field name="sequence" eval="166"/>
398
            <field name="sequence" eval="166"/>
309
346
         </record>
399
         </record>
310
347
400
312
348
        <record id="hr_payslip_rule_lwf" model="hr.salary.rule">
401
        <record id="hr_payslip_rule_lwf_employee" model="hr.salary.rule">
313
402
            <field name="code">LWFE</field>
314
403
            <field name="name">Employee's Deduction Towards State Labour Welfare Fund</field>
315
404
            <field name="category_id" ref="hr_payroll.DED"/>
316
405
            <field name="amount_select">fix</field>
317
406
            <field eval="-3.0" name="amount_fix"/>
318
407
            <field name="sequence" eval="170"/>
319
408
            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
320
409
            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
321
410
        </record>
322
411
323
412
        <record id="hr_payslip_rule_lwf_employer" model="hr.salary.rule">
324
349
            <field name="code">LWF</field>
413
            <field name="code">LWF</field>
326
350
            <field name="name">Deduction Towards State Labour Welfare Fund</field>
414
            <field name="name">Employer's Deduction Towards State Labour Welfare Fund </field>
327
351
            <field name="category_id" ref="hr_payroll.DED"/>
415
            <field name="category_id" ref="hr_payroll.DED"/>
328
352
            <field name="amount_select">fix</field>
416
            <field name="amount_select">fix</field>
331
353
            <field eval="0.0" name="amount_fix"/>
417
            <field eval="-6.0" name="amount_fix"/>
332
354
            <field name="sequence" eval="170"/>
418
            <field name="sequence" eval="171"/>
333
419
            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
334
355
            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
420
            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
335
356
        </record>
421
        </record>
336
357
422
337
@@ -360,8 +425,10 @@
338
360
            <field name="name">Deduction Towards Company Provided Group Term Insurance</field>
425
            <field name="name">Deduction Towards Company Provided Group Term Insurance</field>
339
361
            <field name="category_id" ref="hr_payroll.DED"/>
426
            <field name="category_id" ref="hr_payroll.DED"/>
340
362
            <field name="amount_select">fix</field>
427
            <field name="amount_select">fix</field>
342
363
            <field eval="0.0" name="amount_fix"/>
428
            <field eval="-1000.0" name="amount_fix"/>
343
429
            <field name="register_id" ref="hr_group_term_insurance_register"/>
344
364
            <field name="sequence" eval="175"/>
430
            <field name="sequence" eval="175"/>
345
431
            <field name="note">Group term insurance provides a solid foundation to a comprehensive employee benifit program,backed up by government asistance in the form of valuable tax incentives to both employees and employers.</field>
346
365
        </record>
432
        </record>
347
366
433
348
367
        <record id="hr_payslip_rule_dla" model="hr.salary.rule">
434
        <record id="hr_payslip_rule_dla" model="hr.salary.rule">
349
@@ -369,8 +436,9 @@
350
369
            <field name="name">Deduction Towards Leave Availed</field>
436
            <field name="name">Deduction Towards Leave Availed</field>
351
370
            <field name="category_id" ref="hr_payroll.DED"/>
437
            <field name="category_id" ref="hr_payroll.DED"/>
352
371
            <field name="condition_select">none</field>
438
            <field name="condition_select">none</field>
355
372
            <field name="amount_select">fix</field>
439
            <field name="amount_select">code</field>
356
373
            <field eval="0.0" name="amount_fix"/>
440
            <field name="amount_python_compute">result = - (inputs.LAI.amount)</field>
357
441
            <field name="register_id" ref="hr_leave_availed_register"/>
358
374
            <field name="sequence" eval="180"/>
442
            <field name="sequence" eval="180"/>
359
375
        </record>
443
        </record>
360
376
444
361
@@ -383,6 +451,7 @@
362
383
            <field name="amount_select">code</field>
451
            <field name="amount_select">code</field>
363
384
            <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
452
            <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
364
385
            <field eval="-50.0" name="amount_fix"/>
453
            <field eval="-50.0" name="amount_fix"/>
365
454
            <field name="register_id" ref="hr_medical_insurance_register"/>
366
386
            <field name="sequence" eval="185"/>
455
            <field name="sequence" eval="185"/>
367
387
        </record>
456
        </record>
368
388
457
369
@@ -392,6 +461,7 @@
370
392
            <field name="category_id" ref="hr_payroll.DED"/>
461
            <field name="category_id" ref="hr_payroll.DED"/>
371
393
            <field name="amount_select">fix</field>
462
            <field name="amount_select">fix</field>
372
394
            <field eval="-200.0" name="amount_fix"/>
463
            <field eval="-200.0" name="amount_fix"/>
373
464
            <field name="register_id" ref="hr_other_deduction_register"/>
374
395
            <field name="sequence" eval="187"/>
465
            <field name="sequence" eval="187"/>
375
396
        </record>
466
        </record>
376
397
467
377
@@ -402,6 +472,7 @@
378
402
            <field name="amount_select">code</field>
472
            <field name="amount_select">code</field>
379
403
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
473
            <field name="amount_python_compute">result = payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) or - (contract.wage * 0.10)</field>
380
404
            <field name="sequence" eval="190"/>
474
            <field name="sequence" eval="190"/>
381
475
            <field name="register_id" ref="hr_nps_contribution_register"/>
382
405
            <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
476
            <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
383
406
        </record>
477
        </record>
384
407
478
385
@@ -416,5 +487,60 @@
386
416
            <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
487
            <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
387
417
        </record>
488
        </record>
388
418
489
389
490
        <!-- Rule Inputs -->
390
491
391
492
        <record id="hr_rule_input_performance" model="hr.rule.input">
392
493
            <field name="code">PERF</field>
393
494
            <field name="name">Performance of Employee</field>
394
495
            <field name="input_id" ref="hr_salary_rule_performance"/>
395
496
        </record>
396
497
397
498
        <record id="hr_rule_input_bonus" model="hr.rule.input">
398
499
            <field name="code">BNS</field>
399
500
            <field name="name">Bonus of Employee</field>
400
501
            <field name="input_id" ref="hr_salary_rule_bonus"/>
401
502
        </record>
402
503
403
504
        <record id="hr_rule_input_arrears" model="hr.rule.input">
404
505
            <field name="code">ARS</field>
405
506
            <field name="name">Arrears</field>
406
507
            <field name="input_id" ref="hr_salary_rule_arrears"/>
407
508
        </record>
408
509
409
510
        <record id="hr_rule_input_le" model="hr.rule.input">
410
511
            <field name="code">LE</field>
411
512
            <field name="name">Leave Encashment</field>
412
513
            <field name="input_id" ref="hr_salary_rule_le"/>
413
514
        </record>
414
515
415
516
        <record id="hr_rule_input_journals" model="hr.rule.input">
416
517
            <field name="code">PJ</field>
417
518
            <field name="name">Periodical Journals</field>
418
519
            <field name="input_id" ref="hr_salary_rule_journals"/>
419
520
        </record>
420
521
421
522
        <record id="hr_rule_input_telephone" model="hr.rule.input">
422
523
            <field name="code">TR</field>
423
524
            <field name="name">Telephone Reimbursement</field>
424
525
            <field name="input_id" ref="hr_salary_rule_telephone"/>
425
526
        </record>
426
527
427
528
        <record id="hr_rule_input_car" model="hr.rule.input">
428
529
            <field name="code">CEI</field>
429
530
            <field name="name">Car Expenses</field>
430
531
            <field name="input_id" ref="hr_payroll_rule_car"/>
431
532
        </record>
432
533
433
534
        <record id="hr_rule_input_internet" model="hr.rule.input">
434
535
            <field name="code">IE</field>
435
536
            <field name="name">Internet Expence</field>
436
537
            <field name="input_id" ref="hr_salary_rule_internet"/>
437
538
        </record>
438
539
439
540
        <record id="hr_rule_input_leave_avail" model="hr.rule.input">
440
541
            <field name="code">LAI</field>
441
542
            <field name="name">Leave Availed</field>
442
543
            <field name="input_id" ref="hr_payslip_rule_dla"/>
443
544
        </record>
444
419
    </data>
545
    </data>
445
420
</openerp>
546
</openerp>
446
421
547
447
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll.py'
448
--- l10n_in_hr_payroll/l10n_in_hr_payroll.py	2012-08-21 13:20:23 +0000
449
+++ l10n_in_hr_payroll/l10n_in_hr_payroll.py	2012-08-24 13:15:26 +0000
450
@@ -45,62 +45,12 @@
451
45
        'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
45
        'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
452
46
        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
46
        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
453
47
        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
47
        'voluntary_provident_fund': fields.float('Voluntary Provident Fund', digits_compute=dp.get_precision('Payroll'), help="VPF computed as percentage(%)"),
461
48
        'city_type': fields.selection([
48
        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance for Metro and Non Metro City', digits_compute=dp.get_precision('Payroll'), help="HRA computed as percentage(%)"),
462
49
            ('metro', 'Metro'),
49
        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
456
50
            ('non-metro', 'Non Metro'),
457
51
            ], 'Type of City'),
458
52
    }
459
53
    _defaults = {
460
54
        'city_type': 'non-metro',
463
55
    }
50
    }
464
56
51
465
57
hr_contract()
52
hr_contract()
466
58
53
467
59
class hr_employee(osv.osv):
468
60
    '''
469
61
    Employee's Join date allows to compute total working
470
62
    experience of Employee and it is used to calculate Gratuity rule.
471
63
    '''
472
64
473
65
    _inherit = 'hr.employee'
474
66
    _description = 'Employee'
475
67
476
68
    def _compute_year(self, cr, uid, ids, fields, args, context=None):
477
69
        """
478
70
        @param cr: the current row, from the database cursor,
479
71
        @param uid: the current user’s ID for security checks,
480
72
        @param ids: List of employee’s IDs
481
73
        @return: No. of years of experience.
482
74
        @param context: A standard dictionary for contextual values
483
75
        """
484
76
        res = {}
485
77
        c_date = time.strftime(DATETIME_FORMAT)
486
78
        current_date = datetime.strptime(c_date, DATETIME_FORMAT)
487
79
        for employee in self.browse(cr, uid, ids, context=context):
488
80
            if employee.join_date:
489
81
                date_start = datetime.strptime(employee.join_date, DATETIME_FORMAT)
490
82
                diffyears = current_date.year - date_start.year
491
83
                difference = current_date - date_start.replace(current_date.year)
492
84
                days_in_year = isleap(current_date.year) and 366 or 365
493
85
                difference_in_years = diffyears + (difference.days + difference.seconds / 86400.0) / days_in_year
494
86
                total_years = relativedelta(current_date, date_start).years
495
87
                total_months = relativedelta(current_date, date_start).months
496
88
                if total_months < 10:
497
89
                    year_month = float(total_months) / 10 + total_years
498
90
                else:
499
91
                    year_month = float(total_months) / 100 + total_years
500
92
                res[employee.id] = year_month
501
93
            else:
502
94
                res[employee.id] = 0.0
503
95
        return res
504
96
505
97
    _columns = {
506
98
        'join_date': fields.date('Join Date', help="Joining date of employee"),
507
99
        'number_of_year': fields.function(_compute_year, string='No. of Years of Service', type="float", store=True, help="Total years of work experience"),
508
100
        }
509
101
510
102
hr_employee()
511
103
512
104
class payroll_advice(osv.osv):
54
class payroll_advice(osv.osv):
513
105
    '''
55
    '''
514
106
    Bank Advice
56
    Bank Advice
515
107
57
516
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml'
517
--- l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml	2012-08-21 13:20:23 +0000
518
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml	2012-08-24 13:15:26 +0000
519
@@ -4,13 +4,13 @@
520
4
4
521
5
        <!-- Salary Structure -->
5
        <!-- Salary Structure -->
522
6
6
524
7
       <!--  <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
7
        <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
525
8
            <field name="code">NE</field>
8
            <field name="code">NE</field>
526
9
            <field name="name">Non-Executive Employee</field>
9
            <field name="name">Non-Executive Employee</field>
528
10
            <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1'), ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
10
            <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1')])]" name="rule_ids"/>
529
11
            <field name="company_id" ref="base.main_company"/>
11
            <field name="company_id" ref="base.main_company"/>
530
12
            <field name="parent_id" ref="hr_payroll.structure_base"/>
12
            <field name="parent_id" ref="hr_payroll.structure_base"/>
532
13
        </record> -->
13
        </record>
533
14
14
534
15
    </data>
15
    </data>
535
16
</openerp>
16
</openerp>
536
17
17
537
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml'
538
--- l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml	2012-08-21 13:20:23 +0000
539
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml	2012-08-24 13:15:26 +0000
540
@@ -13,7 +13,8 @@
541
13
                 <group col="2" colspan="2" name="right_column">
13
                 <group col="2" colspan="2" name="right_column">
542
14
                    <separator colspan="2" string="Allowance"/>
14
                    <separator colspan="2" string="Allowance"/>
543
15
                        <field name="driver_salay"/>
15
                        <field name="driver_salay"/>
545
16
                        <field name="city_type"/>
16
                        <field name="house_rent_allowance_metro_nonmetro"/>
546
17
                        <field name="supplementary_allowance"/>
547
17
                 </group>
18
                 </group>
548
18
                 <group col="2" colspan="2" name="left_column">
19
                 <group col="2" colspan="2" name="left_column">
549
19
                    <separator colspan="2" string="Deduction"/>
20
                    <separator colspan="2" string="Deduction"/>
550
@@ -26,21 +27,6 @@
551
26
            </field>
27
            </field>
552
27
        </record>
28
        </record>
553
28
29
554
29
        <record id="hr_employee_form_in_inherit" model="ir.ui.view">
555
30
            <field name="name">hr.employee.form.inherit</field>
556
31
            <field name="model">hr.employee</field>
557
32
            <field name="type">form</field>
558
33
            <field name="inherit_id" ref="hr.view_employee_form"/>
559
34
            <field name="arch" type="xml">
560
35
            <data>
561
36
                 <xpath expr="//field[@name='active']" position="before">
562
37
                    <field name="join_date"/>
563
38
                    <field name="number_of_year"/>
564
39
                 </xpath>
565
40
            </data>
566
41
            </field>
567
42
        </record>
568
43
569
44
        <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
30
        <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
570
45
            <field name="name">hr.payslip.run.form.inherit</field>
31
            <field name="name">hr.payslip.run.form.inherit</field>
571
46
            <field name="model">hr.payslip.run</field>
32
            <field name="model">hr.payslip.run</field>
572
47
33
573
=== modified file 'l10n_in_hr_payroll/report/__init__.py'
574
--- l10n_in_hr_payroll/report/__init__.py	2012-08-21 13:20:23 +0000
575
+++ l10n_in_hr_payroll/report/__init__.py	2012-08-24 13:15:26 +0000
576
@@ -27,5 +27,6 @@
577
27
import report_hr_salary_employee_bymonth
27
import report_hr_salary_employee_bymonth
578
28
import payment_advice_report
28
import payment_advice_report
579
29
import report_hr_yearly_salary_detail
29
import report_hr_yearly_salary_detail
580
30
import payslip_report
581
30
31
582
31
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
32
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
583
32
33
584
=== added file 'l10n_in_hr_payroll/report/payslip_report.py'
585
--- l10n_in_hr_payroll/report/payslip_report.py	1970-01-01 00:00:00 +0000
586
+++ l10n_in_hr_payroll/report/payslip_report.py	2012-08-24 13:15:26 +0000
587
@@ -0,0 +1,88 @@
588
1
# -*- coding: utf-8 -*-
589
2
##############################################################################
590
3
#
591
4
#    OpenERP, Open Source Management Solution
592
5
#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
593
6
#
594
7
#    This program is free software: you can redistribute it and/or modify
595
8
#    it under the terms of the GNU Affero General Public License as
596
9
#    published by the Free Software Foundation, either version 3 of the
597
10
#    License, or (at your option) any later version.
598
11
#
599
12
#    This program is distributed in the hope that it will be useful,
600
13
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
601
14
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
602
15
#    GNU Affero General Public License for more details.
603
16
#
604
17
#    You should have received a copy of the GNU Affero General Public License
605
18
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
606
19
#
607
20
##############################################################################
608
21
609
22
import tools
610
23
from osv import fields, osv
611
24
612
25
class payslip_report(osv.osv):
613
26
    _name = "payslip.report"
614
27
    _description = "Payslip Analysis"
615
28
    _auto = False
616
29
    _columns = {
617
30
        'name':fields.char('Name', size=32, readonly=True),
618
31
        'date_from': fields.date('Date From', readonly=True,),
619
32
        'date_to': fields.date('Date To', readonly=True,),
620
33
        'year': fields.char('Year', size=4, readonly=True),
621
34
        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
622
35
            ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
623
36
            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
624
37
        'day': fields.char('Day', size=128, readonly=True),
625
38
        'state': fields.selection([
626
39
            ('draft', 'Draft'),
627
40
            ('done', 'Done'),
628
41
            ('cancel', 'Rejected'),
629
42
        ], 'State', readonly=True),
630
43
        'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
631
44
        'nbr': fields.integer('# Payslip lines', readonly=True),
632
45
        'number': fields.char('Number', size=16, readonly=True),
633
46
        'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True),
634
47
        'company_id':fields.many2one('res.company', 'Company', readonly=True),
635
48
        'paid': fields.boolean('Made Payment Order ? ', readonly=True),
636
49
        'total': fields.float('Total', readonly=True),
637
50
        'category_id':fields.many2one('hr.salary.rule.category', 'Category', readonly=True),
638
51
    }
639
52
    def init(self, cr):
640
53
        tools.drop_view_if_exists(cr, 'payslip_report')
641
54
        cr.execute("""
642
55
            create or replace view payslip_report as (
643
56
                select
644
57
                    min(l.id) as id,
645
58
                    l.name,
646
59
                    p.struct_id,
647
60
                    p.state,
648
61
                    p.date_from,
649
62
                    p.date_to,
650
63
                    p.number,
651
64
                    p.company_id,
652
65
                    p.paid,
653
66
                    l.category_id,
654
67
                    l.employee_id,
655
68
                    sum(l.total) as total,
656
69
                    to_char(p.date_from, 'YYYY') as year,
657
70
                    to_char(p.date_from, 'MM') as month,
658
71
                    to_char(p.date_from, 'YYYY-MM-DD') as day,
659
72
                    to_char(p.date_to, 'YYYY') as to_year,
660
73
                    to_char(p.date_to, 'MM') as to_month,
661
74
                    to_char(p.date_to, 'YYYY-MM-DD') as to_day,
662
75
                    1 AS nbr
663
76
                from
664
77
                    hr_payslip as p
665
78
                    left join hr_payslip_line as l on (p.id=l.slip_id)
666
79
                where 
667
80
                    l.employee_id IS NOT NULL
668
81
                group by
669
82
                    p.number,l.name,p.date_from,p.date_to,p.state,p.company_id,p.paid,
670
83
                    l.employee_id,p.struct_id,l.category_id
671
84
            )
672
85
        """)
673
86
payslip_report()
674
87
675
88
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
676
0
89
677
=== added file 'l10n_in_hr_payroll/report/payslip_report_view.xml'
678
--- l10n_in_hr_payroll/report/payslip_report_view.xml	1970-01-01 00:00:00 +0000
679
+++ l10n_in_hr_payroll/report/payslip_report_view.xml	2012-08-24 13:15:26 +0000
680
@@ -0,0 +1,86 @@
681
1
<?xml version="1.0" encoding="utf-8"?>
682
2
<openerp>
683
3
<data>
684
4
685
5
    <record id="view_payslip_tree" model="ir.ui.view">
686
6
        <field name="name">payslip.report.tree</field>
687
7
        <field name="model">payslip.report</field>
688
8
        <field name="type">tree</field>
689
9
        <field name="arch" type="xml">
690
10
            <tree colors="blue:state == 'draft';black:state == 'done';gray:state == 'cancel' " string="Payslip Analysis">
691
11
                <field name="nbr" sum="# Payslip Lines"/>
692
12
                <field name="name"/>
693
13
                <field name="employee_id" invisible="1"/>
694
14
                <field name="date_to" invisible="1"/>
695
15
                <field name="date_from" invisible="1"/>
696
16
                <field name="state" invisible="1"/>
697
17
                <field name="number" invisible="1"/>
698
18
                <field name="struct_id" invisible="1"/>
699
19
                <field name="year" invisible="1"/>
700
20
                <field name="day" invisible="1"/>
701
21
                <field name="month" invisible="1"/>
702
22
                <field name="company_id" invisible="1"/>
703
23
                <field name="paid" invisible="1"/>
704
24
                <field name="total" />
705
25
                <field name="category_id" invisible="1"/>
706
26
            </tree>
707
27
        </field>
708
28
    </record>
709
29
710
30
    <record id="view_payslip_search" model="ir.ui.view">
711
31
        <field name="name">payslip.report.search</field>
712
32
        <field name="model">payslip.report</field>
713
33
        <field name="type">search</field>
714
34
        <field name="arch" type="xml">
715
35
            <search string="Payslip Analysis">
716
36
                 <group>
717
37
                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payslips which are in draft state"/>
718
38
                    <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Payslips which are in done state"/>
719
39
                    <separator orientation="vertical"/>
720
40
                    <filter icon="terp-camera_test" string="Paid" domain="[('paid','=',True)]" help="Payslips which are paid"/>
721
41
                    <separator orientation="vertical"/>
722
42
                    <field name="date_from"/>
723
43
                    <field name="date_to"/>
724
44
                    <separator orientation="vertical"/>
725
45
                    <field name="number"/>
726
46
                    <field name="name"/>
727
47
                    <field name="employee_id"/>
728
48
                </group>
729
49
                <newline/>
730
50
                 <group expand="0" string="Extended Filters...">
731
51
                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
732
52
                </group>
733
53
                <newline/>
734
54
                <group expand="1" string="Group By...">
735
55
                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
736
56
                    <filter string="Structure" context="{'group_by':'struct_id'}" />
737
57
                    <filter string="Category" name="category" context="{'group_by':'category_id'}" />
738
58
                    <filter string="Payslip Line" context="{'group_by':'name'}" />
739
59
                    <separator orientation="vertical"/>
740
60
                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
741
61
                    <separator orientation="vertical"/>
742
62
                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
743
63
                    <separator orientation="vertical"/>
744
64
                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of Payslip"/>
745
65
                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payslip"/>
746
66
                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payslip"/>
747
67
748
68
                </group>
749
69
            </search>
750
70
        </field>
751
71
    </record>
752
72
753
73
    <record id="action_payslip_report_all" model="ir.actions.act_window">
754
74
        <field name="name">Payslip Analysis</field>
755
75
        <field name="res_model">payslip.report</field>
756
76
        <field name="view_type">form</field>
757
77
        <field name="view_mode">tree</field>
758
78
        <field name="view_id" ref="view_payslip_tree"/>
759
79
        <field name="context">{'search_default_employee':1,'search_default_category':1,'group_by_no_leaf':uid,'group_by':[]}</field>
760
80
        <field name="help">This report performs analysis on Payslip</field>
761
81
    </record>
762
82
763
83
    <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
764
84
765
85
</data>
766
86
</openerp>
767
0
87
768
=== modified file 'l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml'
769
--- l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml	2012-08-21 13:20:23 +0000
770
+++ l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml	2012-08-24 13:15:26 +0000
771
@@ -239,7 +239,7 @@
772
239
    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
239
    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
773
240
    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
240
    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
774
241
    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
241
    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
776
242
    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
242
    <paraStyle name="terp_tblheader_Details" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
777
243
    <paraStyle name="Footer" fontName="Helvetica"/>
243
    <paraStyle name="Footer" fontName="Helvetica"/>
778
244
    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
244
    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
779
245
    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
245
    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
780
@@ -247,7 +247,6 @@
781
247
    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
247
    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
782
248
    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
248
    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
783
249
    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
249
    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
784
250
    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
785
251
    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
250
    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
786
252
    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
251
    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
787
253
    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
252
    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
788
@@ -262,8 +261,7 @@
789
262
    <blockTable colWidths="785.0" style="Table12">
261
    <blockTable colWidths="785.0" style="Table12">
790
263
      <tr>
262
      <tr>
791
264
        <td>
263
        <td>
794
265
          <para style="terp_header_Centre">Employees Salary Details </para>
264
          <para style="terp_default_Centre_9">From <u>[[ formatLang(data['form']['date_from'], date=True) ]]</u> To <u>[[ formatLang(data['form']['date_to'], date=True) ]]</u></para>
793
266
          <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
795
267
        </td>
265
        </td>
796
268
      </tr>
266
      </tr>
797
269
    </blockTable>
267
    </blockTable>
798
@@ -392,7 +390,7 @@
799
392
        <font color="white"> </font>
390
        <font color="white"> </font>
800
393
      </para>
391
      </para>
801
394
      <section>
392
      <section>
803
395
        <blockTable colWidths="785.0" style="Table7">
393
        <blockTable colWidths="803.0" style="Table7">
804
396
          <tr>
394
          <tr>
805
397
            <td>
395
            <td>
806
398
              <para style="terp_tblheader_Details">Allowances with Basic: </para>
396
              <para style="terp_tblheader_Details">Allowances with Basic: </para>
807
@@ -404,66 +402,79 @@
808
404
          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
402
          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
809
405
            <tr>
403
            <tr>
810
406
              <td>
404
              <td>
871
407
                <para style="terp_default_9">[[ e1[0] ]]</para>
405
                <para style="terp_default_9"><b>[[ e1[0] in ["Basic","Gross"] and e1[0] ]]</b> </para>
872
408
              </td>
406
                <para style="terp_default_9">[[ e1[0] not in ["Basic","Gross"] and e1[0] ]]</para>
873
409
              <td>
407
              </td>
874
410
                <para style="terp_default_Right_8">
408
              <td>
875
411
                  <font face="Helvetica" size="7.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
409
                <para style="terp_default_Right_8">
876
412
                </para>
410
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
877
413
              </td>
411
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
878
414
              <td>
412
                </para>
879
415
                <para style="terp_default_Right_8">
413
              </td>
880
416
                  <font face="Helvetica" size="7.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
414
              <td>
881
417
                </para>
415
                <para style="terp_default_Right_8">
882
418
              </td>
416
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
883
419
              <td>
417
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
884
420
                <para style="terp_default_Right_8">
418
                </para>
885
421
                  <font face="Helvetica" size="7.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
419
              </td>
886
422
                </para>
420
              <td>
887
423
              </td>
421
                <para style="terp_default_Right_8">
888
424
              <td>
422
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
889
425
                <para style="terp_default_Right_8">
423
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
890
426
                  <font face="Helvetica" size="7.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
424
                </para>
891
427
                </para>
425
              </td>
892
428
              </td>
426
              <td>
893
429
              <td>
427
                <para style="terp_default_Right_8">
894
430
                <para style="terp_default_Right_8">
428
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
895
431
                  <font face="Helvetica" size="7.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
429
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
896
432
                </para>
430
                </para>
897
433
              </td>
431
              </td>
898
434
              <td>
432
              <td>
899
435
                <para style="terp_default_Right_8">
433
                <para style="terp_default_Right_8">
900
436
                  <font face="Helvetica" size="7.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
434
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
901
437
                </para>
435
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
902
438
              </td>
436
                </para>
903
439
              <td>
437
              </td>
904
440
                <para style="terp_default_Right_8">
438
              <td>
905
441
                  <font face="Helvetica" size="7.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
439
                <para style="terp_default_Right_8">
906
442
                </para>
440
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
907
443
              </td>
441
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
908
444
              <td>
442
                </para>
909
445
                <para style="terp_default_Right_8">
443
              </td>
910
446
                  <font face="Helvetica" size="7.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
444
              <td>
911
447
                </para>
445
                <para style="terp_default_Right_8">
912
448
              </td>
446
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
913
449
              <td>
447
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
914
450
                <para style="terp_default_Right_8">
448
                </para>
915
451
                  <font face="Helvetica" size="7.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
449
              </td>
916
452
                </para>
450
              <td>
917
453
              </td>
451
                <para style="terp_default_Right_8">
918
454
              <td>
452
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
919
455
                <para style="terp_default_Right_8">
453
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
920
456
                  <font face="Helvetica" size="7.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
454
                </para>
921
457
                </para>
455
              </td>
922
458
              </td>
456
              <td>
923
459
              <td>
457
                <para style="terp_default_Right_8">
924
460
                <para style="terp_default_Right_8">
458
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
925
461
                  <font face="Helvetica" size="7.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
459
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
926
462
                </para>
460
                </para>
927
463
              </td>
461
              </td>
928
464
              <td>
462
              <td>
929
465
                <para style="terp_default_Right_8">
463
                <para style="terp_default_Right_8">
930
466
                  <font face="Helvetica" size="7.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
464
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
931
465
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
932
466
                </para>
933
467
              </td>
934
468
              <td>
935
469
                <para style="terp_default_Right_8">
936
470
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
937
471
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
938
472
                </para>
939
473
              </td>
940
474
              <td>
941
475
                <para style="terp_default_Right_8">
942
476
                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
943
477
                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
944
467
                </para>
478
                </para>
945
468
              </td>
479
              </td>
946
469
              <td>
480
              <td>
947
@@ -472,7 +483,7 @@
948
472
            </tr>
483
            </tr>
949
473
          </blockTable>
484
          </blockTable>
950
474
        </section>
485
        </section>
952
475
        <blockTable colWidths="785.0" style="Table10">
486
        <blockTable colWidths="803.0" style="Table10">
953
476
          <tr>
487
          <tr>
954
477
            <td>
488
            <td>
955
478
              <para style="terp_tblheader_Details">Deductions: </para>
489
              <para style="terp_tblheader_Details">Deductions: </para>
956
@@ -484,66 +495,79 @@
957
484
          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
495
          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
958
485
            <tr>
496
            <tr>
959
486
              <td>
497
              <td>
1020
487
                <para style="terp_default_9">[[ e2[0] ]]</para>
498
                <para style="terp_default_9"><b>[[ e2[0] in ["Net"] and e2[0] ]]</b> </para>
1021
488
              </td>
499
                <para style="terp_default_9">[[ e2[0] not in ["Net"] and e2[0] ]]</para>
1022
489
              <td>
500
              </td>
1023
490
                <para style="terp_default_Right_8">
501
              <td>
1024
491
                  <font face="Helvetica" size="7.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
502
                <para style="terp_default_Right_8">
1025
492
                </para>
503
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
1026
493
              </td>
504
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
1027
494
              <td>
505
                </para>
1028
495
                <para style="terp_default_Right_8">
506
              </td>
1029
496
                  <font face="Helvetica" size="7.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
507
              <td>
1030
497
                </para>
508
                <para style="terp_default_Right_8">
1031
498
              </td>
509
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
1032
499
              <td>
510
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
1033
500
                <para style="terp_default_Right_8">
511
                </para>
1034
501
                  <font face="Helvetica" size="7.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
512
              </td>
1035
502
                </para>
513
              <td>
1036
503
              </td>
514
                <para style="terp_default_Right_8">
1037
504
              <td>
515
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
1038
505
                <para style="terp_default_Right_8">
516
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
1039
506
                  <font face="Helvetica" size="7.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
517
                </para>
1040
507
                </para>
518
              </td>
1041
508
              </td>
519
              <td>
1042
509
              <td>
520
                <para style="terp_default_Right_8">
1043
510
                <para style="terp_default_Right_8">
521
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
1044
511
                  <font face="Helvetica" size="7.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
522
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
1045
512
                </para>
523
                </para>
1046
513
              </td>
524
              </td>
1047
514
              <td>
525
              <td>
1048
515
                <para style="terp_default_Right_8">
526
                <para style="terp_default_Right_8">
1049
516
                  <font face="Helvetica" size="7.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
527
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
1050
517
                </para>
528
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
1051
518
              </td>
529
                </para>
1052
519
              <td>
530
              </td>
1053
520
                <para style="terp_default_Right_8">
531
              <td>
1054
521
                  <font face="Helvetica" size="7.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
532
                <para style="terp_default_Right_8">
1055
522
                </para>
533
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
1056
523
              </td>
534
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
1057
524
              <td>
535
                </para>
1058
525
                <para style="terp_default_Right_8">
536
              </td>
1059
526
                  <font face="Helvetica" size="7.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
537
              <td>
1060
527
                </para>
538
                <para style="terp_default_Right_8">
1061
528
              </td>
539
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
1062
529
              <td>
540
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
1063
530
                <para style="terp_default_Right_8">
541
                </para>
1064
531
                  <font face="Helvetica" size="7.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
542
              </td>
1065
532
                </para>
543
              <td>
1066
533
              </td>
544
                <para style="terp_default_Right_8">
1067
534
              <td>
545
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
1068
535
                <para style="terp_default_Right_8">
546
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
1069
536
                  <font face="Helvetica" size="7.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
547
                </para>
1070
537
                </para>
548
              </td>
1071
538
              </td>
549
              <td>
1072
539
              <td>
550
                <para style="terp_default_Right_8">
1073
540
                <para style="terp_default_Right_8">
551
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
1074
541
                  <font face="Helvetica" size="7.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
552
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
1075
542
                </para>
553
                </para>
1076
543
              </td>
554
              </td>
1077
544
              <td>
555
              <td>
1078
545
                <para style="terp_default_Right_8">
556
                <para style="terp_default_Right_8">
1079
546
                  <font face="Helvetica" size="7.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
557
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
1080
558
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
1081
559
                </para>
1082
560
              </td>
1083
561
              <td>
1084
562
                <para style="terp_default_Right_8">
1085
563
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
1086
564
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
1087
565
                </para>
1088
566
              </td>
1089
567
              <td>
1090
568
                <para style="terp_default_Right_8">
1091
569
                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
1092
570
                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
1093
547
                </para>
571
                </para>
1094
548
              </td>
572
              </td>
1095
549
              <td>
573
              <td>
1096
550
574
1097
=== modified file 'l10n_in_hr_payroll/security/ir.model.access.csv'
1098
--- l10n_in_hr_payroll/security/ir.model.access.csv	2012-08-21 13:20:23 +0000
1099
+++ l10n_in_hr_payroll/security/ir.model.access.csv	2012-08-24 13:15:26 +0000
1100
@@ -2,3 +2,4 @@
1101
2
"access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
2
"access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
1102
3
"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
3
"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
1103
4
"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1
4
"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1
1104
5
"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","base.group_hr_manager",1,1,1,1
Status:	Rejected
Rejected by:	Mustufa Rangwala (Open ERP) on 2012-08-27
Proposed branch:	lp:~openerp-dev/openerp-india/payroll-india-l10n_in_hr_payroll-migrate-with-6.1-kbh
Merge into:	lp:~openerp-dev/openerp-india/payroll-india
Diff against target:	1104 lines (+510/-247) 10 files modified l10n_in_hr_payroll/__openerp__.py (+2/-1) l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml (+175/-49) l10n_in_hr_payroll/l10n_in_hr_payroll.py (+2/-52) l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml (+3/-3) l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml (+2/-16) l10n_in_hr_payroll/report/__init__.py (+1/-0) l10n_in_hr_payroll/report/payslip_report.py (+88/-0) l10n_in_hr_payroll/report/payslip_report_view.xml (+86/-0) l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml (+150/-126) l10n_in_hr_payroll/security/ir.model.access.csv (+1/-0)
To merge this branch:	bzr merge lp:~openerp-dev/openerp-india/payroll-india-l10n_in_hr_payroll-migrate-with-6.1-kbh
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
OpenERP R&D Team		2012-08-24	Pending
Review via email: mp+121178@code.launchpad.net