From 095f290eed1cb05e62a2791e54e965bdfe9c446e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 14 Sep 2015 23:25:50 +0200 Subject: [PATCH 1/3] IDEMPIERE-1440:line description alignment wrong on document printing / found issue printing a multiline string with empty lines --- .../src/org/compiere/print/layout/TableElement.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java index cd1a26b2ba..7fe046e1ff 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java @@ -434,7 +434,10 @@ public class TableElement extends PrintElement String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(string); for (int lineNo = 0; lineNo < lines.length; lineNo++) { - AttributedString aString = new AttributedString(lines[lineNo]); + String str = lines[lineNo]; + if (str.length() == 0) + str = " "; + AttributedString aString = new AttributedString(str); aString.addAttribute(TextAttribute.FONT, font); AttributedCharacterIterator iter = aString.getIterator(); LineBreakMeasurer measurer = new LineBreakMeasurer(iter, frc); From c4dea23fec5e6452f123e56986f78ed7fe10e091 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 16 Sep 2015 11:41:54 +0200 Subject: [PATCH 2/3] IDEMPIERE-2856 Promotion Rule creating wrong order lines --- org.adempiere.base/src/org/adempiere/model/PromotionRule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.adempiere.base/src/org/adempiere/model/PromotionRule.java b/org.adempiere.base/src/org/adempiere/model/PromotionRule.java index 0822141809..498f9b8a53 100644 --- a/org.adempiere.base/src/org/adempiere/model/PromotionRule.java +++ b/org.adempiere.base/src/org/adempiere/model/PromotionRule.java @@ -296,6 +296,7 @@ public class PromotionRule { nol.setQty(qty); if (discount.scale() > 2) discount = discount.setScale(2, BigDecimal.ROUND_HALF_UP); + nol.setPriceEntered(discount.negate()); nol.setPriceActual(discount.negate()); if (ol != null && Integer.toString(ol.getLine()).endsWith("0")) { for(int i = 0; i < 9; i++) { From 22ed5bebb47214050195dae2674695f3cc857ea0 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 16 Sep 2015 17:53:49 +0200 Subject: [PATCH 3/3] IDEMPIERE-2806 Incorrect Open Balance on Business Partner Screen --- org.adempiere.ui/src/org/compiere/apps/form/Allocation.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java index 9d8ecd4521..8370ebd14d 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java @@ -27,6 +27,7 @@ import org.adempiere.exceptions.AdempiereException; import org.compiere.minigrid.IMiniTable; import org.compiere.model.MAllocationHdr; import org.compiere.model.MAllocationLine; +import org.compiere.model.MBPartner; import org.compiere.model.MInvoice; import org.compiere.model.MPayment; import org.compiere.model.MRole; @@ -801,6 +802,9 @@ public class Allocation if (log.isLoggable(Level.CONFIG)) log.config("Payment #" + i + (pay.isAllocated() ? " not" : " is") + " fully allocated"); } + MBPartner bpartner = new MBPartner(Env.getCtx(), m_C_BPartner_ID, trxName); + bpartner.setTotalOpenBalance(); + bpartner.save(); paymentList.clear(); amountList.clear();