Merge branch 'master' into test

db/routines/vn/procedures/expeditionPallet_build.sql

@@ -1,5 +1,10 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionPallet_build`(IN vExpeditions JSON, IN vArcId INT, IN vWorkerFk INT, OUT vPalletFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionPallet_build`(
+	vExpeditions JSON,
+	vArcId INT,
+	vWorkerFk INT,
+	OUT vPalletFk INT
+)
 BEGIN
 /** Construye un pallet de expediciones.
  *
@@ -7,28 +12,22 @@ BEGIN
  * en cuyo caso actualiza ese pallet.
  *
  * @param vExpeditions JSON_ARRAY con esta estructura [exp1, exp2, exp3, ...]
- * @param vArcId INT Identificador de vn.arcRead
+ * @param vArcId INT Identificador de arcRead
- * @param vWorkerFk INT Identificador de vn.worker
+ * @param vWorkerFk INT Identificador de worker
- * @param out vPalletFk Identificador de vn.expeditionPallet
+ * @param out vPalletFk Identificador de expeditionPallet
  */
 	DECLARE vCounter INT;
 	DECLARE vExpeditionFk INT;
 	DECLARE vTruckFk INT;
 	DECLARE vPrinterFk INT;
+	DECLARE vExpeditionStateTypeFk INT;
 
-	DROP TEMPORARY TABLE IF EXISTS tExpedition;
+	CREATE OR REPLACE TEMPORARY TABLE tExpedition (
-	CREATE TEMPORARY TABLE tExpedition
+		expeditionFk INT,
-		SELECT
+		routeFk INT,
-			e.id expeditionFk,
+		palletFk INT,
-			r.id routeFk,
+		PRIMARY KEY (expeditionFk)
-			ep.id palletFk
+	);
-			FROM
-				vn.expedition e,
-				vn.route r,
-				vn.expeditionPallet ep
-			LIMIT 0;
-
-	ALTER TABLE tExpedition ADD PRIMARY KEY (expeditionFk);
 
 	SET vCounter = JSON_LENGTH(vExpeditions);
 
@@ -39,9 +38,9 @@ BEGIN
 
 		INSERT IGNORE INTO tExpedition(expeditionFk, routeFk, palletFk)
 			SELECT vExpeditionFk, t.routeFk, es.palletFk
-				FROM vn.expedition e
+				FROM expedition e
-					LEFT JOIN vn.ticket t ON t.id = e.ticketFk
+					LEFT JOIN ticket t ON t.id = e.ticketFk
-					LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id
+					LEFT JOIN expeditionScan es ON es.expeditionFk = e.id
 				WHERE e.id = vExpeditionFk;
 	END WHILE;
 
@@ -52,40 +51,45 @@ BEGIN
 					WHERE palletFk > 0
 				GROUP BY palletFk
 				ORDER BY n DESC
-					LIMIT 100 ) sub
+				LIMIT 100 
+		) sub
 		LIMIT 1;
 
 	IF vPalletFk IS NULL THEN
-		SELECT roadmapStopFk
+		SELECT roadmapStopFk INTO vTruckFk
-			INTO vTruckFk
 			FROM (
 				SELECT rm.roadmapStopFk, count(*) n
-						FROM vn.routesMonitor rm
+					FROM routesMonitor rm
 						JOIN tExpedition e ON e.routeFk = rm.routeFk
 					GROUP BY roadmapStopFk
 					ORDER BY n DESC
-						LIMIT 1) sub;
+					LIMIT 1
+			) sub;
 
 		IF vTruckFk IS NULL THEN
 				CALL util.throw ('TRUCK_NOT_AVAILABLE');
 		END IF;
 
-		INSERT INTO vn.expeditionPallet(truckFk)
+		INSERT INTO expeditionPallet SET truckFk = vTruckFk;
-			VALUES(vTruckFk);
 
 		SET vPalletFk = LAST_INSERT_ID();
 	END IF;
 
-	INSERT INTO vn.expeditionScan(expeditionFk, palletFk, workerFk)
+	INSERT INTO expeditionScan(expeditionFk, palletFk, workerFk)
 		SELECT expeditionFk, vPalletFk, vWorkerFk
 			FROM tExpedition
 			ON DUPLICATE KEY UPDATE palletFk = vPalletFk, workerFk = vWorkerFk;
 
-	SELECT printerFk INTO vPrinterFk
+	SELECT id INTO vExpeditionStateTypeFk
-		FROM vn.arcRead
+		FROM expeditionStateType
-			WHERE id = vArcId;
+		WHERE code = 'PALLETIZED';
 
-	CALL vn.report_print(
+	INSERT INTO expeditionState(expeditionFk, typeFk)
+		SELECT expeditionFk, vExpeditionStateTypeFk FROM tExpedition;
+
+	SELECT printerFk INTO vPrinterFk FROM arcRead WHERE id = vArcId;
+
+	CALL report_print(
 		'LabelPalletExpedition',
 		vPrinterFk,
 		account.myUser_getId(),
@@ -93,7 +97,7 @@ BEGIN
 		'high'
 	);
 
-	UPDATE vn.expeditionPallet SET isPrint = TRUE WHERE id = vPalletFk;
+	UPDATE expeditionPallet SET isPrint = TRUE WHERE id = vPalletFk;
 
 	DROP TEMPORARY TABLE tExpedition;
 END$$

db/versions/11118-limeCymbidium/00-firstScript.sql

@@ -16,6 +16,4 @@ INSERT IGNORE INTO account.roleInherit (`role`,`inheritsFrom`)
 
 UPDATE salix.ACL
 	SET principalId='$authenticated'
-	WHERE id=264;
+	WHERE id=(SELECT id FROM salix.ACL WHERE model='StarredModule' and property='*' and `accessType`='*');
-
-

modules/entry/back/methods/entry/getBuys.js

@@ -1,5 +1,4 @@
 const UserError = require('vn-loopback/util/user-error');
-
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
 
 module.exports = Self => {

print/templates/email/sepa-core/locale/en.yml

@@ -0,0 +1,16 @@
+subject: Bank Direct Debit Request
+title: SEPA CORE Direct Debit
+description:
+  dear: Dear Customer
+  instructions: <p>Given the excellent relationship between our two companies 
+    and to facilitate the payment processes of our invoices, we suggest the use
+    of the SEPA CORE direct debit system.</p>
+    <p>This service involves issuing our receipts to your company in an automated 
+    and electronic manner, which represents a substantial reduction in costs for you 
+    in terms of fees and bank charges.</p>
+    <p>If you accept our proposal, on the due date of each payment, it will be automatically 
+    debited from your account through your bank.</p>
+    <p>This system is based on the electronic transmission of data; the handling of 
+    physical documents has been eliminated.</p>
+    <p>We appreciate your cooperation,</p>
+  conclusion: Thank you for your attention!

print/templates/email/sepa-core/locale/es.yml

@@ -9,9 +9,7 @@ description:
     forma automatizada y electrónicamente, lo que supone para usted una reducción 
     sustancial de costos en términos de honorarios y gastos bancarios.</p>
     <p>En caso de que acepte nuestra propuesta, a la fecha de vencimiento de cada efecto, 
-    se debitará a su cuenta automáticamente a través de su entidad bancaria. 
+    se debitará a su cuenta automáticamente a través de su entidad bancaria.</p>
-    Por tanto, le pedimos que firme y envíe a su banco la autorización original adjunta, 
-    debidamente cumplimentada, y nos devuelva una fotocopia de dicha autorización.</p>
     <p>Este sistema se basa en la transmisión electrónica de datos; 
     el manejo de documentos físicos ha sido eliminado.</p>
     <p>Le agradecemos su cooperación,</p>

print/templates/email/sepa-core/locale/fr.yml

@@ -14,11 +14,7 @@ description:
     et commissions bancaires.</p>
     <p>Dans le cas où vous accepteriez notre proposition, à
     l’échéance de chaque effet, votre compte sera débité
-    automatiquement par votre Banque.
+    automatiquement par votre Banque.</p>
-    Ainsi, nous vous demandons de signer et envoyer à votre
-    Banque l'original de l'autorisation pour débit en annexe,
-    dûment remplie, et de nous retourner une photocopie de la
-    dite autorisation.</p>
     <p>Ce système étant basé sur la transmission de données de
     manière électronique, le maniement de documents
     physiques á été éliminé</p>

print/templates/reports/sepa-core/locale/en.yml

@@ -0,0 +1,46 @@
+reportName: direct-debit-order
+title: SEPA CORE Direct Debit Order
+description: By signing this direct debit order, the debtor authorizes (A) the creditor 
+  to send instructions to the debtor's bank to debit their account and (B) the bank to debit 
+  their account according to the creditor's instructions. As part of their rights, 
+  the debtor is entitled to a refund by their bank under the terms and conditions 
+  of the contract signed with the bank. The refund request must be made within 
+  eight weeks of the debit. You can obtain additional information about your rights 
+  from your financial institution.
+documentCopy: You must take a signed copy of this document to your Bank for registration to avoid returns.
+mandatoryFields: ALL FIELDS MUST BE COMPLETED.
+sendOrder:  ONCE THIS DIRECT DEBIT ORDER IS SIGNED, IT MUST BE SENT TO THE CREDITOR 
+  FOR SAFEGUARDING AND IT IS RECOMMENDED TO PROVIDE A COPY TO YOUR BANK.
+supplier:
+  toCompleteBySupplier: To be completed by the creditor
+  orderReference: Direct debit order reference
+  identifier: Creditor identifier
+  name: Creditor's name
+  street: Address
+  location: Postal Code - City - Province
+  country: Country
+client:
+  toCompleteByClient: To be completed by the debtor
+  name: Debtor's name(s)
+  fiscalId: NIF
+  street: Debtor's address
+  location: Postal Code - City - Province
+  country: Debtor's country
+  swift: Swift BIC
+  accountNumber: IBAN
+  accountHolder: "(Account holder(s))"
+  accountNumberFormat: In {0}, the IBAN consists of {1} characters always starting with {2}
+  paymentType: Payment type
+  recurrent: Recurrent
+  unique: Unique
+  signLocation: Date - City
+  sign: Debtor's signature and stamp
+order: Direct Debit Order {0}
+Francia: France
+España: Spain
+Portugal: Portugal
+instructions:
+  title: Instructions
+  accountFields: Fill in the fields related to the bank account
+  signDocument: Sign and stamp the document. For it to be valid, the stamp must show the CIF/NIF. If not, the request must be accompanied by an account ownership certificate.
+  thanks: Thank you for your cooperation!

print/templates/reports/sepa-core/sepa-core.js

@@ -1,13 +1,12 @@
 const vnReport = require('../../../core/mixins/vn-report.js');
-const db = require('../../../core/database');
 
 module.exports = {
     name: 'sepa-core',
     mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.findOneFromDef('client', [this.companyId, this.companyId, this.id]);
+        this.client = await this.findOneFromDef('client', [this.id]);
         this.checkMainEntity(this.client);
-        const suppliers = await this.rawSqlFromDef('supplier', [this.companyId, this.companyId, this.id]);
+        const suppliers = await this.rawSqlFromDef('supplier', [this.companyId, this.id]);
         this.supplier = {
             ...suppliers[0],
             accountDetailValue: suppliers.map(val => val?.accountDetailValue)
@@ -23,16 +22,5 @@ module.exports = {
             type: Number,
             required: true
         }
-    },
-    methods: {
-        getSupplierCif() {
-            return db.findOne(`
-            SELECT DISTINCT ad.value
-                FROM supplierAccount sa
-                    JOIN accountDetail ad ON ad.supplierAccountFk = sa.id
-                    JOIN accountDetailType adt ON adt.id = ad.accountDetailTypeFk AND adt.id = 3
-                WHERE sa.supplierFk = ?`) [this.companyId];
     }
-    }
-
 };

print/templates/reports/sepa-core/sql/client.sql

@@ -1,19 +1,14 @@
-SELECT
+SELECT c.id,
-        c.id,
-        m.code mandateCode,
         c.socialName,
         c.street,
         c.postcode,
         c.city,
         c.fi,
-        p.name AS province,
+        p.name province,
         ct.name country,
-        ct.code AS countryCode,
+        ct.code countryCode,
-        ct.ibanLength AS ibanLength
+        ct.ibanLength ibanLength
     FROM client c
         JOIN country ct ON ct.id = c.countryFk
-    LEFT JOIN mandate m ON m.clientFk = c.id 
+        JOIN province p ON p.id = c.provinceFk
-        AND m.companyFk = ? AND m.finished IS NULL
+    WHERE c.id = ?
-    LEFT JOIN province p ON p.id = c.provinceFk
-WHERE (m.companyFk = ? OR m.companyFk IS NULL) AND c.id = ?
-ORDER BY m.created DESC LIMIT 1

print/templates/reports/sepa-core/sql/supplier.sql

@@ -1,29 +1,24 @@
-SELECT
+SELECT m.code mandateCode,
-    m.code mandateCode,
         s.name,
         s.street,
         sc.name country,
         s.postCode,
         s.city,
         sp.name province,
-    s.nif,
-    sa.supplierFk,
-    be.name bankName,
         ad.value accountDetailValue
-FROM
+    FROM client c
-    client c
+        JOIN mandate m ON m.clientFk = c.id 
-    LEFT JOIN mandate m ON m.clientFk = c.id AND m.companyFk = ? AND m.finished IS NULL
+        JOIN mandateType mt ON mt.id = m.mandateTypeFk 
-    LEFT JOIN supplier s ON s.id = m.companyFk
+        JOIN supplier s ON s.id = m.companyFk
         LEFT JOIN country sc ON sc.id = s.countryFk
         LEFT JOIN province sp ON sp.id = s.provinceFk
-    LEFT JOIN province p ON p.id = c.provinceFk
+        JOIN supplierAccount sa ON sa.supplierFk = s.id
-    LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
+        JOIN accountDetail ad ON ad.supplierAccountFk = sa.id
-    LEFT JOIN bankEntity be ON sa.bankEntityFk = be.id
+        JOIN accountDetailType adt ON adt.id = ad.accountDetailTypeFk
-    LEFT JOIN accountDetail ad ON ad.supplierAccountFk = sa.id
+    WHERE m.companyFk = ?
-    JOIN accountDetailType adt ON adt.id = ad.accountDetailTypeFk AND adt.id = 3
+        AND m.finished IS NULL
-WHERE
+        AND c.id = ?
-    (m.companyFk = ? OR m.companyFk IS NULL)
+        AND mt.name = 'CORE'
-    AND (c.id = ? OR (c.id IS NULL AND c.countryFk = sa.countryFk))
+        AND adt.description = 'Referencia Remesas'
-GROUP BY ad.value
+    GROUP BY m.id, ad.value
-ORDER BY
+    ORDER BY m.created DESC
-m.created DESC;