[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915112719-2sodpzi0wwbzqlca

diff --git a/addons/google_map/wizard/google_map_launch_view.xml b/addons/google_map/wizard/google_map_launch_view.xml
deleted file mode 100644 (file)
index 1d609d1..0000000
--- a/addons/google_map/wizard/google_map_launch_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_google_map_launch_form" model="ir.ui.view">
-            <field name="name">launch.map.form</field>
-            <field name="model">launch.map</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Launch Map">
-                    <separator string="This wizard will launch google map" colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                        <button name="launch_wizard" string="Map" type="object" icon="gtk-zoom-in"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_google_map_launch_form" model="ir.actions.act_window">
-            <field name="name">Google Map</field>
-            <field name="res_model">launch.map</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="view_id" ref="view_google_map_launch_form"/>
-        </record>
-
-        <act_window
-            name="Launch Google Map"
-            id="act_google_map_launch_form"
-            res_model="launch.map"
-            src_model="res.partner.address"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"/>
-    </data>
-</openerp>