Merge branch 'dev' into 6372-ExpenseManual-Error

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
Merge pull request 'refs #6922 change order' (!2071 ) from 6922-invoiceOutOrder into dev
2024-02-23 06:03:14 +00:00 · 2024-02-22 14:56:53 +01:00 · 2024-02-22 13:40:46 +00:00 · 2024-02-22 10:16:09 +00:00 · 2024-02-22 10:01:01 +00:00 · 2024-02-22 10:39:34 +01:00
2 changed files with 7 additions and 12 deletions
--- a/db/versions/10835-brownCarnation/00-firstScript.sql
+++ b/db/versions/10835-brownCarnation/00-firstScript.sql
@ -97,10 +97,6 @@ ALTER TABLE IF EXISTS vn2008.Tickets_stack__ COMMENT='refs #6371 deprecated 2024
 ALTER TABLE IF EXISTS vn2008.Tipos_f11 RENAME vn2008.Tipos_f11__;
 ALTER TABLE IF EXISTS vn2008.Tipos_f11__ COMMENT='refs #6371 deprecated 2024-01-11';

-- Para la tabla Tramos
-ALTER TABLE IF EXISTS vn2008.Tramos RENAME vn2008.Tramos__;
-ALTER TABLE IF EXISTS vn2008.Tramos__ COMMENT='refs #6371 deprecated 2024-01-11';
-
 -- Para la tabla accion_dits
 ALTER TABLE IF EXISTS vn2008.accion_dits RENAME vn2008.accion_dits__;
 ALTER TABLE IF EXISTS vn2008.accion_dits__ COMMENT='refs #6371 deprecated 2024-01-11';
@ -161,10 +157,6 @@ ALTER TABLE IF EXISTS vn2008.cyc__ COMMENT='refs #6371 deprecated 2024-01-11';
 ALTER TABLE IF EXISTS vn2008.cyc_declaration RENAME vn2008.cyc_declaration__;
 ALTER TABLE IF EXISTS vn2008.cyc_declaration__ COMMENT='refs #6371 deprecated 2024-01-11';

-- Para la tabla dock
-ALTER TABLE IF EXISTS vn2008.dock RENAME vn2008.dock__;
-ALTER TABLE IF EXISTS vn2008.dock__ COMMENT='refs #6371 deprecated 2024-01-11';
-
 -- Para la tabla edi_testigos
 ALTER TABLE IF EXISTS vn2008.edi_testigos RENAME vn2008.edi_testigos__;
 ALTER TABLE IF EXISTS vn2008.edi_testigos__ COMMENT='refs #6371 deprecated 2024-01-11';
--- a/print/templates/reports/invoice/sql/sales.sql
+++ b/print/templates/reports/invoice/sql/sales.sql
@ -7,7 +7,8 @@ SELECT
        s.discount,
        s.itemFk,
        s.concept,
-		tc.code vatType
+		tc.code vatType,
+		it.isPackaging
 	FROM vn.invoiceOut io
        JOIN vn.ticket t ON t.refFk = io.ref
        JOIN vn.supplier su ON su.id = io.companyFk
@ -34,9 +35,10 @@ SELECT
        ts.quantity,
        ts.price,
        0 discount,
-        '',
-        ts.description concept,
-        tc.code vatType
+        NULL,
+        ts.description,
+        tc.code,
+        NULL
    FROM vn.invoiceOut io
        JOIN vn.ticket t ON t.refFk = io.ref
        JOIN vn.ticketService ts ON ts.ticketFk = t.id
@ -46,3 +48,4 @@ SELECT
        JOIN vn.supplierAccount sa ON sa.id = co.supplierAccountFk
        JOIN vn.taxClass tc ON tc.id = ts.taxClassFk
    WHERE t.refFk = ?
+ORDER BY (isPackaging), concept, itemFk
Author	SHA1	Message	Date
David Domenech	f2b1418419	Merge branch 'dev' into 6372-ExpenseManual-Error gitea/salix/pipeline/pr-dev This commit looks good Details	2024-02-23 06:03:14 +00:00
Alex Moreno	a0593804ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev gitea/salix/pipeline/head There was a failure building this commit Details	2024-02-22 14:56:53 +01:00
Carlos Satorres	4c7d7f2ab7	Merge pull request 'refs #6922 change order' (!2071 ) from 6922-invoiceOutOrder into dev gitea/salix/pipeline/head There was a failure building this commit Details Reviewed-on: #2071 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-22 13:40:46 +00:00
Carlos Andrés	ae58c2219b	Merge branch 'dev' into test gitea/salix/pipeline/pr-dev This commit looks good Details gitea/salix/pipeline/head There was a failure building this commit Details	2024-02-22 10:16:09 +00:00
Carlos Satorres	8a2cff5308	Merge branch 'dev' into 6922-invoiceOutOrder gitea/salix/pipeline/pr-dev This commit looks good Details	2024-02-22 10:01:01 +00:00
Carlos Satorres	b6086e74c1	refs #6922 change order gitea/salix/pipeline/pr-dev This commit looks good Details	2024-02-22 10:39:34 +01:00
Robert Ferrús	1a8044ee82	Merge pull request 'fix: refs #6371 restore tables' (!2068 ) from 6371-restoreTables into test gitea/salix/pipeline/head This commit looks good Details gitea/salix/pipeline/pr-dev This commit looks good Details Reviewed-on: #2068 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-21 17:50:19 +00:00
Robert Ferrús	0a16335eaa	fix: refs #6371 restore tables gitea/salix/pipeline/pr-test This commit looks good Details	2024-02-21 18:48:39 +01:00