Skip to content

Commit

Permalink
Merge branch '16.0' into correct-typo
Browse files Browse the repository at this point in the history
  • Loading branch information
wouitmil authored Oct 30, 2024
2 parents 1efeeb1 + 25169bb commit b447c3a
Show file tree
Hide file tree
Showing 47 changed files with 852 additions and 135 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ addon | version | maintainers | summary
[base_geolocalize_company](base_geolocalize_company/) | 16.0.1.0.1 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Add latitude and longitude fields on company model
[geoengine_base_geolocalize](geoengine_base_geolocalize/) | 16.0.1.0.1 | | Geospatial support for base_geolocalize
[geoengine_partner](geoengine_partner/) | 16.0.1.0.1 | | Geospatial support of partners
[web_view_leaflet_map](web_view_leaflet_map/) | 16.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Integrate leaflet.js librairy with odoo and add new 'leaflet_map' view, to display markers.
[web_leaflet_lib](web_leaflet_lib/) | 16.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Bring leaflet.js librairy in odoo.
[web_view_leaflet_map](web_view_leaflet_map/) | 16.0.2.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Add new 'leaflet_map' view, to display markers.
[web_view_leaflet_map_partner](web_view_leaflet_map_partner/) | 16.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | TODO
[website_geoengine](website_geoengine/) | 16.0.1.0.0 | | Geospatial Website
[website_geoengine_store_locator](website_geoengine_store_locator/) | 16.0.1.0.0 | [![Wouitmil](https://github.com/Wouitmil.png?size=30px)](https://github.com/Wouitmil) | Geospatial Website store locator

[//]: # (end addons)

Expand Down
7 changes: 7 additions & 0 deletions base_geoengine/i18n/base_geoengine.pot
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,13 @@ msgstr ""

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_extent
msgid "Default map extent"
msgstr ""

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_zoom
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_zoom
msgid "Default map zoom"
msgstr ""

Expand Down Expand Up @@ -522,6 +524,7 @@ msgstr ""
#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_geoengine_raster_layer__projection
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__projection
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__projection
msgid "Projection"
msgstr ""

Expand Down Expand Up @@ -568,6 +571,7 @@ msgstr ""

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__raster_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__raster_layer_ids
msgid "Raster layers"
msgstr ""

Expand Down Expand Up @@ -628,6 +632,7 @@ msgstr ""

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__restricted_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__restricted_extent
msgid "Restricted map extent"
msgstr ""

Expand Down Expand Up @@ -729,6 +734,7 @@ msgstr ""

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__vector_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__vector_layer_ids
msgid "Vector layers"
msgstr ""

Expand All @@ -751,6 +757,7 @@ msgstr ""

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__type
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__type
msgid "View Type"
msgstr ""

Expand Down
7 changes: 7 additions & 0 deletions base_geoengine/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,13 @@ msgstr "Personalizar"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_extent
msgid "Default map extent"
msgstr "Extensión predeterminada del mapa"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_zoom
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_zoom
msgid "Default map zoom"
msgstr "Zoom predeterminado del mapa"

Expand Down Expand Up @@ -542,6 +544,7 @@ msgstr "Tipo PostGIs"
#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_geoengine_raster_layer__projection
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__projection
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__projection
msgid "Projection"
msgstr "Proyección"

Expand Down Expand Up @@ -588,6 +591,7 @@ msgstr "Tipo de capa rasterizada"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__raster_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__raster_layer_ids
msgid "Raster layers"
msgstr "Capas Ráster"

Expand Down Expand Up @@ -650,6 +654,7 @@ msgstr "Resoluciones"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__restricted_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__restricted_extent
msgid "Restricted map extent"
msgstr "Extensión de mapa restringida"

Expand Down Expand Up @@ -750,6 +755,7 @@ msgstr "Gestión de capas vectoriales"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__vector_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__vector_layer_ids
msgid "Vector layers"
msgstr "Capas vectoriales"

Expand All @@ -772,6 +778,7 @@ msgstr "Gestión de visualización"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__type
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__type
msgid "View Type"
msgstr "Tipo de vista"

Expand Down
7 changes: 7 additions & 0 deletions base_geoengine/i18n/fr_BE.po
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,13 @@ msgstr "Personnalisable"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_extent
msgid "Default map extent"
msgstr "Étendue de la carte par défaut"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_zoom
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_zoom
msgid "Default map zoom"
msgstr "Zoom par défaut de la carte"

Expand Down Expand Up @@ -543,6 +545,7 @@ msgstr "Type PostGIs"
#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_geoengine_raster_layer__projection
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__projection
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__projection
msgid "Projection"
msgstr ""

Expand Down Expand Up @@ -589,6 +592,7 @@ msgstr "Type de couche d'arrière-plan"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__raster_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__raster_layer_ids
msgid "Raster layers"
msgstr "Couches d'arrière-plan"

Expand Down Expand Up @@ -651,6 +655,7 @@ msgstr "Résolutions"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__restricted_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__restricted_extent
msgid "Restricted map extent"
msgstr "Limitation de l'étendue de la carte"

Expand Down Expand Up @@ -752,6 +757,7 @@ msgstr "Gestion des couches vectorielles"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__vector_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__vector_layer_ids
msgid "Vector layers"
msgstr "Couches vectorielles"

Expand All @@ -774,6 +780,7 @@ msgstr "Gestion des vues"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__type
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__type
msgid "View Type"
msgstr "Type de vue"

Expand Down
22 changes: 15 additions & 7 deletions base_geoengine/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,13 @@ msgstr "Personalizzato"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_extent
msgid "Default map extent"
msgstr "Estensione predefinita della mappa"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_zoom
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_zoom
msgid "Default map zoom"
msgstr "Zoom predefinito della mappa"

Expand Down Expand Up @@ -173,7 +175,11 @@ msgstr "Classe colore fine"
#: code:addons/base_geoengine/geo_db.py:0
#, python-format
msgid ""
"Error, can not automatically initialize spatial postgis support. Database user may have to be superuser and postgres/postgis extensions with their devel header have to be installed. If you do not want Odoo to connect with a super user you can manually prepare your database. To do this, open a client to your database using a super user and run:\n"
"Error, can not automatically initialize spatial postgis support. Database "
"user may have to be superuser and postgres/postgis extensions with their "
"devel header have to be installed. If you do not want Odoo to connect with a "
"super user you can manually prepare your database. To do this, open a client "
"to your database using a super user and run:\n"
"CREATE EXTENSION postgis;\n"
"CREATE EXTENSION postgis_topology;\n"
msgstr ""
Expand Down Expand Up @@ -212,8 +218,7 @@ msgstr "Generale"
#. odoo-python
#: code:addons/base_geoengine/fields.py:0
#, python-format
msgid ""
"Geo Value %(geom_type)s must be of the same type %(geo_type)s as fields"
msgid "Geo Value %(geom_type)s must be of the same type %(geo_type)s as fields"
msgstr ""
"Il valore geo %(geom_type)s deve essere dello stesso tipo %(geo_type)s come "
"i campi"
Expand All @@ -239,8 +244,8 @@ msgstr "Campo geo"
#: code:addons/base_geoengine/fields.py:0
#, python-format
msgid ""
"Geo type modification is not implemented. We can not change type %(data)s to"
" %(geo_type)s"
"Geo type modification is not implemented. We can not change type %(data)s to "
"%(geo_type)s"
msgstr ""
"La modifica del tipo geo non è implementata. Non si può cambiare il tipo "
"%(data)s a %(geo_type)s"
Expand Down Expand Up @@ -539,6 +544,7 @@ msgstr "Tipo PostGIs"
#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_geoengine_raster_layer__projection
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__projection
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__projection
msgid "Projection"
msgstr "Proiezione"

Expand Down Expand Up @@ -585,6 +591,7 @@ msgstr "Tipo livello raster"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__raster_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__raster_layer_ids
msgid "Raster layers"
msgstr "Livelli raster"

Expand Down Expand Up @@ -647,6 +654,7 @@ msgstr "Risoluzione"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__restricted_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__restricted_extent
msgid "Restricted map extent"
msgstr "Estensione ristretta della mappa"

Expand All @@ -660,8 +668,6 @@ msgstr "Salva"
#. module: base_geoengine
#. odoo-javascript
#: code:addons/base_geoengine/static/src/js/views/geoengine/records_panel/search_bar_records/search_bar_records.xml:0
#: code:addons/base_geoengine/static/src/js/views/geoengine/records_panel/search_bar_records/search_bar_records.xml:0
#: code:addons/base_geoengine/static/src/js/views/geoengine/records_panel/search_bar_records/search_bar_records.xml:0
#, python-format
msgid "Search..."
msgstr "Cerca..."
Expand Down Expand Up @@ -749,6 +755,7 @@ msgstr "Gestione livello vettoriale"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__vector_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__vector_layer_ids
msgid "Vector layers"
msgstr "Livelli vettoriali"

Expand All @@ -771,6 +778,7 @@ msgstr "Gestione vista"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__type
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__type
msgid "View Type"
msgstr "Tipo vista"

Expand Down
25 changes: 17 additions & 8 deletions base_geoengine/i18n/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,13 @@ msgstr "Anpassad"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_extent
msgid "Default map extent"
msgstr "Standard kartomfattning"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__default_zoom
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__default_zoom
msgid "Default map zoom"
msgstr "Standard kartzoom"

Expand Down Expand Up @@ -173,7 +175,11 @@ msgstr "Avsluta färgklass"
#: code:addons/base_geoengine/geo_db.py:0
#, python-format
msgid ""
"Error, can not automatically initialize spatial postgis support. Database user may have to be superuser and postgres/postgis extensions with their devel header have to be installed. If you do not want Odoo to connect with a super user you can manually prepare your database. To do this, open a client to your database using a super user and run:\n"
"Error, can not automatically initialize spatial postgis support. Database "
"user may have to be superuser and postgres/postgis extensions with their "
"devel header have to be installed. If you do not want Odoo to connect with a "
"super user you can manually prepare your database. To do this, open a client "
"to your database using a super user and run:\n"
"CREATE EXTENSION postgis;\n"
"CREATE EXTENSION postgis_topology;\n"
msgstr ""
Expand Down Expand Up @@ -211,8 +217,7 @@ msgstr "Generell"
#. odoo-python
#: code:addons/base_geoengine/fields.py:0
#, python-format
msgid ""
"Geo Value %(geom_type)s must be of the same type %(geo_type)s as fields"
msgid "Geo Value %(geom_type)s must be of the same type %(geo_type)s as fields"
msgstr "Geovärde %(geom_type)s måste vara av samma typ %(geo_type)s som fält"

#. module: base_geoengine
Expand All @@ -236,8 +241,8 @@ msgstr "Geofält"
#: code:addons/base_geoengine/fields.py:0
#, python-format
msgid ""
"Geo type modification is not implemented. We can not change type %(data)s to"
" %(geo_type)s"
"Geo type modification is not implemented. We can not change type %(data)s to "
"%(geo_type)s"
msgstr ""
"Ändring av geotyp är inte implementerad. Vi kan inte ändra typ %(data)s till "
"%(geo_type)s"
Expand Down Expand Up @@ -536,6 +541,7 @@ msgstr "PostGIs typ"
#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_geoengine_raster_layer__projection
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__projection
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__projection
msgid "Projection"
msgstr "Projektion"

Expand Down Expand Up @@ -582,6 +588,7 @@ msgstr "Rasterlagertyp"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__raster_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__raster_layer_ids
msgid "Raster layers"
msgstr "Rasterlager"

Expand Down Expand Up @@ -644,6 +651,7 @@ msgstr "Upplösningar"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__restricted_extent
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__restricted_extent
msgid "Restricted map extent"
msgstr "Begränsad kartutsträckning"

Expand All @@ -657,8 +665,6 @@ msgstr "Spara"
#. module: base_geoengine
#. odoo-javascript
#: code:addons/base_geoengine/static/src/js/views/geoengine/records_panel/search_bar_records/search_bar_records.xml:0
#: code:addons/base_geoengine/static/src/js/views/geoengine/records_panel/search_bar_records/search_bar_records.xml:0
#: code:addons/base_geoengine/static/src/js/views/geoengine/records_panel/search_bar_records/search_bar_records.xml:0
#, python-format
msgid "Search..."
msgstr "Sök..."
Expand Down Expand Up @@ -746,6 +752,7 @@ msgstr "Vektor lagerhantering"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__vector_layer_ids
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__vector_layer_ids
msgid "Vector layers"
msgstr "Vektor lager"

Expand All @@ -768,6 +775,7 @@ msgstr "Visningshanterare"

#. module: base_geoengine
#: model:ir.model.fields,field_description:base_geoengine.field_ir_ui_view__type
#: model:ir.model.fields,field_description:base_geoengine.field_website_page__type
msgid "View Type"
msgstr "Vytyp"

Expand Down Expand Up @@ -930,7 +938,8 @@ msgstr "geo_polygon"
#: code:addons/base_geoengine/models/base.py:0
#, python-format
msgid "geo_search is deprecated: uses search method defined on base model"
msgstr "geo_search är föråldrad: använder sökmetod som definieras i basmodellen"
msgstr ""
"geo_search är föråldrad: använder sökmetod som definieras i basmodellen"

#. module: base_geoengine
#. odoo-javascript
Expand Down
2 changes: 1 addition & 1 deletion setup/_metapackage/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.0.20231211.0
16.0.20241030.0
3 changes: 3 additions & 0 deletions setup/_metapackage/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
'odoo-addon-base_geolocalize_company>=16.0dev,<16.1dev',
'odoo-addon-geoengine_base_geolocalize>=16.0dev,<16.1dev',
'odoo-addon-geoengine_partner>=16.0dev,<16.1dev',
'odoo-addon-web_leaflet_lib>=16.0dev,<16.1dev',
'odoo-addon-web_view_leaflet_map>=16.0dev,<16.1dev',
'odoo-addon-web_view_leaflet_map_partner>=16.0dev,<16.1dev',
'odoo-addon-website_geoengine>=16.0dev,<16.1dev',
'odoo-addon-website_geoengine_store_locator>=16.0dev,<16.1dev',
],
classifiers=[
'Programming Language :: Python',
Expand Down
1 change: 1 addition & 0 deletions setup/web_leaflet_lib/odoo/addons/web_leaflet_lib
Loading

0 comments on commit b447c3a

Please sign in to comment.