0048175: Paid receipt / Full Invoice taxes printed in the wrong order

diff --git a/src/org/openbravo/retail/posterminal/Invoices.java b/src/org/openbravo/retail/posterminal/Invoices.java
index 3f1a62180..4ae3ca423 100644
--- a/src/org/openbravo/retail/posterminal/Invoices.java
+++ b/src/org/openbravo/retail/posterminal/Invoices.java
@@ -301,8 +301,9 @@ public class Invoices extends JSONProcessSimple {
         // TODO: make this extensible
         String hqlReceiptTaxes = "select invoiceTax.tax.id as taxId, invoiceTax.tax.rate as rate, "
             + "invoiceTax.taxableAmount as taxableamount, invoiceTax.taxAmount as taxamount, invoiceTax.tax.name as name, "
-            + "invoiceTax.tax.cascade as cascade, invoiceTax.tax.docTaxAmount as docTaxAmount, invoiceTax.tax.lineNo as lineNo, invoiceTax.tax.taxBase.id as taxBase "
-            + "from InvoiceTax as invoiceTax where invoiceTax.invoice.id=:invoiceId";
+            + "invoiceTax.tax.cascade as cascade, invoiceTax.tax.docTaxAmount as docTaxAmount, invoiceTax.lineNo as lineNo, invoiceTax.tax.taxBase.id as taxBase "
+            + "from InvoiceTax as invoiceTax where invoiceTax.invoice.id=:invoiceId "
+            + "order by invoiceTax.lineNo ";
         @SuppressWarnings("rawtypes")
         Query ReceiptTaxesQuery = OBDal.getInstance().getSession().createQuery(hqlReceiptTaxes);
         ReceiptTaxesQuery.setParameter("invoiceId", invoiceid);
diff --git a/src/org/openbravo/retail/posterminal/PaidReceipts.java b/src/org/openbravo/retail/posterminal/PaidReceipts.java
index 5c988a481..c7b009d7b 100644
--- a/src/org/openbravo/retail/posterminal/PaidReceipts.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceipts.java
@@ -658,7 +658,7 @@ public class PaidReceipts extends JSONProcessSimple {
         paidReceipt.put("receiptPayments", listpaidReceiptsPayments);
 
         // TODO: make this extensible
-        String hqlReceiptTaxes = "select orderTax.tax.id as taxId, orderTax.tax.rate as rate, orderTax.taxableAmount as taxableamount, orderTax.taxAmount as taxamount, orderTax.tax.name as name, orderTax.tax.cascade as cascade, orderTax.tax.docTaxAmount as docTaxAmount, orderTax.tax.lineNo as lineNo, orderTax.tax.taxBase.id as taxBase from OrderTax as orderTax where orderTax.salesOrder.id=:salesOrderId";
+        String hqlReceiptTaxes = "select orderTax.tax.id as taxId, orderTax.tax.rate as rate, orderTax.taxableAmount as taxableamount, orderTax.taxAmount as taxamount, orderTax.tax.name as name, orderTax.tax.cascade as cascade, orderTax.tax.docTaxAmount as docTaxAmount, orderTax.lineNo as lineNo, orderTax.tax.taxBase.id as taxBase from OrderTax as orderTax where orderTax.salesOrder.id=:salesOrderId order by orderTax.lineNo";
         Query<Object[]> ReceiptTaxesQuery = OBDal.getInstance()
             .getSession()
             .createQuery(hqlReceiptTaxes, Object[].class);