diff --git a/db/routines/vn/procedures/clean.sql b/db/routines/vn/procedures/clean.sql
index cf96066e8b..5ffb03f6d9 100644
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@@ -188,11 +188,13 @@ BEGIN
 					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 <= util.VN_CURDATE() - INTERVAL 60 DAY;
+			WHERE tl.creationDate <= v2Months;
 	DELETE t
 		FROM ticket t
 			JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
diff --git a/db/routines/vn/procedures/item_getSimilar.sql b/db/routines/vn/procedures/item_getSimilar.sql
index e87e778192..e8b791d29f 100644
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/db/routines/vn/procedures/item_getSimilar.sql
@@ -19,17 +19,17 @@ BEGIN
 	DECLARE vTypeFk INT;
 	DECLARE vPriority INT DEFAULT 1;
 
-    DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    
-    DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag1 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag5 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag6 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag7 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag8 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+
+	DECLARE vValue1 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue5 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue6 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue7 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue8 VARCHAR(50) COLLATE 'utf8_unicode_ci';
 
 	SELECT typeFk,
 			tag5,
@@ -81,7 +81,8 @@ BEGIN
 			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
 			iss.visible located
 		FROM item i
-			JOIN cache.available a ON a.item_id = i.id
+			STRAIGHT_JOIN cache.available a ON a.item_id = i.id
+				AND a.calc_id = vCalcFk
 			LEFT JOIN itemProposal ip ON ip.mateFk = i.id
 				AND ip.itemFk = vSelf
 			LEFT JOIN itemTag it ON it.itemFk = i.id
@@ -92,8 +93,7 @@ BEGIN
 			LEFT JOIN buy b ON b.id = lb.buy_id
 			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
 				AND iss.warehouseFk = vWarehouseFk
-		WHERE a.calc_id = vCalcFk
-			AND a.available > 0
+		WHERE a.available > 0
 			AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
 			AND i.id <> vSelf
 		ORDER BY `counter` DESC,
diff --git a/modules/supplier/back/methods/supplier/newSupplier.js b/modules/supplier/back/methods/supplier/newSupplier.js
index c40e7214fe..3cca4195ff 100644
--- a/modules/supplier/back/methods/supplier/newSupplier.js
+++ b/modules/supplier/back/methods/supplier/newSupplier.js
@@ -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);
 
diff --git a/modules/supplier/front/descriptor/locale/es.yml b/modules/supplier/front/descriptor/locale/es.yml
index d889a9eee5..cf4a523936 100644
--- a/modules/supplier/front/descriptor/locale/es.yml
+++ b/modules/supplier/front/descriptor/locale/es.yml
@@ -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
\ No newline at end of file
+Create invoiceIn: Crear factura recibida
+Supplier name: Razón social