From b9c3f19c841d5b194897924d30e36f6b3cf6121f Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Thu, 14 Nov 2013 12:39:44 +0800 Subject: [PATCH 1/2] Support "trim" attribute at the element. It is an optional attribute and is defaulted to true (i.e. trimmable). --- .../src/org/adempiere/pipo2/PackInHandler.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java index 0b2cfa5381..07cbe8593e 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java @@ -301,8 +301,12 @@ public class PackInHandler extends DefaultHandler { { if (e.contents.toString().length() != e.contents.toString().trim().length()) { - String s = e.contents.toString().trim(); - e.contents = new StringBuffer(s); + String trim = e.attributes.getValue("trim"); + if (!(trim != null && trim.equals("false"))) + { + String s = e.contents.toString().trim(); + e.contents = new StringBuffer(s); + } } } if (stack.isEmpty()) From 0a29fdcae05457ede19dcd1ffcd5d2b33455857d Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 14 Nov 2013 14:50:35 +0800 Subject: [PATCH 2/2] 1003475 IDEMPIERE-1530 Allow Material Receipt Line with Quantity Receipt more then Purchase Order Line's Quantity Ordered. Move migration script from i1.0c to i2.0 since i1.0c is closed. --- migration/{i1.0c => i2.0}/oracle/201311131356_IDEMPIERE-1530.sql | 0 .../{i1.0c => i2.0}/postgresql/201311131356_IDEMPIERE-1530.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename migration/{i1.0c => i2.0}/oracle/201311131356_IDEMPIERE-1530.sql (100%) rename migration/{i1.0c => i2.0}/postgresql/201311131356_IDEMPIERE-1530.sql (100%) diff --git a/migration/i1.0c/oracle/201311131356_IDEMPIERE-1530.sql b/migration/i2.0/oracle/201311131356_IDEMPIERE-1530.sql similarity index 100% rename from migration/i1.0c/oracle/201311131356_IDEMPIERE-1530.sql rename to migration/i2.0/oracle/201311131356_IDEMPIERE-1530.sql diff --git a/migration/i1.0c/postgresql/201311131356_IDEMPIERE-1530.sql b/migration/i2.0/postgresql/201311131356_IDEMPIERE-1530.sql similarity index 100% rename from migration/i1.0c/postgresql/201311131356_IDEMPIERE-1530.sql rename to migration/i2.0/postgresql/201311131356_IDEMPIERE-1530.sql