[MERGE] converted wizard.interface to osv.osv_memory for google_map module

bzr revid: tfr@openerp.com-20111018160840-kd7mlj9npkqhc5ss
This commit is contained in:
tfr@openerp.com 2011-10-18 18:08:40 +02:00
commit f9248ab5cf
6 changed files with 36 additions and 85 deletions

View File

@ -19,7 +19,6 @@
#
##############################################################################
import google_map
import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -34,7 +34,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': ['wizard/google_map_launch_view.xml',
'google_map_view.xml',
],
'demo_xml': [],
'installable': True,
'active': False,

View File

@ -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:

View File

@ -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>

View File

@ -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>

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@ -15,47 +15,41 @@
# 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/>.
#
##############################################################################
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):
class launch_map(wizard.interface):
_name = "launch.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')
partner = address_obj.browse(cr, uid, active_id, context=context)
url="http://maps.google.com/maps?oi=map&q="
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,
'target': 'new'
}
launch_map()
states= {'init' : {'actions': [],
'result':{'type':'action',
'action': _launch_wizard,
'state':'end'}
}
}
launch_map('google_map_launch')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: