From 5544efea471c38b6e336e7916316f6efdccbafb9 Mon Sep 17 00:00:00 2001
From: Imanol Aranburu <iaranburu@binovo.es>
Date: Mon, 16 Nov 2020 16:56:43 +0100
Subject: [PATCH 1/2] [REF] 6221 Conflict project_characterization vs
 project_category

---
 project_characterization/models/project_task.py      | 2 +-
 project_characterization/views/project_task_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project_characterization/models/project_task.py b/project_characterization/models/project_task.py
index 215248d5..e1e4d6ef 100644
--- a/project_characterization/models/project_task.py
+++ b/project_characterization/models/project_task.py
@@ -7,7 +7,7 @@
 class ProjectTask(models.Model):
     _inherit = 'project.task'
 
-    type_id = fields.Many2one(
+    type2_id = fields.Many2one(
         comodel_name='project.task.type2', string='Type')
 
 
diff --git a/project_characterization/views/project_task_view.xml b/project_characterization/views/project_task_view.xml
index d683237a..b3db0dcd 100644
--- a/project_characterization/views/project_task_view.xml
+++ b/project_characterization/views/project_task_view.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="tag_ids" position="after">
-                <field name="type_id" />
+                <field name="type2_id" />
             </field>
             <field name="date_deadline" position="before">
                 <label for="date_from" string="Period"/>

From 60523de62db7adab3c437ad73516d3872a203456 Mon Sep 17 00:00:00 2001
From: arodriguez <arodriguez@binovo.es>
Date: Mon, 25 Jan 2021 16:23:44 +0100
Subject: [PATCH 2/2] =?UTF-8?q?#6548=20A=C3=B1adir=20traducciones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project_characterization/i18n/es.po    |   2 +-
 project_characterization/i18n/eu_ES.po | 295 +++++++++++++++++++++++++
 2 files changed, 296 insertions(+), 1 deletion(-)
 create mode 100644 project_characterization/i18n/eu_ES.po

diff --git a/project_characterization/i18n/es.po b/project_characterization/i18n/es.po
index 8966f8b0..28314610 100644
--- a/project_characterization/i18n/es.po
+++ b/project_characterization/i18n/es.po
@@ -284,7 +284,7 @@ msgid "This will disable automatic number adding to create analytic account code
 msgstr "Esto deshabilita la generación de número aútomatico para obtener el código de cuenta analítica."
 
 #. module: project_characterization
-#: model:ir.model.fields,field_description:project_characterization.field_project_task_type_id_5576
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_id_7406
 msgid "Type"
 msgstr "Tipo"
 
diff --git a/project_characterization/i18n/eu_ES.po b/project_characterization/i18n/eu_ES.po
new file mode 100644
index 00000000..03f472dd
--- /dev/null
+++ b/project_characterization/i18n/eu_ES.po
@@ -0,0 +1,295 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* project_characterization
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-25 15:01+0000\n"
+"PO-Revision-Date: 2021-01-25 15:01+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.res_activity_menuitem
+msgid "Activity"
+msgstr "Jarduera"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.res_activity_type_menuitem
+msgid "Activity Type"
+msgstr "Jarduera-mota"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_res_config_settings_manual_code
+msgid "Add number manually to compose account code"
+msgstr "Kontu-koderako zenbakia eskuz gehitzea"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Kontu analitikoa"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Lerro analitikoa"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_res_area_id
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_res_area_id
+#: model:ir.ui.menu,name:project_characterization.res_area_menuitem
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+msgid "Area"
+msgstr "Arloa"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.res_area_specialization_menuitem
+msgid "Area Specialization"
+msgstr "Espezializazio arloa"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.res_area_type_menuitem
+msgid "Area Type"
+msgstr "Arlo-mota"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_res_area_type_id
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_res_area_type_id
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+msgid "Area type"
+msgstr "Arlo-mota"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_res_area_type
+msgid "Area types"
+msgstr "Arlo-motak"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_res_area
+#: model:ir.ui.view,arch_db:project_characterization.view_account_analytic_account_search_inh_project_char
+msgid "Areas"
+msgstr "Arloak"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_res_character_id
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_res_character_id
+#: model:ir.ui.menu,name:project_characterization.res_character_menuitem
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+msgid "Character"
+msgstr "Natura"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.project_characterization_config_menuitem
+#: model:ir.ui.view,arch_db:project_characterization.project_project_form_view
+msgid "Characterization"
+msgstr "Karakterizazioa"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.view_account_analytic_account_search_inh_project_char
+msgid "Characters"
+msgstr "Natura"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.res_committee_menuitem
+msgid "Committee"
+msgstr "Batzordea"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_create_uid
+msgid "Created by"
+msgstr "Nork sortua"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_create_date
+msgid "Created on"
+msgstr "Noiz sortua"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_description
+msgid "Description"
+msgstr "Deskribapena"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_display_name
+msgid "Display Name"
+msgstr "Izena erakutsi"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.project_project_form_view
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+#: model:ir.ui.view,arch_db:project_characterization.project_project_tree_view
+msgid "End Date"
+msgstr "Amaiera data"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_id
+msgid "ID"
+msgstr "ID"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.project_project_form_view
+msgid "Initial Date"
+msgstr "Hasiera data"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_justification_deadline
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_justification_deadline
+msgid "Justification Deadline"
+msgstr "Azken egunaren justifikazioa"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2___last_update
+msgid "Last Modified on"
+msgstr "Azken aldaketa"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_write_uid
+msgid "Last Updated by"
+msgstr "Azkenengoz eguneratu zuena"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_write_date
+msgid "Last Updated on"
+msgstr "Azken eguneraketa noiz"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.project_config_settings_form_view
+msgid "Manual Code for Analytic Accounts"
+msgstr "Kontu analitikorako eskuzko kodea"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_name
+msgid "Name"
+msgstr "Izena"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_nonoperative
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_line_nonoperative
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_nonoperative
+#: model:ir.model.fields,field_description:project_characterization.field_res_area_nonoperative
+#: model:ir.ui.view,arch_db:project_characterization.account_analytic_line_search_view
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+#: model:ir.ui.view,arch_db:project_characterization.res_area_operative_search_view
+#: model:ir.ui.view,arch_db:project_characterization.view_account_analytic_account_search_inh_project_char
+msgid "Non Operative"
+msgstr "Ez dabil"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_num_code
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_num_code
+msgid "Number"
+msgstr "Zenbakia "
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.account_analytic_line_search_view
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+#: model:ir.ui.view,arch_db:project_characterization.res_area_operative_search_view
+#: model:ir.ui.view,arch_db:project_characterization.view_account_analytic_account_search_inh_project_char
+msgid "Operative"
+msgstr "Operatiboa"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_op_space_id
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_op_space_id
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+msgid "Opportunity Space"
+msgstr "Aukerako espazioa"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.res_opportunity_space_menuitem
+#: model:ir.ui.view,arch_db:project_characterization.view_account_analytic_account_search_inh_project_char
+msgid "Opportunity Spaces"
+msgstr "Aukerako espazioak"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.project_task_form_view
+msgid "Period"
+msgstr "Aldiak"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_project_project
+msgid "Project"
+msgstr "Proiektu"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.project_task_type2_form_view
+msgid "Project Task Type"
+msgstr "Proiektuko ataza motak"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_res_area_type_project_ids
+msgid "Projects"
+msgstr "Proiektuak "
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_res_area_related_operative_area_ids
+msgid "Related Operative Area"
+msgstr "Arlo operatiboak"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.project_config_settings_form_view
+msgid "Select number to compose analytic account code"
+msgstr "Hautatu zenbaki bat kontu analitikoaren kodea lortzeko"
+
+#. module: project_characterization
+#: model:ir.ui.menu,name:project_characterization.res_structure_menuitem
+msgid "Structures"
+msgstr "Egiturak"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_res_target_id
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_res_target_id
+#: model:ir.ui.menu,name:project_characterization.res_target_menuitem
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+msgid "Target"
+msgstr "Sektore objektiboa"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.view_account_analytic_account_search_inh_project_char
+msgid "Targets"
+msgstr "Sektore objektiboak"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_project_task
+msgid "Task"
+msgstr "Ataza"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_project_task_type2
+msgid "Task Type"
+msgstr "Ataza mota"
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_account_analytic_account_res_team_id
+#: model:ir.model.fields,field_description:project_characterization.field_project_project_res_team_id
+#: model:ir.ui.menu,name:project_characterization.res_team_menuitem
+#: model:ir.ui.view,arch_db:project_characterization.project_project_search_view
+msgid "Team"
+msgstr "Taldea"
+
+#. module: project_characterization
+#: model:ir.ui.view,arch_db:project_characterization.view_account_analytic_account_search_inh_project_char
+msgid "Teams"
+msgstr "Taldeak"
+
+#. module: project_characterization
+#: model:ir.model.fields,help:project_characterization.field_res_config_settings_manual_code
+msgid "This will disable automatic number adding to create analytic account code in projects."
+msgstr "This will disable automatic number adding to create analytic account code in projects."
+
+#. module: project_characterization
+#: model:ir.model.fields,field_description:project_characterization.field_project_task_type2_id_7406
+msgid "Type"
+msgstr "Mota"
+
+#. module: project_characterization
+#: model:ir.model,name:project_characterization.model_res_config_settings
+msgid "res.config.settings"
+msgstr "res.config.settings"
+