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

Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-03-11 12:21:54 +01:00
parent 47c7985233 03e9f167a6
commit a34be6ca02
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/routines/vn/procedures/clean.sql
View File

@ -188,11 +188,13 @@ BEGIN
SELECT MAX(tl.id)ids SELECT MAX(tl.id)ids
FROM ticket t FROM ticket t
JOIN ticketLog tl ON tl.originFk = t.id JOIN ticketLog tl ON tl.originFk = t.id
LEFT JOIN ticketWeekly tw ON tw.ticketFk = t.id
WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31' WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31'
AND t.isDeleted AND t.isDeleted
AND tw.ticketFk IS NULL
GROUP BY t.id GROUP BY t.id
) sub ON sub.ids = tl.id ) sub ON sub.ids = tl.id
WHERE tl.creationDate <= util.VN_CURDATE() - INTERVAL 60 DAY; WHERE tl.creationDate <= v2Months;
DELETE t DELETE t
FROM ticket t FROM ticket t
JOIN tTicketDelete tmp ON tmp.ticketFk = t.id; JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;

5
modules/supplier/back/methods/supplier/newSupplier.js
View File

@ -1,3 +1,5 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => { module.exports = Self => {
Self.remoteMethodCtx('newSupplier', { Self.remoteMethodCtx('newSupplier', {
description: 'Creates a new supplier and returns it', description: 'Creates a new supplier and returns it',
@ -19,12 +21,13 @@ module.exports = Self => {
Self.newSupplier = async(ctx, options) => { Self.newSupplier = async(ctx, options) => {
const models = Self.app.models; const models = Self.app.models;
const args = ctx.args; const args = ctx.args;
const myOptions = {}; const myOptions = {validate: false};
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
delete args.ctx; delete args.ctx;
if (!args.name) throw new UserError('The social name cannot be empty');
const data = {...args, ...{nickname: args.name}}; const data = {...args, ...{nickname: args.name}};
const supplier = await models.Supplier.create(data, myOptions); const supplier = await models.Supplier.create(data, myOptions);

3
modules/supplier/front/descriptor/locale/es.yml
View File

@ -4,4 +4,5 @@ Go to client: Ir al cliente
Verified supplier: Proveedor verificado Verified supplier: Proveedor verificado
Unverified supplier: Proveedor no verificado Unverified supplier: Proveedor no verificado
Inactive supplier: Proveedor inactivo Inactive supplier: Proveedor inactivo
Create invoiceIn: Crear factura recibida Create invoiceIn: Crear factura recibida
Supplier name: Razón social