From c06b2854f70542ae724fe8c4d7ea558b0a3140d5 Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Wed, 4 Jul 2012 10:47:41 +0530 Subject: [PATCH] [REM]: l10n_in_hr_payroll: Remove food coupan amount from contact it will work with qty now bzr revid: mra@tinyerp.com-20120704051741-v5ab5xws4x8acsah --- .../data/l10n_in_hr_payroll_data.xml | 16 ++++++++-------- addons/l10n_in_hr_payroll/i18n/bn.po | 10 ---------- addons/l10n_in_hr_payroll/i18n/gu.po | 10 ---------- addons/l10n_in_hr_payroll/i18n/hi.po | 10 ---------- .../i18n/l10n_in_hr_payroll.pot | 10 ---------- addons/l10n_in_hr_payroll/i18n/ta.po | 10 ---------- addons/l10n_in_hr_payroll/i18n/te.po | 10 ---------- addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 1 - .../l10n_in_hr_payroll_view.xml | 1 - 9 files changed, 8 insertions(+), 70 deletions(-) diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml index 3bd5b50b096..5140dd84299 100644 --- a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml +++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml @@ -184,13 +184,13 @@ number of years of service (date of joining – date of retirement/leaving job)< This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills. - + + fix + + worked_days.WORK100.number_of_days FC - none Food Coupons Allowance - code - result = worked_days.WORK100.number_of_days * contract.food_coupon_amount @@ -424,13 +424,13 @@ one is liable to pay the tax what ever he received excess of the limit or Rs 50, - + + fix + + worked_days.WORK100.number_of_days FD - none Deduction Towards Food Coupons - code - result = -(worked_days.WORK100.number_of_days * contract.food_coupon_amount) diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po index 7857cc95d4e..42a4b326386 100644 --- a/addons/l10n_in_hr_payroll/i18n/bn.po +++ b/addons/l10n_in_hr_payroll/i18n/bn.po @@ -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 " diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po index ef9a79440fa..e50fe1c22b9 100644 --- a/addons/l10n_in_hr_payroll/i18n/gu.po +++ b/addons/l10n_in_hr_payroll/i18n/gu.po @@ -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 " diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po index 10a7cf7f39e..55eb291e05c 100644 --- a/addons/l10n_in_hr_payroll/i18n/hi.po +++ b/addons/l10n_in_hr_payroll/i18n/hi.po @@ -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 " diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot index f9312875e1c..88c54554960 100644 --- a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot +++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot @@ -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 " diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po index 859ff2874a3..614c2e98d4e 100644 --- a/addons/l10n_in_hr_payroll/i18n/ta.po +++ b/addons/l10n_in_hr_payroll/i18n/ta.po @@ -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 " diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po index 2e50c615d9e..d79a7271437 100644 --- a/addons/l10n_in_hr_payroll/i18n/te.po +++ b/addons/l10n_in_hr_payroll/i18n/te.po @@ -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 " diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py index 22c9eafebc9..7465453df3c 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py @@ -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"), diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml index ab4ed8ec3c7..124c4f1553f 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml @@ -12,7 +12,6 @@ -