db/routines/vn/procedures/supplierPackaging_ReportSource.sql

@@ -5,10 +5,10 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`supplierPackaging_R
 )
 BEGIN
 /**
-* Selecciona los embalajes de un proveedor a partir de una fecha
+* Create a report with packaging balance
 *
-* @param vFromDated Fecha de la que partir
+* @param vFromDated Starting date
-* @param vSupplierFk Id del proveedor
+* @param vSupplierFk Supplier ID
 */
 	SET @vBalance = 0;
 	SET @vItemFk = NULL;
@@ -99,6 +99,7 @@ BEGIN
 					WHERE su.id = vSupplierFk
 						AND t.shipped < vFromDated
 						AND p.isPackageReturnable
+						AND NOT t.isDeleted
 					GROUP BY s.itemFk
 				UNION ALL
 				SELECT vSupplierFk,
@@ -138,8 +139,9 @@ BEGIN
 						JOIN client c ON c.id = t.clientFk
 						JOIN supplier su ON su.nif = c.fi
 					WHERE su.id = vSupplierFk
-						AND t.shipped >= vFromDated
+						AND t.shipped < vFromDated
 						AND p.isPackageReturnable
+						AND NOT t.isDeleted
 					GROUP BY p.itemFk
 					ORDER BY itemFk, landed, entryFk
 				) sub

db/versions/11099-greenFern/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.client
+    CHANGE hasIncoterms hasIncoterms__ tinyint(1) DEFAULT 0 NOT NULL
+    COMMENT '@deprecated 2024-06-12 refs #7545 Received incoterms authorization from client';

loopback/locale/en.json

@@ -232,5 +232,6 @@
 	"Incoterms and Customs agent are required for a non UEE member": "Incoterms and Customs agent are required for a non UEE member",
 	"It has been invoiced but the PDF could not be generated": "It has been invoiced but the PDF could not be generated",
 	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated",
-	"Cannot add holidays on this day": "Cannot add holidays on this day"
+	"Cannot add holidays on this day": "Cannot add holidays on this day",
+	"Cannot send mail": "Cannot send mail"
 }

loopback/locale/es.json

@@ -365,5 +365,6 @@
 	"You can only have one PDA": "Solo puedes tener un PDA",
 	"It has been invoiced but the PDF could not be generated": "Se ha facturado pero no se ha podido generar el PDF",
 	"It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono",
-	"Payment method is required": "El método de pago es obligatorio"
+	"Payment method is required": "El método de pago es obligatorio",
+	"Cannot send mail": "Não é possível enviar o email"
 }

loopback/locale/fr.json

@@ -359,5 +359,6 @@
 	"Select ticket or client": "Choisissez un ticket ou un client",
 	"It was not able to create the invoice": "Il n'a pas été possible de créer la facture",
 	"It has been invoiced but the PDF could not be generated": "La facture a été émise mais le PDF n'a pas pu être généré",
-	"It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré"
+	"It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré",
+	"Cannot send mail": "Impossible d'envoyer le mail"
 }

modules/client/back/methods/client/updateFiscalData.js

@@ -96,10 +96,6 @@ module.exports = Self => {
                 arg: 'despiteOfClient',
                 type: 'any'
             },
-            {
-                arg: 'hasIncoterms',
-                type: 'boolean'
-            },
             {
                 arg: 'hasElectronicInvoice',
                 type: 'boolean'

modules/client/back/models/client.json

@@ -97,9 +97,6 @@
 		"hasCoreVnh": {
 			"type": "boolean"
 		},
-		"hasIncoterms": {
-			"type": "boolean"
-		},
 		"isTaxDataChecked":{
 			"type": "boolean"
 		},

modules/client/front/fiscal-data/index.html

@@ -184,11 +184,6 @@
             </vn-check>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-check
-                label="Incoterms authorization"
-                ng-model="$ctrl.client.hasIncoterms"
-                vn-acl="administrative">
-            </vn-check>
             <vn-check
                 label="Electronic invoice"
                 ng-model="$ctrl.client.hasElectronicInvoice"

print/core/email.js

@@ -2,6 +2,7 @@ const path = require('path');
 const smtp = require('./smtp');
 const Component = require('./component');
 const Report = require('./report');
+const UserError = require('vn-loopback/util/user-error');
 
 if (!process.env.OPENSSL_CONF)
     process.env.OPENSSL_CONF = '/etc/ssl/';
@@ -9,7 +10,6 @@ if (!process.env.OPENSSL_CONF)
 class Email extends Component {
     constructor(name, args) {
         super(name);
-
         this.args = args;
     }
 
@@ -88,7 +88,11 @@ class Email extends Component {
             force: options.force
         };
 
+        try {
             return await smtp.send(mailOptions);
+        } catch (error) {
+            throw new UserError('Cannot send mail');
+        }
     }
 }