[REVERT] rev.5399 had missing files and breaks tests
bzr revid: odo@openerp.com-20111018173109-ul9jorop4khd09aj
This commit is contained in:
parent
f9248ab5cf
commit
8e2ea9a656
|
@ -19,6 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
import google_map
|
||||
import wizard
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
@ -34,9 +34,7 @@ Using this you can directly open Google Map from the URL widget.""",
|
|||
'images': ['images/google_map.jpeg'],
|
||||
'depends': ['base'],
|
||||
'init_xml': [],
|
||||
'update_xml': ['wizard/google_map_launch_view.xml',
|
||||
'google_map_view.xml',
|
||||
],
|
||||
'update_xml': ['google_map_wizard.xml', 'google_map_view.xml'],
|
||||
'demo_xml': [],
|
||||
'installable': True,
|
||||
'active': False,
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
# -*- 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:
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<label string="Street2 : " align="1.0"/>
|
||||
<group colspan="1" col="2">
|
||||
<field name="street2" nolabel="1"/>
|
||||
<button name="%(action_google_map_launch_form)d"
|
||||
<button name="%(wizard_google_map)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="%(action_google_map_launch_form)d" string="Map" type="action" icon="gtk-zoom-in"/>
|
||||
<button name="%(wizard_google_map)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="%(action_google_map_launch_form)d"
|
||||
<button name="%(wizard_google_map)d"
|
||||
string="Map" type="action" icon="gtk-zoom-in"/>
|
||||
</group>
|
||||
</field>
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
<?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>
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
||||
#
|
||||
|
@ -15,41 +15,47 @@
|
|||
# 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
|
||||
|
||||
class launch_map(osv.osv_memory):
|
||||
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'
|
||||
}
|
||||
|
||||
_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()
|
||||
class launch_map(wizard.interface):
|
||||
|
||||
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:
|
||||
|
||||
|
|
Loading…
Reference in New Issue