diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 7452c6636..ef1b370b5 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -150,10 +150,10 @@ export default class Controller extends Section {
if (value == null || value == '') return null;
switch (prop) {
case 'search':
- const or = [{changedModelId: value}];
- if (!/^[0-9]+$/.test(value))
- or.push({changedModelValue: {like: `%${value}%`}});
- return {or};
+ if (/^[0-9]+$/.test(value))
+ return {changedModelId: value};
+ else
+ return {changedModelValue: {like: `%${value}%`}};
case 'changes':
return {or: [
{oldInstance: {like: `%${value}%`}},
diff --git a/modules/client/back/methods/client/getCard.js b/modules/client/back/methods/client/getCard.js
index 414cbe058..48840b036 100644
--- a/modules/client/back/methods/client/getCard.js
+++ b/modules/client/back/methods/client/getCard.js
@@ -59,6 +59,12 @@ module.exports = function(Self) {
fields: ['id', 'name']
}
},
+ {
+ relation: 'businessType',
+ scope: {
+ fields: ['description']
+ }
+ },
{
relation: 'account',
scope: {
diff --git a/modules/client/back/models/pay-method.json b/modules/client/back/models/pay-method.json
index c83c21e2f..6eeb2b0ee 100644
--- a/modules/client/back/models/pay-method.json
+++ b/modules/client/back/models/pay-method.json
@@ -3,7 +3,7 @@
"base": "VnModel",
"options": {
"mysql": {
- "table": "payMethod"
+ "table": "payMethod"
}
},
"properties": {
diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index 5aaecbdb0..f2dbd64b6 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -43,6 +43,10 @@
{{$ctrl.client.salesPersonUser.name}}
+