From 0208b31f449f8a525e2d40c98f4d739f712b26f3 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 24 Jan 2023 09:12:26 +0100 Subject: [PATCH] Naming rollback --- modules/account/back/models/mail-alias-account.json | 6 +++--- modules/account/back/models/mail-forward.json | 6 +++--- modules/account/back/models/user-account.json | 8 ++++---- modules/client/back/models/client-sample.json | 2 +- modules/client/back/models/client.json | 4 ++-- modules/client/back/models/till.json | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/account/back/models/mail-alias-account.json b/modules/account/back/models/mail-alias-account.json index bf159d0e5..416c2acd8 100644 --- a/modules/account/back/models/mail-alias-account.json +++ b/modules/account/back/models/mail-alias-account.json @@ -1,9 +1,9 @@ { - "name": "MailAliasVnUser", + "name": "MailAliasAccount", "base": "VnModel", "options": { "mysql": { - "table": "VnUser.mailAliasVnUser" + "table": "account.mailAliasAccount" } }, "properties": { @@ -21,7 +21,7 @@ "user": { "type": "belongsTo", "model": "VnUser", - "foreignKey": "VnUser" + "foreignKey": "account" } } } diff --git a/modules/account/back/models/mail-forward.json b/modules/account/back/models/mail-forward.json index 621d10964..edef1bf08 100644 --- a/modules/account/back/models/mail-forward.json +++ b/modules/account/back/models/mail-forward.json @@ -3,11 +3,11 @@ "base": "VnModel", "options": { "mysql": { - "table": "VnUser.mailForward" + "table": "account.mailForward" } }, "properties": { - "VnUser": { + "account": { "id": true }, "forwardTo": { @@ -19,7 +19,7 @@ "user": { "type": "belongsTo", "model": "VnUser", - "foreignKey": "VnUser" + "foreignKey": "account" } } } diff --git a/modules/account/back/models/user-account.json b/modules/account/back/models/user-account.json index c7d48e7f6..e6fdad0ef 100644 --- a/modules/account/back/models/user-account.json +++ b/modules/account/back/models/user-account.json @@ -1,9 +1,9 @@ { - "name": "UserVnUser", + "name": "UserAccount", "base": "VnModel", "options": { "mysql": { - "table": "VnUser.VnUser" + "table": "account.account" } }, "properties": { @@ -19,8 +19,8 @@ }, "aliases": { "type": "hasMany", - "model": "MailAliasVnUser", - "foreignKey": "VnUser" + "model": "MailAliasAccount", + "foreignKey": "account" } } } diff --git a/modules/client/back/models/client-sample.json b/modules/client/back/models/client-sample.json index 535cb0592..f260b9369 100644 --- a/modules/client/back/models/client-sample.json +++ b/modules/client/back/models/client-sample.json @@ -37,7 +37,7 @@ "model": "VnUser", "foreignKey": "userFk" }, - "VnUser": { + "account": { "type": "belongsTo", "model": "VnUser", "foreignKey": "userFk" diff --git a/modules/client/back/models/client.json b/modules/client/back/models/client.json index ba304893c..990579b2c 100644 --- a/modules/client/back/models/client.json +++ b/modules/client/back/models/client.json @@ -116,7 +116,7 @@ "isRelevant": { "type": "boolean" }, - "VnUseringVnUser": { + "accountingAccount": { "type": "string" }, "created": { @@ -149,7 +149,7 @@ }, "relations": { - "VnUser": { + "account": { "type": "belongsTo", "model": "VnUser", "foreignKey": "id" diff --git a/modules/client/back/models/till.json b/modules/client/back/models/till.json index 5bd0b614a..4b86e50e2 100644 --- a/modules/client/back/models/till.json +++ b/modules/client/back/models/till.json @@ -16,7 +16,7 @@ "type": "date", "required": true }, - "isVnUserable": { + "isAccountable": { "type": "boolean" }, "serie": {