Merge lp:~therp-nl/openupgrade-addons/6.1-crm-base_action_rule-stock-procurement-sale into lp:openupgrade-addons/6.1

[Holger Brunn (Therp)]

=== added file 'base_action_rule/migrations/6.1.1.0/user_notes.txt'
--- base_action_rule/migrations/6.1.1.0/user_notes.txt	1970-01-01 00:00:00 +0000
+++ base_action_rule/migrations/6.1.1.0/user_notes.txt	2012-06-06 15:46:26 +0000
@@ -0,0 +1,1 @@
+Nothing to do for module 'base_action_rule'

=== added file 'base_calendar/migrations/6.1.1.0/pre-migration.py'
--- base_calendar/migrations/6.1.1.0/pre-migration.py	1970-01-01 00:00:00 +0000
+++ base_calendar/migrations/6.1.1.0/pre-migration.py	2012-06-06 15:46:26 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+from osv import osv
+import pooler, logging
+from openerp.openupgrade import openupgrade
+
+logger = logging.getLogger('OpenUpgrade')
+me = __file__
+
+def migrate_calendar_event_table(cr, table_name):
+    """migrates a table that inherited calendar_event
+    @param cr: db cursor
+    @param table_name: the table that inherited calendar_event
+    """
+    cr.execute("update %s set count=100, end_type='count' where end_type='forever'" % table_name)
+
+
+def migrate(cr, version):
+    try:
+        logger.info("%s called", me)
+        migrate_calendar_event_table(cr, 'calendar_event')
+    except Exception, e:
+        raise osv.except_osv("OpenUpgrade", '%s: %s' % (me, e))

=== modified file 'base_calendar/migrations/6.1.1.0/user_notes.txt'
--- base_calendar/migrations/6.1.1.0/user_notes.txt	2012-02-23 23:23:05 +0000
+++ base_calendar/migrations/6.1.1.0/user_notes.txt	2012-06-06 15:46:26 +0000
@@ -1,3 +1,2 @@
 A new security rule is loaded to grant read access on calendars for survey users.
-
-
+End type 'forever' was removed for repeating calendar_events. As this was handled internally as end type 'count' with 100 repeats, the migration converts those events to just that.

=== added directory 'crm/migrations/6.1.1.0/data'
=== added file 'crm/migrations/6.1.1.0/data/crm_lead_view.xml'
--- crm/migrations/6.1.1.0/data/crm_lead_view.xml	1970-01-01 00:00:00 +0000
+++ crm/migrations/6.1.1.0/data/crm_lead_view.xml	2012-06-06 15:46:26 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+    <record id="crm_lead_stage_act" model="ir.actions.act_window">
+        <field name="name">Stages</field>
+        <field name="res_model">crm.case.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+        <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
+        <field name="domain" />
+        <field name="context">{}</field>
+    </record>
+</data>
+</openerp>

=== added file 'crm/migrations/6.1.1.0/post-migration.py'
--- crm/migrations/6.1.1.0/post-migration.py	1970-01-01 00:00:00 +0000
+++ crm/migrations/6.1.1.0/post-migration.py	2012-06-06 15:46:26 +0000
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+from osv import osv
+import pooler, logging
+from openerp.openupgrade import openupgrade
+
+from openerp import SUPERUSER_ID
+
+logger = logging.getLogger('OpenUpgrade')
+me = __file__
+
+def migrate(cr, version):
+    try:
+        #former versions added domains and contexts for crm.case.stage's type field - remove them
+        openupgrade.load_data(cr, 'crm', 'migrations/6.1.1.0/data/crm_lead_view.xml')
+    except Exception, e:
+        raise osv.except_osv("OpenUpgrade", '%s: %s' % (me, e))

=== added file 'crm/migrations/6.1.1.0/pre-migration.py'
--- crm/migrations/6.1.1.0/pre-migration.py	1970-01-01 00:00:00 +0000
+++ crm/migrations/6.1.1.0/pre-migration.py	2012-06-06 15:46:26 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+from osv import osv
+import pooler, logging
+import os
+import base_calendar
+from openerp.openupgrade import openupgrade
+from imp import load_source
+from openerp import SUPERUSER_ID
+
+logger = logging.getLogger('OpenUpgrade')
+me = __file__
+
+def migrate(cr, version):
+    try:
+        #base_calendar's migration script defines a function to migrate tables that inherit calendar_event
+        base_calendar_migration=load_source('base_calendar_migration', os.path.join(base_calendar.__path__[0], 'migrations', '6.1.1.0', 'pre-migration.py'))
+        base_calendar_migration.migrate_calendar_event_table(cr, 'crm_meeting')
+
+        if openupgrade.table_exists(cr, 'res_partner_canal') and not openupgrade.table_exists(cr, 'crm_case_channel'):
+            openupgrade.rename_tables(cr, [('res_partner_canal', 'crm_case_channel')])
+            openupgrade.rename_models(cr, [('res.partner.canal', 'crm.case.channel')])
+    except Exception, e:
+        raise osv.except_osv("OpenUpgrade", '%s: %s' % (me, e))

=== added file 'crm/migrations/6.1.1.0/user_notes.txt'
--- crm/migrations/6.1.1.0/user_notes.txt	1970-01-01 00:00:00 +0000
+++ crm/migrations/6.1.1.0/user_notes.txt	2012-06-06 15:46:26 +0000
@@ -0,0 +1,5 @@
+Deleted fields:
+- type in crm_case_stage
+- freq in crm_meeting
+- canal_id in crm_phonecall
+they still exist in the database in case you need them.

=== added file 'procurement/migrations/6.1.1.0/user_notes.txt'
--- procurement/migrations/6.1.1.0/user_notes.txt	1970-01-01 00:00:00 +0000
+++ procurement/migrations/6.1.1.0/user_notes.txt	2012-06-06 15:46:26 +0000
@@ -0,0 +1,1 @@
+Nothing to do for module 'procurement'

=== added file 'sale/migrations/6.1.1.0/user_notes.txt'
--- sale/migrations/6.1.1.0/user_notes.txt	1970-01-01 00:00:00 +0000
+++ sale/migrations/6.1.1.0/user_notes.txt	2012-06-06 15:46:26 +0000
@@ -0,0 +1,1 @@
+Nothing to do for module 'sale'

=== added file 'stock/migrations/6.1.1.1/user_notes.txt'
--- stock/migrations/6.1.1.1/user_notes.txt	1970-01-01 00:00:00 +0000
+++ stock/migrations/6.1.1.1/user_notes.txt	2012-06-06 15:46:26 +0000
@@ -0,0 +1,1 @@
+Nothing to do for module 'stock'