2412_testToMaster #2185

Merged
alexm merged 19 commits from 2412_testToMaster into master 2024-03-21 06:00:10 +00:00
3 changed files with 27 additions and 2 deletions
Showing only changes of commit 03e9f167a6 - Show all commits

View File

@ -182,6 +182,27 @@ BEGIN
DELETE FROM travelLog WHERE creationDate < v3Month;
CREATE OR REPLACE TEMPORARY TABLE tTicketDelete
SELECT DISTINCT tl.originFk ticketFk
FROM ticketLog tl
JOIN (
SELECT MAX(tl.id)ids
FROM ticket t
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'
AND t.isDeleted
AND tw.ticketFk IS NULL
GROUP BY t.id
) sub ON sub.ids = tl.id
WHERE tl.creationDate <= vDateShort;
DELETE t
FROM ticket t
JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
DROP TEMPORARY TABLE tTicketDelete;
CALL shelving_clean;
DELETE FROM chat WHERE dated < v5Years;

View File

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

View File

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