From ad09b92e2e3eea61afeb30a447436a6900450acd Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Wed, 24 Aug 2011 12:12:33 +0530
Subject: [PATCH 1/7] [CONVERT] converted wizard.interface to osv.osv_memory
 for google_map module

bzr revid: bde@tinyerp.com-20110824064233-jvf01fvdbtrcufgs
---
 addons/google_map/__openerp__.py              |  4 +-
 addons/google_map/google_map_view.xml         |  6 +-
 addons/google_map/google_map_wizard.xml       | 12 ----
 addons/google_map/wizard/google_map_launch.py | 57 +++++++++----------
 .../wizard/google_map_launch_view.xml         | 31 ++++++++++
 5 files changed, 63 insertions(+), 47 deletions(-)
 delete mode 100644 addons/google_map/google_map_wizard.xml
 create mode 100644 addons/google_map/wizard/google_map_launch_view.xml

diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 5c48a9370d7..c5ba79f70db 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -36,7 +36,9 @@ Using this you can directly open Google Map from the URL widget.""",
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['google_map_wizard.xml', 'google_map_view.xml'],
+    'update_xml': ['google_map_view.xml',
+                   'wizard/google_map_launch_view.xml' 
+                  ],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 7909b271cd4..cd2648599dc 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -12,7 +12,7 @@
                     <label string="Street2 : " align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="%(wizard_google_map)d"
+                        <button name="%(action_google_map_launch_form)d"
                            string="Map" type="action" icon="gtk-zoom-in"/>
                     </group>
                 </field>
@@ -29,7 +29,7 @@
                     <label string="Street2 : " align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="%(wizard_google_map)d" string="Map" type="action" icon="gtk-zoom-in"/>
+                        <button name="%(action_google_map_launch_form)d" string="Map" type="action" icon="gtk-zoom-in"/>
                     </group>
                 </field>
             </field>
@@ -46,7 +46,7 @@
                         <label string="Street2 : " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="%(wizard_google_map)d"
+                        <button name="%(action_google_map_launch_form)d"
                             string="Map" type="action" icon="gtk-zoom-in"/>
                         </group>
                     </field>
diff --git a/addons/google_map/google_map_wizard.xml b/addons/google_map/google_map_wizard.xml
deleted file mode 100644
index 2f3b3b2a178..00000000000
--- a/addons/google_map/google_map_wizard.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-		<wizard
-			string="Launch Google Map"
-			model="res.partner.address"
-			name="google_map_launch"
-			id="wizard_google_map"
-			keyword="client_action_multi"/>
-	</data>
-</openerp>
diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
index a2b3003da7c..c42aff61378 100644
--- a/addons/google_map/wizard/google_map_launch.py
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -19,43 +19,38 @@
 #
 ##############################################################################
 
-import wizard
 from osv import osv
 import pooler
 from osv import fields
 import time
 
-def _launch_wizard(self, cr, uid, data, context=None):
-    address_obj= pooler.get_pool(cr.dbname).get('res.partner.address')
-    m= address_obj.browse(cr, uid, data['id'], context=context)
-    url=''
-    url="http://maps.google.com/maps?oi=map&q="
-    if m.street:
-        url+=m.street.replace(' ','+')
-    if m.street2:
-        url+='+'+m.street2.replace(' ','+')
-    if m.city:
-        url+='+'+m.city.replace(' ','+')
-    if m.state_id:
-        url+='+'+m.state_id.name.replace(' ','+')
-    if m.country_id:
-        url+='+'+m.country_id.name.replace(' ','+')
-    if m.zip:
-        url+='+'+m.zip.replace(' ','+')
-    return {
-    'type': 'ir.actions.act_url',
-    'url':url,
-    'target': 'new'
-    }
+class launch_map(osv.osv_memory):
+    
+    _name = "launch.map"
 
-class launch_map(wizard.interface):
+    def launch_wizard(self, cr, uid, data, context=None):
+        address_obj= pooler.get_pool(cr.dbname).get('res.partner.address')
+        m = address_obj.browse(cr, uid, data, context=context)[0]
+        url=''
+        url="http://maps.google.com/maps?oi=map&q="
+        if m.street:
+            url+=m.street.replace(' ','+')
+        if m.street2:
+            url+='+'+m.street2.replace(' ','+')
+        if m.city:
+            url+='+'+m.city.replace(' ','+')
+        if m.state_id:
+            url+='+'+m.state_id.name.replace(' ','+')
+        if m.country_id:
+            url+='+'+m.country_id.name.replace(' ','+')
+        if m.zip:
+            url+='+'+m.zip.replace(' ','+')
+        return {
+        'type': 'ir.actions.act_url',
+        'url':url,
+        'target': 'new'
+        }
 
-    states= {'init' : {'actions': [],
-                       'result':{'type':'action',
-                                 'action': _launch_wizard,
-                                 'state':'end'}
-                       }
-             }
-launch_map('google_map_launch')
+launch_map()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/google_map/wizard/google_map_launch_view.xml b/addons/google_map/wizard/google_map_launch_view.xml
new file mode 100644
index 00000000000..23857cfa4df
--- /dev/null
+++ b/addons/google_map/wizard/google_map_launch_view.xml
@@ -0,0 +1,31 @@
+<?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">
+                    <group colspan="4">
+                        <separator string="Launch Map"/>
+                        <newline/>
+                        <button name="launch_wizard" string="Map" type="object" icon="gtk-zoom-in"/>
+                        <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                    </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">tree,form,calendar,graph</field>
+            <field name="target">new</field>
+            <field name="view_id" ref="view_google_map_launch_form"/>
+        </record>
+
+    </data>
+</openerp>

From 7101e8134fc15969425bcc929ad1d14ed40ab340 Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Tue, 6 Sep 2011 15:55:10 +0530
Subject: [PATCH 2/7] [IMP] improved the sequence of files in __openerp__.py
 and improved the coding of google_map_launch.py

bzr revid: bde@tinyerp.com-20110906102510-hgl0yoqze417ezvg
---
 addons/google_map/__openerp__.py                |  4 ++--
 addons/google_map/wizard/google_map_launch.py   | 17 +++++++++--------
 .../wizard/google_map_launch_view.xml           |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index c5ba79f70db..8f8d816d510 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -36,8 +36,8 @@ Using this you can directly open Google Map from the URL widget.""",
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['google_map_view.xml',
-                   'wizard/google_map_launch_view.xml' 
+    'update_xml': ['wizard/google_map_launch_view.xml',
+                   'google_map_view.xml',
                   ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
index c42aff61378..ea0e63869e9 100644
--- a/addons/google_map/wizard/google_map_launch.py
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,13 +25,14 @@ from osv import fields
 import time
 
 class launch_map(osv.osv_memory):
-    
-    _name = "launch.map"
 
-    def launch_wizard(self, cr, uid, data, context=None):
-        address_obj= pooler.get_pool(cr.dbname).get('res.partner.address')
-        m = address_obj.browse(cr, uid, data, context=context)[0]
-        url=''
+    _name = "launch.map"
+    _description = "Google Map"
+
+    def launch_wizard(self, cr, uid, ids, context=None):
+        active_id = context.get('active_id', False)
+        address_obj= self.pool.get('res.partner.address')
+        m = address_obj.browse(cr, uid, active_id, context=context)
         url="http://maps.google.com/maps?oi=map&q="
         if m.street:
             url+=m.street.replace(' ','+')
diff --git a/addons/google_map/wizard/google_map_launch_view.xml b/addons/google_map/wizard/google_map_launch_view.xml
index 23857cfa4df..5f7d89d18a4 100644
--- a/addons/google_map/wizard/google_map_launch_view.xml
+++ b/addons/google_map/wizard/google_map_launch_view.xml
@@ -22,7 +22,7 @@
             <field name="name">Google Map</field>
             <field name="res_model">launch.map</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">form</field>
             <field name="target">new</field>
             <field name="view_id" ref="view_google_map_launch_form"/>
         </record>

From 6d97d0922ede523b381655f0a305212ba4832e95 Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Wed, 7 Sep 2011 11:51:43 +0530
Subject: [PATCH 3/7] [IMP] improved the sequence of buttons and made
 act_window for the wizard

bzr revid: bde@tinyerp.com-20110907062143-rqiki92mbciomfhn
---
 .../google_map/wizard/google_map_launch_view.xml  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/google_map/wizard/google_map_launch_view.xml b/addons/google_map/wizard/google_map_launch_view.xml
index 5f7d89d18a4..c8a006d0f67 100644
--- a/addons/google_map/wizard/google_map_launch_view.xml
+++ b/addons/google_map/wizard/google_map_launch_view.xml
@@ -8,11 +8,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Launch Map">
-                    <group colspan="4">
-                        <separator string="Launch Map"/>
-                        <newline/>
-                        <button name="launch_wizard" string="Map" type="object" icon="gtk-zoom-in"/>
+                    <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>
@@ -27,5 +26,13 @@
             <field name="view_id" ref="view_google_map_launch_form"/>
         </record>
 
+        <act_window
+            name="Launch Google Map"
+            id="view_google_map_launch_form"
+            res_model="launch.map"
+            src_model="res.partner.address"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"/>
     </data>
 </openerp>

From 7a5c4d999b3db8a08a723e9324fe3038088cc4eb Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Wed, 7 Sep 2011 16:06:15 +0530
Subject: [PATCH 4/7] [REM] removed unnecessary headers and given meaningful
 variable name in google_map_launch.py

bzr revid: bde@tinyerp.com-20110907103615-lstvq6gf37nrf4fy
---
 addons/google_map/wizard/google_map_launch.py | 33 +++++++++----------
 .../wizard/google_map_launch_view.xml         |  4 +--
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
index ea0e63869e9..12c7142fbb4 100644
--- a/addons/google_map/wizard/google_map_launch.py
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -19,33 +19,30 @@
 #
 ##############################################################################
 
-from osv import osv
-import pooler
-from osv import fields
-import time
+from osv import osv, fields
 
 class launch_map(osv.osv_memory):
 
     _name = "launch.map"
-    _description = "Google Map"
+    _description = "Launch Google Map"
 
     def launch_wizard(self, cr, uid, ids, context=None):
         active_id = context.get('active_id', False)
         address_obj= self.pool.get('res.partner.address')
-        m = address_obj.browse(cr, uid, active_id, context=context)
+        partner = address_obj.browse(cr, uid, active_id, context=context)
         url="http://maps.google.com/maps?oi=map&q="
-        if m.street:
-            url+=m.street.replace(' ','+')
-        if m.street2:
-            url+='+'+m.street2.replace(' ','+')
-        if m.city:
-            url+='+'+m.city.replace(' ','+')
-        if m.state_id:
-            url+='+'+m.state_id.name.replace(' ','+')
-        if m.country_id:
-            url+='+'+m.country_id.name.replace(' ','+')
-        if m.zip:
-            url+='+'+m.zip.replace(' ','+')
+        if partner.street:
+            url+=partner.street.replace(' ','+')
+        if partner.street2:
+            url+='+'+partner.street2.replace(' ','+')
+        if partner.city:
+            url+='+'+partner.city.replace(' ','+')
+        if partner.state_id:
+            url+='+'+partner.state_id.name.replace(' ','+')
+        if partner.country_id:
+            url+='+'+partner.country_id.name.replace(' ','+')
+        if partner.zip:
+            url+='+'+partner.zip.replace(' ','+')
         return {
         'type': 'ir.actions.act_url',
         'url':url,
diff --git a/addons/google_map/wizard/google_map_launch_view.xml b/addons/google_map/wizard/google_map_launch_view.xml
index c8a006d0f67..1d609d1b429 100644
--- a/addons/google_map/wizard/google_map_launch_view.xml
+++ b/addons/google_map/wizard/google_map_launch_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Launch Map">
-                    <separator string="This wizard will launch Google Map" colspan="4"/>
+                    <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"/>
@@ -28,7 +28,7 @@
 
         <act_window
             name="Launch Google Map"
-            id="view_google_map_launch_form"
+            id="act_google_map_launch_form"
             res_model="launch.map"
             src_model="res.partner.address"
             view_mode="form"

From ccde72131de7d91a6193b932e90a63371172b9a7 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 7 Sep 2011 16:42:02 +0530
Subject: [PATCH 5/7] [REM] Google_map: Remove unused py

bzr revid: mra@tinyerp.com-20110907111202-kyvcswl9w34bt3f6
---
 addons/google_map/__init__.py   |  1 -
 addons/google_map/google_map.py | 32 --------------------------------
 2 files changed, 33 deletions(-)
 delete mode 100644 addons/google_map/google_map.py

diff --git a/addons/google_map/__init__.py b/addons/google_map/__init__.py
index aa250662a11..1631b934faf 100644
--- a/addons/google_map/__init__.py
+++ b/addons/google_map/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import google_map
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/google_map/google_map.py b/addons/google_map/google_map.py
deleted file mode 100644
index e8e22516db2..00000000000
--- a/addons/google_map/google_map.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 osv import fields,osv,orm
-
-class res_partner_address(osv.osv):
-    _description ='Partner Contact'
-    _name = 'res.partner.address'
-    _inherit = 'res.partner.address'
-    _columns = {
-        }
-res_partner_address()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 02e025483b2d27ff4b1c2a579bb07901fe873618 Mon Sep 17 00:00:00 2001
From: "Mustufa Rangwala (OpenERP)" <mra@tinyerp.com>
Date: Wed, 7 Sep 2011 16:46:29 +0530
Subject: [PATCH 6/7] [REF] Google_map: remove unused import

bzr revid: mra@tinyerp.com-20110907111629-q9lc0pdoxk73xphm
---
 addons/google_map/wizard/google_map_launch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
index 12c7142fbb4..0d926462dc6 100644
--- a/addons/google_map/wizard/google_map_launch.py
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from osv import osv
 
 class launch_map(osv.osv_memory):
 
@@ -50,5 +50,6 @@ class launch_map(osv.osv_memory):
         }
 
 launch_map()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 71353b1f3ca699bd290934859a810e994f64b782 Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Thu, 15 Sep 2011 16:57:19 +0530
Subject: [PATCH 7/7] [MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915112719-2sodpzi0wwbzqlca
---
 .../wizard/google_map_launch_view.xml         | 38 -------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 addons/google_map/wizard/google_map_launch_view.xml

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
index 1d609d1b429..00000000000
--- 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>