From 6d5412227a4b6fe8b3b0cf25968afbe87d263fce Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Wed, 24 Jul 2019 12:42:33 +0200 Subject: [PATCH] Changed invoiceOut pdf to hasPdf --- db/changes/10070-coffee/00-invoiceOut.sql | 24 ++++++++ .../10070-coffee/00-invoiceOutAgain.sql | 60 +++++++++++++++++++ db/dump/fixtures.sql | 2 +- .../invoiceOut/back/models/invoiceOut.json | 5 +- 4 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 db/changes/10070-coffee/00-invoiceOut.sql create mode 100644 db/changes/10070-coffee/00-invoiceOutAgain.sql diff --git a/db/changes/10070-coffee/00-invoiceOut.sql b/db/changes/10070-coffee/00-invoiceOut.sql new file mode 100644 index 000000000..83561664e --- /dev/null +++ b/db/changes/10070-coffee/00-invoiceOut.sql @@ -0,0 +1,24 @@ +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`invoiceOut` AS + SELECT + `f`.`factura_id` AS `id`, + `f`.`Id_Factura` AS `ref`, + `f`.`Serie` AS `serial`, + `f`.`Fecha` AS `issued`, + `f`.`Importe` AS `amount`, + `f`.`Id_Cliente` AS `clientFk`, + `f`.`odbc_date` AS `created`, + `f`.`empresa_id` AS `companyFk`, + `f`.`Vencimiento` AS `dued`, + `f`.`booked` AS `booked`, + `f`.`Id_Banco` AS `bankFk`, + `f`.`cplusInvoiceType477Fk` AS `cplusInvoiceType477Fk`, + `f`.`cplusTaxBreakFk` AS `cplusTaxBreakFk`, + `f`.`cplusSubjectOpFk` AS `cplusSubjectOpFk`, + `f`.`cplusTrascendency477Fk` AS `cplusTrascendency477Fk`, + `f`.`pdf` AS `hasPdf` + FROM + `vn2008`.`Facturas` `f`; \ No newline at end of file diff --git a/db/changes/10070-coffee/00-invoiceOutAgain.sql b/db/changes/10070-coffee/00-invoiceOutAgain.sql new file mode 100644 index 000000000..3fb88bf11 --- /dev/null +++ b/db/changes/10070-coffee/00-invoiceOutAgain.sql @@ -0,0 +1,60 @@ +DROP procedure IF EXISTS `vn`.`invoiceOutAgain`; + +DELIMITER $$ +CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`invoiceOutAgain`(IN vInvoiceRef VARCHAR(15), vTaxArea VARCHAR(25)) +BEGIN + +/* Para tickets ya facturados, vuelve a repetir el proceso de facturaciĆ³n. +* +* @param vInvoiceFk Numero de factura +* @param vTaxArea Numero de factura +*/ + + DECLARE vInvoiceFk INT; + DECLARE vCountry INT; + DECLARE vTaxArea VARCHAR(15); + DECLARE vSpainCountryCode INT DEFAULT 1; + + SELECT id INTO vInvoiceFk + FROM invoiceOut + WHERE ref = vInvoiceRef; + + UPDATE invoiceOut + SET hasPdf = 0 + WHERE id = vInvoiceFk; + + SELECT s.countryFk INTO vCountry + FROM supplier s + JOIN invoiceOut io ON io.companyFk = s.id + WHERE io.id = vInvoiceFk; + + DROP TEMPORARY TABLE IF EXISTS ticketToInvoice; + + CREATE TEMPORARY TABLE ticketToInvoice + SELECT id + FROM ticket + WHERE refFk = vInvoiceRef; + + CALL invoiceExpenceMake(vInvoiceFk); + + CALL invoiceTaxMake(vInvoiceFk,vTaxArea); + + UPDATE invoiceOut io + JOIN ( + SELECT SUM(amount) AS total + FROM invoiceOutExpence + WHERE invoiceOutFk = vInvoiceFk + ) base + JOIN ( + SELECT SUM(vat) AS total + FROM invoiceOutTax + WHERE invoiceOutFk = vInvoiceFk + ) vat + SET io.amount = base.total + vat.total + WHERE io.id = vInvoiceFk; + + CALL vn.invoiceOutBooking(vInvoiceFk); + +END$$ + +DELIMITER ; diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 5df5a30f2..023f18dd4 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -381,7 +381,7 @@ INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, (791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30'), (1381, 'ORN', NULL, 30, NULL, 7, NULL); -INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `pdf`) +INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`) VALUES (1, 'T', 1014.24, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 101, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1), (2, 'T', 121.36, CURDATE(), 102, CURDATE(), 442, CURDATE(), CURDATE(), 1, 1), diff --git a/modules/invoiceOut/back/models/invoiceOut.json b/modules/invoiceOut/back/models/invoiceOut.json index 0d8881de2..45c4c2774 100644 --- a/modules/invoiceOut/back/models/invoiceOut.json +++ b/modules/invoiceOut/back/models/invoiceOut.json @@ -35,10 +35,7 @@ "type": "date" }, "hasPdf": { - "type": "Boolean", - "mysql": { - "columnName": "pdf" - } + "type": "Boolean" } }, "relations": {