refs #5525 st and nd

db/changes/235001/00-supplier.sql

@@ -6,4 +6,7 @@ ADD COLUMN `countryFk` mediumint(8) unsigned DEFAULT NULL,
 ADD CONSTRAINT `fk_supplierAccount_country`
     FOREIGN KEY (`countryFk`) REFERENCES `country` (`id`) ON UPDATE CASCADE;
 
+ALTER TABLE `vn`.`supplierAccount`
+ADD UNIQUE KEY `uk_supplier_country` (`supplierFk`, `countryFk`);
+
 

print/templates/email/letter-debtor-nd/letter-debtor-nd.js

@@ -7,27 +7,26 @@ module.exports = {
     name: 'letter-debtor-nd',
     async serverPrefetch() {
         this.debtor = await db.findOne(`
-            SELECT sa.iban,
+        SELECT sa.id,
-                    be.name bankName,
+            sa.iban,
-                    sa.countryFk,
+            be.name bankName,
-                    c.countryFk
+            sa.countryFk,
-                FROM supplierAccount sa
+            c.countryFk
-                    JOIN bankEntity be ON sa.bankEntityFk = be.id
+        FROM supplierAccount sa
-                    LEFT JOIN company co ON co.supplierAccountFk = sa.id
+            JOIN bankEntity be ON sa.bankEntityFk = be.id
-                    LEFT JOIN client c ON c.countryFk = sa.countryFk
+            LEFT JOIN company co ON co.supplierAccountFk = sa.id
-                WHERE c.id = ?
+            JOIN client c ON c.countryFk = sa.countryFk
-                ORDER BY co.id DESC
+        WHERE c.id = ?;
-                LIMIT 1;
         `, [this.id]);
-        if (!this.debtor.length) {
+        if (!this.debtor) {
             this.debtor = await db.findOne(`
                 SELECT sa.iban,
                     be.name bankName
                 FROM supplierAccount sa
                     JOIN bankEntity be ON sa.bankEntityFk = be.id
                     JOIN company co ON co.supplierAccountFk = sa.id
-                WHERE co.code = ?;
+                WHERE co.id = ?;
-        `, [this.companyCode]);
+        `, [this.companyId]);
         }
     },
     data() {

print/templates/email/letter-debtor-nd/locale/en.yml

@@ -6,12 +6,12 @@ sections:
     description: We are writing to you once again to inform you that your debt with our company remains unpaid, as you can verify in the attached statement.
     terms: Since the agreed payment deadlines have significantly passed, there should be no further delay in settling the outstanding amount.
   payMethod:
-    description: To do so, you have the following payment options:
+    description: To do so, you have the following payment options
     options:
     - Online payment through our website.
     - Deposit or transfer to the account number provided at the bottom of this letter, indicating your customer number.
   legalAction:
-    description: If this payment reminder is not heeded, we will be compelled to initiate the necessary legal actions, which may include:
+    description: If this payment reminder is not heeded, we will be compelled to initiate the necessary legal actions, which may include
     options:
     - Inclusion in negative credit and financial solvency records.
     - Legal proceedings.

print/templates/email/letter-debtor-nd/sql/client.sql

@@ -1,10 +1,9 @@
-SELECT
+SELECT c.dueDay,
-    c.dueDay,
+        sa.iban,
-    c.iban,
+        be.name bankName
-    sa.iban,
+    FROM client c
-    be.name AS bankName
+        JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk
-FROM client c
+        JOIN bankEntity be ON be.id = sa.bankEntityFk
-    JOIN company AS cny 
+        JOIN company cny
-      JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk
+    WHERE c.id = ?
-    JOIN bankEntity be ON be.id = sa.bankEntityFk
+        AND cny.id = ?
-WHERE c.id = ? AND cny.id = ?

print/templates/email/letter-debtor-st/letter-debtor-st.js

@@ -7,27 +7,26 @@ module.exports = {
     name: 'letter-debtor-st',
     async serverPrefetch() {
         this.debtor = await db.findOne(`
-            SELECT sa.iban,
+        SELECT sa.id,
-                    be.name bankName,
+            sa.iban,
-                    sa.countryFk,
+            be.name bankName,
-                    c.countryFk
+            sa.countryFk,
-                FROM supplierAccount sa
+            c.countryFk
-                    JOIN bankEntity be ON sa.bankEntityFk = be.id
+        FROM supplierAccount sa
-                    LEFT JOIN company co ON co.supplierAccountFk = sa.id
+            JOIN bankEntity be ON sa.bankEntityFk = be.id
-                    LEFT JOIN client c ON c.countryFk = sa.countryFk
+            LEFT JOIN company co ON co.supplierAccountFk = sa.id
-                WHERE c.id = ?
+            JOIN client c ON c.countryFk = sa.countryFk
-                ORDER BY co.id DESC
+        WHERE c.id = ?;
-                LIMIT 1;
         `, [this.id]);
-        if (!this.debtor.length) {
+        if (!this.debtor) {
             this.debtor = await db.findOne(`
                 SELECT sa.iban,
                     be.name bankName
                 FROM supplierAccount sa
                     JOIN bankEntity be ON sa.bankEntityFk = be.id
                     JOIN company co ON co.supplierAccountFk = sa.id
-                WHERE co.code = ?;
+                WHERE co.id = ?;
-        `, [this.companyCode]);
+        `, [this.companyId]);
         }
     },
     data() {

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

@@ -17,8 +17,6 @@ supplier:
   toCompleteBySupplier: A cumplimentar por el acreedor
   orderReference: Referencia de la orden de domiciliación
   identifier: Identificador del acreedor
-  iban: ES89000B97367486
-  cif: B97367486-000
   name: Nombre del acreedor
   street: Dirección
   location: CP - Población - Provincia

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

@@ -13,8 +13,6 @@ sendOrder: APRÈS SIGNATURA, RENVOYER AU CRÉANCIER ET AU VOTRE ÉTABLISSEMENT F
 supplier:
   toCompleteBySupplier: Á compléter pour le créancier
   orderReference: Numéro de référence du mandat
-  iban: FR7630003012690002801121597
-  cif: B97367486-000
   identifier: Identifiant créancier
   name: Nom du céancier
   street: Adresse