diff -r 6e3aa748228a web/org.openbravo.retail.discounts.bypaymentmethod/js/paymentmethod-discount.js
--- a/web/org.openbravo.retail.discounts.bypaymentmethod/js/paymentmethod-discount.js	Wed Apr 03 13:33:49 2019 +0200
+++ b/web/org.openbravo.retail.discounts.bypaymentmethod/js/paymentmethod-discount.js	Thu Jul 11 19:29:33 2019 -0300
@@ -17,7 +17,7 @@
 };
 
 OB.DISXPM.applyDiscount = function (receipt) {
-  if (!OB.UTIL.isNullOrUndefined(receipt) && receipt.get('isEditable') === true && receipt.getTotal() > 0) {
+  if (!OB.UTIL.isNullOrUndefined(receipt) && (receipt.get('isEditable') === true || receipt.get('isLayaway')) && receipt.getTotal() > 0) {
     return true;
   }
   return false;
@@ -363,4 +363,12 @@
   OB.UTIL.HookManager.callbackExecutor(args, callbacks);
 });
 
+OB.UTIL.HookManager.registerHook('OBPOS_preAddPayment', function(args, callbacks) {
+    var receipt = args.receipt;
+    if(receipt.get('isLayaway')){
+        receipt.set('forceCalculateTaxes',true);
+    }
+    OB.UTIL.HookManager.callbackExecutor(args, callbacks);
+});
+
 OB.Model.Discounts.standardFilter = OB.Model.Discounts.standardFilter + " AND M_OFFER_TYPE_ID NOT IN ('" + OB.DISXPM.discountType + "') ";
\ No newline at end of file