From d0649cb6b38d602b5aa230374b025d59a22cc1cf Mon Sep 17 00:00:00 2001
From: Sergio Morillo <sergio.morillo@datalife.com.es>
Date: Fri, 28 Jul 2017 18:56:09 +0200
Subject: [PATCH] Migration to 4.2

---
 CHANGELOG                                | 2 ++
 locale/{es_ES.po => es.po}               | 0
 tests/scenario_labor_yield_timesheet.rst | 8 ++------
 tryton.cfg                               | 2 +-
 view/create_timesheet_start_form.xml     | 4 ++--
 view/delete_timesheet_start_form.xml     | 4 ++--
 view/work_form.xml                       | 2 +-
 view/work_unit_price_form.xml            | 4 ++--
 view/work_unit_price_tree.xml            | 4 ++--
 9 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100644 CHANGELOG
 rename locale/{es_ES.po => es.po} (100%)

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..2f0e52e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 4.2.0 - 2017-07-27
+Version 4.2.0 - 2017-07-27
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 100%
rename from locale/es_ES.po
rename to locale/es.po
diff --git a/tests/scenario_labor_yield_timesheet.rst b/tests/scenario_labor_yield_timesheet.rst
index 6a04f97..37d2eb4 100644
--- a/tests/scenario_labor_yield_timesheet.rst
+++ b/tests/scenario_labor_yield_timesheet.rst
@@ -4,6 +4,7 @@ Labor Yield Timesheet Scenario
 
 Imports::
 
+    >>> from trytond.tests.tools import activate_modules
     >>> from proteus import config, Model, Wizard
     >>> from trytond.modules.company.tests.tools import create_company, \
     ...     get_company
@@ -20,12 +21,7 @@ Create a database::
 
 Install labor_yield_timesheet::
 
-    >>> Module = Model.get('ir.module')
-    >>> module, = Module.find([
-    ...         ('name', '=', 'labor_yield_timesheet'),
-    ...         ])
-    >>> module.click('install')
-    >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+    >>> config = activate_modules('labor_yield_timesheet')
 
 Create company::
 
diff --git a/tryton.cfg b/tryton.cfg
index 624be97..10ccaac 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.2.0
 depends:
     ir
     labor_yield
diff --git a/view/create_timesheet_start_form.xml b/view/create_timesheet_start_form.xml
index 458215f..e0a5c20 100644
--- a/view/create_timesheet_start_form.xml
+++ b/view/create_timesheet_start_form.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- The COPYRIGHT file at the top level of this repository contains the full
      copyright notices and license terms. -->
-<form string="Create timesheet lines">
+<form>
     <label name="work"/>
     <field name="work"/>
     <newline/>
@@ -9,4 +9,4 @@
     <field name="start_date"/>
     <label name="end_date"/>
     <field name="end_date"/>
-</form>
\ No newline at end of file
+</form>
diff --git a/view/delete_timesheet_start_form.xml b/view/delete_timesheet_start_form.xml
index 109fa37..e0a5c20 100644
--- a/view/delete_timesheet_start_form.xml
+++ b/view/delete_timesheet_start_form.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- The COPYRIGHT file at the top level of this repository contains the full
      copyright notices and license terms. -->
-<form string="Delete timesheet lines">
+<form>
     <label name="work"/>
     <field name="work"/>
     <newline/>
@@ -9,4 +9,4 @@
     <field name="start_date"/>
     <label name="end_date"/>
     <field name="end_date"/>
-</form>
\ No newline at end of file
+</form>
diff --git a/view/work_form.xml b/view/work_form.xml
index 5522e50..9e82e21 100644
--- a/view/work_form.xml
+++ b/view/work_form.xml
@@ -6,4 +6,4 @@ this repository contains the full copyright notices and license terms. -->
            position="inside">
         <field name="unit_prices" colspan="4"/>
     </xpath>
-</data>
\ No newline at end of file
+</data>
diff --git a/view/work_unit_price_form.xml b/view/work_unit_price_form.xml
index 59d1779..34331a9 100644
--- a/view/work_unit_price_form.xml
+++ b/view/work_unit_price_form.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- The COPYRIGHT file at the top level of this repository contains the full
      copyright notices and license terms. -->
-<form string="Work unit prices">
+<form>
     <label name="date"/>
     <field name="date"/>
     <label name="work"/>
@@ -10,4 +10,4 @@
     <field name="unit_price"/>
     <label name="unit"/>
     <field name="unit"/>
-</form>
\ No newline at end of file
+</form>
diff --git a/view/work_unit_price_tree.xml b/view/work_unit_price_tree.xml
index 885142a..fe1563f 100644
--- a/view/work_unit_price_tree.xml
+++ b/view/work_unit_price_tree.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!-- The COPYRIGHT file at the top level of this repository contains the full
      copyright notices and license terms. -->
-<tree string="Work unit prices" editable="bottom">
+<tree editable="bottom">
     <field name="work"/>
     <field name="date"/>
     <field name="unit_price"/>
     <field name="unit"/>
-</tree>
\ No newline at end of file
+</tree>