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

[REM]: l10n_in_hr_payroll: Remove food coupan amount from contact it will work with qty now 

bzr revid: mra@tinyerp.com-20120704051741-v5ab5xws4x8acsah
This commit is contained in:
Mustufa Rangwala (OpenERP) 2012-07-04 10:47:41 +05:30
parent c8741b7680
commit c06b2854f7
9 changed files with 8 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
View File

@ -184,13 +184,13 @@ number of years of service (date of joining – date of retirement/leaving job)<
<field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
</record>
<record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
<record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
<field name="amount_select">fix</field>
<field eval="20" name="amount_fix"/>
<field name="quantity">worked_days.WORK100.number_of_days</field>
<field name="code">FC</field>
<field name="category_id" ref="hr_payroll.ALW"/>
<field name="condition_select">none</field>
<field name="name">Food Coupons Allowance</field>
<field name="amount_select">code</field>
<field name="amount_python_compute">result = worked_days.WORK100.number_of_days * contract.food_coupon_amount</field>
<field name="sequence" eval="33"/>
</record>
@ -424,13 +424,13 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50,
<field name="sequence" eval="165"/>
</record>
<record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
<record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
<field name="amount_select">fix</field>
<field eval="-20" name="amount_fix"/>
<field name="quantity">worked_days.WORK100.number_of_days</field>
<field name="code">FD</field>
<field name="category_id" ref="hr_payroll.DED"/>
<field name="condition_select">none</field>
<field name="name">Deduction Towards Food Coupons</field>
<field name="amount_select">code</field>
<field name="amount_python_compute">result = -(worked_days.WORK100.number_of_days * contract.food_coupon_amount)</field>
<field name="sequence" eval="166"/>
</record>

10
addons/l10n_in_hr_payroll/i18n/bn.po
View File

@ -122,11 +122,6 @@ msgstr ""
msgid "Professional Tax "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,food_coupon_amount:0
msgid "Food Coupons "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.payroll.advice.line,bysal:0
msgid "By Salary"
@ -165,11 +160,6 @@ msgstr ""
msgid "Error !"
msgstr ""
#. module: l10n_in_hr_payroll
#: help:hr.contract,food_coupon_amount:0
msgid "Amount of food coupon per day."
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,other_income:0
msgid "Other Income "

10
addons/l10n_in_hr_payroll/i18n/gu.po
View File

@ -122,11 +122,6 @@ msgstr ""
msgid "Professional Tax "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,food_coupon_amount:0
msgid "Food Coupons "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.payroll.advice.line,bysal:0
msgid "By Salary"
@ -165,11 +160,6 @@ msgstr ""
msgid "Error !"
msgstr ""
#. module: l10n_in_hr_payroll
#: help:hr.contract,food_coupon_amount:0
msgid "Amount of food coupon per day."
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,other_income:0
msgid "Other Income "

10
addons/l10n_in_hr_payroll/i18n/hi.po
View File

@ -122,11 +122,6 @@ msgstr ""
msgid "Professional Tax "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,food_coupon_amount:0
msgid "Food Coupons "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.payroll.advice.line,bysal:0
msgid "By Salary"
@ -165,11 +160,6 @@ msgstr ""
msgid "Error !"
msgstr ""
#. module: l10n_in_hr_payroll
#: help:hr.contract,food_coupon_amount:0
msgid "Amount of food coupon per day."
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,other_income:0
msgid "Other Income "

10
addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
View File

@ -122,11 +122,6 @@ msgstr ""
msgid "Professional Tax "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,food_coupon_amount:0
msgid "Food Coupons "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.payroll.advice.line,bysal:0
msgid "By Salary"
@ -165,11 +160,6 @@ msgstr ""
msgid "Error !"
msgstr ""
#. module: l10n_in_hr_payroll
#: help:hr.contract,food_coupon_amount:0
msgid "Amount of food coupon per day."
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,other_income:0
msgid "Other Income "

10
addons/l10n_in_hr_payroll/i18n/ta.po
View File

@ -122,11 +122,6 @@ msgstr ""
msgid "Professional Tax "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,food_coupon_amount:0
msgid "Food Coupons "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.payroll.advice.line,bysal:0
msgid "By Salary"
@ -165,11 +160,6 @@ msgstr ""
msgid "Error !"
msgstr ""
#. module: l10n_in_hr_payroll
#: help:hr.contract,food_coupon_amount:0
msgid "Amount of food coupon per day."
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,other_income:0
msgid "Other Income "

10
addons/l10n_in_hr_payroll/i18n/te.po
View File

@ -122,11 +122,6 @@ msgstr ""
msgid "Professional Tax "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,food_coupon_amount:0
msgid "Food Coupons "
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.payroll.advice.line,bysal:0
msgid "By Salary"
@ -165,11 +160,6 @@ msgstr ""
msgid "Error !"
msgstr ""
#. module: l10n_in_hr_payroll
#: help:hr.contract,food_coupon_amount:0
msgid "Amount of food coupon per day."
msgstr ""
#. module: l10n_in_hr_payroll
#: field:hr.contract,other_income:0
msgid "Other Income "

1
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
View File

@ -46,7 +46,6 @@ class hr_contract(osv.osv):
'other_income': fields.float('Other Income ', digits_compute=dp.get_precision('Payroll'), help="Other income of employee"),
'short_term_gain':fields.float('Short Term Gain from Share Trading/Equity MFs ', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are sold before one year"),
'long_term_gain':fields.float('Long Term Gain from Share Trading/Equity MFs', digits_compute=dp.get_precision('Payroll'), help="Stocks/equity mutual funds are kept for more than a year"),
'food_coupon_amount': fields.float('Food Coupons ', digits_compute=dp.get_precision('Payroll'), help="Amount of food coupon per day"),
'driver_salay': fields.boolean('Driver Salary', help=" Allowance for company provided driver"),
'professional_tax': fields.float('Professional Tax ', digits_compute=dp.get_precision('Payroll'), help="Professional tax deducted from salary"),
'leave_avail_dedution': fields.float('Leave Availed Deduction ', digits_compute=dp.get_precision('Payroll'), help="Deduction for emergency leave of employee"),

1
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
View File

@ -12,7 +12,6 @@
<xpath expr="//field[@name='struct_id']" position="after">
<group col="2" colspan="2" name="right_column">
<separator colspan="2" string="Allowance"/>
<field name="food_coupon_amount"/>
<field name="house_rent_income"/>
<field name="saving_bank_account"/>
<field name="other_income"/>