0048271: Error doing a C&R in a terminal that does not have the payment method of the FIN_Paymentmethod_ID in a not paid Layaway

diff --git a/src/org/openbravo/retail/posterminal/POSUtils.java b/src/org/openbravo/retail/posterminal/POSUtils.java
index 82a7868d3..d616d86d8 100644
--- a/src/org/openbravo/retail/posterminal/POSUtils.java
+++ b/src/org/openbravo/retail/posterminal/POSUtils.java
@@ -877,7 +877,28 @@ public class POSUtils {
             defaultPaymentType.getFinancialAccount().getId());
         jsonorder.put("defaultPaymentType", paymentTypeValues);
       } else {
-        throw new OBException(OBMessageUtils.messageBD("OBPOS_NoPaymentMethodInStore"));
+        paymentQuery = OBDal.getInstance()
+            .createQuery(OBPOSAppPayment.class,
+                "as e where e.obposApplications.organization = :organization"
+                    + " and e.obposApplications.id = :terminal"
+                    + " and e.financialAccount.currency = :currency order by e.id");
+        paymentQuery.setNamedParameter("organization",
+            order.getObposApplications().getOrganization());
+        paymentQuery.setNamedParameter("terminal", order.getObposApplications().getId());
+        paymentQuery.setNamedParameter("currency", order.getOrganization().getCurrency());
+        paymentQuery.setFilterOnReadableOrganization(false);
+        paymentQuery.setMaxResult(1);
+        defaultPaymentType = paymentQuery.uniqueResult();
+        if (defaultPaymentType != null) {
+          JSONObject paymentTypeValues = new JSONObject();
+          paymentTypeValues.put("paymentMethodId",
+              defaultPaymentType.getPaymentMethod().getPaymentMethod().getId());
+          paymentTypeValues.put("financialAccountId",
+              defaultPaymentType.getFinancialAccount().getId());
+          jsonorder.put("defaultPaymentType", paymentTypeValues);
+        } else {
+          throw new OBException(OBMessageUtils.messageBD("OBPOS_NoPaymentMethodInStore"));
+        }
       }
     } catch (JSONException e) {
       log.error("Error setting default payment type to order" + order, e);