diff --git a/client/core/src/components/drop-down/drop-down.js b/client/core/src/components/drop-down/drop-down.js index bfe372b7d..c8b6c2a52 100755 --- a/client/core/src/components/drop-down/drop-down.js +++ b/client/core/src/components/drop-down/drop-down.js @@ -196,7 +196,7 @@ export default class DropDown extends Component { } let where = {}; - where[this.showField] = {regexp: search}; + where[this.showField] = {like: `%${search}%`}; return where; } diff --git a/client/item/routes.json b/client/item/routes.json index a6028871c..7d09314a5 100644 --- a/client/item/routes.json +++ b/client/item/routes.json @@ -54,7 +54,7 @@ "description": "Tax", "icon": "icon-tax" }, - "acl": ["administrative","salesAssistant"] + "acl": ["administrative","buyer"] }, { "url" : "/history", "state": "item.card.history", diff --git a/client/item/src/data/data.html b/client/item/src/data/data.html index 507fdc2b2..d37fc0af1 100644 --- a/client/item/src/data/data.html +++ b/client/item/src/data/data.html @@ -51,6 +51,7 @@ field="$ctrl.item.expenceFk" initial-data="$ctrl.item.expence"> + diff --git a/client/item/src/data/locale/es.yml b/client/item/src/data/locale/es.yml new file mode 100644 index 000000000..8efa03cd6 --- /dev/null +++ b/client/item/src/data/locale/es.yml @@ -0,0 +1 @@ +Reference: Referencia \ No newline at end of file diff --git a/client/locator/routes.json b/client/locator/routes.json index b508fcc5f..0ea240bda 100644 --- a/client/locator/routes.json +++ b/client/locator/routes.json @@ -1,4 +1,4 @@ -{ +/* { "module": "locator", "name": "Locator", "icon": "add_location", @@ -11,4 +11,4 @@ "acl": ["developer"] } ] -} \ No newline at end of file +} */ \ No newline at end of file diff --git a/client/modules.yml b/client/modules.yml index cd51504b1..3ffb57dfc 100644 --- a/client/modules.yml +++ b/client/modules.yml @@ -2,9 +2,9 @@ auth: [] client: [] core: [] item: [] -locator: [] -production: [] +#locator: [] +#production: [] salix: [] -route: [] +#route: [] ticket: [item] order: [] diff --git a/client/production/routes.json b/client/production/routes.json index 159a80144..2df511b28 100644 --- a/client/production/routes.json +++ b/client/production/routes.json @@ -1,4 +1,4 @@ -{ +/* { "module": "production", "name": "Production", "icon": "local_florist", @@ -11,4 +11,4 @@ "acl": ["developer"] } ] -} \ No newline at end of file +} */ \ No newline at end of file diff --git a/client/route/routes.json b/client/route/routes.json index 9e7c48833..907a65b75 100644 --- a/client/route/routes.json +++ b/client/route/routes.json @@ -1,4 +1,4 @@ -{ +/* { "module": "route", "name": "Routes", "icon" : "local_shipping", @@ -65,4 +65,4 @@ } } ] -} \ No newline at end of file +} */ \ No newline at end of file diff --git a/client/ticket/src/data/step-one/step-one.html b/client/ticket/src/data/step-one/step-one.html index 8db25398d..0df72dec2 100644 --- a/client/ticket/src/data/step-one/step-one.html +++ b/client/ticket/src/data/step-one/step-one.html @@ -3,20 +3,21 @@ Basic data + initial-data="$ctrl.ticket.clientFk" + on-change="$ctrl.onChange()"> + value-field="id" + field="$ctrl.ticket.addressFk"> ${components.vnTextfield}`, + thirdCodeInput: `vn-item-barcode vn-horizontal:nth-child(4) > ${components.vnTextfield}`, submitBarcodesButton: `${components.vnSubmit}`, firstCodeRemoveButton: `vn-horizontal:nth-child(2) > ${components.vnIcon}[icon="remove_circle_outline"]` }, diff --git a/services/db/install/changes/1.0.5/12-ACL.sql b/services/db/install/changes/1.0.5/12-ACL.sql new file mode 100644 index 000000000..f3885c01f --- /dev/null +++ b/services/db/install/changes/1.0.5/12-ACL.sql @@ -0,0 +1,5 @@ +UPDATE `salix`.`ACL` SET `accessType`='READ' WHERE `id`='20'; +UPDATE `salix`.`ACL` SET `principalId`='production' WHERE `id`='67'; +INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('78', 'TicketTracking', '*', 'WRITE', 'ALLOW', 'ROLE', 'production'); +INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `permission`, `principalType`, `principalId`) VALUES ('79', 'TicketTracking', 'changeState', 'ALLOW', 'ROLE', 'employe'); + diff --git a/services/loopback/common/methods/item/clone.js b/services/loopback/common/methods/item/clone.js index b0021bb0b..4846a4825 100644 --- a/services/loopback/common/methods/item/clone.js +++ b/services/loopback/common/methods/item/clone.js @@ -37,6 +37,7 @@ module.exports = Self => { delete copy.id; delete copy.itemTag; + delete copy.description; let newItem = await Self.create(copy); let promises = []; diff --git a/services/mailer/package.json b/services/mailer/package.json index 408ce541d..17bd23567 100644 --- a/services/mailer/package.json +++ b/services/mailer/package.json @@ -12,7 +12,8 @@ "nodemailer": "^4.0.1", "path": "^0.12.7", "request": "^2.83.0", - "require-yaml": "0.0.1" + "require-yaml": "0.0.1", + "fs-extra": "^5.0.0" }, "repository": { "type": "git", diff --git a/services/mailer/server/server.js b/services/mailer/server/server.js.bak similarity index 100% rename from services/mailer/server/server.js rename to services/mailer/server/server.js.bak diff --git a/services/print/package.json b/services/print/package.json index d63a8fe34..9d763c113 100644 --- a/services/print/package.json +++ b/services/print/package.json @@ -10,7 +10,9 @@ "inline-css": "^2.2.2", "mustache": "^2.3.0", "mysql": "^2.13.0", - "path": "^0.12.7" + "path": "^0.12.7", + "require-yaml": "0.0.1", + "fs-extra": "^5.0.0" }, "repository": { "type": "git", diff --git a/services/print/server/server.js b/services/print/server/server.js.bak similarity index 100% rename from services/print/server/server.js rename to services/print/server/server.js.bak diff --git a/services/production/server/server.js b/services/production/server/server.js.bak similarity index 100% rename from services/production/server/server.js rename to services/production/server/server.js.bak diff --git a/services/route/server/server.js b/services/route/server/server.js.bak similarity index 100% rename from services/route/server/server.js rename to services/route/server/server.js.bak