← Back to team overview

credativ team mailing list archive

[Merge] lp:~therp-nl/openupgrade-addons/lp1316542-hr_holidays_action_tag into lp:openupgrade-addons/6.1

 

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/openupgrade-addons/lp1316542-hr_holidays_action_tag into lp:openupgrade-addons/6.1.

Requested reviews:
  OpenUpgrade Committers (openupgrade-committers)
Related bugs:
  Bug #1316542 in OpenUpgrade Addons: "[6.0->6.1] Cannot refuse holidays: TypeError: holidays_refuse() takes at least 5 arguments (4 given)"
  https://bugs.launchpad.net/openupgrade-addons/+bug/1316542

For more details, see:
https://code.launchpad.net/~therp-nl/openupgrade-addons/lp1316542-hr_holidays_action_tag/+merge/218385
-- 
https://code.launchpad.net/~therp-nl/openupgrade-addons/lp1316542-hr_holidays_action_tag/+merge/218385
Your team OpenUpgrade Committers is requested to review the proposed merge of lp:~therp-nl/openupgrade-addons/lp1316542-hr_holidays_action_tag into lp:openupgrade-addons/6.1.
=== added file 'hr_holidays/migrations/6.1.1.5/data.xml'
--- hr_holidays/migrations/6.1.1.5/data.xml	1970-01-01 00:00:00 +0000
+++ hr_holidays/migrations/6.1.1.5/data.xml	2014-05-06 11:10:39 +0000
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8'?>
+<openerp>
+  <data>
+    <record model="hr.holidays.status" id="holiday_status_cl"><field name="name">Legal Leaves</field>
+      </record>
+    <record model="hr.holidays.status" id="holiday_status_sl"><field name="name">Sick Leaves</field>
+      </record>
+    <record model="workflow.activity" id="act_refuse">
+      <field name="action"/>
+    </record>
+  </data>
+</openerp>
+

=== added file 'hr_holidays/migrations/6.1.1.5/post-migration.py'
--- hr_holidays/migrations/6.1.1.5/post-migration.py	1970-01-01 00:00:00 +0000
+++ hr_holidays/migrations/6.1.1.5/post-migration.py	2014-05-06 11:10:39 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.openupgrade import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(cr, version):
+    openupgrade.load_data(
+        cr, 'hr_holidays',
+        'migrations/6.1.1.5/data.xml')


Follow ups