Merge branch 'dev' into 6372-ExpenseManual-Error

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';

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