verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
Conversation 0 Commits 490 Files Changed 557 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fded7d062b - Show all commits

4
loopback/locale/en.json
View File

@ -155,5 +155,7 @@
"Warehouse inventory not set": "Almacén inventario no está establecido", "Warehouse inventory not set": "Almacén inventario no está establecido",
"Component cost not set": "Componente coste no está estabecido", "Component cost not set": "Componente coste no está estabecido",
"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2", "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2",
"Description cannot be blank": "Description cannot be blank" "Description cannot be blank": "Description cannot be blank",
"Added observation": "Added observation",
"Comment added to client": "Comment added to client"
} }

2
modules/client/back/methods/defaulter/observationEmail.js
View File

@ -34,7 +34,7 @@ module.exports = Self => {
Object.assign(myOptions, options); Object.assign(myOptions, options);
for (const defaulter of defaulters) { for (const defaulter of defaulters) {
const user = await models.Account.findById(userId, {fields: ['name']}, myOptions); const user = await models.VnUser.findById(userId, {fields: ['name']}, myOptions);
const body = $t('Added observation', { const body = $t('Added observation', {
user: user.name, user: user.name,