Release/v1.3.3

manifest.json.in

@@ -18,7 +18,7 @@
             "push-helper": "ubtms-push-helper.json"
         }
     },
-    "version": "1.3.2",
+    "version": "1.3.3",
     "maintainer": "CIT Services <info@cit-services.eu>",
     "framework" : "@CLICK_FRAMEWORK@"
 }

models/Main.js

@@ -87,12 +87,27 @@ function get_projects_spent_hours(account, startDate, endDate) {
 
         db.transaction(function (tx) {
             var params = [];
-            var conditions = [];
+            var conditions = [
+                "(a.status IS NULL OR a.status != 'deleted')",
+                "a.unit_amount > 0",
+                "(a.project_id IS NOT NULL OR a.sub_project_id IS NOT NULL)"
+            ];
             var query =
-                "SELECT p.name AS entity_name, SUM(a.unit_amount) AS total, s.name AS stage_name " +
+                "SELECT p.name AS entity_name, parent.name AS parent_name, SUM(a.unit_amount) AS total, s.name AS stage_name " +
                 "FROM account_analytic_line_app a " +
-                "LEFT JOIN project_project_app p ON p.odoo_record_id = a.project_id AND p.account_id = a.account_id " +
-                "LEFT JOIN project_project_stage_app s ON s.odoo_record_id = p.stage AND s.account_id = p.account_id ";
+                "JOIN project_project_app p ON (" +
+                "  (p.odoo_record_id = COALESCE(NULLIF(a.sub_project_id, 0), a.project_id) OR " +
+                "   (a.account_id = 0 AND p.id = COALESCE(NULLIF(a.sub_project_id, 0), a.project_id))) " +
+                "  AND p.account_id = a.account_id " +
+                ") " +
+                "LEFT JOIN project_project_app parent ON (" +
+                "  (parent.odoo_record_id = p.parent_id OR (a.account_id = 0 AND parent.id = p.parent_id)) " +
+                "  AND parent.account_id = p.account_id " +
+                ") " +
+                "LEFT JOIN project_project_stage_app s ON (" +
+                "  (s.odoo_record_id = p.stage OR (a.account_id = 0 AND s.id = p.stage)) " +
+                "  AND s.account_id = p.account_id " +
+                ") ";
 
             if (account !== -1 && account !== undefined && account !== null) {
                 conditions.push("a.account_id = ?");
@@ -107,16 +122,13 @@ function get_projects_spent_hours(account, startDate, endDate) {
                 params.push(endDate);
             }
 
-            if (conditions.length > 0) {
-                query += "WHERE " + conditions.join(" AND ") + " ";
-            }
-
-            query += "GROUP BY a.project_id, a.account_id, p.name, s.name ORDER BY total DESC";
+            query += "WHERE " + conditions.join(" AND ") + " ";
+            query += "GROUP BY p.account_id, p.id, p.name, parent.name, s.name ORDER BY total DESC";
 
             var result = tx.executeSql(query, params);
             for (var i = 0; i < result.rows.length; i++) {
                 var row = result.rows.item(i);
-                var name = row.entity_name || "Unknown Project";
+                var name = row.parent_name ? (row.parent_name + " / " + row.entity_name) : (row.entity_name || "Unknown Project");
                 project_details.push({
                     name: name,
                     total: row.total,
@@ -149,11 +161,18 @@ function get_tasks_spent_hours(account, startDate, endDate) {
 
         db.transaction(function (tx) {
             var params = [];
-            var conditions = [];
+            var conditions = [
+                "(a.status IS NULL OR a.status != 'deleted')",
+                "a.unit_amount > 0",
+                "a.task_id IS NOT NULL"
+            ];
             var query =
                 "SELECT t.name AS entity_name, SUM(a.unit_amount) AS total " +
                 "FROM account_analytic_line_app a " +
-                "LEFT JOIN project_task_app t ON t.id = a.task_id ";
+                "JOIN project_task_app t ON (" +
+                "  (t.odoo_record_id = a.task_id OR (a.account_id = 0 AND t.id = a.task_id)) " +
+                "  AND t.account_id = a.account_id " +
+                ") ";
 
             if (account !== -1 && account !== undefined && account !== null) {
                 conditions.push("a.account_id = ?");
@@ -168,10 +187,7 @@ function get_tasks_spent_hours(account, startDate, endDate) {
                 params.push(endDate);
             }
 
-            if (conditions.length > 0) {
-                query += "WHERE " + conditions.join(" AND ") + " ";
-            }
-
+            query += "WHERE " + conditions.join(" AND ") + " ";
             query += "GROUP BY a.task_id, t.name ORDER BY total DESC";
 
             var result = tx.executeSql(query, params);

models/accounts.js

@@ -20,7 +20,11 @@ function getAccountsList() {
 
             for (var i = 0; i < accounts.rows.length; i++) {
                 var row = accounts.rows.item(i);
-                accountsList.push(DBCommon.rowToObject(row));
+                var obj = DBCommon.rowToObject(row);
+                if (obj.id === 0 || obj.name === "Local Account") {
+                    obj.name = "Local";
+                }
+                accountsList.push(obj);
             }
         });
 
@@ -123,6 +127,11 @@ function getDefaultAccountId() {
             var res = tx.executeSql("SELECT id FROM users WHERE is_default = 1 LIMIT 1");
             if (res.rows.length > 0) {
                 defaultId = res.rows.item(0).id;
+            } else {
+                var fallback = tx.executeSql("SELECT id FROM users ORDER BY id ASC LIMIT 1");
+                if (fallback.rows.length > 0) {
+                    defaultId = fallback.rows.item(0).id;
+                }
             }
         });
 
@@ -134,6 +143,37 @@ function getDefaultAccountId() {
 }
 
 
+/**
+ * Retrieves the ID of the default remote account (id > 0), or the first remote account.
+ *
+ * @returns {number} The remote account ID, or -1 if no remote account exists.
+ */
+function getDefaultRemoteAccountId() {
+    var remoteId = -1;
+
+    try {
+        var db = Sql.LocalStorage.openDatabaseSync(DBCommon.NAME, DBCommon.VERSION, DBCommon.DISPLAY_NAME, DBCommon.SIZE);
+
+        db.transaction(function (tx) {
+            var res = tx.executeSql("SELECT id FROM users WHERE is_default = 1 AND id > 0 LIMIT 1");
+            if (res.rows.length > 0) {
+                remoteId = res.rows.item(0).id;
+            } else {
+                var fallback = tx.executeSql("SELECT id FROM users WHERE id > 0 ORDER BY id ASC LIMIT 1");
+                if (fallback.rows.length > 0) {
+                    remoteId = fallback.rows.item(0).id;
+                }
+            }
+        });
+
+    } catch (e) {
+        DBCommon.logException(e);
+    }
+
+    return remoteId;
+}
+
+
 /**
  * Retrieves a list of Odoo users associated with the given account ID.
  *
@@ -159,7 +199,10 @@ function getUsers(accountId) {
 
         db.transaction(function (tx) {
             var result = tx.executeSql(
-                        "SELECT u.id, u.name, COALESCE(NULLIF(u.login, ''), NULLIF(u.email, ''), NULLIF(u.work_email, ''), '') as email, u.odoo_record_id, u.account_id, a.name as account_name FROM res_users_app u LEFT JOIN users a ON u.account_id = a.id WHERE u.account_id = ?",
+                        "SELECT u.id, u.name, COALESCE(NULLIF(u.login, ''), NULLIF(u.email, ''), NULLIF(u.work_email, ''), '') as email, u.odoo_record_id, u.account_id, a.name as account_name " +
+                        "FROM res_users_app u LEFT JOIN users a ON u.account_id = a.id " +
+                        "WHERE u.account_id = ? AND (u.active IS NULL OR u.active = 1) AND u.name IS NOT NULL AND TRIM(u.name) != '' " +
+                        "ORDER BY u.name COLLATE NOCASE ASC",
                         [accountId]
                         );
 
@@ -373,6 +416,10 @@ function updateAccount(accountId, name, link, database, username, selectedConnec
  * @param {number} userId - The `id` of the user to delete.
  */
 function deleteAccountAndRelatedData(userId) {
+    if (userId === 0 || userId === "0") {
+        console.warn("Cannot delete Local Account");
+        return;
+    }
 
     try {
         const db = Sql.LocalStorage.openDatabaseSync(DBCommon.NAME, DBCommon.VERSION, DBCommon.DISPLAY_NAME, DBCommon.SIZE);
@@ -385,23 +432,55 @@ function deleteAccountAndRelatedData(userId) {
                              "account_analytic_line_app",
                              "res_users_app",
                              "mail_activity_type_app",
-                             "mail_activity_app"
+                             "ir_model_app",
+                             "mail_activity_app",
+                             "ir_attachment_app",
+                             "project_task_assignee_app",
+                             "project_update_app",
+                             "project_task_type_app",
+                             "project_project_stage_app",
+                             "attachment_download_app",
+                             "form_drafts",
+                             "notification"
                          ];
 
+            var numericUserId = parseInt(userId, 10);
             for (let i = 0; i < tables.length; i++) {
                 const table = tables[i];
-                DBCommon.log("Deleting data from account " + userId)
-                tx.executeSql(`DELETE FROM ${table} WHERE account_id = ?`, [userId]);
+                DBCommon.log("Deleting data from account " + numericUserId);
+                try {
+                    tx.executeSql(`DELETE FROM ${table} WHERE account_id = ?`, [numericUserId]);
+                } catch (tableErr) {
+                    DBCommon.log("Could not delete from table " + table + ": " + tableErr);
+                }
             }
 
-            DBCommon.log(`Deleting user from users table where id = ${userId}`);
-            tx.executeSql("DELETE FROM users WHERE id = ?", [userId]);
+            DBCommon.log(`Deleting user from users table where id = ${numericUserId}`);
+            tx.executeSql("DELETE FROM users WHERE id = ?", [numericUserId]);
 
-            DBCommon.log(`Account and related data deleted for account_id: ${userId}`);
+            // Ensure a valid default account exists
+            var defaultCheck = tx.executeSql("SELECT id FROM users WHERE is_default = 1 LIMIT 1");
+            if (defaultCheck.rows.length === 0) {
+                var firstAccount = tx.executeSql("SELECT id FROM users ORDER BY id ASC LIMIT 1");
+                if (firstAccount.rows.length > 0) {
+                    tx.executeSql("UPDATE users SET is_default = 1 WHERE id = ?", [firstAccount.rows.item(0).id]);
+                }
+            }
+
+            // Post-deletion sweep across all tables to purge any unlinked records
+            for (let j = 0; j < tables.length; j++) {
+                try {
+                    tx.executeSql(`DELETE FROM ${tables[j]} WHERE account_id NOT IN (SELECT id FROM users)`);
+                } catch (sweepErr) {
+                    // Ignore sweep errors for optional tables
+                }
+            }
+
+            DBCommon.log(`Account and related data deleted for account_id: ${numericUserId}`);
         });
 
     } catch (e) {
-        DBCommon.logException(e);
+        DBCommon.logException("Accounts", e);
     }
 }
 
@@ -414,7 +493,8 @@ function deleteAccountAndRelatedData(userId) {
  * @returns {number|null} The `odoo_record_id` of the matched user, or `null` if not found.
  */
 function getCurrentUserOdooId(accountId) {
-    if (accountId === 0) {
+    var parsedAccountId = (accountId !== undefined && accountId !== null) ? parseInt(accountId) : -1;
+    if (parsedAccountId === 0) {
         return 1; // Local account
     }
     let odooId = null;
@@ -536,6 +616,10 @@ function getAccountName(accountId) {
         return "";
     }
 
+    if (Number(accountId) === 0) {
+        return "Local";
+    }
+
     try {
         var db = Sql.LocalStorage.openDatabaseSync(DBCommon.NAME, DBCommon.VERSION, DBCommon.DISPLAY_NAME, DBCommon.SIZE);
         var name = "";
@@ -547,6 +631,10 @@ function getAccountName(accountId) {
             }
         });
 
+        if (name === "Local Account") {
+            return "Local";
+        }
+
         return name;
     } catch (e) {
         Logger.error("Accounts", "getAccountName failed:", e)
@@ -575,8 +663,8 @@ function getUserNameByOdooId(odoo_record_id) {
         var db = Sql.LocalStorage.openDatabaseSync(DBCommon.NAME, DBCommon.VERSION, DBCommon.DISPLAY_NAME, DBCommon.SIZE);
 
         db.transaction(function (tx) {
-            var query = "SELECT name FROM res_users_app WHERE odoo_record_id = ? LIMIT 1";
-            var result = tx.executeSql(query, [odoo_record_id]);
+            var query = "SELECT name FROM res_users_app WHERE (odoo_record_id = ? OR id = ?) LIMIT 1";
+            var result = tx.executeSql(query, [odoo_record_id, odoo_record_id]);
 
             if (result.rows.length > 0) {
                 userName = result.rows.item(0).name;