lp:~openerp-community/geospatial-addons/7.0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~geospatial-addons-core-editors/geospatial-addons/7.0 at revision 88

Sandy Carter (http://www.savoirfairelinux.com): Approve on 2013-09-27

Nicolas Bessi - Camptocamp (community): Needs Information on 2013-09-27

Maxime Chambreuil (http://www.savoirfairelinux.com): Approve (code review) on 2013-09-23

Diff: 995 lines (+197/-258)

17 files modified

base_geoengine/__init__.py (+1/-1)
base_geoengine/geo_ir/ir_model_view.xml (+15/-14)
base_geoengine/geo_view/geo_raster_layer.py (+1/-3)
base_geoengine/geo_view/geo_raster_layer_view.xml (+6/-8)
base_geoengine/geo_view/geo_vector_layer_view.xml (+5/-7)
base_geoengine/geo_view/ir_view_view.xml (+1/-1)
base_geoengine/static/src/css/style.css (+2/-15)
base_geoengine/static/src/js/geoengine_view.js (+96/-36)
base_geoengine/static/src/xml/geoengine.xml (+5/-5)
base_geoengine_demo/__openerp__.py (+1/-1)
base_geoengine_demo/retail_machine_view.xml (+11/-13)
base_geoengine_demo/zip_view.xml (+7/-9)
geoengine_geoname_geocoder/geonames_coder.py (+8/-8)
geoengine_geoname_geocoder/wizard/bulk_encode.py (+2/-2)
geoengine_partner/geo_partner.py (+2/-32)
geoengine_partner/geo_partner_view.xml (+20/-89)
geoengine_sale/geo_sale_view.xml (+14/-14)

api

On hold for merging into lp:~geospatial-addons-core-editors/geospatial-addons/6.1

Geospatial Addons Core Editors: Pending requested 2013-09-20

Diff: 957 lines (+148/-252) (has conflicts)

20 files modified

base_geoengine/__init__.py (+1/-1)
base_geoengine/__openerp__.py (+1/-1)
base_geoengine/geo_ir/ir_model_view.xml (+15/-14)
base_geoengine/geo_view/geo_raster_layer_view.xml (+5/-7)
base_geoengine/geo_view/geo_vector_layer_view.xml (+5/-7)
base_geoengine/geo_view/ir_view_view.xml (+1/-1)
base_geoengine/static/src/css/style.css (+2/-15)
base_geoengine/static/src/js/geoengine_view.js (+40/-24)
base_geoengine/static/src/xml/geoengine.xml (+5/-5)
base_geoengine_demo/__openerp__.py (+2/-2)
base_geoengine_demo/retail_machine_view.xml (+10/-12)
base_geoengine_demo/zip_view.xml (+6/-8)
geoengine_geoname_geocoder/__openerp__.py (+5/-5)
geoengine_geoname_geocoder/geonames_coder.py (+8/-8)
geoengine_geoname_geocoder/wizard/bulk_encode.py (+2/-2)
geoengine_partner/__openerp__.py (+2/-2)
geoengine_partner/geo_partner.py (+2/-32)
geoengine_partner/geo_partner_view.xml (+20/-89)
geoengine_sale/__openerp__.py (+2/-3)
geoengine_sale/geo_sale_view.xml (+14/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

106. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-27

[FIX] Geocoder
res.partner.address -> res.partner
ResPartnerAddress -> ResPartner

105. By Nicolas Bessi - Camptocamp on 2013-09-27

[FIX] installable state of addons to be uninstallable. They do not match actual requirement to be installable

104. By Nicolas Bessi - Camptocamp on 2013-09-27

[FIX] installable state of addons are set to False. They do not match actual requirement to be installable

103. By Nicolas Bessi - Camptocamp on 2013-09-27

[FIX] Geoengine demo module name

102. By Nicolas Bessi - Camptocamp on 2013-09-27

[FIX] geo_sale view in order to have installable addon

101. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-26

[IMP] Partner geo view simplified by removing depricated address layers and view
Google still doesn't work but using OpenStreetMaps, it works.

100. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-26

[IMP] Use widget name instead of id_for_label

99. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-26

[IMP] Colspans of Backend forms

98. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-26

[FIX] Demo Retail Machine
geoengine_raster_layer: mapbox_type -> mapbox_id
Merged some code from 6.1 branch

97. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-25

[FIX] Made geo_partner installable