Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue

back/methods/dms/deleteTrashFiles.js

@@ -1,3 +1,4 @@
+const UserError = require('vn-loopback/util/user-error');
 const fs = require('fs-extra');
 const path = require('path');
 
@@ -15,7 +16,7 @@ module.exports = Self => {
         }
     });
 
-    Self.deleteTrashFiles = async(options) => {
+    Self.deleteTrashFiles = async options => {
         const tx = await Self.beginTransaction({});
         const myOptions = {};
 
@@ -26,6 +27,9 @@ module.exports = Self => {
             myOptions.transaction = tx;
 
         try {
+            if (process.env.NODE_ENV == 'test')
+                throw new UserError(`Action not allowed on the test environment`);
+
             const models = Self.app.models;
             const DmsContainer = models.DmsContainer;
 
@@ -33,9 +37,15 @@ module.exports = Self => {
                 where: {code: 'trash'}
             }, myOptions);
 
+            const date = new Date();
+            date.setMonth(date.getMonth() - 4);
+
             const dmsToDelete = await models.Dms.find({
                 where: {
-                    dmsTypeFk: trashDmsType.id
+                    and: [
+                        {dmsTypeFk: trashDmsType.id},
+                        {created: {lt: date}}
+                    ]
                 }
             }, myOptions);
 
@@ -43,14 +53,19 @@ module.exports = Self => {
                 const pathHash = DmsContainer.getHash(dms.id);
                 const dmsContainer = await DmsContainer.container(pathHash);
                 const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
+                const dstFolder = path.join(dmsContainer.client.root, pathHash);
                 await fs.unlink(dstFile);
-                await dms.destroy(myOptions);
+                try {
+                    await fs.rmdir(dstFolder);
+                    await dms.destroy(myOptions);
+                } catch (err) {
+                    await dms.destroy(myOptions);
+                }
             }
             if (tx) await tx.commit();
-
         } catch (e) {
             if (tx) await tx.rollback();
-            
+
             throw e;
         }
     };

db/changes/10480-june/00-albaran_gestdoc.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn2008`.`albaran_gestdoc` DROP FOREIGN KEY fk_albaran_gestdoc_gestdoc1;
+ALTER TABLE `vn2008`.`albaran_gestdoc` ADD CONSTRAINT albaran_gestdoc_FK FOREIGN KEY (gestdoc_id) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/dump/structure.sql

@@ -23,6 +23,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `account` /*!40100 DEFAULT CHARACTER SE
 
 USE `account`;
 
+
 --
 -- Table structure for table `account`
 --
@@ -37167,6 +37168,7 @@ CREATE TABLE `ticket` (
   `zoneBonus` decimal(10,2) DEFAULT NULL,
   `totalWithVat` decimal(10,2) DEFAULT NULL COMMENT 'cache calculada del total con iva',
   `totalWithoutVat` decimal(10,2) DEFAULT NULL COMMENT 'cache calculada del total sin iva',
+  `weight` decimal(10,2) DEFAULT NULL COMMENT 'En caso de informar, se utilizará su valor para calcular el peso de la factura',
   PRIMARY KEY (`id`),
   KEY `Id_Cliente` (`clientFk`),
   KEY `Id_Consigna` (`addressFk`),
@@ -37189,7 +37191,7 @@ CREATE TABLE `ticket` (
   CONSTRAINT `ticket_ibfk_9` FOREIGN KEY (`routeFk`) REFERENCES `route` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `tickets_fk11` FOREIGN KEY (`collectionFk__`) REFERENCES `collection` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `tickets_zone_fk` FOREIGN KEY (`zoneFk`) REFERENCES `zone` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3750016 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
@@ -43321,6 +43323,40 @@ BEGIN
 		) t1;
 
 	RETURN totalAmount;
+END ;; 
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP FUNCTION IF EXISTS `invoiceOutAmount` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `invoiceOut_getWeight`(vInvoice VARCHAR(15)) RETURNS decimal(10,2)
+    READS SQL DATA
+BEGIN
+    DECLARE vTotalWeight DECIMAL(10,2);
+
+    SELECT SUM(CAST(IFNULL(i.stems, 1) * s.quantity * 
+        IF(ic.grams, ic.grams, i.density * ic.cm3delivery / 1000) 
+        / 1000 AS DECIMAL(10,2))) 
+            INTO vTotalWeight
+        FROM ticket t
+            JOIN sale s ON s.ticketFk = t.id
+            JOIN item i ON i.id = s.itemFk
+            JOIN itemCost ic ON ic.itemFk = i.id 
+                AND ic.warehouseFk = t.warehouseFk
+        WHERE t.refFk = vInvoice 
+            AND i.intrastatFk ;
+
+    RETURN vTotalWeight;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;

modules/invoiceOut/back/methods/invoiceOut/createPdf.js

@@ -61,7 +61,7 @@ module.exports = Self => {
                 responseType: 'stream',
                 params: {
                     authorization: auth.id,
-                    invoiceId: id
+                    refFk: invoiceOut.ref
                 }
             }).then(async response => {
                 const issued = invoiceOut.issued;

modules/invoiceOut/front/descriptor-menu/index.js

@@ -84,7 +84,7 @@ class Controller extends Section {
     showCsvInvoice() {
         this.vnReport.showCsv('invoice', {
             recipientId: this.invoiceOut.client.id,
-            invoiceId: this.id
+            refFk: this.invoiceOut.ref
         });
     }
 
@@ -95,7 +95,7 @@ class Controller extends Section {
         return this.vnEmail.send('invoice', {
             recipientId: this.invoiceOut.client.id,
             recipient: $data.email,
-            invoiceId: this.id
+            refFk: this.invoiceOut.ref
         });
     }
 
@@ -106,14 +106,14 @@ class Controller extends Section {
         return this.vnEmail.sendCsv('invoice', {
             recipientId: this.invoiceOut.client.id,
             recipient: $data.email,
-            invoiceId: this.id
+            refFk: this.invoiceOut.ref
         });
     }
 
     showExportationLetter() {
         this.vnReport.show('exportation', {
             recipientId: this.invoiceOut.client.id,
-            invoiceId: this.id
+            refFk: this.invoiceOut.ref
         });
     }
 

modules/invoiceOut/front/descriptor-menu/index.spec.js

@@ -6,7 +6,8 @@ describe('vnInvoiceOutDescriptorMenu', () => {
     let $httpParamSerializer;
     const invoiceOut = {
         id: 1,
-        client: {id: 1101}
+        client: {id: 1101},
+        ref: 'T1111111'
     };
 
     beforeEach(ngModule('invoiceOut'));
@@ -40,8 +41,8 @@ describe('vnInvoiceOutDescriptorMenu', () => {
             jest.spyOn(window, 'open').mockReturnThis();
 
             const expectedParams = {
-                invoiceId: invoiceOut.id,
+                recipientId: invoiceOut.client.id,
-                recipientId: invoiceOut.client.id
+                refFk: invoiceOut.ref
             };
             const serializedParams = $httpParamSerializer(expectedParams);
             const expectedPath = `api/csv/invoice/download?${serializedParams}`;
@@ -84,9 +85,9 @@ describe('vnInvoiceOutDescriptorMenu', () => {
 
             const $data = {email: 'brucebanner@gothamcity.com'};
             const expectedParams = {
-                invoiceId: invoiceOut.id,
                 recipient: $data.email,
-                recipientId: invoiceOut.client.id
+                recipientId: invoiceOut.client.id,
+                refFk: invoiceOut.ref
             };
             const serializedParams = $httpParamSerializer(expectedParams);
 
@@ -104,9 +105,9 @@ describe('vnInvoiceOutDescriptorMenu', () => {
 
             const $data = {email: 'brucebanner@gothamcity.com'};
             const expectedParams = {
-                invoiceId: invoiceOut.id,
                 recipient: $data.email,
-                recipientId: invoiceOut.client.id
+                recipientId: invoiceOut.client.id,
+                refFk: invoiceOut.ref
             };
             const serializedParams = $httpParamSerializer(expectedParams);
 

print/methods/closure/closure.js

@@ -31,7 +31,7 @@ module.exports = {
 
                 if (invoiceOut) {
                     const args = Object.assign({
-                        invoiceId: invoiceOut.id,
+                        refFk: invoiceOut.ref,
                         recipientId: ticket.clientFk,
                         recipient: ticket.recipient,
                         replyTo: ticket.salesPersonEmail
@@ -118,7 +118,7 @@ module.exports = {
 
                     await db.rawSql(`
                         INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
-                    `, [ticket.clientFk, sample.id, ticket.companyFk])
+                    `, [ticket.clientFk, sample.id, ticket.companyFk]);
                 }
             } catch (error) {
                 // Domain not found

print/methods/csv/invoice/download.js

@@ -7,13 +7,13 @@ const sqlPath = path.join(__dirname, 'sql');
 module.exports = async function(request, response, next) {
     try {
         const reqArgs = request.query;
-        if (!reqArgs.invoiceId)
+        if (!reqArgs.refFk)
-            throw new Error('The argument invoiceId is required');
+            throw new Error('The argument refFk is required');
 
-        const invoiceId = reqArgs.invoiceId;
+        const refFk = reqArgs.refFk;
-        const sales = await db.rawSqlFromDef(`${sqlPath}/sales`, [invoiceId]);
+        const sales = await db.rawSqlFromDef(`${sqlPath}/sales`, [refFk]);
         const content = toCSV(sales);
-        const fileName = `invoice_${invoiceId}.csv`;
+        const fileName = `invoice_${refFk}.csv`;
 
         response.setHeader('Content-type', 'text/csv');
         response.setHeader('Content-Disposition', `inline; filename="${fileName}"`);

print/methods/csv/invoice/send.js

@@ -8,22 +8,22 @@ const sqlPath = path.join(__dirname, 'sql');
 module.exports = async function(request, response, next) {
     try {
         const reqArgs = request.query;
-        if (!reqArgs.invoiceId)
+        if (!reqArgs.refFk)
-            throw new Error('The argument invoiceId is required');
+            throw new Error('The argument refFk is required');
 
-        const invoiceId = reqArgs.invoiceId;
+        const refFk = reqArgs.refFk;
-        const invoice = await db.findOneFromDef(`${sqlPath}/invoice`, [invoiceId]);
+        const invoice = await db.findOneFromDef(`${sqlPath}/invoice`, [refFk]);
-        const sales = await db.rawSqlFromDef(`${sqlPath}/sales`, [invoiceId]);
+        const sales = await db.rawSqlFromDef(`${sqlPath}/sales`, [refFk]);
 
         const args = Object.assign({
-            invoiceId: (String(invoice.id)),
+            refFk: invoice.refFk,
             recipientId: invoice.clientFk,
             recipient: invoice.recipient,
             replyTo: invoice.salesPersonEmail
         }, response.locals);
 
         const content = toCSV(sales);
-        const fileName = `invoice_${invoiceId}.csv`;
+        const fileName = `invoice_${refFk}.csv`;
         const email = new Email('invoice', args);
         await email.send({
             overrideAttachments: true,

print/methods/csv/invoice/sql/invoice.sql

@@ -6,4 +6,5 @@ SELECT
 FROM invoiceOut io
     JOIN client c ON c.id = io.clientFk
     LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-WHERE io.id = ?
+    LEFT JOIN ticket t ON t.refFk = io.ref
+WHERE t.refFk = ?

print/methods/csv/invoice/sql/sales.sql

@@ -31,5 +31,5 @@ FROM sale s
         AND itc.countryFk = s2.countryFk 
     JOIN taxClass tc ON tc.id = itc.taxClassFk     
     JOIN invoiceOut io ON io.ref = t.refFk 
-WHERE io.id = ?
+WHERE t.refFk = ?
 ORDER BY s.ticketFk, s.created

print/methods/schedule/invoice.js

@@ -38,7 +38,7 @@ module.exports = async function(request, response, next) {
                 connection.query('START TRANSACTION');
 
                 const args = Object.assign({
-                    invoiceId: invoiceOut.id,
+                    refFk: invoiceOut.ref,
                     recipientId: invoiceOut.clientFk,
                     recipient: invoiceOut.recipient,
                     replyTo: invoiceOut.salesPersonEmail

print/templates/email/invoice/invoice.js

@@ -5,11 +5,11 @@ const emailFooter = new Component('email-footer');
 module.exports = {
     name: 'invoice',
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.invoiceId);
+        this.invoice = await this.fetchInvoice(this.refFk);
     },
     methods: {
-        fetchInvoice(invoiceId) {
+        fetchInvoice(refFk) {
-            return this.findOneFromDef('invoice', [invoiceId]);
+            return this.findOneFromDef('invoice', [refFk]);
         },
     },
     components: {
@@ -17,7 +17,7 @@ module.exports = {
         'email-footer': emailFooter.build()
     },
     props: {
-        invoiceId: {
+        refFk: {
             type: [Number, String],
             required: true
         }

print/templates/email/invoice/sql/invoice.sql

@@ -4,4 +4,4 @@ SELECT
 FROM invoiceOut io
     JOIN ticket t ON t.refFk = io.ref
     JOIN client c ON c.id = io.clientFk
-WHERE io.id = ?
+WHERE t.refFk = ?

print/templates/reports/exportation/exportation.js

@@ -5,14 +5,14 @@ const reportFooter = new Component('report-footer');
 module.exports = {
     name: 'exportation',
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.invoiceId);
+        this.invoice = await this.fetchInvoice(this.refFk);
 
         if (!this.invoice)
             throw new Error('Something went wrong');
     },
     methods: {
-        fetchInvoice(invoiceId) {
+        fetchInvoice(refFk) {
-            return this.findOneFromDef('invoice', [invoiceId]);
+            return this.findOneFromDef('invoice', [refFk]);
         }
     },
     computed: {
@@ -27,7 +27,7 @@ module.exports = {
         'report-footer': reportFooter.build()
     },
     props: {
-        invoiceId: {
+        refFk: {
             type: [Number, String],
             required: true
         }

print/templates/reports/exportation/sql/invoice.sql

@@ -3,4 +3,5 @@ SELECT
     io.ref, 
     io.issued
 FROM invoiceOut io
-WHERE io.id = ?
+    LEFT JOIN ticket t ON t.refFk = io.ref
+WHERE t.refFk = ?

print/templates/reports/invoice-incoterms/invoice-incoterms.js

@@ -5,9 +5,9 @@ const reportFooter = new Component('report-footer');
 module.exports = {
     name: 'invoice-incoterms',
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.invoiceId);
+        this.invoice = await this.fetchInvoice(this.refFk);
-        this.client = await this.fetchClient(this.invoiceId);
+        this.client = await this.fetchClient(this.refFk);
-        this.incoterms = await this.fetchIncoterms(this.invoiceId);
+        this.incoterms = await this.fetchIncoterms(this.refFk);
 
         if (!this.invoice)
             throw new Error('Something went wrong');
@@ -16,14 +16,14 @@ module.exports = {
 
     },
     methods: {
-        fetchInvoice(invoiceId) {
+        fetchInvoice(refFk) {
-            return this.findOneFromDef('invoice', [invoiceId]);
+            return this.findOneFromDef('invoice', [refFk]);
         },
-        fetchClient(invoiceId) {
+        fetchClient(refFk) {
-            return this.findOneFromDef('client', [invoiceId]);
+            return this.findOneFromDef('client', [refFk]);
         },
-        fetchIncoterms(invoiceId) {
+        fetchIncoterms(refFk) {
-            return this.findOneFromDef('incoterms', [invoiceId, invoiceId, invoiceId]);
+            return this.findOneFromDef('incoterms', [refFk, refFk, refFk]);
         }
     },
     components: {
@@ -31,7 +31,7 @@ module.exports = {
         'report-footer': reportFooter.build()
     },
     props: {
-        invoiceId: {
+        refFk: {
             type: [Number, String],
             required: true
         }

print/templates/reports/invoice-incoterms/sql/client.sql

@@ -9,4 +9,5 @@ FROM vn.invoiceOut io
     JOIN vn.country cty ON cty.id = c.countryFk
     LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial 
         AND ios.taxAreaFk = 'CEE'
-WHERE io.id =  ?
+    LEFT JOIN ticket t ON t.refFk = io.ref
+WHERE t.refFk = ?

print/templates/reports/invoice-incoterms/sql/incoterms.sql

@@ -51,7 +51,7 @@ SELECT  io.issued,
                         FROM vn.invoiceOut io 
                             JOIN vn.ticket t ON t.refFk = io.ref
                             JOIN vn.saleVolume sv ON sv.ticketFk = t.id 
-                        WHERE io.id = ?
+                        WHERE t.refFk = ?
              ) sub2 ON TRUE  
         JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk AND itc.itemFk = s.itemFk
         JOIN vn.taxClass tc ON tc.id = itc.taxClassFk
@@ -66,6 +66,7 @@ SELECT  io.issued,
                                 JOIN vn.sale s ON t.id = s.ticketFk
                                 JOIN vn.item i ON i.id = s.itemFk   
                                 JOIN vn.intrastat ir ON ir.id = i.intrastatFk 
-							WHERE io.id = ?
+							WHERE t.refFk = ?
                   )sub3 ON TRUE
-	WHERE io.id = ?
+	WHERE t.refFk = ?
+

print/templates/reports/invoice-incoterms/sql/invoice.sql

@@ -14,4 +14,5 @@ FROM invoiceOut io
     JOIN company cny ON cny.id = io.companyFk
     JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk
     LEFT JOIN invoiceOutSerial ios ON ios.code = io.serial
-WHERE io.id =  ?
+    LEFT JOIN ticket t ON t.refFk = io.ref
+WHERE t.refFk = ?

print/templates/reports/invoice/invoice.js

@@ -7,15 +7,15 @@ const invoiceIncoterms = new Report('invoice-incoterms');
 module.exports = {
     name: 'invoice',
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.invoiceId);
+        this.invoice = await this.fetchInvoice(this.refFk);
-        this.client = await this.fetchClient(this.invoiceId);
+        this.client = await this.fetchClient(this.refFk);
-        this.taxes = await this.fetchTaxes(this.invoiceId);
+        this.taxes = await this.fetchTaxes(this.refFk);
-        this.intrastat = await this.fetchIntrastat(this.invoiceId);
+        this.intrastat = await this.fetchIntrastat(this.refFk);
-        this.rectified = await this.fetchRectified(this.invoiceId);
+        this.rectified = await this.fetchRectified(this.refFk);
-        this.hasIncoterms = await this.fetchHasIncoterms(this.invoiceId);
+        this.hasIncoterms = await this.fetchHasIncoterms(this.refFk);
 
-        const tickets = await this.fetchTickets(this.invoiceId);
+        const tickets = await this.fetchTickets(this.refFk);
-        const sales = await this.fetchSales(this.invoiceId);
+        const sales = await this.fetchSales(this.refFk);
 
         const map = new Map();
 
@@ -65,29 +65,29 @@ module.exports = {
         }
     },
     methods: {
-        fetchInvoice(invoiceId) {
+        fetchInvoice(refFk) {
-            return this.findOneFromDef('invoice', [invoiceId]);
+            return this.findOneFromDef('invoice', [refFk]);
         },
-        fetchClient(invoiceId) {
+        fetchClient(refFk) {
-            return this.findOneFromDef('client', [invoiceId]);
+            return this.findOneFromDef('client', [refFk]);
         },
-        fetchTickets(invoiceId) {
+        fetchTickets(refFk) {
-            return this.rawSqlFromDef('tickets', [invoiceId]);
+            return this.rawSqlFromDef('tickets', [refFk]);
         },
-        fetchSales(invoiceId) {
+        fetchSales(refFk) {
-            return this.rawSqlFromDef('sales', [invoiceId, invoiceId]);
+            return this.rawSqlFromDef('sales', [refFk, refFk]);
         },
-        fetchTaxes(invoiceId) {
+        fetchTaxes(refFk) {
-            return this.rawSqlFromDef(`taxes`, [invoiceId]);
+            return this.rawSqlFromDef(`taxes`, [refFk]);
         },
-        fetchIntrastat(invoiceId) {
+        fetchIntrastat(refFk) {
-            return this.rawSqlFromDef(`intrastat`, [invoiceId]);
+            return this.rawSqlFromDef(`intrastat`, [refFk, refFk, refFk]);
         },
-        fetchRectified(invoiceId) {
+        fetchRectified(refFk) {
-            return this.rawSqlFromDef(`rectified`, [invoiceId]);
+            return this.rawSqlFromDef(`rectified`, [refFk]);
         },
-        fetchHasIncoterms(invoiceId) {
+        fetchHasIncoterms(refFk) {
-            return this.findValueFromDef(`hasIncoterms`, [invoiceId]);
+            return this.findValueFromDef(`hasIncoterms`, [refFk]);
         },
         saleImport(sale) {
             const price = sale.quantity * sale.price;
@@ -115,9 +115,8 @@ module.exports = {
         'invoice-incoterms': invoiceIncoterms.build()
     },
     props: {
-        invoiceId: {
+        refFk: {
-            type: [Number, String],
+            type: String
-            required: true
         }
     }
 };

print/templates/reports/invoice/sql/client.sql

@@ -9,4 +9,5 @@ FROM vn.invoiceOut io
     JOIN vn.country cty ON cty.id = c.countryFk
     LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial 
         AND ios.taxAreaFk = 'CEE'
-WHERE io.id =  ?
+    LEFT JOIN vn.ticket t ON t.refFk = io.ref
+WHERE t.refFk = ?

print/templates/reports/invoice/sql/hasIncoterms.sql

@@ -3,6 +3,6 @@ SELECT IF(incotermsFk IS NULL, FALSE, TRUE) AS hasIncoterms
         JOIN invoiceOut io ON io.ref = t.refFk
         JOIN client c ON c.id = t.clientFk  
         JOIN address a ON a.id = t.addressFk  
-    WHERE io.id = ? 
+    WHERE t.refFk = ?
         AND IF(c.hasToinvoiceByAddress = FALSE, c.defaultAddressFk, TRUE)  
     LIMIT 1

print/templates/reports/invoice/sql/intrastat.sql

@@ -1,18 +1,22 @@
-SELECT 
+SELECT   
-        ir.id AS code,
+    ir.id code,
-        ir.description AS description, 
+    ir.description description,
-        CAST(SUM(IFNULL(i.stems,1) * s.quantity) AS DECIMAL(10,2)) as stems,
+    CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
-        CAST(SUM(IF(sv.physicalWeight, sv.physicalWeight, i.density * sub.cm3delivery/1000000)) AS DECIMAL(10,2)) netKg,
+    CAST(SUM(CAST(IFNULL(i.stems, 1) * s.quantity * IF(ic.grams, ic.grams, i.density * ic.cm3delivery / 1000) / 1000 AS DECIMAL(10,2)) * 
-        CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100 )) AS DECIMAL(10,2)) AS subtotal 
+    IF(sub.weight, sub.weight / vn.invoiceOut_getWeight(?), 1)) AS DECIMAL(10,2)) netKg,
-    FROM vn.sale s 
+    CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100 )) AS DECIMAL(10,2)) subtotal    
-        LEFT JOIN (SELECT ic.itemFk, ic.cm3, ic.cm3delivery
+        FROM vn.ticket t
-                        FROM vn.itemCost ic
+            JOIN vn.sale s ON s.ticketFk = t.id
-                        WHERE ic.cm3
+            JOIN vn.item i ON i.id = s.itemFk
-                        GROUP BY ic.itemFk) sub ON s.itemFk = sub.itemFk  
+            JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
-        LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
+            JOIN vn.intrastat ir ON ir.id = i.intrastatFk 
-        LEFT JOIN vn.ticket t ON t.id = s.ticketFk
+            LEFT JOIN (
-        LEFT JOIN vn.invoiceOut io ON io.ref = t.refFk
+                SELECT t2.weight
-        LEFT JOIN vn.item i ON i.id = s.itemFk   
+                    FROM vn.ticket t2 
-        JOIN vn.intrastat ir ON ir.id = i.intrastatFk 
+                    WHERE refFk = ? AND weight
-    WHERE io.id  = ? 
+                    LIMIT 1
-    GROUP BY i.intrastatFk;
+            ) sub ON TRUE
+        WHERE t.refFk = ?
+            AND i.intrastatFk     
+        GROUP BY i.intrastatFk
+        ORDER BY i.intrastatFk; 

print/templates/reports/invoice/sql/invoice.sql

@@ -13,4 +13,5 @@ FROM invoiceOut io
     JOIN company cny ON cny.id = io.companyFk
     JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk
     LEFT JOIN invoiceOutSerial ios ON ios.code = io.serial
-WHERE io.id =  ?
+    LEFT JOIN ticket t ON t.refFk = io.ref
+WHERE t.refFk = ?

print/templates/reports/invoice/sql/rectified.sql

@@ -6,4 +6,5 @@ SELECT
 FROM vn.invoiceCorrection ic
     JOIN vn.invoiceOut io ON io.id = ic.correctedFk
     JOIN vn.invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
-where ic.correctingFk = ?
+    LEFT JOIN ticket t ON t.refFk = io.ref
+WHERE t.refFk = ?

print/templates/reports/invoice/sql/sales.sql

@@ -37,7 +37,7 @@ SELECT
         JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk
             AND itc.itemFk = s.itemFk
         JOIN vn.taxClass tc ON tc.id = itc.taxClassFk
-    WHERE io.id = ?
+    WHERE t.refFk = ?
     UNION ALL	
 SELECT  
         io.ref,
@@ -69,4 +69,4 @@ SELECT
         JOIN vn.company co ON co.id = io.companyFk        
         JOIN vn.supplierAccount sa ON sa.id = co.supplierAccountFk
         JOIN vn.taxClass tc ON tc.id = ts.taxClassFk
-    WHERE io.id = ?
+    WHERE t.refFk = ?

print/templates/reports/invoice/sql/taxes.sql

@@ -6,6 +6,7 @@ SELECT
     FROM invoiceOutTax iot
         JOIN pgc ON pgc.code = iot.pgcFk
         LEFT JOIN pgcEqu pe ON pe.equFk = pgc.code
-            JOIN invoiceOut io ON io.id = iot.invoiceOutFk
+        JOIN invoiceOut io ON io.id = iot.invoiceOutFk
-    WHERE invoiceOutFk = ?
+        LEFT JOIN ticket t ON t.refFk = io.ref
+    WHERE t.refFk = ?
     ORDER BY iot.id

print/templates/reports/invoice/sql/tickets.sql

@@ -4,5 +4,5 @@ SELECT
     t.nickname
 FROM invoiceOut io 
     JOIN ticket t ON t.refFk = io.ref
-WHERE io.id = ?
+WHERE t.refFk = ?
 ORDER BY t.shipped