openerp-dev-web team mailing list archive

Thread
Date

[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3

To: mp+50126@xxxxxxxxxxxxxxxxxx
From: "Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>
Date: Thu, 17 Feb 2011 11:31:21 -0000
Reply-to: mp+50126@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #615522 Report Of Invoice  : Payment Term + Due date not printed
  https://bugs.launchpad.net/bugs/615522
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029
  #656378 [trunk] general ledger -
  https://bugs.launchpad.net/bugs/656378
  #672553 opening entries from chart of account doesn't use context
  https://bugs.launchpad.net/bugs/672553
  #674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
  https://bugs.launchpad.net/bugs/674480
  #675494 [Trunk] - If you delete an invoice entry, invoice still exists
  https://bugs.launchpad.net/bugs/675494
  #681398 sale access right
  https://bugs.launchpad.net/bugs/681398
  #689536 [6.0] partner layout salesman/salesteam issue
  https://bugs.launchpad.net/bugs/689536
  #690326 [6.0RC1] View mode "tree,form,search" in several window actions
  https://bugs.launchpad.net/bugs/690326
  #690753 [6.0] and [5.x] account_analytic_line must not be deleted if the journal etc is deleted
  https://bugs.launchpad.net/bugs/690753
  #691072 [6.0RC1][TRUNK][account_voucher] Wrong definition of field 'company_id' in 'account_voucher_line' object
  https://bugs.launchpad.net/bugs/691072
  #692986 [6.0] hr_payroll_account hr_payroll_account_view.xml - required fields block opening form
  https://bugs.launchpad.net/bugs/692986
  #694833 Salary Structure deduction percentage limitation
  https://bugs.launchpad.net/bugs/694833
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #696914 [6.0 RC2] account bank statement - usability
  https://bugs.launchpad.net/bugs/696914
  #697673 Wrong column title in timesheet view
  https://bugs.launchpad.net/bugs/697673
  #697989 Failed to install module multi_company
  https://bugs.launchpad.net/bugs/697989
  #701410 shouldn't see employee's categories in simplify view
  https://bugs.launchpad.net/bugs/701410
  #701683 [6.0 rc2] Setup/upgrade/run fails for init:module account_analytic_plans
  https://bugs.launchpad.net/bugs/701683
  #702318 Default period and account in invoices line for multi-company doesn't work
  https://bugs.launchpad.net/bugs/702318
  #705675 Error creating a DTA
  https://bugs.launchpad.net/bugs/705675
  #707398 [6.0] Account_payment: "Select Invoices to Pay" button on payment order not working
  https://bugs.launchpad.net/bugs/707398
  #707404 [trunk][account] useless variable in button_confirm_bank
  https://bugs.launchpad.net/bugs/707404
  #711886 [6.0 trunk] account : period selection not working for BS and PL legal reports 
  https://bugs.launchpad.net/bugs/711886
  #713562 [6.0] account - demo data - all periods have "special = true"
  https://bugs.launchpad.net/bugs/713562
  #713772 Cannot specify RFC in the accounting options
  https://bugs.launchpad.net/bugs/713772
  #714860 analytic account - Wrong demo data and account type must be come in tree view
  https://bugs.launchpad.net/bugs/714860
  #715470 [PS] sale margin module :  wrong computation
  https://bugs.launchpad.net/bugs/715470
  #715695 Multi-Company Environment :Configuration of consolidated type of account is not possible due to the _check_type constraints.
  https://bugs.launchpad.net/bugs/715695
  #717874 [6.0] account id - domain must check for <> view and consolidation and matching company_id
  https://bugs.launchpad.net/bugs/717874
  #719915 [PS] Human Resources : employee form view : Mobile field
  https://bugs.launchpad.net/bugs/719915
  #719957 [PS] Human Resources : Job position : Survey
  https://bugs.launchpad.net/bugs/719957
  #720582 [PS] Holiday Request - Two different fields with same labels
  https://bugs.launchpad.net/bugs/720582

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/50126

Hello,

[FIX]: Holiday Request - Two different fields with same labels
       https://bugs.launchpad.net/openobject-addons/+bug/720582

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/50126
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-02-17 09:17:54 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-02-17 11:30:45 +0000
@@ -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>

=== modified file 'hr_holidays/i18n/ar.po'
--- hr_holidays/i18n/ar.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/ar.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/bg.po'
--- hr_holidays/i18n/bg.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/bg.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/bs.po'
--- hr_holidays/i18n/bs.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/bs.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/ca.po'
--- hr_holidays/i18n/ca.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/ca.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/cs.po'
--- hr_holidays/i18n/cs.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/cs.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/de.po'
--- hr_holidays/i18n/de.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/de.po	2011-02-17 11:30:45 +0000
@@ -25,8 +25,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/el.po'
--- hr_holidays/i18n/el.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/el.po	2011-02-17 11:30:45 +0000
@@ -27,8 +27,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/es.po'
--- hr_holidays/i18n/es.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/es.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/es_AR.po'
--- hr_holidays/i18n/es_AR.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/es_AR.po	2011-02-17 11:30:45 +0000
@@ -25,8 +25,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/es_EC.po'
--- hr_holidays/i18n/es_EC.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/es_EC.po	2011-02-17 11:30:45 +0000
@@ -25,8 +25,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/et.po'
--- hr_holidays/i18n/et.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/et.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/fi.po'
--- hr_holidays/i18n/fi.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/fi.po	2011-02-17 11:30:45 +0000
@@ -25,8 +25,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/fr.po'
--- hr_holidays/i18n/fr.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/fr.po	2011-02-17 11:30:45 +0000
@@ -25,8 +25,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/hi.po'
--- hr_holidays/i18n/hi.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/hi.po	2011-02-17 11:30:45 +0000
@@ -25,8 +25,15 @@
 #. 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

=== modified file 'hr_holidays/i18n/hr.po'
--- hr_holidays/i18n/hr.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/hr.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/hr_holidays.pot'
--- hr_holidays/i18n/hr_holidays.pot	2011-01-14 00:11:01 +0000
+++ hr_holidays/i18n/hr_holidays.pot	2011-02-17 11:30:45 +0000
@@ -23,7 +23,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/hu.po'
--- hr_holidays/i18n/hu.po	2011-02-05 05:02:01 +0000
+++ hr_holidays/i18n/hu.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,14 @@
 #. 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

=== modified file 'hr_holidays/i18n/id.po'
--- hr_holidays/i18n/id.po	2011-02-09 04:55:56 +0000
+++ hr_holidays/i18n/id.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,14 @@
 #. 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

=== modified file 'hr_holidays/i18n/it.po'
--- hr_holidays/i18n/it.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/it.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,14 @@
 #. 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

=== modified file 'hr_holidays/i18n/ko.po'
--- hr_holidays/i18n/ko.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/ko.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/lt.po'
--- hr_holidays/i18n/lt.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/lt.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/lv.po'
--- hr_holidays/i18n/lv.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/lv.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/mn.po'
--- hr_holidays/i18n/mn.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/mn.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,14 @@
 #. 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

=== modified file 'hr_holidays/i18n/nl.po'
--- hr_holidays/i18n/nl.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/nl.po	2011-02-17 11:30:45 +0000
@@ -24,8 +24,14 @@
 #. 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

=== modified file 'hr_holidays/i18n/nl_BE.po'
--- hr_holidays/i18n/nl_BE.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/nl_BE.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/pl.po'
--- hr_holidays/i18n/pl.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/pl.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/pt.po'
--- hr_holidays/i18n/pt.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/pt.po	2011-02-17 11:30:45 +0000
@@ -24,6 +24,17 @@
 #. 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
 msgid "Allocation Type"
 msgstr ""
 

=== modified file 'hr_holidays/i18n/pt_BR.po'
--- hr_holidays/i18n/pt_BR.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/pt_BR.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/ro.po'
--- hr_holidays/i18n/ro.po	2011-02-16 05:03:38 +0000
+++ hr_holidays/i18n/ro.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/ru.po'
--- hr_holidays/i18n/ru.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/ru.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/sl.po'
--- hr_holidays/i18n/sl.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/sl.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/sq.po'
--- hr_holidays/i18n/sq.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/sq.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/sr.po'
--- hr_holidays/i18n/sr.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/sr.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/sr@xxxxxxxx'
--- hr_holidays/i18n/sr@xxxxxxxx	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/sr@xxxxxxxx	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/sv.po'
--- hr_holidays/i18n/sv.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/sv.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/th.po'
--- hr_holidays/i18n/th.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/th.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/tlh.po'
--- hr_holidays/i18n/tlh.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/tlh.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/tr.po'
--- hr_holidays/i18n/tr.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/tr.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/uk.po'
--- hr_holidays/i18n/uk.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/uk.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/vi.po'
--- hr_holidays/i18n/vi.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/vi.po	2011-02-17 11:30:45 +0000
@@ -25,7 +25,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/zh_CN.po'
--- hr_holidays/i18n/zh_CN.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/zh_CN.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

=== modified file 'hr_holidays/i18n/zh_TW.po'
--- hr_holidays/i18n/zh_TW.po	2011-02-01 14:25:28 +0000
+++ hr_holidays/i18n/zh_TW.po	2011-02-17 11:30:45 +0000
@@ -24,7 +24,13 @@
 #. 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

Follow ups

[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
From: Mustufa Rangwala (Open ERP), 2011-02-17