[MIG] forward-port changes from 14.0

advanced_translation/README.rst

@@ -40,25 +40,25 @@ Usage
 
 You can go in the Technical Settings/Translations/Advanced Translations
 
--  Enter all terms you want to use
-
--  Use method get of ir.advanced.translation in order to fetch
-   translations
-
--  Make models inherit the class 'translatable.model' so that they can
-   now use these methods:
-
-   -  translate(field_name): Will retrieve the translation of a
-      char/selection field and replaces keywords by advanced
-      translations. Keywords should be placed in brackets.
-   -  get_list: Return comma separated field values (see doc in
-      translatable_model.py)
-   -  get_date(field_name, date_format='date_full'): Returns a date
-      field directly formatted in the format wanted. date_format can be
-      an advanced translation which will return the date format wanted
-      (can change depending on the language), or it can directly be a
-      date format used by Babel package :
-      http://babel.pocoo.org/en/latest/dates.html
+- Enter all terms you want to use
+
+- Use method get of ir.advanced.translation in order to fetch
+  translations
+
+- Make models inherit the class 'translatable.model' so that they can
+  now use these methods:
+
+  - translate(field_name): Will retrieve the translation of a
+    char/selection field and replaces keywords by advanced translations.
+    Keywords should be placed in brackets.
+  - get_list: Return comma separated field values (see doc in
+    translatable_model.py)
+  - get_date(field_name, date_format='date_full'): Returns a date field
+    directly formatted in the format wanted. date_format can be an
+    advanced translation which will return the date format wanted (can
+    change depending on the language), or it can directly be a date
+    format used by Babel package :
+    http://babel.pocoo.org/en/latest/dates.html
 
 Bug Tracker
 ===========
@@ -81,7 +81,7 @@ Authors
 Contributors
 ------------
 
--  Emanuel Cino <ecino@compassion.ch>
+- Emanuel Cino <ecino@compassion.ch>
 
 Maintainers
 -----------

advanced_translation/static/description/index.html

@@ -400,15 +400,15 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <li>Make models inherit the class ‘translatable.model’ so that they can
 now use these methods:<ul>
 <li>translate(field_name): Will retrieve the translation of a
-char/selection field and replaces keywords by advanced
-translations. Keywords should be placed in brackets.</li>
+char/selection field and replaces keywords by advanced translations.
+Keywords should be placed in brackets.</li>
 <li>get_list: Return comma separated field values (see doc in
 translatable_model.py)</li>
-<li>get_date(field_name, date_format=’date_full’): Returns a date
-field directly formatted in the format wanted. date_format can be
-an advanced translation which will return the date format wanted
-(can change depending on the language), or it can directly be a
-date format used by Babel package :
+<li>get_date(field_name, date_format=’date_full’): Returns a date field
+directly formatted in the format wanted. date_format can be an
+advanced translation which will return the date format wanted (can
+change depending on the language), or it can directly be a date
+format used by Babel package :
 <a class="reference external" href="http://babel.pocoo.org/en/latest/dates.html">http://babel.pocoo.org/en/latest/dates.html</a></li>
 </ul>
 </li>

child_compassion/README.rst

@@ -43,18 +43,18 @@ Configuration
 Access rights
 -------------
 
--  Assign the rights to the users so that they can access the new
-   "Sponsorship" menu
+- Assign the rights to the users so that they can access the new
+  "Sponsorship" menu
 
 Configuration menu
 ------------------
 
--  Find the configuration menu in Sponsorship/Configuration (must be
-   given rights)
--  Configure the default hold durations in the menu Global
-   Childpool/Availability Management
--  Assign people to be notified when receiving National Office Disaster
-   Alerts using the menu Communication/Staff Notifications
+- Find the configuration menu in Sponsorship/Configuration (must be
+  given rights)
+- Configure the default hold durations in the menu Global
+  Childpool/Availability Management
+- Assign people to be notified when receiving National Office Disaster
+  Alerts using the menu Communication/Staff Notifications
 
 Odoo.conf file
 --------------
@@ -70,8 +70,8 @@ Demand planning
 You can add in the system settings default values for weekly demand and
 resupply quantities by setting the following keys:
 
--  child_compassion.default_demand
--  child_compassion.default_resupply
+- child_compassion.default_demand
+- child_compassion.default_resupply
 
 Usage
 =====
@@ -84,8 +84,8 @@ Changelog
 14.0.1.4.0
 ----------
 
--  ADD World Bank Data API fields in the Field Offices for fetching
-   country statistics.
+- ADD World Bank Data API fields in the Field Offices for fetching
+  country statistics.
 
 Bug Tracker
 ===========
@@ -108,10 +108,10 @@ Authors
 Contributors
 ------------
 
--  Emanuel Cino <ecino@compassion.ch>
--  Cyril Sester <cyril.sester@outlook.com>
--  Kevin Cristi <kcristi@compassion.ch>
--  David Coninckx <david@coninckx.com>
+- Emanuel Cino <ecino@compassion.ch>
+- Cyril Sester <cyril.sester@outlook.com>
+- Kevin Cristi <kcristi@compassion.ch>
+- David Coninckx <david@coninckx.com>
 
 Maintainers
 -----------

child_compassion/__manifest__.py

@@ -29,7 +29,7 @@
 # pylint: disable=C8101
 {
     "name": "Compassion Children",
-    "version": "17.0.1.0.7",
+    "version": "17.0.1.0.9",
     "category": "Compassion",
     "author": "Compassion CH",
     "license": "AGPL-3",

child_compassion/migrations/17.0.1.0.9/pre-migration.py

@@ -0,0 +1,23 @@
+from openupgradelib import openupgrade
+
+
+def migrate(cr, version):
+    if not openupgrade.column_exists(
+        cr, "compassion_project", "gps_latitude_obfuscated"
+    ):
+        openupgrade.logged_query(
+            cr,
+            """
+            ALTER TABLE compassion_project
+            ADD COLUMN gps_latitude_obfuscated float,
+            ADD COLUMN gps_longitude_obfuscated float;
+            """,
+        )
+        openupgrade.logged_query(
+            cr,
+            """
+    UPDATE compassion_project
+    SET gps_longitude_obfuscated = TRUNC(CAST(gps_longitude AS numeric), 0),
+        gps_latitude_obfuscated = TRUNC(CAST(gps_latitude AS numeric), 0);
+""",
+        )

child_compassion/models/project_compassion.py

@@ -11,6 +11,7 @@
 import logging
 import re
 from datetime import datetime, timedelta
+from random import random
 
 import requests
 
@@ -85,6 +86,12 @@ class CompassionProject(models.Model):
     zip_code = fields.Char(readonly=True)
     gps_latitude = fields.Float(readonly=True)
     gps_longitude = fields.Float(readonly=True)
+    gps_latitude_obfuscated = fields.Float(
+        compute="_compute_gps_obfuscated", store=True
+    )
+    gps_longitude_obfuscated = fields.Float(
+        compute="_compute_gps_obfuscated", store=True
+    )
     google_link = fields.Char(readonly=True, compute="_compute_google_link")
     timezone = fields.Char(readonly=True, compute="_compute_timezone", store=True)
     cluster = fields.Char(readonly=True)
@@ -473,13 +480,26 @@ def _get_months(self):
     @api.depends("lifecycle_ids", "lifecycle_ids.date")
     def _compute_last_lifecycle(self):
         for project in self:
-            last_info = project.lifecycle_ids[:1]
-            reactivation_lifecycle = project.lifecycle_ids.filtered(
+            if not project.lifecycle_ids:
+                project.last_lifecycle_id = False
+                continue
+
+            # Sort lifecycle events by date descending
+            sorted_events = project.lifecycle_ids.sorted(
+                key=lambda r: (str(r.date or ""), r.id), reverse=True
+            )
+            # Take first (newest) event
+            last_info = sorted_events[0]
+
+            reactivation_lifecycle = sorted_events.filtered(
                 lambda r, _last=last_info: r.date == _last.date
                 and r.type == "Reactivation"
-            )[:1]
+            )
+
             # If it exists, lifecycle with type 'Reactivation' is determinant
-            project.last_lifecycle_id = reactivation_lifecycle or last_info
+            project.last_lifecycle_id = (
+                reactivation_lifecycle[0] if reactivation_lifecycle else last_info
+            )
 
     def _search_last_lifecycle_id(self, operator, value):
         return [("lifecycle_ids", operator, value)]
@@ -516,6 +536,45 @@ def _get_materials(self):
             ("Plastic", "Plastic"),
         ]
 
+    @api.depends("gps_latitude", "gps_longitude", "closest_city")
+    def _compute_gps_obfuscated(self):
+        """
+        This method calculates and stores the obfuscated coordinates
+        (latitude and longitude).
+        """
+        api_key = (
+            self.env["ir.config_parameter"].sudo().get_param("google_maps_api_key")
+        )
+        base_url = "https://maps.googleapis.com/maps/api/geocode/json"
+        for project in self:
+            try:
+                parts = [
+                    project.closest_city,
+                    project.state_province,
+                    project.country_id.name,
+                ]
+                address_string = ", ".join(filter(None, parts))
+                params = {"address": address_string, "key": api_key}
+                response = requests.get(base_url, params=params, timeout=3)
+                data = response.json()
+                if data["status"] == "OK":
+                    location = data["results"][0]["geometry"]["location"]
+                    project.gps_latitude_obfuscated = location["lat"]
+                    project.gps_longitude_obfuscated = location["lng"]
+            except Exception:
+                # Fallback to randomized gps coords
+                logging.warning("Request failed", exc_info=True)
+                project.gps_latitude_obfuscated = (
+                    (int(project.gps_latitude) + random())
+                    if project.gps_latitude
+                    else 0
+                )
+                project.gps_longitude_obfuscated = (
+                    (int(project.gps_longitude) + random())
+                    if project.gps_longitude
+                    else 0
+                )
+
     @api.depends("gps_longitude", "gps_latitude")
     def _compute_timezone(self):
         tf = TimezoneFinder()

child_compassion/views/project_compassion_view.xml

@@ -80,7 +80,9 @@
                                 </group>
                                 <group string="Lifecycle">
                                     <field name="lifecycle_ids">
-                                        <tree>
+                                        <tree
+                      default_order="date desc, id desc"
+                    >
                                             <field name="create_date" />
                                             <field name="date" />
                                             <field name="type" />

gift_compassion/data/gift_thresholds.xml

@@ -1,4 +1,4 @@
-<odoo>
+<odoo noupdate="1">
     <!-- Gift Thresholds -->
     <record id="gt-01" model="gift.threshold.settings">
         <field
@@ -47,4 +47,4 @@
         <field name="max_amount">2000</field>
         <field name="currency_id" ref="base.USD" />
     </record>
-</odoo>
+    </odoo>