Author: jleroux Date: Thu Oct 19 09:39:42 2006 New Revision: 465674 URL: http://svn.apache.org/viewvc?view=rev&rev=465674 Log: A patch from Ray Barlow : "Changes the POS adjustments to be != 0 rather than just > 0, it will then show discounts on receipts" (https://issues.apache.org/jira/browse/OFBIZ-388)
Modified: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Modified: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java?view=diff&rev=465674&r1=465673&r2=465674 ============================================================================== --- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java Thu Oct 19 09:39:42 2006 @@ -225,7 +225,7 @@ itemInfo.put("basePrice", UtilFormatOut.formatPrice(item.getBasePrice())); itemInfo.put("subtotal", UtilFormatOut.formatPrice(item.getItemSubTotal())); itemInfo.put("isTaxable", item.taxApplies() ? "T" : " "); - itemInfo.put("adjustments", item.getOtherAdjustments() > 0 ? + itemInfo.put("adjustments", item.getOtherAdjustments() != 0 ? UtilFormatOut.formatPrice(item.getOtherAdjustments()) : ""); return itemInfo; @@ -1016,4 +1016,4 @@ pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); } } -} \ No newline at end of file +} Modified: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java?view=diff&rev=465674&r1=465673&r2=465674 ============================================================================== --- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java (original) +++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Thu Oct 19 09:39:42 2006 @@ -484,23 +484,23 @@ } public void printBarCode(int i, String s, int i1, int i2, int i3, int i4, int i5) throws JposException { - printALine("Barcode:" + s + "\n"); + printALine("Barcode:" + s); } public void printBitmap(int i, String s, int i1, int i2) throws JposException { - printALine("Bitmap:" + s + "\n"); + printALine("Bitmap:" + s); } public void printImmediate(int i, String s) throws JposException { - printALine("Immediate:" + s + "\n"); + printALine("Immediate:" + s); } public void printNormal(int i, String s) throws JposException { - printALine("Normal:" + s + "\n"); + printALine("Normal:" + s); } public void printTwoNormal(int i, String s, String s1) throws JposException { - printALine("2Normal:" + s + "\n"); + printALine("2Normal:" + s); } public void rotatePrint(int i, int i1) throws JposException {