pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]Holiday Request - Two different fields with same labels

Browse Source 
lp bug: https://launchpad.net/bugs/720582 fixed

bzr revid: ara@tinyerp.com-20110217111720-nbqov0u17qqgxvjq
This commit is contained in:
ARA (OpenERP)
2011-02-17 16:47:20 +05:30
parent 891c269b1d
commit 990befd610
43 changed files with 321 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/hr_holidays_view.xml
+3 -3
View File
@@ -70,7 +70,7 @@
<form string="Leave Request">
<group col="8" colspan="4">
<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager, base.group_extended" string="Leave Type"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager, base.group_extended" string="Leave Category"/>
<group attrs="{'invisible':[('holiday_type','=','employee')]}">
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
</group>
@@ -114,7 +114,7 @@
<form string="Allocation Request">
<group col="8" colspan="4">
<field name="name" />
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_hr_manager, base.group_extended"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Category" groups="base.group_hr_manager, base.group_extended"/>
<group attrs="{'invisible':[('holiday_type','=','category')]}">
<field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
</group>
@@ -414,7 +414,7 @@
</record>
<menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
<menuitem name="Leave Type"
action="open_view_holiday_status"
id="menu_open_view_holiday_status"
addons/hr_holidays/i18n/ar.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/bg.po
+8 -1
View File
@@ -24,9 +24,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/bs.po
+8 -1
View File
@@ -24,9 +24,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/ca.po
+8 -1
View File
@@ -24,9 +24,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/cs.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/de.po
+9 -2
View File
@@ -25,8 +25,15 @@ msgstr "Blau"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Typ Anspruch"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/el.po
+8 -1
View File
@@ -27,9 +27,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/es.po
+9 -2
View File
@@ -24,8 +24,15 @@ msgstr "Azul"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Tipo de asignación"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/es_AR.po
+8 -1
View File
@@ -25,9 +25,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/es_EC.po
+8 -1
View File
@@ -25,9 +25,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/et.po
+8 -1
View File
@@ -24,9 +24,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/fi.po
+8 -1
View File
@@ -25,9 +25,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/fr.po
+9 -2
View File
@@ -25,8 +25,15 @@ msgstr "Bleu"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Type d'attribution"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/hi.po
+8 -1
View File
@@ -25,9 +25,16 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Second Approval"
addons/hr_holidays/i18n/hr.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/hr_holidays.pot
+7 -1
View File
@@ -23,7 +23,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/hu.po
+8 -2
View File
@@ -24,8 +24,14 @@ msgstr "Kék"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Juttatás típusa"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/id.po
+8 -2
View File
@@ -24,8 +24,14 @@ msgstr "Biru"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Jenis Alokasi"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/it.po
+8 -2
View File
@@ -24,8 +24,14 @@ msgstr "Blu"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Tipo assegnazione"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/ko.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/lt.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/lv.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/mn.po
+8 -2
View File
@@ -24,8 +24,14 @@ msgstr "Цэнхэр"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Хуваарилах төрөл"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/nl.po
+8 -2
View File
@@ -24,8 +24,14 @@ msgstr "Blauw"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr "Soort reservering"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
addons/hr_holidays/i18n/nl_BE.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/pl.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr "Niebieski"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/pt.po
+11
View File
@@ -21,6 +21,17 @@ msgstr ""
msgid "Blue"
msgstr "Azul"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
addons/hr_holidays/i18n/pt_BR.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/ro.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/ru.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/sl.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/sq.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/sr.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/sr@latin.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/sv.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/th.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr "สีน้ำเงิน"
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/tlh.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/tr.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/uk.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/vi.po
+7 -1
View File
@@ -25,7 +25,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/zh_CN.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays
addons/hr_holidays/i18n/zh_TW.po
+7 -1
View File
@@ -24,7 +24,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgid "Allocation Category"
msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: field:hr.holidays,holiday_type:0
msgid "Leave Category"
msgstr ""
#. module: hr_holidays